Ticket #8962: 8962_v2.patch

mythtv/libs/libmythtv/jobqueue.cpp

@@ -1062 +1062 @@
     return 0;
 }
 
-bool JobQueue::IsJobRunning(int jobType,
-                            uint chanid, const QDateTime &recstartts)
+bool JobQueue::IsJobStatusQueued(int status)
 {
-    int tmpStatus = GetJobStatus(jobType, chanid, recstartts);
+    return (status & JOB_QUEUED);
+}
 
-    if ((tmpStatus != JOB_UNKNOWN) && (tmpStatus != JOB_QUEUED) &&
-        (!(tmpStatus & JOB_DONE)))
-        return true;
+bool JobQueue::IsJobStatusRunning(int status)
+{
+    return ((status != JOB_UNKNOWN) && (status != JOB_QUEUED) &&
+            (!(status & JOB_DONE)));
+}
 
-    return false;
+bool JobQueue::IsJobRunning(int jobType,
+                            uint chanid, const QDateTime &recstartts)
+{
+    return IsJobStatusRunning(GetJobStatus(jobType, chanid, recstartts));
 }
 
 bool JobQueue::IsJobRunning(int jobType, const ProgramInfo &pginfo)
@@ -1094 +1099 @@
 bool JobQueue::IsJobQueued(
     int jobType, uint chanid, const QDateTime &recstartts)
 {
-    int tmpStatus = GetJobStatus(jobType, chanid, recstartts);
-
-    if (tmpStatus & JOB_QUEUED)
-        return true;
-
-    return false;
+    return IsJobStatusQueued(GetJobStatus(jobType, chanid, recstartts));
 }
 
 QString JobQueue::JobText(int jobType)

mythtv/libs/libmythtv/jobqueue.h

@@ -161 +161 @@
     static bool IsJobRunning(int jobType, const ProgramInfo &pginfo);
     static bool IsJobQueued(int jobType,
                             uint chanid, const QDateTime &recstartts);
+    static bool IsJobStatusQueued(int status);
+    static bool IsJobStatusRunning(int status);
     static bool PauseJob(int jobID);
     static bool ResumeJob(int jobID);
     static bool RestartJob(int jobID);

mythtv/programs/mythfrontend/playbackbox.cpp

@@ -288 +288 @@
     return state;
 }
 
-static QString extract_job_state(const ProgramInfo &pginfo)
+QString PlaybackBox::extract_job_state(const ProgramInfo &pginfo)
 {
     QString job = "default";
 
     if (pginfo.GetRecordingStatus() == RecStatus::Recording ||
         pginfo.GetRecordingStatus() == RecStatus::Failing)
         job = "recording";
-    else if (JobQueue::IsJobQueuedOrRunning(
+    else if (m_jobQueue.IsJobQueuedOrRunning(
                  JOB_TRANSCODE, pginfo.GetChanID(),
                  pginfo.GetRecordingStartTime()))
         job = "transcoding";
-    else if (JobQueue::IsJobQueuedOrRunning(
+    else if (m_jobQueue.IsJobQueuedOrRunning(
                  JOB_COMMFLAG,  pginfo.GetChanID(),
                  pginfo.GetRecordingStartTime()))
         job = "commflagging";
@@ -307 +307 @@
     return job;
 }
 
-static QString extract_commflag_state(const ProgramInfo &pginfo)
+QString PlaybackBox::extract_commflag_state(const ProgramInfo &pginfo)
 {
     QString job = "default";
 
     // commflagged can be yes, no or processing
-    if (JobQueue::IsJobRunning(JOB_COMMFLAG, pginfo))
+    if (m_jobQueue.IsJobRunning(JOB_COMMFLAG, pginfo.GetChanID(),
+                                pginfo.GetRecordingStartTime()))
         return "running";
-    if (JobQueue::IsJobQueued(JOB_COMMFLAG, pginfo.GetChanID(),
-                              pginfo.GetRecordingStartTime()))
+    if (m_jobQueue.IsJobQueued(JOB_COMMFLAG, pginfo.GetChanID(),
+                               pginfo.GetRecordingStartTime()))
         return "queued";
 
     return ((pginfo.GetProgramFlags() & FL_COMMFLAG) ? "yes" : "no");
@@ -5544 +5545 @@
     item->DisplayState(state, "icons");
 }
 
+void PlaybackBox::PbbJobQueue::Update()
+{
+    QDateTime now = QDateTime::currentDateTime();
+    if (!m_lastUpdated.isValid() ||
+        m_lastUpdated.msecsTo(now) >= kInvalidateTimeMs)
+    {
+        QMap<int, JobQueueEntry> jobs;
+        JobQueue::GetJobsInQueue(jobs, JOB_LIST_ALL);
+        m_jobs.clear();
+        for (int i = 0; i < jobs.size(); ++i)
+        {
+            JobQueueEntry &entry = jobs[i];
+            m_jobs.insert(qMakePair(entry.chanid, entry.recstartts), entry);
+        }
+        m_lastUpdated = now;
+    }
+}
+
+bool PlaybackBox::PbbJobQueue::IsJobQueued(int jobType, uint chanid,
+                                           const QDateTime &recstartts)
+{
+    Update();
+    MapType::const_iterator iter = m_jobs.find(qMakePair(chanid, recstartts));
+    for (; iter != m_jobs.end(); ++iter)
+    {
+        if (iter->type == jobType)
+            return JobQueue::IsJobStatusQueued(iter->status);
+    }
+    return false;
+}
+
+bool PlaybackBox::PbbJobQueue::IsJobRunning(int jobType, uint chanid,
+                                            const QDateTime &recstartts)
+{
+    Update();
+    MapType::const_iterator iter = m_jobs.find(qMakePair(chanid, recstartts));
+    for (; iter != m_jobs.end(); ++iter)
+    {
+        if (iter->type == jobType)
+            return JobQueue::IsJobStatusRunning(iter->status);
+    }
+    return false;
+}
+
+bool PlaybackBox::PbbJobQueue::IsJobQueuedOrRunning(int jobType, uint chanid,
+                                                    const QDateTime &recstartts)
+{
+    return IsJobQueued(jobType, chanid, recstartts) ||
+        IsJobRunning(jobType, chanid, recstartts);
+}
+
 /* vim: set expandtab tabstop=4 shiftwidth=4: */

mythtv/programs/mythfrontend/playbackbox.h

@@ -13 +13 @@
 
 #include <QStringList>
 #include <QDateTime>
+#include <QMultiMap>
 #include <QObject>
 #include <QMutex>
 #include <QMap>
@@ -333 +334 @@
 
     QString CreateProgramInfoString(const ProgramInfo &program) const;
 
+    QString extract_job_state(const ProgramInfo &pginfo);
+    QString extract_commflag_state(const ProgramInfo &pginfo);
+
 
     QRegExp m_prefixes;   ///< prefixes to be ignored when sorting
     QRegExp m_titleChaff; ///< stuff to remove for search rules
@@ -442 +446 @@
     bool                m_usingGroupSelector;
     bool                m_groupSelected;
     bool                m_passwordEntered;
+
+    // This class caches the contents of the jobqueue table to avoid excessive
+    // DB queries each time the PBB selection changes (currently 4 queries per
+    // displayed item).  The cache remains valid for 15 seconds
+    // (kInvalidateTimeMs).
+    class PbbJobQueue
+    {
+    public:
+        PbbJobQueue() {}
+        bool IsJobQueued(int jobType, uint chanid,
+                         const QDateTime &recstartts);
+        bool IsJobRunning(int jobType, uint chanid,
+                          const QDateTime &recstartts);
+        bool IsJobQueuedOrRunning(int jobType, uint chanid,
+                                  const QDateTime &recstartts);
+    private:
+        static const qint64 kInvalidateTimeMs = 15000;
+        void Update();
+        QDateTime m_lastUpdated;
+        // Maps <chanid, recstartts> to a set of JobQueueEntry values.
+        typedef QMultiMap<QPair<uint, QDateTime>, JobQueueEntry> MapType;
+        MapType m_jobs;
+    } m_jobQueue;
 };
 
 class GroupSelector : public MythScreenType