Ticket #5251: watch-weight-expire.diff

programs/mythfrontend/globalsettings.cpp

@@ -669 +669 @@
     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("Weighted Time/Priority Combination"), "3");
+    bc->addSelection(QObject::tr("Weighted Time/Priority/Watched Combination"), 
+                     "3");
     bc->setHelpText(QObject::tr("Method used to determine which recorded "
                     "shows to delete first.  LiveTV recordings will always "
                     "expire before normal recordings."));
@@ -684 +685 @@
     bc->setValue(false); 
     bc->setHelpText(QObject::tr("If set, programs that have been marked as "
                     "watched will be expired before programs that have not "
-                    "been watched."));
+                    "been watched. Does not apply to Weighted "
+                    "Time/Priority/Watched Auto Expire Method "
+                    "(use Watched Weight instead)."));
     return bc;
 }
 
@@ -694 +697 @@
     bs->setLabel(QObject::tr("Priority Weight"));
     bs->setHelpText(QObject::tr("The number of days bonus a program gets for "
                     "each priority point. This is only used when the Weighted "
-                    "Time/Priority Auto Expire Method is selected."));
+                    "Time/Priority/Watched Auto Expire Method is selected."));
     bs->setValue(3);
     return bs;
 };
 
+static GlobalSpinBox *AutoExpireWatchedWeight()
+{
+    GlobalSpinBox *bs = new GlobalSpinBox("AutoExpireWatchedWeight", 1, 400, 1);
+    bs->setLabel(QObject::tr("Watched Weight"));
+    bs->setHelpText(QObject::tr("The number of days fewer a program gets when "
+                    "it is marked as watched. This is only used when the "
+                    "Weighted Time/Priority/Watched Auto Expire Method "
+                    "is selected."));
+    bs->setValue(14);
+    return bs;
+};
+
+
 static GlobalCheckBox *AutoExpireDefault()
 {
     GlobalCheckBox *bc = new GlobalCheckBox("AutoExpireDefault");
@@ -4760 +4776 @@
         new VerticalConfigurationGroup(false, false, true, true);
     expgrp1->addChild(AutoExpireLiveTVMaxAge());
     expgrp1->addChild(AutoExpireDayPriority());
+    expgrp1->addChild(AutoExpireWatchedWeight());
     expgrp1->addChild(AutoExpireExtraSpace());
 
     HorizontalConfigurationGroup *expgrp =

programs/mythbackend/autoexpire.cpp

@@ -869 +869 @@
         case emWeightedTimePriority:
             msg = "Adding expirable programs in Weighted Time Priority order";
             where = "autoexpire > 0";
-            if (gContext->GetNumSetting("AutoExpireWatchedPriority", 0))
-                orderby = "recorded.watched DESC, ";
-            orderby += QString("DATE_ADD(starttime, INTERVAL '%1' * "
-                                        "recorded.recpriority DAY) ASC")
-                      .arg(gContext->GetNumSetting("AutoExpireDayPriority", 3));
+            orderby = 
+                QString("starttime"
+                        " + INTERVAL '%1' * recorded.recpriority DAY"
+                        " - INTERVAL '%2' * recorded.watched DAY"
+                        " ASC")
+                .arg(gContext->GetNumSetting("AutoExpireDayPriority", 3))
+                .arg(gContext->GetNumSetting("AutoExpireWatchedWeight", 14));
             break;
         case emShortLiveTVPrograms:
             msg = "Adding Short LiveTV programs in starttime order";