Ticket #1657: ignoreincomplete.patch

libs/libmythtv/scheduledrecording.h

@@ -28 +28 @@
 class SRAutoUserJob3;
 class SRAutoUserJob4;
 class SRAutoExpire;
+class SRIgnoreIncomplete;
 class SRStartOffset;
 class SREndOffset;
 class SRMaxEpisodes;
@@ -76 +77 @@
     int GetAutoExpire(void) const;
     void SetAutoExpire(int expire);
 
+    int GetIgnoreIncomplete(void) const;
+    void SetIgnoreIncomplete(int expire);
+
     int GetMaxEpisodes(void) const;
     bool GetMaxNewest(void) const;
 
@@ -143 +147 @@
     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;}
@@ -211 +216 @@
     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.cpp

@@ -28 +28 @@
     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/sr_items.h

@@ -336 +336 @@
         class SREndOffset* endOffset;
         class SRDupMethod* dupMethItem;
         class SRDupIn* dupLocItem;
+        class SRIgnoreIncomplete* ignoreIncomplete;
 
         ScheduledRecording *schedRec;
 };
@@ -687 +688 @@
         }
 };
 
+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

@@ -29 +29 @@
     dupin = NULL;
     dupmethod = NULL;
     autoexpire = NULL;
+    ignoreincomplete = NULL;
     autotranscode = NULL;
     transcoder = NULL;
     autocommflag = NULL;
@@ -398 +399 @@
     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();
 }
@@ -450 +459 @@
         MSqlQuery query(MSqlQuery::InitCon());
         query.prepare(
             "UPDATE recorded "
-                "SET recpriority = :RECPRIORITY, recgroup = :RECGROUP, "
+                "SET recpriority = :RECPRIORITY, "
+            // "recgroup = :RECGROUP, "
                     "transcoder = :TRANSCODER, playgroup = :PLAYGROUP "
                 "WHERE recordid = :RECORDID ;");
         query.bindValue(":RECPRIORITY", getRecPriority());
-        query.bindValue(":RECGROUP", recgroup->getValue());
+        //        query.bindValue(":RECGROUP", recgroup->getValue());
         query.bindValue(":TRANSCODER", transcoder->getValue().toInt());
         query.bindValue(":PLAYGROUP", playgroup->getValue());
         query.bindValue(":RECORDID", getRecordID());
@@ -788 +798 @@
     recpriority->setValue(0);
     
     autoexpire->setValue(gContext->GetNumSetting("AutoExpireDefault", 0));
+    ignoreincomplete->setValue(gContext->GetNumSetting("IgnoreIncompleteDefault", 0));
 
     autotranscode->setValue(gContext->GetNumSetting("AutoTranscode", 0));
     transcoder->fillSelections();
@@ -873 +884 @@
     dupin->setChanged();
     dupmethod->setChanged();
     autoexpire->setChanged();
+    ignoreincomplete->setChanged();
     autotranscode->setChanged();
     autocommflag->setChanged();
     autouserjob1->setChanged();

programs/mythbackend/scheduler.cpp

@@ -2006 +2005 @@
 "program.airdate, program.stars, program.originalairdate, RECTABLE.inactive, "
 "RECTABLE.parentid, ") + progfindid + ", RECTABLE.playgroup, "
 "oldrecstatus.recstatus, oldrecstatus.reactivate, " 
-"channel.recpriority + cardinput.preference "
+"channel.recpriority + cardinput.preference, "
+"RECTABLE.ignoreincomplete, program.generic "
 + QString(
 "FROM recordmatch "
 
@@ -2102 +2102 @@
     }
 
     VERBOSE(VB_SCHEDULE, QString(" |-- %1 results in %2 sec. Processing...")
-            .arg(result.size())
+            .arg((unsigned long)result.size())
             .arg(((dbend.tv_sec  - dbstart.tv_sec) * 1000000 +
                   (dbend.tv_usec - dbstart.tv_usec)) / 1000000.0));
 
@@ -2223 +2223 @@
                  !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(40).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;