Ticket #1008: time-pri-expire.diff

programs/mythfrontend/globalsettings.cpp

@@ -522 +522 @@
     bc->setLabel(QObject::tr("Auto Expire Method"));
     bc->addSelection(QObject::tr("Oldest Show First"), "1");
     bc->addSelection(QObject::tr("Lowest Priority First"), "2");
+    bc->addSelection(QObject::tr("Time/Priority Tradeoff"), "3");
     bc->setHelpText(QObject::tr("Method used to determine which recorded "
                                 "shows to delete first.  LiveTV recordings "
                                 "will always expire before normal "
@@ -530 +531 @@
     return bc;
 }
 
+static GlobalSpinBox *AutoExpireDayPriority()
+{
+    GlobalSpinBox *bs = new GlobalSpinBox("AutoExpireDayPriority", 1, 400, 1);
+    bs->setLabel(QObject::tr("Auto Expire Priority Weight"));
+    bs->setHelpText(QObject::tr(
+                        "The number of days bonus a program "
+                        "gets for each priority point. "
+                        "This is only used when Time/Priority tradeoff "
+                        "is selected for the auto expire method."));
+    bs->setValue(3);
+    return bs;
+};
+
 static GlobalCheckBox *AutoExpireDefault()
 {
     GlobalCheckBox *bc = new GlobalCheckBox("AutoExpireDefault");
@@ -3148 +3162 @@
     general->addChild(SmartChannelChange());
     general->addChild(LastFreeCard());
     general->addChild(AutoExpireMethod());
+    general->addChild(AutoExpireDayPriority());
     general->addChild(AutoExpireDefault());
     general->addChild(AutoExpireLiveTVMaxAge());
     addChild(general);

programs/mythbackend/autoexpire.cpp

@@ -590 +590 @@
     {
         case emOldestFirst:
         case emLowestPriorityFirst:
+        case emTimePriorityTradeoff:
                 FillDBOrdered(expMethod);
                 break;
         // default falls through so list is empty so no AutoExpire
@@ -677 +678 @@
             where = "autoexpire > 0";
             orderby = "recorded.recpriority ASC, starttime ASC";
             break;
+        case emTimePriorityTradeoff:
+            where = "autoexpire > 0";
+            orderby = QString("DATE_ADD(starttime, INTERVAL '%1' * recorded.recpriority DAY) ASC")
+                    .arg(gContext->GetNumSetting("AutoExpireDayPriority", 3));
+            break;
         case emShortLiveTVPrograms:
             where = "recgroup = 'LiveTV' "
                     "AND endtime < DATE_ADD(starttime, INTERVAL '2' MINUTE) "
@@ -703 +709 @@
                "       title,           subtitle,    description, "
                "       hostname,        channum,     name,        "
                "       callsign,        seriesid,    programid,   "
-               "       recorded.        recpriority, progstart, "
+               "       recorded.recpriority,         progstart, "
                "       progend,         filesize "
                "FROM recorded "
                "LEFT JOIN channel ON recorded.chanid = channel.chanid "

programs/mythbackend/autoexpire.h

@@ -21 +21 @@
 enum ExpireMethodType {
     emOldestFirst          = 1,
     emLowestPriorityFirst  = 2,
+    emTimePriorityTradeoff = 3,
     emShortLiveTVPrograms  = 10000,
     emNormalLiveTVPrograms = 10001
 };