Remove support for old recording rule filters in frontend and backend.

Any rules using the old filters for "Exclude Old Episodes", "Exclude
unidentified episodes" and "Record new episode first showings" are
automatically converted to the new style.  Also add a new "This
Episode" filter to make it easier to match a specific episode.

Refs #9850.

Author: gigem

mythtv/libs/libmyth/recordingtypes.h

@@ -29,10 +29,7 @@ typedef enum RecordingDupInTypes
     kDupsInRecorded     = 0x01,
     kDupsInOldRecorded  = 0x02,
     kDupsInAll          = 0x0F,
-    kDupsNewEpi         = 0x10,
-    kDupsExRepeats      = 0x20,
-    kDupsExGeneric      = 0x40,
-    kDupsFirstNew       = 0x80
+    kDupsNewEpi         = 0x10
 } RecordingDupInType; // note stored in uin8_t in ProgramInfo
 
 

mythtv/libs/libmythbase/mythversion.h

@@ -51,7 +51,7 @@
  *  MythTV Python Bindings
  *      mythtv/bindings/python/MythTV/static.py
  */
-#define MYTH_DATABASE_VERSION "1283"
+#define MYTH_DATABASE_VERSION "1284"
 
 
  MBASE_PUBLIC  const char *GetMythSourceVersion();

mythtv/libs/libmythtv/dbcheck.cpp

@@ -5895,6 +5895,22 @@ NULL
             return false;
     }
 
+    if (dbver == "1283")
+    {
+        const char *updates[] = {
+"UPDATE record SET filter = filter | 1 WHERE record.dupin & 0x20",
+"UPDATE record SET filter = filter | 2 WHERE record.dupin & 0x40",
+"UPDATE record SET filter = filter | 5 WHERE record.dupin & 0x80",
+"UPDATE record SET dupin = dupin & ~0xe0",
+"INSERT INTO recordfilter (filterid, description, clause, newruledefault) "
+"    VALUES (6, 'This Episode', '(program.programid <> '''' AND program.programid = RECTABLE.programid) OR (program.programid = '''' AND program.subtitle = RECTABLE.subtitle AND program.description = RECTABLE.description)', 0);",
+NULL
+};
+
+        if (!performActualUpdate(updates, "1284", dbver))
+            return false;
+    }
+
     return true;
 }
 

mythtv/programs/mythbackend/scheduler.cpp

@@ -3345,11 +3345,6 @@ void Scheduler::UpdateMatches(int recordid) {
 "FROM (RECTABLE, program INNER JOIN channel "
 "      ON channel.chanid = program.chanid) ") + fromclauses[clause] + QString(
 " WHERE ") + whereclauses[clause] +
-    QString(" AND (NOT ((RECTABLE.dupin & %1) AND program.previouslyshown)) "
-            " AND (NOT ((RECTABLE.dupin & %2) AND program.generic > 0)) "
-            " AND (NOT ((RECTABLE.dupin & %3) AND (program.previouslyshown "
-            "                                      OR program.first = 0))) ")
-            .arg(kDupsExRepeats).arg(kDupsExGeneric).arg(kDupsFirstNew) +
     QString(" AND channel.visible = 1 ") +
     filterClause + QString(" AND "
 

mythtv/programs/mythfrontend/scheduleeditor.cpp

@@ -49,6 +49,7 @@ static QString fs2(QT_TRANSLATE_NOOP("SchedFilterEditor", "First showing"));
 static QString fs3(QT_TRANSLATE_NOOP("SchedFilterEditor", "Primetime"));
 static QString fs4(QT_TRANSLATE_NOOP("SchedFilterEditor", "Commercial free"));
 static QString fs5(QT_TRANSLATE_NOOP("SchedFilterEditor", "High definition"));
+static QString fs6(QT_TRANSLATE_NOOP("SchedFilterEditor", "This Episode"));
 
 void *ScheduleEditor::RunScheduleEditor(ProgramInfo *proginfo, void *player)
 {
@@ -621,23 +622,11 @@ void SchedOptEditor::Load()
                                 "only"),
                              ENUM_TO_QVARIANT(kDupsInOldRecorded));
 
-    if (!m_filtersButton)
+    if (gCoreContext->GetNumSetting("HaveRepeats", 0))
     {
         new MythUIButtonListItem(m_dupscopeList,
-                                tr("Exclude unidentified episodes"),
-                                ENUM_TO_QVARIANT(kDupsExGeneric | kDupsInAll));
-        if (gCoreContext->GetNumSetting("HaveRepeats", 0))
-        {
-            new MythUIButtonListItem(m_dupscopeList,
-                                    tr("Exclude old episodes"),
-                                    ENUM_TO_QVARIANT(kDupsExRepeats | kDupsInAll));
-            new MythUIButtonListItem(m_dupscopeList,
-                                    tr("Record new episodes only"),
-                                    ENUM_TO_QVARIANT(kDupsNewEpi | kDupsInAll));
-            new MythUIButtonListItem(m_dupscopeList,
-                                    tr("Record new episode first showings"),
-                                    ENUM_TO_QVARIANT(kDupsFirstNew | kDupsInAll));
-        }
+                                 tr("Record new episodes only"),
+                                 ENUM_TO_QVARIANT(kDupsNewEpi | kDupsInAll));
     }
 
     m_dupscopeList->SetValueByData(ENUM_TO_QVARIANT(m_recordingRule->m_dupIn));
@@ -781,14 +770,9 @@ void SchedFilterEditor::Load()
             button = new MythUIButtonListItem(m_filtersList, description,
                                               filterid);
             button->setCheckable(true);
-            if (m_recordingRule->IsLoaded())
-                button->setChecked(m_recordingRule->m_filter & (1 << filterid) ?
-                                   MythUIButtonListItem::FullChecked :
-                                   MythUIButtonListItem::NotChecked);
-            else
-                button->setChecked(filter_default ?
-                                   MythUIButtonListItem::FullChecked :
-                                   MythUIButtonListItem::NotChecked);
+            button->setChecked(m_recordingRule->m_filter & (1 << filterid) ?
+                               MythUIButtonListItem::FullChecked :
+                               MythUIButtonListItem::NotChecked);
         }
     }