Merge branch 'mythsystem-rewrite'

README

@@ -0,0 +1,2 @@
+Empty README.
+

mythplugins/mytharchive/mytharchive/archiveutil.cpp

@@ -20,6 +20,8 @@ using namespace std;
 #include <mythmainwindow.h>
 #include <mythdialogbox.h>
 #include <util.h>
+#include <mythsystem.h>
+#include <exitcodes.h>
 
 // mytharchive
 #include "archiveutil.h"
@@ -102,7 +104,7 @@ void checkTempDirectory()
     if (!dir.exists())
     {
         dir.mkdir(tempDir);
-        if( !chmod(qPrintable(tempDir), 0777) )
+        if( chmod(qPrintable(tempDir), 0777) )
             VERBOSE(VB_IMPORTANT, QString("Failed to change permissions on archive directory: %1")
                 .arg(strerror(errno)));
     }
@@ -111,7 +113,7 @@ void checkTempDirectory()
     if (!dir.exists())
     {
         dir.mkdir(workDir);
-        if( !chmod(qPrintable(workDir), 0777) )
+        if( chmod(qPrintable(workDir), 0777) )
             VERBOSE(VB_IMPORTANT, QString("Failed to change permissions on archive work directory: %1")
                 .arg(strerror(errno)));
     }
@@ -120,7 +122,7 @@ void checkTempDirectory()
     if (!dir.exists())
     {
         dir.mkdir(logDir);
-        if( !chmod(qPrintable(logDir), 0777) )
+        if( chmod(qPrintable(logDir), 0777) )
             VERBOSE(VB_IMPORTANT, QString("Failed to change permissions on archive log directory: %1")
                 .arg(strerror(errno)));
 
@@ -129,7 +131,7 @@ void checkTempDirectory()
     if (!dir.exists())
     {
         dir.mkdir(configDir);
-        if( !chmod(qPrintable(configDir), 0777) )
+        if( chmod(qPrintable(configDir), 0777) )
             VERBOSE(VB_IMPORTANT, QString("Failed to change permissions on archive config directory: %1")
                 .arg(strerror(errno)));
     }
@@ -233,16 +235,14 @@ bool getFileDetails(ArchiveItem *a)
     inFile.replace("\"", "\\\"");
     inFile.replace("`", "\\`");
 
-    QString outFile = tempDir + "/work/file.xml";
+    QString outFile = tempDir + "work/file.xml";
 
     // call mytharchivehelper to get files stream info etc.
     QString command = QString("mytharchivehelper -i \"%1\" \"%2\" %3 > /dev/null 2>&1")
             .arg(inFile).arg(outFile).arg(lenMethod);
 
-    int res = system(qPrintable(command));
-    if (WIFEXITED(res))
-        res = WEXITSTATUS(res);
-    if (res != 0)
+    uint flags = kMSDontBlockInputDevs | kMSDontDisableDrawing;
+    if (myth_system(command, flags) != GENERIC_EXIT_OK)
         return false;
 
     QDomDocument doc("mydocument");

mythplugins/mytharchive/mytharchive/exportnative.cpp

@@ -22,6 +22,8 @@
 #include <mythuibuttonlist.h>
 #include <mythuiprogressbar.h>
 #include <mythmainwindow.h>
+#include <mythsystem.h>
+#include <exitcodes.h>
 
 // mytharchive
 #include "exportnative.h"
@@ -464,17 +466,17 @@ void ExportNative::runScript()
     commandline = "mytharchivehelper -n " + configDir + "/mydata.xml";  // job file
     commandline += " > "  + logDir + "/progress.log 2>&1 &";            // Logs
 
-    int state = system(qPrintable(commandline));
-
-    if (state != 0)
+    uint flags = kMSRunBackground | kMSDontBlockInputDevs | 
+                 kMSDontDisableDrawing;
+    uint retval = myth_system(commandline, flags);
+    if (retval != GENERIC_EXIT_RUNNING && retval != GENERIC_EXIT_OK)
     {
         ShowOkPopup(QObject::tr("It was not possible to create the DVD. "
                                 "An error occured when running the scripts") );
+        return;
     }
-    else
-    {
-        showLogViewer();
-    }
+
+    showLogViewer();
 }
 
 void ExportNative::handleAddRecording()

mythplugins/mytharchive/mytharchive/importnative.cpp

@@ -16,6 +16,8 @@
 #include <mythuibutton.h>
 #include <mythuibuttonlist.h>
 #include <mythdialogbox.h>
+#include <mythsystem.h>
+#include <exitcodes.h>
 
 // mytharchive
 #include "importnative.h"
@@ -426,16 +428,17 @@ void ImportNative::finishedPressed()
     commandline = "mytharchivehelper -f \"" + m_xmlFile + "\" " + chanID;
     commandline += " > "  + logDir + "/progress.log 2>&1 &";
 
-    int state = system(qPrintable(commandline));
-
-    if (state != 0)
+    uint flags = kMSRunBackground | kMSDontBlockInputDevs | 
+                 kMSDontDisableDrawing;
+    uint retval = myth_system(commandline, flags);
+    if (retval != GENERIC_EXIT_RUNNING && retval != GENERIC_EXIT_OK)
     {
         ShowOkPopup(tr("It was not possible to import the Archive. "
                        " An error occured when running 'mytharchivehelper'") );
         return;
     }
-    else
-        showLogViewer();
+
+    showLogViewer();
 
     m_previousScreen->Close();
     Close();

mythplugins/mytharchive/mytharchive/logviewer.cpp

@@ -153,12 +153,14 @@ void LogViewer::updateLogItem(MythUIButtonListItem *item)
 void LogViewer::cancelClicked(void)
 {
     QString tempDir = gCoreContext->GetSetting("MythArchiveTempDir", "");
+    QFile lockFile(tempDir + "/logs/mythburncancel.lck");
 
-    QString command("echo Cancel > " + tempDir + "/logs/mythburncancel.lck");
-    int res = system(qPrintable(command));
-    if (WIFEXITED(res) == 0)
+    if (!lockFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
         VERBOSE(VB_IMPORTANT, "LogViewer: Failed to create mythburncancel.lck file");
 
+    lockFile.write("Cancel\n\r");
+    lockFile.close();
+
     ShowOkPopup(QObject::tr("Background creation has been asked to stop.\n" 
                             "This may take a few minutes."));
 }

mythplugins/mytharchive/mytharchive/mythburn.cpp

@@ -25,6 +25,9 @@
 #include <mythuicheckbox.h>
 #include <mythuibuttonlist.h>
 #include <mythuiprogressbar.h>
+#include <util.h>
+#include <mythsystem.h>
+#include <exitcodes.h>
 
 // mytharchive
 #include "archiveutil.h"
@@ -36,6 +39,8 @@
 #include "videoselector.h"
 #include "logviewer.h"
 
+using namespace std;
+
 MythBurn::MythBurn(MythScreenStack   *parent,
                    MythScreenType    *destinationScreen,
                    MythScreenType    *themeScreen,
@@ -49,12 +54,8 @@ MythBurn::MythBurn(MythScreenStack   *parent,
     // remove any old thumb images
     QString thumbDir = getTempDirectory() + "/config/thumbs";
     QDir dir(thumbDir);
-    if (dir.exists())
-    {
-        int res = system(qPrintable("rm -rf " + thumbDir));
-        if (!WIFEXITED(res) || WEXITSTATUS(res))
-            VERBOSE(VB_IMPORTANT, "MythBurn: Failed to clear thumb directory");
-    }
+    if (dir.exists() && !RemoveDirectory(dir))
+        VERBOSE(VB_IMPORTANT, "MythBurn: Failed to clear thumb directory");
 
     m_bCreateISO = false;
     m_bDoBurn = false;
@@ -942,9 +943,10 @@ void MythBurn::runScript()
 
     gCoreContext->SaveSetting("MythArchiveLastRunStatus", "Running");
 
-    int state = system(qPrintable(commandline));
-
-    if (state != 0)
+    uint flags = kMSRunBackground | kMSDontBlockInputDevs | 
+                 kMSDontDisableDrawing;
+    uint retval = myth_system(commandline, flags);
+    if (retval != GENERIC_EXIT_RUNNING && retval != GENERIC_EXIT_OK)
     {
         ShowOkPopup(tr("It was not possible to create the DVD. "
                        " An error occured when running the scripts"));
@@ -1195,9 +1197,11 @@ void BurnMenu::doBurn(int mode)
     commandline = "mytharchivehelper -b " + sArchiveFormat +
                   " " + sEraseDVDRW  + " " + sNativeFormat;
     commandline += " > "  + logDir + "/progress.log 2>&1 &";
-    int state = system(qPrintable(commandline));
 
-    if (state != 0)
+    uint flags = kMSRunBackground | kMSDontBlockInputDevs | 
+                 kMSDontDisableDrawing;
+    uint retval = myth_system(commandline, flags);
+    if (retval != GENERIC_EXIT_RUNNING && retval != GENERIC_EXIT_OK)
     {
         showWarningDialog(QObject::tr("It was not possible to run "
                                       "mytharchivehelper to burn the DVD."));

mythplugins/mytharchive/mytharchive/recordingselector.cpp

@@ -116,7 +116,7 @@ bool RecordingSelector::Create(void)
 
 void RecordingSelector::Init(void)
 {
-    QString message = tr("Retrieving Recording List.\nPlease Wait...");
+    QString message = tr("Retrieving Recording List. Please Wait...");
 
     MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack");
 

mythplugins/mytharchive/mytharchive/thumbfinder.cpp

@@ -352,22 +352,20 @@ QString ThumbFinder::createThumbDir(void)
     if (!dir.exists())
     {
         dir.mkdir(thumbDir);
-        if( !chmod(qPrintable(thumbDir), 0777) )
+        if( chmod(qPrintable(thumbDir), 0777) )
             VERBOSE(VB_IMPORTANT, QString("ThumbFinder: Failed to change permissions on thumb directory: %1")
                 .arg(strerror(errno)));
     }
 
-    int x = 0;
     QString path;
-    do
+    for (int x = 1; dir.exists(); x++)
     {
-        x++;
         path = QString(thumbDir + "/%1").arg(x);
         dir.setPath(path);
-    } while (dir.exists());
+    }
 
     dir.mkdir(path);
-    if( !chmod(qPrintable(path), 0777) )
+    if( chmod(qPrintable(path), 0777) )
         VERBOSE(VB_IMPORTANT, QString("ThumbFinder: Failed to change permissions on thumb directory: %1")
             .arg(strerror(errno)));
 

mythplugins/mytharchive/mytharchive/videoselector.cpp

@@ -28,12 +28,8 @@ VideoSelector::VideoSelector(MythScreenStack *parent, QList<ArchiveItem *> *arch
               :MythScreenType(parent, "VideoSelector")
 {
     m_archiveList = archiveList;
-    m_currentParentalLevel = ParentalLevel::plNone;
+    m_currentParentalLevel = 1;
     m_videoList = NULL;
-
-    m_parentalLevelChecker = new ParentalLevelChangeChecker();
-    connect(m_parentalLevelChecker, SIGNAL(SigResultReady(bool, ParentalLevel::Level)),
-            this, SLOT(parentalLevelChanged(bool, ParentalLevel::Level)));
 }
 
 VideoSelector::~VideoSelector(void)
@@ -44,8 +40,6 @@ VideoSelector::~VideoSelector(void)
     while (!m_selectedList.isEmpty())
          delete m_selectedList.takeFirst();
     m_selectedList.clear();
-
-    delete m_parentalLevelChecker;
 }
 
 bool VideoSelector::Create(void)
@@ -92,8 +86,6 @@ bool VideoSelector::Create(void)
 
     SetFocusWidget(m_videoButtonList);
 
-    setParentalLevel(ParentalLevel::plLowest);
-
     updateSelectedList();
     updateVideoList();
 
@@ -120,19 +112,19 @@ bool VideoSelector::keyPressEvent(QKeyEvent *event)
         }
         else if (action == "1")
         {
-            setParentalLevel(ParentalLevel::plLowest);
+            setParentalLevel(1);
         }
         else if (action == "2")
         {
-            setParentalLevel(ParentalLevel::plLow);
+            setParentalLevel(2);
         }
         else if (action == "3")
         {
-            setParentalLevel(ParentalLevel::plMedium);
+            setParentalLevel(3);
         }
         else if (action == "4")
         {
-            setParentalLevel(ParentalLevel::plHigh);
+            setParentalLevel(4);
         }
         else
             handled = false;
@@ -529,20 +521,79 @@ void VideoSelector::updateSelectedList()
     }
 }
 
-void VideoSelector::setParentalLevel(ParentalLevel::Level level)
+void VideoSelector::setParentalLevel(int which_level)
 {
-    m_parentalLevelChecker->Check(m_currentParentalLevel, level);
+    if (which_level < 1)
+        which_level = 1;
+
+    if (which_level > 4)
+        which_level = 4;
+
+    if ((which_level > m_currentParentalLevel) && !checkParentPassword())
+        which_level = m_currentParentalLevel;
+
+
+    if (m_currentParentalLevel != which_level)
+    {
+        m_currentParentalLevel = which_level;
+        updateVideoList();
+        m_plText->SetText(QString::number(which_level));
+    }
 }
 
-void VideoSelector::parentalLevelChanged(bool passwordValid, ParentalLevel::Level newLevel)
+bool VideoSelector::checkParentPassword()
 {
-    if (passwordValid)
+    QDateTime curr_time = QDateTime::currentDateTime();
+    QString last_time_stamp = gCoreContext->GetSetting("VideoPasswordTime");
+    QString password = gCoreContext->GetSetting("VideoAdminPassword");
+    if (password.length() < 1)
     {
-        m_currentParentalLevel = newLevel;
-        updateVideoList();
-        m_plText->SetText(QString::number(newLevel));
+        return true;
+    }
+
+    //  See if we recently (and succesfully) asked for a password
+    if (last_time_stamp.length() < 1)
+    {
+        //  Probably first time used
     }
     else
-        ShowOkPopup(tr("You need to enter a valid password for this parental level"));
+    {
+        QDateTime last_time = QDateTime::fromString(last_time_stamp,
+                                                    Qt::TextDate);
+        if (last_time.secsTo(curr_time) < 120)
+        {
+            //  Two minute window
+            last_time_stamp = curr_time.toString(Qt::TextDate);
+            gCoreContext->SetSetting("VideoPasswordTime", last_time_stamp);
+            gCoreContext->SaveSetting("VideoPasswordTime", last_time_stamp);
+            return true;
+        }
+    }
+
+    //  See if there is a password set
+    if (password.length() > 0)
+    {
+        bool ok = false;
+        MythPasswordDialog *pwd = new MythPasswordDialog(tr("Parental Pin:"),
+                &ok,
+                password,
+                GetMythMainWindow());
+        pwd->exec();
+        pwd->deleteLater();
+        if (ok)
+        {
+            //  All is good
+            last_time_stamp = curr_time.toString(Qt::TextDate);
+            gCoreContext->SetSetting("VideoPasswordTime", last_time_stamp);
+            gCoreContext->SaveSetting("VideoPasswordTime", last_time_stamp);
+            return true;
+        }
+    }
+    else
+    {
+        return true;
+    }
+
+    return false;
 }