Ticket #4004: whats_on_now.patch

programs/mythfrontend/networkcontrol.h

@@ -46 +46 @@
     void customEvent(QCustomEvent *e);
 
     QString listRecordings(QString chanid = "", QString starttime = "");
+        QString listSchedule(const QString& chanID) const;
     QString saveScreenshot(QStringList tokens);
 
     void processNetworkControlCommand(QString command);

programs/mythfrontend/networkcontrol.cpp

@@ -664 +664 @@
                 result = "ERROR: Timed out waiting for reply from player";
         }
     }
+        else if (is_abbrev("liveTV", tokens[1]))
+        {
+                if(tokens.size() == 3) // has a channel ID
+                {
+                        return listSchedule(tokens[2]);
+                }
+                else // return the channel schedule for all subscribed channels
+                {
+                        return listSchedule("");
+                }
+        }
+    else if(is_abbrev("time", tokens[1]))
+    {
+        QDateTime qdtNow = QDateTime::currentDateTime();
+        return qdtNow.toString(Qt::ISODate);
+    }
     else if ((tokens.size() == 4) &&
              is_abbrev("recording", tokens[1]) &&
              (tokens[2].contains(QRegExp("^\\d+$"))) &&
@@ -771 +787 @@
             "query location        - Query current screen or location\r\n"
             "query recordings      - List currently available recordings\r\n"
             "query recording CHANID STARTTIME\r\n"
-            "                      - List info about the specified program\r\n";
+            "                      - List info about the specified program\r\n"
+                        "query liveTV          - List current TV schedule\r\n"
+                        "query liveTV   CHANID - Query current program for specified channel\r\n"
+            "query time            - Query current time on server\r\n";
     }
     else if (command == "exit")
     {
@@ -875 +894 @@
     }
 }
 
+QString NetworkControl::listSchedule(const QString& chanID) const
+{
+    QString episode;
+        QString result("");
+    MSqlQuery query(MSqlQuery::InitCon());
+    bool appendCRLF = true;
+        QDateTime qdtNow = QDateTime::currentDateTime();        
+        QString currentTimeString = qdtNow.toString("yyyy-MM-dd hh:mm:ss");
+        QString queryStr("SELECT chanid, starttime, endtime, title, subtitle FROM program where endtime > '");
+        queryStr += currentTimeString + "' AND starttime < '" + currentTimeString + "'";
+        if(chanID != "")
+        {
+                queryStr += " AND chanid = " + chanID;
+        appendCRLF = false;
+        }
+        query.prepare(queryStr);
+        if (query.exec() && query.isActive() && query.size() > 0)
+    {
+        while (query.next())
+        {
+            QString title = QString::fromUtf8(query.value(3).toString());
+            QString subtitle = QString::fromUtf8(query.value(4).toString());
+
+            if (subtitle > " ")
+                episode = QString("%1 -\"%2\"")
+                                  .arg(title)
+                                  .arg(subtitle);
+            else
+                episode = title;
+
+            result +=
+                QString("%1 %2 %3 %4").arg(query.value(0).toInt())
+                        .arg(query.value(1).toDateTime().toString(Qt::ISODate))
+                                                .arg(query.value(2).toDateTime().toString(Qt::ISODate))
+                        .arg(episode);
+                        
+
+            if (appendCRLF)
+                result += "\r\n";
+        }
+    }
+    else
+    {
+       result = "ERROR: Unable to retrieve current schedule list.";
+    }
+    return result;
+}
+
 QString NetworkControl::listRecordings(QString chanid, QString starttime)
 {
     QString result = "";