Ticket #3910: 06-3910-mythshutdown-dbsettings.patch

mythtv/programs/mythshutdown/main.cpp

@@ -18 +18 @@
 #include "remoteutil.h"
 #include "compat.h"
 
-void setGlobalSetting(const QString &key, const QString &value)
-{
-    MSqlQuery query(MSqlQuery::InitCon());
-    if (query.isConnected())
-    {
-        query.prepare("DELETE FROM settings WHERE value = :KEY;");
-        query.bindValue(":KEY", key);
-
-        if (!query.exec() || !query.isActive())
-            MythDB::DBError("Clear setting", query);
-
-        query.prepare("INSERT INTO settings ( value, data ) "
-                "VALUES ( :VALUE, :DATA );");
-        query.bindValue(":VALUE", key);
-        query.bindValue(":DATA", value);
-
-        if (!query.exec() || !query.isActive())
-            MythDB::DBError("Save new global setting", query);
-    }
-    else
-    {
-        VERBOSE(VB_IMPORTANT,
-                QString("Database not open while trying to save setting: %1")
-                        .arg(key));
-    }
-}
-
-QString getGlobalSetting(const QString &key, const QString &defaultval)
-{
-    QString value = defaultval;
-
-    MSqlQuery query(MSqlQuery::InitCon());
-    if (query.isConnected())
-    {
-        query.prepare("SELECT data FROM settings WHERE value = :KEY AND "
-                      "hostname IS NULL;");
-        query.bindValue(":KEY", key);
-        query.exec();
-        if (query.isActive() && query.size() > 0)
-        {
-            query.next();
-            value = query.value(0).toString();
-        }
-    }
-    else
-    {
-        VERBOSE(VB_IMPORTANT,
-                QString("Database not open while trying to load setting: %1")
-                        .arg(key));
-    }
-
-    return value;
-}
-
 int lockShutdown()
 {
     VERBOSE(VB_GENERAL, "Mythshutdown: --lock");
@@ -177 +123 @@
 
 QDateTime getDailyWakeupTime(QString sPeriod)
 {
-    QString sTime = getGlobalSetting(sPeriod, "00:00");
+    QString sTime = gContext->GetGlobalSetting(sPeriod, "00:00");
     QTime tTime = QTime::fromString(sTime, "hh:mm");
     QDateTime dtDateTime = QDateTime(QDate::currentDate(), tTime);
 
@@ -231 +177 @@
         res += 8;
     }
 
-    if (getGlobalSetting("MythShutdownLock", "0") != "0")
+    if (gContext->GetGlobalSetting("MythShutdownLock", "0") != "0")
     {
         VERBOSE(VB_IMPORTANT, "Shutdown is locked");
         res += 16;
@@ -363 +309 @@
         return 1;
     }
 
-    setGlobalSetting("MythShutdownNextScheduled",
+    gContext->SaveGlobalSetting("MythShutdownNextScheduled",
                      dtWakeupTime.toString(Qt::ISODate));
 
     return 0;
@@ -480 +426 @@
 
     // get next scheduled wake up for a recording if any
     QDateTime dtNextRecordingStart = QDateTime();
-    QString s = getGlobalSetting("MythShutdownNextScheduled", "");
+    QString s = gContext->GetGlobalSetting("MythShutdownNextScheduled", "");
     if (s != "")
         dtNextRecordingStart = QDateTime::fromString(s, Qt::ISODate);
 
@@ -501 +447 @@
                                   " already passed. Schedule deleted");
 
             dtNextRecordingStart = QDateTime();
-            setGlobalSetting("MythShutdownNextScheduled", "");
+            gContext->SaveGlobalSetting("MythShutdownNextScheduled", "");
         }
     }
 
@@ -553 +499 @@
     }
 
     // save the next wakuptime in the db
-    setGlobalSetting("MythShutdownWakeupTime",
+    gContext->SaveGlobalSetting("MythShutdownWakeupTime",
                      dtWakeupTime.toString(Qt::ISODate));
 
     // stop here to debug
@@ -667 +613 @@
 
     int res = 0;
     QDateTime startupTime = QDateTime();
-    QString s = getGlobalSetting("MythshutdownWakeupTime", "");
+    QString s = gContext->GetGlobalSetting("MythshutdownWakeupTime", "");
     if (s != "")
         startupTime = QDateTime::fromString(s, Qt::ISODate);