Ticket #2655: mythtvsmartdup.2.patch

libs/libmythtv/recordingtypes.h

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

libs/libmythtv/sr_items.h

@@ -321 +321 @@
             : SRSelectSetting(_parent, "dupMethodList", QObject::tr("[ Match duplicates with ]"), _group,
                               "dupmethod", _list)
         {
+            addSelection(QObject::tr("Match duplicates using subtitle else description"), kDupCheckSmart);
             addSelection(QObject::tr("Match duplicates using subtitle & description"), kDupCheckSubDesc);
             addSelection(QObject::tr("Match duplicates using subtitle"), kDupCheckSub);
             addSelection(QObject::tr("Match duplicates using description"), kDupCheckDesc);
             addSelection(QObject::tr("Don't match duplicates"), kDupCheckNone);
-            setValue(kDupCheckSubDesc);
+            setValue(kDupCheckSmart);
             _parent->setDupMethodObj(this);
         }
 };

libs/libmythtv/programinfo.cpp

@@ -103 +103 @@
     parentid = 0;
     rectype = kNotRecording;
     dupin = kDupsInAll;
-    dupmethod = kDupCheckSubDesc;
+    dupmethod = kDupCheckSmart;
 
     sourceid = 0;
     inputid = 0;
@@ -1349 +1349 @@
          (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;
 }
 

libs/libmythtv/scheduledrecording.cpp

@@ -788 +788 @@
     profile->setValue(QObject::tr("Default"));
     
     dupin->setValue(kDupsInAll);
-    dupmethod->setValue(kDupCheckSubDesc);
+    dupmethod->setValue(kDupCheckSmart);
     maxepisodes->setValue(0);
     startoffset->setValue(gContext->GetNumSetting("DefaultStartOffset", 0));
     endoffset->setValue(gContext->GetNumSetting("DefaultEndOffset", 0));

programs/mythbackend/scheduler.cpp

@@ -2220 +2220 @@
 "       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)) "
 "      ) "
 "     ) "
 "  ) "
@@ -2247 +2252 @@
 "       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)) "
 "      ) "
 "     ) "
 "  ) "