Ticket #2544: mythtv-cleanup_recording_rules_and_oldrecorded_in_housekeeper.patch

programs/mythbackend/housekeeper.h

@@ -35 +35 @@
     void CleanupMyOldRecordings(void);
     void CleanupAllOldInUsePrograms(void);
     void CleanupRecordedTables(void);
+    void CleanupExpiredRecordingRules(void);
+    void CleanupOldrecordedTable(void);
     bool threadrunning;
     bool filldbRunning;
     bool isMaster;

programs/mythbackend/housekeeper.cpp

@@ -225 +225 @@
                 JobQueue::CleanupOldJobsInQueue();
                 CleanupAllOldInUsePrograms();
                 CleanupRecordedTables();
+                CleanupExpiredRecordingRules();
+                CleanupOldrecordedTable();
                 updateLastrun("DailyCleanup");
             }
         }
@@ -368 +370 @@
     }
 }
 
+void HouseKeeper::CleanupExpiredRecordingRules(void)
+{
+    MSqlQuery query(MSqlQuery::InitCon());
+    MSqlQuery findq(MSqlQuery::InitCon());
+
+    query.prepare("DELETE FROM record WHERE (type = :SINGLE "
+                  "OR type = :OVERRIDE OR type = :DONTRECORD) "
+                  "AND enddate < NOW();");
+    query.bindValue(":SINGLE", kSingleRecord);
+    query.bindValue(":OVERRIDE", kOverrideRecord);
+    query.bindValue(":DONTRECORD", kDontRecord);
+    query.exec();
+
+    findq.prepare("SELECT record.recordid FROM record "
+                  "LEFT JOIN oldfind ON oldfind.recordid = record.recordid "
+                  "WHERE type = :FINDONE AND oldfind.findid IS NOT NULL;");
+    findq.bindValue(":FINDONE", kFindOneRecord);
+    findq.exec();
+
+    if (findq.isActive() && findq.size() > 0)
+    {
+        while (findq.next())
+        {
+            query.prepare("DELETE FROM record WHERE recordid = :RECORDID;");
+            query.bindValue(":RECORDID", findq.value(0).toInt());
+            query.exec();
+        }
+    }
+
+    query.prepare("DELETE FROM oldfind WHERE findid < TO_DAYS(NOW()) - 14;");
+    query.exec();
+}
+
+void HouseKeeper::CleanupOldrecordedTable(void)
+{
+    MSqlQuery query(MSqlQuery::InitCon());
+    int cleanOldRecorded = gContext->GetNumSetting( "CleanOldRecorded", 10);
+
+    query.prepare("DELETE FROM oldrecorded WHERE "
+                  "recstatus <> :RECORDED AND duplicate = 0 AND "
+                  "endtime < DATE_SUB(CURRENT_DATE, INTERVAL :CLEAN DAY);");
+    query.bindValue(":RECORDED", rsRecorded);
+    query.bindValue(":CLEAN", cleanOldRecorded);
+    query.exec();
+}
+
 void *HouseKeeper::doHouseKeepingThread(void *param)
 {
     HouseKeeper *hkeeper = (HouseKeeper*)param;

programs/mythfilldatabase/filldata.cpp

@@ -2781 +2781 @@
                   "DATE_SUB(CURRENT_DATE, INTERVAL :OFFSET DAY);");
     query.bindValue(":OFFSET", offset);
     query.exec();
-
-    query.prepare("DELETE FROM record WHERE (type = :SINGLE "
-                  "OR type = :OVERRIDE OR type = :DONTRECORD) "
-                  "AND enddate < NOW();");
-    query.bindValue(":SINGLE", kSingleRecord);
-    query.bindValue(":OVERRIDE", kOverrideRecord);
-    query.bindValue(":DONTRECORD", kDontRecord);
-    query.exec();
-
-    MSqlQuery findq(MSqlQuery::InitCon());
-    findq.prepare("SELECT record.recordid FROM record "
-                  "LEFT JOIN oldfind ON oldfind.recordid = record.recordid "
-                  "WHERE type = :FINDONE AND oldfind.findid IS NOT NULL;");
-    findq.bindValue(":FINDONE", kFindOneRecord);
-    findq.exec();
-        
-    if (findq.isActive() && findq.size() > 0)
-    {
-        while (findq.next())
-        {
-            query.prepare("DELETE FROM record WHERE recordid = :RECORDID;");
-            query.bindValue(":RECORDID", findq.value(0).toInt());
-            query.exec();
-        }
-    }
-    query.prepare("DELETE FROM oldfind WHERE findid < TO_DAYS(NOW()) - 14;");
-    query.exec();
-
-    int cleanOldRecorded = gContext->GetNumSetting( "CleanOldRecorded", 10);
-
-    query.prepare("DELETE FROM oldrecorded WHERE "
-                  "recstatus <> :RECORDED AND duplicate = 0 AND "
-                  "endtime < DATE_SUB(CURRENT_DATE, INTERVAL :CLEAN DAY);");
-    query.bindValue(":RECORDED", rsRecorded);
-    query.bindValue(":CLEAN", cleanOldRecorded);
-    query.exec();
 }
 
 /** \fn fillData(QValueList<Source> &sourcelist)