Ticket #1657: ignoreincomplete.3.patch

libs/libmythtv/sr_items.cpp

@@ -31 +31 @@
     addItem(dupLocItem->getItem(), -1);
     connect(dupMethItem->getItem(), SIGNAL(changed(ManagedListItem*)), this, SLOT(itemChanged(ManagedListItem*)));
 
+    ignoreIncomplete = new SRIgnoreIncomplete(_rec, this, parentList);
+    addItem(ignoreIncomplete->getItem(), -1);
+
     inactive = new SRInactive(_rec, this, _parentList);
     addItem(inactive->getItem(), -1);
 }

libs/libmythtv/scheduledrecording.h

@@ -28 +28 @@
 class SRAutoUserJob3;
 class SRAutoUserJob4;
 class SRAutoExpire;
+class SRIgnoreIncomplete;
 class SRStartOffset;
 class SREndOffset;
 class SRMaxEpisodes;
@@ -80 +81 @@
     int GetAutoExpire(void) const;
     void SetAutoExpire(int expire);
 
+    int GetIgnoreIncomplete(void) const;
+    void SetIgnoreIncomplete(int expire);
+
     int GetMaxEpisodes(void) const;
     bool GetMaxNewest(void) const;
 
@@ -150 +154 @@
     void setAutoUserJob3Obj(SRAutoUserJob3* val) {autouserjob3 = val;}
     void setAutoUserJob4Obj(SRAutoUserJob4* val) {autouserjob4 = val;}
     void setAutoExpireObj(SRAutoExpire* val) {autoexpire = val;}
+    void setIgnoreIncompleteObj(SRIgnoreIncomplete* val) {ignoreincomplete = val;}
     void setStartOffsetObj(SRStartOffset* val) {startoffset = val;}
     void setEndOffsetObj(SREndOffset* val) {endoffset = val;}
     void setMaxEpisodesObj(SRMaxEpisodes* val) {maxepisodes = val;}
@@ -223 +228 @@
     class SRAutoUserJob3* autouserjob3;
     class SRAutoUserJob4* autouserjob4;
     class SRAutoExpire* autoexpire;
+    class SRIgnoreIncomplete* ignoreincomplete;
     class SRStartOffset* startoffset;
     class SREndOffset* endoffset;
     class SRMaxEpisodes* maxepisodes;

libs/libmythtv/sr_items.h

@@ -394 +394 @@
         class SRDupIn* dupLocItem;
         class SRInput* prefInput;
         class SRInactive* inactive;
+        class SRIgnoreIncomplete* ignoreIncomplete;
 
         ScheduledRecording *schedRec;
 };
@@ -719 +720 @@
         }
 };
 
+class SRIgnoreIncomplete: public SRBoolSetting
+{
+    public:
+        SRIgnoreIncomplete(ScheduledRecording *_parent, ManagedListGroup* _group, ManagedList* _list)
+                    : SRBoolSetting(_parent, QObject::tr("Ignore generic episodes"), 
+                                     QObject::tr("Record generic episodes"),
+                                    "ignoreIncompleteItem", "ignoreincomplete", _group, _list )
+        {
+            _parent->setIgnoreIncompleteObj(this);
+        }
+};
+
 class SRInactive: public SRBoolSetting
 {
     public:

libs/libmythtv/scheduledrecording.cpp

@@ -58 +58 @@
     dupin = NULL;
     dupmethod = NULL;
     autoexpire = NULL;
+    ignoreincomplete = NULL;
     autotranscode = NULL;
     transcoder = NULL;
     autocommflag = NULL;
@@ -426 +427 @@
     autoexpire->setValue(expire);
 }
 
+int ScheduledRecording::GetIgnoreIncomplete(void) const {
+    return(ignoreincomplete->getValue().toInt());
+}
+
+void ScheduledRecording::SetIgnoreIncomplete(int expire) {
+    ignoreincomplete->setValue(expire);
+}
+
 int ScheduledRecording::GetTranscoder(void) const {
     return transcoder->getValue().toInt();
 }
@@ -855 +864 @@
     recpriority->setValue(0);
     
     autoexpire->setValue(gContext->GetNumSetting("AutoExpireDefault", 0));
+    ignoreincomplete->setValue(gContext->GetNumSetting("IgnoreIncompleteDefault", 0));
 
     autotranscode->setValue(gContext->GetNumSetting("AutoTranscode", 0));
     transcoder->fillSelections();
@@ -944 +954 @@
     dupin->setChanged();
     dupmethod->setChanged();
     autoexpire->setChanged();
+    ignoreincomplete->setChanged();
     autotranscode->setChanged();
     autocommflag->setChanged();
     autouserjob1->setChanged();

programs/mythbackend/scheduler.cpp

@@ -2750 +2750 @@
 "program.videoprop+0, program.subtitletypes+0, program.audioprop+0, "
 "RECTABLE.storagegroup, capturecard.hostname, recordmatch.oldrecstatus, " + 
     pwrpri + QString(
+", RECTABLE.ignoreincomplete "
 "FROM recordmatch "
 " INNER JOIN RECTABLE ON (recordmatch.recordid = RECTABLE.recordid) "
 " INNER JOIN program ON (recordmatch.chanid = program.chanid AND "
@@ -2922 +2923 @@
             if ((p->dupin & kDupsNewEpi) && p->repeat)
                 p->recstatus = rsRepeat;
 
+             
+            // If we want to ignore episodes in series with bogus data.
+            // Unfortunately the 'generic' flag doesn't work very well, since
+            // since it is not set if there is a generic description. More fundamentally, 
+            // you need to know which of subtitle and/or description are expected before 
+            // you can determine if a program entry is generic. In this test
+            // if you match on subtitle AND desctiption, BOTH must be set or it's
+            // treated as generic.
+            QRegExp exp(".*0000");
+            QString series("series");
+
+            if (result.value(46).toInt() && p->category.compare(series) && p->programid.contains(exp)) {
+              if( (p->dupmethod & 0x2 && p->subtitle.isEmpty()) ||
+                  (p->dupmethod & 0x4 && p->description.isEmpty()) )
+                p->recstatus = rsRepeat;
+            }
+
             if ((p->dupin & kDupsInOldRecorded) && result.value(10).toInt())
             {
                 if (result.value(44).toInt() == rsNeverRecord)
@@ -2929 +2947 @@
                 else
                     p->recstatus = rsPreviousRecording;
             }
+
+            /* finddulicate */
             if ((p->dupin & kDupsInRecorded) && result.value(14).toInt())
                 p->recstatus = rsCurrentRecording;
         }