Ticket #2655: smartdup3.patch

mythtv/libs/libmythtv/recordingtypes.h

@@ -35 +35 @@
     kDupCheckNone     = 0x01,
     kDupCheckSub      = 0x02,
     kDupCheckDesc     = 0x04,
-    kDupCheckSubDesc  = 0x06
+    kDupCheckSubDesc  = 0x06,
+    kDupCheckSmart    = 0x08
 };
 
 enum RecSearchType

mythtv/libs/libmythtv/programinfo.cpp

@@ -1390 +1390 @@
          (description.lower() != other.description.lower())))
         return false;
 
+    if ((dupmethod & kDupCheckSmart) &&
+        ((subtitle == "" && other.subtitle == "" && description.lower() != other.description.lower()) ||
+         (subtitle.lower() != other.subtitle.lower()) ||
+         (description == "" && subtitle == ""))) 
+        return false;
+
     return true;
 }
 

mythtv/programs/mythbackend/scheduler.cpp

@@ -2198 +2198 @@
 "       AND "
 "       (((RECTABLE.dupmethod & 0x04) = 0) OR (program.description <> '' "
 "          AND program.description = oldrecorded.description)) "
+"       AND "
+"       (((RECTABLE.dupmethod & 0x08) = 0) OR (program.subtitle <> '' "
+"          AND program.subtitle = oldrecorded.subtitle) OR (program.subtitle = ''  "
+"          AND oldrecorded.subtitle = '' AND program.description <> '' "
+"          AND program.description = oldrecorded.description)) "
 "      ) "
 "     ) "
 "  ) "
@@ -2225 +2230 @@
 "       AND "
 "       (((RECTABLE.dupmethod & 0x04) = 0) OR (program.description <> '' "
 "          AND program.description = recorded.description)) "
+"       AND "
+"       (((RECTABLE.dupmethod & 0x08) = 0) OR (program.subtitle <> '' "
+"          AND program.subtitle = recorded.subtitle) OR (program.subtitle = ''  "
+"          AND recorded.subtitle = '' AND program.description <> '' "
+"          AND program.description = recorded.description)) "
 "      ) "
 "     ) "
 "  ) "

mythplugins/mythweb/modules/_shared/lang/English_GB.lang

@@ -539 +539 @@
 "subtitle"
 "Subtitle"
 "Subtitle and Description"
+"Subtitle else Description"
 "Subtitled"
 "Sunday"
 "The requested recording schedule has been deleted."

mythplugins/mythweb/modules/tv/includes/recording_schedules.php

@@ -436 +436 @@
                 case 2:  $str .= t('Subtitle');                     break;
                 case 4:  $str .= t('Description');                  break;
                 case 6:  $str .= t('Subtitle and Description');     break;
+                case 8:  $str .= t('Subtitle else Description');    break;
                 case 22: $str .= t('Sub and Desc (Empty matches)'); break;
             }
             $str .= "</dd>\n";

mythplugins/mythweb/modules/tv/tmpl/default/detail.php

@@ -457 +457 @@
                         if ($schedule->dupmethod == 6 || $schedule->dupmethod == 0)
                             echo ' SELECTED';
                         echo '>'.t('Subtitle and Description').'</option>';
+                        echo '<option value="8"';
+                        if ($schedule->dupmethod == 8)
+                            echo ' SELECTED';
+                        echo '>'.t('Subtitle else Description').'</option>';
                    ?></select></dd>
                 <dt><?php echo t('Preferred Input') ?>:</dt>
                 <dd><?php input_select($schedule->prefinput, 'prefinput') ?></dd>