Ticket #1629: autoexpire-actions.2.diff

programs/mythbackend/autoexpire.cpp

@@ -740 +740 @@
                "       progend,         filesize,    recgroup "
                "FROM recorded "
                "LEFT JOIN channel ON recorded.chanid = channel.chanid "
-               "WHERE %1 "
+               "WHERE %1 AND deletepending=0 "
                "ORDER BY autoexpire DESC, %2").arg(where).arg(orderby);
 
     query.prepare(querystr);

programs/mythfrontend/statusbox.h

@@ -6 +6 @@
 #include "mythdialogs.h"
 #include "uitypes.h"
 #include "xmlparse.h"
+#include "programinfo.h"
 
 typedef QMap<QString, unsigned int> recprof2bps_t;
 
@@ -64 +65 @@
     QMap<int, QString> contentData;
     recprof2bps_t      recordingProfilesBPS;
 
+    vector<ProgramInfo *> expList;
+
     MythMainWindow *my_parent;
 
     bool isBackend;

programs/mythfrontend/statusbox.cpp

@@ -24 +24 @@
 #include "mythdbcon.h"
 #include "cardutil.h"
 
+#define REC_CAN_BE_DELETED(rec) \
+    ((((rec)->programflags & FL_INUSEPLAYING) == 0) && \
+     ((((rec)->programflags & FL_INUSERECORDING) == 0) || \
+      ((rec)->recgroup != "LiveTV")))
+
+
 /** \class StatusBox
  *  \brief Reports on various status items.
  *
@@ -611 +617 @@
                 }
             }
         }
+        else if (currentItem == QObject::tr("AutoExpire List"))
+        {
+            ProgramInfo* rec;
 
-        return;
+            rec = expList[contentPos];
+
+            if (rec) 
+            {
+              QStringList msgs;
+              int retval;
+
+              msgs << QObject::tr("Delete Now");
+              msgs << QObject::tr("Disable AutoExpire");
+              msgs << QObject::tr("No Change");
+              
+              retval = MythPopupBox::showButtonPopup(my_parent,
+                                                     QString("AutoExpirePopup"),
+                                                     QObject::tr("AutoExpire Actions:"),
+                                                     msgs, 2);
+
+              if (retval == 0 && REC_CAN_BE_DELETED(rec))
+              {
+                RemoteDeleteRecording(rec, false, false);
+              }
+              else if (retval == 1)
+              {
+                  rec->SetAutoExpire(0);
+                  if ((rec)->recgroup == "LiveTV")
+                    rec->ApplyRecordRecGroupChange("Default");
+              }
+
+              // Update list, prevent selected item going off bottom
+              doAutoExpireList();
+              if (contentPos >= (int)expList.size())  
+                  contentPos = max((int)expList.size()-1,0);
+            }
+        }
+        return;
     }
     
     // Clear all visible content elements here
@@ -1286 +1328 @@
 void StatusBox::doAutoExpireList()
 {
     int                   count(0);
-    vector<ProgramInfo *> expList;
     ProgramInfo*          pginfo;
     QString               contentLine;
     QString               detailInfo;
@@ -1300 +1341 @@
     contentFont.clear();
     doScroll = true;
 
+    vector<ProgramInfo *>::iterator it;
+    for (it = expList.begin(); it != expList.end(); it++)
+        delete *it;
+    expList.clear();
+
     RemoteGetAllExpiringRecordings(expList);
 
-    vector<ProgramInfo *>::iterator it;
     for (it = expList.begin(); it != expList.end(); it++)
     {
         pginfo = *it;