Ticket #171: mythtv.autoexpire-priority.171.diff

libs/libmythtv/scheduledrecording.h

@@ -84 +84 @@
 
     void setStart(const QDateTime& start);
     void setEnd(const QDateTime& end);
+    int getRecPriority(void) const;
     void setRecPriority(int recpriority);
     void setRecGroup(const QString& recgroup);
 

libs/libmythtv/dbcheck.cpp

@@ -10 +10 @@
 #include "mythdbcon.h"
 
 /// This is the DB schema version expected by the running MythTV instance.
-const QString currentDatabaseVersion = "1090";
+const QString currentDatabaseVersion = "1091";
 
 static bool UpdateDBVersionNumber(const QString &newnumber);
 static bool performActualUpdate(const QString updates[], QString version,
@@ -1991 +1991 @@
             return false;
     }
 
+    if (dbver == "1090")
+    {
+        const QString updates[] = {
+            "ALTER TABLE recorded ADD COLUMN recpriority INT NOT NULL DEFAULT 0;",
+            ""
+        };
+        
+        if (!performActualUpdate(updates, "1091", dbver))
+            return false;
+
+        MSqlQuery recordids(MSqlQuery::InitCon());
+        recordids.prepare("SELECT recordid,recpriority FROM record;");
+        if (recordids.exec() && recordids.isActive() && recordids.size() > 0)
+        {
+            MSqlQuery update(MSqlQuery::InitCon());
+            while (recordids.next())
+            {
+                update.prepare(QString(
+                    "UPDATE recorded SET recpriority = %1 WHERE recordid = %2;")
+                    .arg(recordids.value(1).toInt())
+                    .arg(recordids.value(0).toInt()));
+                update.exec();
+            }
+        }
+    }
+
 // Drop xvmc_buffer_settings at some point
 // Drop dead DVB tables eventually, too   
     
@@ -2480 +2506 @@
     return true;
 }
 
+/* vim: set expandtab tabstop=4 shiftwidth=4: */

libs/libmythtv/programinfo.cpp

@@ -704 +704 @@
                   "channel.callsign,channel.name,channel.commfree, "
                   "channel.outputfilters,seriesid,programid,filesize, "
                   "lastmodified,stars,previouslyshown,originalairdate, "
-                  "hostname,recordid,transcoder,timestretch "
+                  "hostname,recordid,transcoder,timestretch, "
+                  "recorded.recpriority "
                   "FROM recorded "
                   "LEFT JOIN channel "
                   "ON recorded.chanid = channel.chanid "
@@ -765 +766 @@
         proginfo->programflags = proginfo->getProgramFlags();
 
         proginfo->timestretch = query.value(21).toString().toFloat();
+        proginfo->recpriority = query.value(22).toInt();
 
         return proginfo;
     }
@@ -1228 +1230 @@
                   " subtitle,description,hostname,category,recgroup,"
                   " autoexpire,recordid,seriesid,programid,stars,"
                   " previouslyshown,originalairdate,findid,transcoder,"
-                  " timestretch)"
+                  " timestretch,recpriority)"
                   " VALUES(:CHANID,:STARTS,:ENDS,:TITLE,:SUBTITLE,:DESC,"
                   " :HOSTNAME,:CATEGORY,:RECGROUP,:AUTOEXP,:RECORDID,"
                   " :SERIESID,:PROGRAMID,:STARS,:REPEAT,:ORIGAIRDATE,"
-                  " :FINDID,:TRANSCODER,:TIMESTRETCH);");
+                  " :FINDID,:TRANSCODER,:TIMESTRETCH,:RECPRIORITY);");
     query.bindValue(":CHANID", chanid);
     query.bindValue(":STARTS", starts);
     query.bindValue(":ENDS", ends);
@@ -1252 +1254 @@
     query.bindValue(":ORIGAIRDATE", originalAirDate);
     query.bindValue(":TRANSCODER", record->GetTranscoder());
     query.bindValue(":TIMESTRETCH", timestretch);
+    query.bindValue(":RECPRIORITY", record->getRecPriority());
 
     if (!query.exec() || !query.isActive())
         MythContext::DBError("WriteRecordedToDB", query);
@@ -3525 +3528 @@
     else
         return 0;
 }
+
+/* vim: set expandtab tabstop=4 shiftwidth=4: */

libs/libmythtv/scheduledrecording.cpp

@@ -608 +609 @@
     endDate->setValue(end.date());
 }
 
+int ScheduledRecording::getRecPriority(void) const {
+    return recpriority->getValue().toInt();
+}
+
 void ScheduledRecording::setRecPriority(int newrecpriority) {
     recpriority->setValue(newrecpriority);
 }
@@ -774 +779 @@
     recgroup->setChanged();
 }
 
-
-
-
+/* vim: set expandtab tabstop=4 shiftwidth=4: */

programs/mythfrontend/globalsettings.cpp

@@ -514 +514 @@
     bc->setLabel(QObject::tr("Auto Expire Method"));
     bc->addSelection(QObject::tr("None"), "0");
     bc->addSelection(QObject::tr("Oldest Show First"), "1");
+    bc->addSelection(QObject::tr("Lowest Priority First"), "2");
     bc->setHelpText(QObject::tr("Method used to determine which recorded "
                                 "shows to delete first. Set to 'None' to "
                                 "disable Auto Expire (not recommended)."));

programs/mythbackend/autoexpire.cpp

@@ -467 +467 @@
 
     switch(expMethod)
     {
-        case 1: FillOldestFirst(); break;
+        case 1:
+        case 2:
+            FillOldestFirst(expMethod);
+            break;
 
         // default falls through so list is empty so no AutoExpire
     }
@@ -489 +492 @@
         if (first->subtitle != "")
             title += ": \"" + first->subtitle + "\"";
 
-        cout << title.local8Bit().leftJustify(40, ' ', true) << " "
+        cout << title.local8Bit().leftJustify(39, ' ', true) << " "
+             << QString("%1").arg(first->filesize / 1024 / 1024).local8Bit()
+                .rightJustify(5, ' ', true) << "MiB  "
              << first->startts.toString().local8Bit().leftJustify(24, ' ', true)
-             << "  " << first->filesize / 1024 / 1024 << " MBytes"
+             << " [" << QString("%1").arg(first->recpriority).local8Bit()
+                .rightJustify(3, ' ', true) << "]"
              << endl;
     }
 }
@@ -512 +518 @@
 /** \fn AutoExpire::FillOldestFirst()
  *  \brief Creates a list of programs to delete, with the oldest file listed first.
  */
-void AutoExpire::FillOldestFirst(void)
+void AutoExpire::FillOldestFirst(int expMethod)
 {
     QString fileprefix = gContext->GetFilePrefix();
 
+    QString orderby;
+
+    switch (expMethod)
+    {
+    default:
+    case 1: // Oldest first
+        orderby = "starttime ASC";
+        break;
+
+    case 2: // Lowest priority first
+        orderby = "recorded.recpriority ASC, starttime ASC";
+        break;
+    }
+
     MSqlQuery query(MSqlQuery::InitCon());
     QString querystr = QString(
                "SELECT recorded.chanid,starttime,endtime,title,subtitle, "
-               "description,hostname,channum,name,callsign,seriesid,programid "
+               "description,hostname,channum,name,callsign,seriesid,programid, "
+               "recorded.recpriority "
                "FROM recorded "
                "LEFT JOIN channel ON recorded.chanid = channel.chanid "
                "WHERE autoexpire > 0 "
-               "ORDER BY autoexpire DESC, starttime ASC");
-
+               "ORDER BY autoexpire DESC, %1")
+        .arg(orderby);
+    
     query.prepare(querystr);
 
     if (!query.exec() || !query.isActive() || !query.size())
@@ -561 +583 @@
 
         proginfo->seriesid = query.value(10).toString();
         proginfo->programid = query.value(11).toString();
+        proginfo->recpriority = query.value(12).toInt();
 
         proginfo->pathname = proginfo->GetRecordFilename(fileprefix);
 

programs/mythbackend/autoexpire.h

@@ -34 +34 @@
   private:
     void ExpireEpisodesOverMax(void);
 
-    void FillOldestFirst(void);
+    void FillOldestFirst(int expMethod);
     void SendDeleteMessages(size_t, size_t);
     void ClearExpireList(void);
     void Sleep();