Ticket #1657: ignoreincomplete.2.patch

libs/libmythtv/sr_items.cpp

@@ -31 +31 @@
     prefInput = new SRInput(_rec, _parentList, this);
     addItem(prefInput->getItem(), -1);
 
+    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;
@@ -77 +78 @@
     int GetAutoExpire(void) const;
     void SetAutoExpire(int expire);
 
+    int GetIgnoreIncomplete(void) const;
+    void SetIgnoreIncomplete(int expire);
+
     int GetMaxEpisodes(void) const;
     bool GetMaxNewest(void) const;
 
@@ -145 +149 @@
     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;}
@@ -215 +220 @@
     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

@@ -385 +385 @@
         class SRDupIn* dupLocItem;
         class SRInput* prefInput;
         class SRInactive* inactive;
+        class SRIgnoreIncomplete* ignoreIncomplete;
 
         ScheduledRecording *schedRec;
 };
@@ -737 +738 @@
         }
 };
 
+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

@@ -30 +30 @@
     dupin = NULL;
     dupmethod = NULL;
     autoexpire = NULL;
+    ignoreincomplete = NULL;
     autotranscode = NULL;
     transcoder = NULL;
     autocommflag = NULL;
@@ -400 +401 @@
     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();
 }
@@ -796 +805 @@
     recpriority->setValue(0);
     
     autoexpire->setValue(gContext->GetNumSetting("AutoExpireDefault", 0));
+    ignoreincomplete->setValue(gContext->GetNumSetting("IgnoreIncompleteDefault", 0));
 
     autotranscode->setValue(gContext->GetNumSetting("AutoTranscode", 0));
     transcoder->fillSelections();
@@ -883 +893 @@
     dupin->setChanged();
     dupmethod->setChanged();
     autoexpire->setChanged();
+    ignoreincomplete->setChanged();
     autotranscode->setChanged();
     autocommflag->setChanged();
     autouserjob1->setChanged();

programs/mythbackend/scheduler.cpp

@@ -2050 +2050 @@
 "oldrecstatus.recstatus, oldrecstatus.reactivate, " 
 "channel.recpriority + cardinput.recpriority, "
 "RECTABLE.prefinput, program.hdtv, program.closecaptioned, "
-"program.first, program.last, program.stereo "
+"program.first, program.last, program.stereo, "
+"RECTABLE.ignoreincomplete "
 + QString(
 "FROM recordmatch "
 
@@ -2292 +2293 @@
                  !p->reactivate &&
                  !(p->dupmethod & kDupCheckNone))
         {
-            if (p->dupin == kDupsNewEpi && p->repeat)
+          QRegExp exp(".*0000");
+          QString series("series");
+
+             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 seem to work,
+             // perhaps because of generic descriptions
+            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;
+            }
 
+            /* findduplicate */
             if (((p->dupin & kDupsInOldRecorded) || (p->dupin == kDupsNewEpi)) &&
                 result.value(10).toInt())
                 p->recstatus = rsPreviousRecording;