Add new MythSystem. Rename old MythSystem to MythSystemLegacy.

This commit creates a new simplifed and less ambiguous MythSystem API. The old MythSystem has been renamed MythSystemLegacy and provides the current implementation for the new MythSystem. The next steps are: Complete unit tests for new MythSystem, fixing bugs as they are found & enhancing MythSystemLegacy as necessary. Port code over to the new MythSystem interface. Get a windows buildbot running. Eliminate MythSystemLegacy unit tests. Refactor MythSystemLegacy to support only the new interface. Eliminate any unneccesary abstractions.
MythTV · Jun 2, 2013 · 3afaff0 · 3afaff0
1 parent 27b78ab
commit 3afaff0
Show file tree

Hide file tree

Showing 91 changed files with 1,616 additions and 1,041 deletions.
diff --git a/mythplugins/mytharchive/mytharchive/archiveutil.cpp b/mythplugins/mytharchive/mytharchive/archiveutil.cpp
@@ -20,7 +20,7 @@ using namespace std;
 #include <mythmainwindow.h>
 #include <mythdialogbox.h>
 #include <mythdate.h>
-#include <mythsystem.h>
+#include <mythsystemlegacy.h>
 #include <exitcodes.h>
 #include <mythlogging.h>
 

diff --git a/mythplugins/mytharchive/mytharchive/exportnative.cpp b/mythplugins/mytharchive/mytharchive/exportnative.cpp
@@ -22,7 +22,7 @@
 #include <mythuibuttonlist.h>
 #include <mythuiprogressbar.h>
 #include <mythmainwindow.h>
-#include <mythsystem.h>
+#include <mythsystemlegacy.h>
 #include <exitcodes.h>
 
 // mytharchive

diff --git a/mythplugins/mytharchive/mytharchive/importnative.cpp b/mythplugins/mytharchive/mytharchive/importnative.cpp
@@ -16,7 +16,7 @@
 #include <mythuibutton.h>
 #include <mythuibuttonlist.h>
 #include <mythdialogbox.h>
-#include <mythsystem.h>
+#include <mythsystemlegacy.h>
 #include <exitcodes.h>
 #include <mythdate.h>
 

diff --git a/mythplugins/mytharchive/mytharchive/main.cpp b/mythplugins/mytharchive/mytharchive/main.cpp
@@ -22,7 +22,7 @@ using namespace std;
 #include <mythversion.h>
 #include <mythplugin.h>
 #include <mythcoreutil.h>
-#include <mythsystem.h>
+#include <mythsystemlegacy.h>
 #include <myththemedmenu.h>
 #include <mythuihelper.h>
 #include <mythdialogbox.h>

diff --git a/mythplugins/mytharchive/mytharchive/mythburn.cpp b/mythplugins/mytharchive/mytharchive/mythburn.cpp
@@ -26,7 +26,7 @@
 #include <mythuibuttonlist.h>
 #include <mythuiprogressbar.h>
 #include <mythdate.h>
-#include <mythsystem.h>
+#include <mythsystemlegacy.h>
 #include <mythmiscutil.h>
 #include <exitcodes.h>
 

diff --git a/mythplugins/mytharchive/mytharchivehelper/main.cpp b/mythplugins/mytharchive/mytharchivehelper/main.cpp
@@ -62,7 +62,7 @@ using namespace std;
 #include <programinfo.h>
 #include <mythdirs.h>
 #include <mythconfig.h>
-#include <mythsystem.h>
+#include <mythsystemlegacy.h>
 #include <mythdate.h>
 #include <mythlogging.h>
 

diff --git a/mythplugins/mythbrowser/mythbrowser/bookmarkmanager.cpp b/mythplugins/mythbrowser/mythbrowser/bookmarkmanager.cpp
@@ -12,7 +12,7 @@ using namespace std;
 #include <mythdirs.h>
 #include <mythuicheckbox.h>
 #include <mythuibuttonlist.h>
-#include <mythsystem.h>
+#include <mythsystemlegacy.h>
 
 // mythbrowser
 #include "bookmarkmanager.h"

diff --git a/mythplugins/mythgallery/dcrawplugin/dcrawhandler.cpp b/mythplugins/mythgallery/dcrawplugin/dcrawhandler.cpp
@@ -10,7 +10,7 @@
 #include <QIODevice>
 #include <QString>
 
-#include "mythsystem.h"
+#include "mythsystemlegacy.h"
 #include "exitcodes.h"
 #include "../mythgallery/galleryutil.h"
 #include "mythlogging.h"
@@ -64,7 +64,7 @@ bool DcrawHandler::read(QImage *image)
     arguments << path;
 
     uint flags = kMSRunShell | kMSStdOut | kMSBuffered;
-    MythSystem ms("dcraw", arguments, flags);
+    MythSystemLegacy ms("dcraw", arguments, flags);
     ms.Run();
     if (ms.Wait() != GENERIC_EXIT_OK)
         return false;
@@ -84,7 +84,7 @@ int DcrawHandler::loadThumbnail(QImage *image, QString fileName)
     arguments << "'" + fileName + "'";
 
     uint flags = kMSRunShell | kMSStdOut | kMSBuffered;
-    MythSystem ms("dcraw", arguments, flags);
+    MythSystemLegacy ms("dcraw", arguments, flags);
     ms.Run();
     if (ms.Wait() != GENERIC_EXIT_OK)
         return -1;

diff --git a/mythplugins/mythgallery/mythgallery/iconview.cpp b/mythplugins/mythgallery/mythgallery/iconview.cpp
@@ -37,7 +37,7 @@ using namespace std;
 // MythTV headers
 #include <mythdate.h>
 #include <mythdbcon.h>
-#include <mythsystem.h>
+#include <mythsystemlegacy.h>
 #include <mythcontext.h>
 #include <mythlogging.h>
 #include <mythmainwindow.h>

diff --git a/mythplugins/mythgallery/mythgallery/thumbgenerator.cpp b/mythplugins/mythgallery/mythgallery/thumbgenerator.cpp
@@ -39,7 +39,7 @@
 #include "config.h"
 #include "thumbgenerator.h"
 #include "galleryutil.h"
-#include "mythsystem.h"
+#include "mythsystemlegacy.h"
 #include "exitcodes.h"
 #include "mythlogging.h"
 
@@ -304,7 +304,7 @@ void ThumbGenerator::loadFile(QImage& image, const QFileInfo& fi)
             args << "--infile" << '"' + fi.absoluteFilePath() + '"';
             args << "--outfile" << '"' + tmpDir.filePath(thumbFile) + '"';
 
-            MythSystem ms(cmd, args, kMSRunShell);
+            MythSystemLegacy ms(cmd, args, kMSRunShell);
             ms.SetDirectory(tmpDir.absolutePath());
             ms.Run();
             if (ms.Wait() == GENERIC_EXIT_OK)

diff --git a/mythplugins/mythgame/mythgame/gamehandler.cpp b/mythplugins/mythgame/mythgame/gamehandler.cpp
@@ -9,7 +9,7 @@
 
 #include <mythdb.h>
 #include <mythdbcon.h>
-#include <mythsystem.h>
+#include <mythsystemlegacy.h>
 #include <mythcontext.h>
 #include <mythdialogs.h>
 #include <mythuihelper.h>

diff --git a/mythplugins/mythmusic/mythmusic/cdrip.cpp b/mythplugins/mythmusic/mythmusic/cdrip.cpp
@@ -39,7 +39,7 @@ using namespace std;
 #include <mythuibutton.h>
 #include <mythuiprogressbar.h>
 #include <mythuibuttonlist.h>
-#include <mythsystem.h>
+#include <mythsystemlegacy.h>
 
 // MythUI headers
 #include <mythtv/libmythui/mythscreenstack.h>

diff --git a/mythplugins/mythmusic/mythmusic/playlist.cpp b/mythplugins/mythmusic/mythmusic/playlist.cpp
@@ -24,7 +24,7 @@ using namespace std;
 #include <compat.h>
 #include <mythmediamonitor.h>
 #include <mythmiscutil.h>
-#include <mythsystem.h>
+#include <mythsystemlegacy.h>
 #include <exitcodes.h>
 
 const char *kID0err = "Song with ID of 0 in playlist, this shouldn't happen.";
@@ -1336,7 +1336,7 @@ int Playlist::CreateCDMP3(void)
                  kMSDontDisableDrawing | kMSDontBlockInputDevs |
                  kMSRunBackground;
 
-    m_proc = new MythSystem(command, args, flags);
+    m_proc = new MythSystemLegacy(command, args, flags);
 
     connect(m_proc, SIGNAL(readDataReady(int)), this, SLOT(mkisofsData(int)),
             Qt::DirectConnection);
@@ -1387,7 +1387,7 @@ int Playlist::CreateCDMP3(void)
                 kMSDontDisableDrawing | kMSDontBlockInputDevs |
                 kMSRunBackground;
 
-        m_proc = new MythSystem(command, args, flags);
+        m_proc = new MythSystemLegacy(command, args, flags);
         connect(m_proc, SIGNAL(readDataReady(int)),
                 this, SLOT(cdrecordData(int)), Qt::DirectConnection);
         connect(m_proc, SIGNAL(finished()),

diff --git a/mythplugins/mythmusic/mythmusic/playlist.h b/mythplugins/mythmusic/mythmusic/playlist.h
@@ -13,7 +13,7 @@
 
 class PlaylistContainer;
 class Playlist;
-class MythSystem;
+class MythSystemLegacy;
 
 enum InsertPLOption
 {
@@ -129,7 +129,7 @@ class Playlist : public QObject
     bool                  m_changed;
     bool                  m_doSave;
     MythProgressDialog   *m_progress;
-    MythSystem           *m_proc;
+    MythSystemLegacy           *m_proc;
     uint                  m_procExitVal;
 };
 

diff --git a/mythplugins/mythnetvision/mythnetvision/netsearch.cpp b/mythplugins/mythnetvision/mythnetvision/netsearch.cpp
@@ -14,7 +14,7 @@
 #include <mythcontext.h>
 #include <mythdbcon.h>
 #include <mythdirs.h>
-#include <mythsystem.h>
+#include <mythsystemlegacy.h>
 #include <mythprogressdialog.h>
 #include <storagegroup.h>
 #include <remotefile.h>

diff --git a/mythplugins/mythnetvision/mythnetvision/nettree.cpp b/mythplugins/mythnetvision/mythnetvision/nettree.cpp
@@ -8,7 +8,7 @@
 #include <mythdb.h>
 #include <mythcontext.h>
 #include <mythdirs.h>
-#include <mythsystem.h>
+#include <mythsystemlegacy.h>
 #include <remoteutil.h>
 #include <remotefile.h>
 #include <mythprogressdialog.h>

diff --git a/mythplugins/mythnews/mythnews/mythnews.cpp b/mythplugins/mythnews/mythnews/mythnews.cpp
@@ -19,7 +19,7 @@
 #include <mythdialogbox.h>
 #include <mythcontext.h>
 #include <mythuiimage.h>
-#include <mythsystem.h>
+#include <mythsystemlegacy.h>
 #include <mythuitext.h>
 #include <mythdate.h>
 #include <mythdirs.h>

diff --git a/mythplugins/mythweather/mythweather/weatherSource.cpp b/mythplugins/mythweather/mythweather/weatherSource.cpp
@@ -12,7 +12,7 @@
 #include <mythdb.h>
 #include <compat.h>
 #include <mythdirs.h>
-#include <mythsystem.h>
+#include <mythsystemlegacy.h>
 #include <exitcodes.h>
 
 // MythWeather headers
@@ -29,7 +29,7 @@ QStringList WeatherSource::ProbeTypes(QString workingDirectory,
 
     uint flags = kMSRunShell | kMSStdOut | kMSBuffered | 
                  kMSDontDisableDrawing | kMSDontBlockInputDevs;
-    MythSystem ms(program, arguments, flags);
+    MythSystemLegacy ms(program, arguments, flags);
     ms.SetDirectory(workingDirectory);
     ms.Run();
     if (ms.Wait() != GENERIC_EXIT_OK)
@@ -72,7 +72,7 @@ bool WeatherSource::ProbeTimeouts(QString  workingDirectory,
 
     uint flags = kMSRunShell | kMSStdOut | kMSBuffered | 
                  kMSDontDisableDrawing | kMSDontBlockInputDevs;
-    MythSystem ms(program, arguments, flags);
+    MythSystemLegacy ms(program, arguments, flags);
     ms.SetDirectory(workingDirectory);
     ms.Run();
     if (ms.Wait() != GENERIC_EXIT_OK)
@@ -135,7 +135,7 @@ bool WeatherSource::ProbeInfo(ScriptInfo &info)
 
     uint flags = kMSRunShell | kMSStdOut | kMSBuffered | 
                  kMSDontDisableDrawing | kMSDontBlockInputDevs;
-    MythSystem ms(info.program, arguments, flags);
+    MythSystemLegacy ms(info.program, arguments, flags);
     ms.SetDirectory(info.path);
     ms.Run();
     if (ms.Wait() != GENERIC_EXIT_OK)
@@ -385,7 +385,7 @@ QStringList WeatherSource::getLocationList(const QString &str)
 
     uint flags = kMSRunShell | kMSStdOut | kMSBuffered | 
                  kMSDontDisableDrawing | kMSDontBlockInputDevs;
-    MythSystem ms(program, args, flags);
+    MythSystemLegacy ms(program, args, flags);
     ms.SetDirectory(m_info->path);
     ms.Run();
 
@@ -487,7 +487,7 @@ void WeatherSource::startUpdate(bool forceUpdate)
 
     uint flags = kMSRunShell | kMSStdOut | kMSBuffered | kMSRunBackground |
                  kMSDontDisableDrawing | kMSDontBlockInputDevs;
-    m_ms = new MythSystem(program, args, flags);
+    m_ms = new MythSystemLegacy(program, args, flags);
     m_ms->SetDirectory(m_info->path);
 
     connect(m_ms, SIGNAL(finished()),  this, SLOT(processExit()));

diff --git a/mythplugins/mythweather/mythweather/weatherSource.h b/mythplugins/mythweather/mythweather/weatherSource.h
@@ -5,7 +5,7 @@
 #include <QObject>
 #include <QTimer>
 #include <QFileInfo>
-#include "mythsystem.h"
+#include "mythsystemlegacy.h"
 
 // MythWeather headers
 #include "weatherUtils.h"
@@ -90,7 +90,7 @@ class WeatherSource : public QObject
     bool m_ready;
     bool m_inuse;
     ScriptInfo *m_info;
-    MythSystem *m_ms;
+    MythSystemLegacy *m_ms;
     QString m_dir;
     QString m_locale;
     QString m_cachefile;

diff --git a/mythtv/libs/libmyth/mediamonitor-unix.cpp b/mythtv/libs/libmyth/mediamonitor-unix.cpp
@@ -40,7 +40,7 @@ using namespace std;
 #include "mythcdrom.h"
 #include "mythhdd.h"
 #include "mythlogging.h"
-#include "mythsystem.h"
+#include "mythsystemlegacy.h"
 #include "exitcodes.h"
 
 #if HAVE_LIBUDEV
@@ -372,8 +372,8 @@ QString MediaMonitorUnix::GetDeviceFile(const QString &sysfs)
     if (VERBOSE_LEVEL_CHECK(VB_MEDIA, LOG_DEBUG))
         flags |= kMSStdErr;
 
-    // TODO: change this to a MythSystem on the stack?
-    MythSystem *udevinfo = new MythSystem("udevinfo", args, flags);
+    // TODO: change this to a MythSystemLegacy on the stack?
+    MythSystemLegacy *udevinfo = new MythSystemLegacy("udevinfo", args, flags);
     udevinfo->Run(4);
     if( udevinfo->Wait() != GENERIC_EXIT_OK )
     {

diff --git a/mythtv/libs/libmyth/mythcontext.cpp b/mythtv/libs/libmyth/mythcontext.cpp
@@ -36,7 +36,7 @@ using namespace std;
 #include "mythxmlclient.h"
 #include "upnp.h"
 #include "mythlogging.h"
-#include "mythsystem.h"
+#include "mythsystemlegacy.h"
 #include "mythmiscutil.h"
 
 #include "mythplugin.h"

diff --git a/mythtv/libs/libmyth/mythmediamonitor.cpp b/mythtv/libs/libmyth/mythmediamonitor.cpp
@@ -23,7 +23,7 @@ using namespace std;
 #include "mythdate.h"
 #include "mythlogging.h"
 #include "mythmainwindow.h"
-#include "mythsystem.h"
+#include "mythsystemlegacy.h"
 #include "mythmiscutil.h"
 
 #ifdef USING_DARWIN_DA

diff --git a/mythtv/libs/libmyth/netgrabbermanager.cpp b/mythtv/libs/libmyth/netgrabbermanager.cpp
@@ -6,11 +6,11 @@
 
 #include "mythdirs.h"
 #include "mythcontext.h"
-#include "mythsystem.h"
+#include "mythsystemlegacy.h"
 #include "exitcodes.h"
 #include "mythdate.h"
 #include "mythlogging.h"
-#include "mythsystem.h"
+#include "mythsystemlegacy.h"
 
 #include "netgrabbermanager.h"
 #include "netutils.h"
@@ -50,7 +50,7 @@ void GrabberScript::run()
     QMutexLocker locker(&m_lock);
 
     QString commandline = m_commandline;
-    MythSystem getTree(commandline, QStringList("-T"),
+    MythSystemLegacy getTree(commandline, QStringList("-T"),
                        kMSRunShell | kMSStdOut | kMSBuffered);
     getTree.Run(900);
     uint status = getTree.Wait();
@@ -264,7 +264,7 @@ void Search::executeSearch(const QString &script, const QString &query, uint pag
     resetSearch();
 
     LOG(VB_GENERAL, LOG_DEBUG, "Search::executeSearch");
-    m_searchProcess = new MythSystem();
+    m_searchProcess = new MythSystemLegacy();
 
     connect(m_searchProcess, SIGNAL(finished()),
             this, SLOT(slotProcessSearchExit()));
@@ -283,7 +283,7 @@ void Search::executeSearch(const QString &script, const QString &query, uint pag
 
     args.append("-S");
     QString term = query;
-    args.append(MythSystem::ShellEscape(term));
+    args.append(MythSystemLegacy::ShellEscape(term));
 
     LOG(VB_GENERAL, LOG_DEBUG, LOC +
         QString("Internet Search Query: %1 %2") .arg(cmd).arg(args.join(" ")));

diff --git a/mythtv/libs/libmyth/netgrabbermanager.h b/mythtv/libs/libmyth/netgrabbermanager.h
@@ -11,7 +11,7 @@
 
 #include "rssparse.h"
 #include "mythexp.h"
-#include "mythsystem.h"
+#include "mythsystemlegacy.h"
 
 class MPUBLIC GrabberScript : public QObject, public MThread
 {
@@ -160,7 +160,7 @@ class MPUBLIC Search : public QObject
 
   private:
 
-    MythSystem             *m_searchProcess;
+    MythSystemLegacy             *m_searchProcess;
 
     QByteArray              m_data;
     QDomDocument            m_document;

diff --git a/mythtv/libs/libmythbase/dbutil.cpp b/mythtv/libs/libmythbase/dbutil.cpp
@@ -20,7 +20,7 @@
 #include "mythdb.h"
 #include "mythdirs.h"
 #include "mythlogging.h"
-#include "mythsystem.h"
+#include "mythsystemlegacy.h"
 #include "exitcodes.h"
 
 #define LOC QString("DBUtil: ")