Ticket #2544: mythtv-cleanup_program_listings_through_housekeeper-post_11619.patch

programs/mythbackend/housekeeper.h

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

programs/mythbackend/housekeeper.cpp

@@ -18 +18 @@
 #include "libmyth/mythdbcon.h"
 #include "libmyth/util.h"
 
+#include "programdata.h"
+
 static bool HouseKeeper_filldb_running = false;
 
 HouseKeeper::HouseKeeper(bool runthread, bool master)
@@ -225 +227 @@
                 JobQueue::CleanupOldJobsInQueue();
                 CleanupAllOldInUsePrograms();
                 CleanupRecordedTables();
+                CleanupProgramListings();
                 updateLastrun("DailyCleanup");
             }
         }
@@ -368 +371 @@
     }
 }
 
+void HouseKeeper::CleanupProgramListings(void)
+{
+    if (!gContext->GetNumSetting("MythFillEnabled", 0))
+    {
+        ProgramData *prog_data = new ProgramData;
+        // Keep 7 days of old listings.  Users wanting listings deleted
+        // "immediately" may set up mythfilldatabase to run without
+        // the "--no-delete" argument
+        prog_data->no_delete = true;
+        prog_data->clearOldDBEntries();
+        delete prog_data;
+    }
+}
+
 void *HouseKeeper::doHouseKeepingThread(void *param)
 {
     HouseKeeper *hkeeper = (HouseKeeper*)param;