Ticket #13251: mythfilerecorder-add-exec.patch

mythtv/programs/mythfilerecorder/commandlineparser.cpp

@@ -12 +12 @@
 
 QString MythFileRecorderCommandLineParser::GetHelpHeader(void) const
 {
-    return "MythFilelRecorder's allow a go-between app to interface "
-        "with a recording device before the data is processed by mythbackend.";
+    return "MythFileRecorder is a go-between app which interfaces "
+        "between a recording device and mythbackend.";
 }
 
 void MythFileRecorderCommandLineParser::LoadArguments(void)
@@ -26 +26 @@
 
     addInFile();
 
+    add(QStringList(QStringList() << "--exec"),
+        "exec", false,
+        "Execute infile as a program, rather than opening it. Recording data is expected to be on stdout. --noloop is ignored.", "");
+
     add(QStringList(QStringList() << "--noloop"),
         "noloop", false,
         "Don't loop input back to beginning on EOF.", "");
@@ -33 +37 @@
     add(QStringList(QStringList() << "--data-rate"),
         "data_rate", 188*50000,
         "Rate at which to read data from the file.", "");
+
+    add(QStringList(QStringList() << "--tuner"),
+        "tuner", "",
+        "Path of another program which will tune the channel requested by MythTV. Must accept the channel number as the last parameter.", "");
 }

mythtv/programs/mythfilerecorder/mythfilerecorder.cpp

@@ -12 +12 @@
 #include <QCoreApplication>
 #include <QTime>
 #include <QThread>
+#include <QProcess>
 
 #include "commandlineparser.h"
 #include "mythfilerecorder.h"
@@ -23 +24 @@
 
 
 #define VERSION "1.0.0"
-#define LOC QString("File(%1): ").arg(m_fileName)
+#define LOC (m_exec_file ? QString("Child program: ") : QString("File(%1): ").arg(m_fileName))
 
 Streamer::Streamer(Commands *parent, const QString &fname,
-                   int data_rate, bool loopinput) :
-    m_parent(parent), m_fileName(fname), m_file(NULL), m_loop(loopinput),
+                   bool exec_file, int data_rate, bool loopinput) :
+    m_parent(parent), m_fileName(fname), m_file(NULL),
+    m_exec_file(exec_file), m_loop(loopinput),
     m_bufferMax(188 * 100000), m_blockSize(m_bufferMax / 4),
-    m_data_rate(data_rate), m_data_read(0)
+    m_data_rate(data_rate), m_data_read(0), m_proc(NULL)
 {
     setObjectName("Streamer");
-    OpenFile();
+    if (!m_exec_file) OpenFile();
     LOG(VB_RECORD, LOG_INFO, LOC + QString("Data Rate: %1").arg(m_data_rate));
 }
 
@@ -45 +47 @@
 
 void Streamer::OpenFile(void)
 {
-    m_file = new QFile(m_fileName);
-    if (!m_file || !m_file->open(QIODevice::ReadOnly))
+    if (m_exec_file)
     {
-        LOG(VB_RECORD, LOG_ERR, LOC + QString("Failed to open '%1' - ")
-            .arg(m_fileName) + ENO);
+        m_proc = new QProcess(this);
+        m_proc->setProcessChannelMode(QProcess::ForwardedOutputChannel);
+        m_proc->start(m_fileName, QIODevice::ReadOnly|QProcess::Unbuffered);
+        if (!m_proc->waitForStarted()) {
+            LOG(VB_RECORD, LOG_ERR, LOC + QString("Failed to execute '%1' - ")
+                .arg(m_fileName) + ENO);
+        }
+        else {
+            LOG(VB_RECORD, LOG_INFO, LOC + QString("Executed '%1' - pid: %2")
+                .arg(m_fileName).arg(m_proc->processId()));
+        }
+    }
+    else {
+        m_file = new QFile(m_fileName);
+        if (!m_file || !m_file->open(QIODevice::ReadOnly))
+        {
+            LOG(VB_RECORD, LOG_ERR, LOC + QString("Failed to open '%1' - ")
+                .arg(m_fileName) + ENO);
+        }
     }
 }
 
@@ -62 +80 @@
         delete m_file;
         m_file = NULL;
     }
+    if (m_proc)
+    {
+        m_proc->close();
+        delete m_proc;
+        m_proc = NULL;
+    }
 
     LOG(VB_RECORD, LOG_INFO, LOC + "Streamer::Close -- end");
 }
@@ -72 +96 @@
 
     LOG(VB_RECORD, LOG_DEBUG, LOC + "SendBytes -- start");
 
+    if (m_exec_file)
+    {
+        if (!m_proc)
+        {
+            OpenFile();
+        }
+        return;
+    }
+
     if (!m_file)
     {
         LOG(VB_GENERAL, LOG_ERR, LOC + "SendBytes -- file not open");
@@ -199 +232 @@
     }
     if (cmd.startsWith("HasLock?"))
     {
-        send_status(m_streamer->IsOpen() ? "OK:Yes" : "OK:No");
+        send_status(m_exec_file || m_streamer->IsOpen() ? "OK:Yes" : "OK:No");
         return true;
     }
     if (cmd.startsWith("SignalStrengthPercent"))
     {
-        send_status(m_streamer->IsOpen() ? "OK:100" : "OK:0");
+        send_status(m_exec_file || m_streamer->IsOpen() ? "OK:100" : "OK:0");
         return true;
     }
     if (cmd.startsWith("LockTimeout"))
     {
-        send_status("OK:1000");
+        send_status("OK:5000");
         return true;
     }
     if (cmd.startsWith("HasTuner?"))
     {
-        send_status("OK:No");
+        send_status(m_tuner.isEmpty() ? "OK:No" : "OK:Yes");
         return true;
     }
     if (cmd.startsWith("HasPictureAttributes?"))
@@ -233 +266 @@
 
     if (cmd.startsWith("SendBytes"))
     {
-        if (!m_streamer->IsOpen())
+        if (!m_exec_file && !m_streamer->IsOpen())
         {
             send_status("ERR:file not open");
             LOG(VB_RECORD, LOG_ERR, LOC + "SendBytes - file not open.");
@@ -241 +274 @@
         else
         {
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-        if (m_eof.loadAcquire() != 0)
+            if (m_eof.loadAcquire() != 0)
 #else
-        if (m_eof != 0)
+            if (m_eof != 0)
 #endif
                 send_status("ERR:End of file");
             else
@@ -253 +286 @@
             }
         }
     }
-#if 0
     else if (cmd.startsWith("XON"))
     {
         // Used when FlowControl is XON/XOFF
+        send_status("OK");
     }
     else if (cmd.startsWith("XOFF"))
     {
         // Used when FlowControl is XON/XOFF
+        send_status("OK");
     }
-    else if (cmd.startsWith("TuneChannel"))
+    else if (cmd.startsWith("TuneChannel:"))
     {
-        // Used if we announce that we have a 'tuner'
-
-        /**
-         * TODO:  extend to allow to 'tune' to different files.
-         */
+        if (!m_tuner.isEmpty())
+        {
+            QProcess *p = new QProcess(this);
+            p->start(QString("%1 %2").arg(m_tuner).arg(cmd.mid(12)));
+            p->waitForFinished();
+            delete p;
+            p = NULL;
+            send_status("OK");
+        }
+        else
+            send_status(QString("ERR:No tuner has been set"));
     }
-#endif
     else if (cmd.startsWith("IsOpen?"))
     {
-        if (m_streamer->IsOpen())
+        if (m_exec_file || m_streamer->IsOpen())
             send_status("OK:Open");
         else
-            send_status(QString("ERR:Not Open: '%2'")
+            send_status(QString("ERR:Not Open: '%1'")
                         .arg(m_streamer->ErrorString()));
     }
     else if (cmd.startsWith("CloseRecorder"))
@@ -304 +343 @@
          * this 'recording' ExternalChannel::EnterPowerSavingMode()
          * will be called, which invokes CloseRecorder() */
         send_status("OK:Stopped");
+        emit CloseFile();
     }
     else
     {
@@ -315 +355 @@
     return true;
 }
 
-bool Commands::Run(const QString & filename, int data_rate, bool loopinput)
+bool Commands::Run(const QString & filename, bool exec_file, int data_rate, bool loopinput, const QString & tuner)
 {
     QString cmd;
 
@@ -329 +369 @@
     polls[0].revents = 0;
 
     m_fileName = filename;
+    m_exec_file = exec_file;
+    m_tuner = tuner;
 
-    m_streamer = new Streamer(this, m_fileName, data_rate, loopinput);
+    m_streamer = new Streamer(this, m_fileName, m_exec_file, data_rate, loopinput);
     QThread *streamThread = new QThread(this);
 
     m_streamer->moveToThread(streamThread);
@@ -339 +381 @@
 
     connect(this, SIGNAL(SendBytes(void)),
             m_streamer, SLOT(SendBytes(void)));
+    connect(this, SIGNAL(CloseFile(void)),
+            m_streamer, SLOT(CloseFile(void)));
 
     streamThread->start();
 
@@ -424 +468 @@
     }
 
     bool loopinput = !cmdline.toBool("noloop");
+    bool exec_file = cmdline.toBool("exec");
     int  data_rate = cmdline.toInt("data_rate");
 
     QCoreApplication a(argc, argv);
@@ -439 +484 @@
     else if (cmdline.GetArgs().size() >= 1)
         filename = cmdline.GetArgs()[0];
 
+    QString tuner = "";
+    if (!cmdline.toString("tuner").isEmpty())
+        tuner = cmdline.toString("tuner");
+
     Commands recorder;
-    recorder.Run(filename, data_rate, loopinput);
+    recorder.Run(filename, exec_file, data_rate, loopinput, tuner);
 
     return GENERIC_EXIT_OK;
 }

mythtv/programs/mythfilerecorder/mythfilerecorder.h

@@ -4 +4 @@
 #include <QObject>
 #include <QFile>
 #include <QString>
+#include <QProcess>
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -22 +23 @@
     void SendBytes(void);
 
   public:
-    Streamer(Commands *parent, const QString &filename, int data_rate,
-             bool loopinput);
+    Streamer(Commands *parent, const QString &filename, bool exec_file,
+             int data_rate, bool loopinput);
     virtual ~Streamer(void);
     void BlockSize(int val) { m_blockSize = val; }
-    bool IsOpen(void) const { return m_file; }
+    bool IsOpen(void) const { return m_exec_file ? (bool) m_proc : (bool) m_file; }
     QString ErrorString(void) const { return m_error; }
 
   protected:
@@ -36 +37 @@
     Commands *m_parent;
     QString   m_fileName;
     QFile    *m_file;
+    bool      m_exec_file;
     bool      m_loop;
 
-    QString m_error;
+    QString   m_error;
 
-    QByteArray  m_buffer;
-    int     m_bufferMax;
-    QAtomicInt  m_blockSize;
+    QByteArray m_buffer;
+    int        m_bufferMax;
+    QAtomicInt m_blockSize;
 
     // Regulate data rate
     uint      m_data_rate;  // bytes per second
     QDateTime m_start_time; // When the first packet was processed
     quint64   m_data_read;  // How many bytes have been sent
+
+    QProcess *m_proc;
 };
 
 class Commands : public QObject
@@ -61 +65 @@
   public:
     Commands(void);
     virtual ~Commands(void);
-    bool Run(const QString & filename, int data_rate, bool loopinput);
+    bool Run(const QString & filename, bool exec_file, int data_rate, bool loopinput, const QString &tuner);
     void setEoF(void) { m_eof = true; }
 
   protected:
@@ -69 +73 @@
     bool process_command(QString & cmd);
 
   private:
-    QString   m_fileName;
+    QString   m_fileName, m_tuner;
     Streamer *m_streamer;
     int       m_timeout;
     bool      m_run;
+    bool      m_exec_file;
     QAtomicInt m_eof;
 };