Ticket #1654: autoexpire.patch

libs/libmythtv/dbcheck.cpp

@@ -10 +10 @@
 #include "mythdbcon.h"
 
 /// This is the DB schema version expected by the running MythTV instance.
-const QString currentDatabaseVersion = "1135";
+const QString currentDatabaseVersion = "1136";
 
 static bool UpdateDBVersionNumber(const QString &newnumber);
 static bool performActualUpdate(const QString updates[], QString version,
@@ -2180 +2180 @@
             return false;
     }
 
+    if (dbver == "1135")
+    {
+        const QString updates[] = {
+"ALTER TABLE recorded ADD COLUMN parentid int(11) NOT NULL DEFAULT 0;",
+""
+};
+
+        if (!performActualUpdate(updates, "1136", dbver))
+            return false;
+    }
+
 //"ALTER TABLE capturecard DROP COLUMN dvb_recordts;" in 0.21
 //"ALTER TABLE capturecard DROP COLUMN dvb_hw_decoder;" in 0.21
 //"ALTER TABLE cardinput DROP COLUMN  preference;" in 0.22

libs/libmythtv/scheduledrecording.h

@@ -114 +114 @@
     QString getRecordSubTitle(void) const;
     QString getRecordDescription(void) const;
     QString getProfileName(void) const;
+    QString getParentId(void) const;
 
     void findMatchingPrograms(list<ProgramInfo*>& proglist);
 

libs/libmythtv/programinfo.cpp

@@ -1019 +1019 @@
     }
 
     query.prepare("UPDATE recorded "
-                  "SET recordid = :RECID "
+                  "SET recordid = :RECID, "
+                  "    parentid = :PARENTID "
                   "WHERE chanid = :CHANID AND starttime = :START");
     query.bindValue(":RECID",  getRecordID());
+    query.bindValue(":PARENTID", record->getParentId());
     query.bindValue(":CHANID", chanid);
     query.bindValue(":START",  recstartts);
 
@@ -1506 +1508 @@
         "    programid, stars,       previouslyshown, originalairdate,  "
         "    findid,    transcoder,  playgroup,       recpriority,      "
         "    basename,  progstart,   progend,         profile,          "
-        "    duplicate) "
+        "    duplicate, parentid) "
         "VALUES"
         "  (:CHANID,   :STARTS,     :ENDS,           :TITLE,            "
         "   :SUBTITLE, :DESC,       :HOSTNAME,       :CATEGORY,         "
@@ -1514 +1516 @@
         "   :PROGRAMID,:STARS,      :REPEAT,         :ORIGAIRDATE,      "
         "   :FINDID,   :TRANSCODER, :PLAYGROUP,      :RECPRIORITY,      "
         "   :BASENAME, :PROGSTART,  :PROGEND,        :PROFILE,          "
-        "   0) "
+        "   0,         :PARENTID) "
         );
 
     query.bindValue(":CHANID",      pg->chanid);
@@ -1541 +1543 @@
     query.bindValue(":PROGSTART",   pg->startts);
     query.bindValue(":PROGEND",     pg->endts);
     query.bindValue(":PROFILE",     schd->getProfileName());
-
+    query.bindValue(":PARENTID",    schd->getParentId());
     bool ok = query.exec() && (query.numRowsAffected() > 0);
     if (!ok && !query.isActive())
         MythContext::DBError("insert_program -- insert", query);
@@ -1586 +1588 @@
 {
     MSqlQuery query(MSqlQuery::InitCon());
     query.prepare("UPDATE recorded SET endtime = :ENDTIME, "
-                  "    recordid = :RECORDID "
+                  "    recordid = :RECORDID, "
+                  "    parentid = :PARENTID "
                   "WHERE chanid = :CHANID AND "
                   "    starttime = :STARTTIME ");
     query.bindValue(":ENDTIME", recendts);
     query.bindValue(":RECORDID", recordid);
+    query.bindValue(":PARENTID", record->getParentId());
     query.bindValue(":CHANID", chanid);
     query.bindValue(":STARTTIME", recstartts);
 

libs/libmythtv/scheduledrecording.cpp

@@ -723 +723 @@
     return description->getValue();
 }
 
+QString ScheduledRecording::getParentId(void) const {
+    return parentid->getValue();
+}
+
 MythDialog* ScheduledRecording::dialogWidget(MythMainWindow *parent,
                                              const char *name)
 {

programs/mythbackend/autoexpire.cpp

@@ -523 +523 @@
     {
         query.prepare("SELECT chanid, starttime, title, progstart, progend, filesize "
                       "FROM recorded "
-                      "WHERE recordid = :RECID AND preserve = 0 "
+                      "WHERE (recordid = :RECID OR parentid = :RECID) "
+                      "AND preserve = 0 "
                       "AND recgroup <> 'LiveTV' "
                       "ORDER BY starttime DESC;");
         query.bindValue(":RECID", maxIter.key());