Ticket #6457: SG-Preferences.diff

mythtv/libs/libmythtv/dbcheck.cpp

@@ -18 +18 @@
 #define MINIMUM_DBMS_VERSION 5,0,15
 
 /// This is the DB schema version expected by the running MythTV instance.
-const QString currentDatabaseVersion = "1232";
+const QString currentDatabaseVersion = "1233";
 
 static bool UpdateDBVersionNumber(const QString &newnumber);
 static bool performActualUpdate(
@@ -4458 +4458 @@
         if (!performActualUpdate(updates, "1232", dbver))  
             return false;  
     }   
+    if (dbver == "1232")
+    {
+        const char *updates[] = {
+"CREATE TABLE storagemetadata ("
+"  groupname VARCHAR( 32 ) NOT NULL ,"
+"  dirname VARCHAR( 255 ) NOT NULL ,"
+"  subdir VARCHAR( 255 ) NOT NULL ,"
+"  value VARCHAR( 255 ) NOT NULL ,"
+"  data TEXT NOT NULL"
+");",
+NULL
+};
+        if (!performActualUpdate(updates, "1233", dbver))
+            return false;
+    }
 
     return true;
 }

mythtv/libs/libmyth/storagegroup.cpp

@@ -464 +464 @@
     return groups;
 }
 
+QString StorageGroup::getSGSetting(QString groupname, QString dirname,
+                                QString value, QString subdir = "")
+{
+    QString ret;
 
+    MSqlQuery query(MSqlQuery::InitCon());
+
+    QString sql = QString("SELECT data FROM storagemetadata "
+                  "WHERE groupname = :GROUPNAME AND "
+                  "dirname = :DIRNAME AND "
+                  "subdir = :SUBDIR AND "
+                  "value = :VALUE");
+
+    query.prepare(sql);
+    query.bindValue(":GROUPNAME", groupname);
+    query.bindValue(":DIRNAME", dirname);
+    query.bindValue(":SUBDIR", subdir);
+    query.bindValue(":VALUE", value);
+
+    if (query.exec() && query.isActive() && query.size() > 0)
+        ret = query.value(0).toString();
+
+    return ret;
+}
+
+void StorageGroup::setSGSetting(QString groupname, QString dirname,
+                                   QString value, QString data, 
+                                   QString subdir = "")
+{
+
+    QString drop = QString("DELETE FROM storagemetadata WHERE "
+                   "groupname = :GROUPNAME AND "
+                   "dirname = :DIRNAME AND "
+                   "subdir = :SUBDIR AND "
+                   "value = :VALUE");
+
+    MSqlQuery remove(MSqlQuery::InitCon());
+
+    remove.prepare(drop);
+    remove.bindValue(":GROUPNAME", groupname);
+    remove.bindValue(":DIRNAME", dirname);
+    remove.bindValue(":SUBDIR", subdir);
+    remove.bindValue(":VALUE", value);
+
+    if (!remove.exec())
+        MythDB::DBError("StorageGroup::setSGSetting", remove);
+
+    MSqlQuery query(MSqlQuery::InitCon());
+
+    QString sql = QString("INSERT INTO storagemetadata "
+                  "(groupname, dirname, subdir, value, data) "
+                  "VALUES (:GROUPNAME, :DIRNAME, :SUBDIR, "
+                  ":VALUE, :DATA)");
+
+    query.prepare(sql);
+    query.bindValue(":GROUPNAME", groupname);
+    query.bindValue(":DIRNAME", dirname);
+    query.bindValue(":SUBDIR", subdir);
+    query.bindValue(":VALUE", value);
+    query.bindValue(":DATA", data);
+
+    if (!query.exec())
+        MythDB::DBError("StorageGroup::setSGSetting", query);
+}
+
 /****************************************************************************/
 typedef enum {
     SGPopup_OK = 0,

mythtv/libs/libmyth/storagegroup.h

@@ -36 +36 @@
 
     static QStringList getRecordingsGroups(void);
     static QStringList getGroupDirs(QString groupname, QString host);
+    QString getSGSetting(QString groupname, QString dirname, 
+                         QString value, QString subdir);
+    void setSGSetting(QString groupname, QString dirname,
+                      QString value, QString data, 
+                      QString subdir);
 
+
   private:
     QString      m_groupname;
     QString      m_hostname;