Ticket #2493: timeout.patch

libs/libmythtv/remoteutil.h

@@ -19 +19 @@
     long long usedSpaceKB;
 };
 
-vector<ProgramInfo *> *RemoteGetRecordedList(bool deltype);
+vector<ProgramInfo *> *RemoteGetRecordedList(bool deltype, QString where);
 vector<FileSystemInfo> RemoteGetFreeSpace();
 bool RemoteGetLoad(float load[3]);
 bool RemoteGetUptime(time_t &uptime);

libs/libmythtv/tv_play.cpp

@@ -6144 +6144 @@
     // Build jumpMenu of recorded program titles
     ProgramInfo *p;
     progLists.clear();
+    QString whereClause = " and recorded.recgroup = \"" + playbackinfo->recgroup + "\"";
     vector<ProgramInfo *> *infoList;
-    infoList = RemoteGetRecordedList(false);
+    infoList = RemoteGetRecordedList(false, whereClause);
 
     bool LiveTVInAllPrograms = gContext->GetNumSetting("LiveTVInAllPrograms",0);
 

libs/libmythtv/remoteutil.cpp

@@ -6 +6 @@
 #include "mythcontext.h"
 #include "remoteencoder.h"
 
-vector<ProgramInfo *> *RemoteGetRecordedList(bool deltype)
+vector<ProgramInfo *> *RemoteGetRecordedList(bool deltype, QString whereClause)
 {
     QString str = "QUERY_RECORDINGS ";
     if (deltype)
         str += "Delete";
     else
         str += "Play";
+    str += whereClause;
 
     QStringList strlist = str;
 

programs/mythfrontend/playbackbox.cpp

@@ -1479 +1479 @@
 
     bool LiveTVInAllPrograms = gContext->GetNumSetting("LiveTVInAllPrograms",0);
 
+    QString whereClause = "";
+    if( recGroup != "All Programs" ) {
+      if(recGroupType[recGroup] == "category")
+        whereClause = " and recorded.category = \"" + recGroup + "\"";
+      else
+        whereClause = " and recorded.recgroup = \"" + recGroup + "\"";
+    }   
     vector<ProgramInfo *> *infoList;
-    infoList = RemoteGetRecordedList(listOrder == 0 || type == Delete);
+    infoList = RemoteGetRecordedList(listOrder == 0 || type == Delete, whereClause);
     if (infoList)
     {
         sortedList[""] = "";

programs/mythbackend/mainserver.h

@@ -72 +72 @@
     void HandleDone(MythSocket *socket);
 
     void HandleIsActiveBackendQuery(QStringList &slist, PlaybackSock *pbs);
-    void HandleQueryRecordings(QString type, PlaybackSock *pbs);
+    void HandleQueryRecordings(QStringList &tokens, PlaybackSock *pbs);
     void HandleStopRecording(QStringList &slist, PlaybackSock *pbs);
     void DoHandleStopRecording(ProgramInfo *pginfo, PlaybackSock *pbs);
     void HandleDeleteRecording(QStringList &slist, PlaybackSock *pbs,

programs/mythbackend/mainserver.cpp

@@ -351 +351 @@
 
     if (command == "QUERY_RECORDINGS")
     {
-        if (tokens.size() != 2)
+        if (tokens.size() < 2)
             VERBOSE(VB_IMPORTANT, "Bad QUERY_RECORDINGS query");
         else
-            HandleQueryRecordings(tokens[1], pbs);
+            HandleQueryRecordings(tokens, pbs);
     }
     else if (command == "QUERY_FREE_SPACE")
     {
@@ -1003 +1003 @@
     }
 }
 
-void MainServer::HandleQueryRecordings(QString type, PlaybackSock *pbs)
+void MainServer::HandleQueryRecordings(QStringList &tokens, PlaybackSock *pbs)
 {
+  QString type = tokens[1];
     MythSocket *pbssock = pbs->getSocket();
     bool islocal = pbs->isLocal();
     QString playbackhost = pbs->getHostname();
+    int i;
 
     QString fs_db_name = "";
 
@@ -1074 +1076 @@
         "  recorded.progstart = recordedprogram.starttime ) "
         "WHERE ( recorded.deletepending = 0 OR "
         "        DATE_ADD(recorded.lastmodified, INTERVAL 5 MINUTE) <= NOW() "
-        "      ) "
-        "ORDER BY recorded.starttime";
+      "      )";
+    for( i = 2; i < tokens.size(); i++ ) {
+      thequery += " "+tokens[i];
+    }
+        thequery += " ORDER BY recorded.starttime";
 
     if (type == "Delete")
         thequery += " DESC";
@@ -1215 +1220 @@
 
             QString lpath = fileprefix + "/" + basename;
             PlaybackSock *slave = NULL;
-            QFile checkFile(lpath);
+            //QFile checkFile(lpath);
 
             if (proginfo->hostname != gContext->GetHostName())
-                slave = getSlaveByHostname(proginfo->hostname);
+                slave = getSlaveByHostname(proginfo->hostname);  
 
-            if ((masterBackendOverride && checkFile.exists()) || 
+            /* In the original if statement, 
+
+            if ((masterBackendOverride && checkFile.exists()) ||
                 (proginfo->hostname == gContext->GetHostName()) ||
                 (!slave && checkFile.exists()))
+
+               we want to eliminate the costly checkFile
+               call. Presumably this is used in the case where master
+               and slave use the same shared directory. If we assume
+               that is false, then that check can be replaced by
+               hostname compare, which reduces the logic to 
+
+               if( ( A && B ) || B || ( C && B ) )
+
+               which reduces nicely to  if(B) */
+            if (proginfo->hostname == gContext->GetHostName())
             {
                 if (islocal)
                     proginfo->pathname = lpath;