Ticket #5659: xmltv_config_path_trunk.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 = "1223";
+const QString currentDatabaseVersion = "1224";
 
 static bool UpdateDBVersionNumber(const QString &newnumber);
 static bool performActualUpdate(
@@ -4302 +4302 @@
             return false;
     }
 
+    if (dbver == "1223")
+    {
+
+        const char *updates[] = {
+"ALTER TABLE videosource ADD COLUMN configpath VARCHAR(4096) DEFAULT NULL;", NULL
+};
+
+       if (!performActualUpdate(updates, "1224", dbver))
+           return false;
+    
+
+
+        bool ok = true;
+        MSqlQuery query(MSqlQuery::InitCon());
+        query.prepare(
+            "SELECT name, sourceid "
+            "FROM videosource");
+
+        if (!query.exec())
+        {
+            MythDB::DBError(
+                "Could not perform select for update to '1224'", query);
+            ok = false;
+        }
+        else
+        {
+            MSqlQuery query2(MSqlQuery::InitCon());
+            while (query.next())
+            {
+                QString videosource = query.value(0).toString();
+                QString configpath = gContext->GetSetting(QString("XMLTVConfig.%1").arg(videosource));
+
+                if (configpath != QString(""))
+                {
+                    query2.prepare(
+                        "UPDATE videosource "
+                        "SET configpath = :PATH "
+                        "WHERE sourceid = :SOURCEID ");
+                    query2.bindValue(":PATH", configpath);
+                    query2.bindValue(":SOURCEID",   query.value(1).toString());
+                    if (!query2.exec())
+                    {
+                         MythDB::DBError(
+                            "Could not perform update for '1224'", query2);
+                         ok = false;
+                    }
+                }
+            }
+        }
+        if (!ok)
+        return false;
+
+        MSqlQuery query3(MSqlQuery::InitCon());
+        query3.prepare(
+            "DELETE FROM settings "
+            "WHERE value LIKE 'XMLTVConfig.%'");
+        if (!query3.exec()) 
+        {
+            MythDB::DBError(
+                "Could not perform update for '1224'", query3);
+            ok = false;
+        }
+
+        if (!ok)
+        return false;
+    }
+
+
     return true;
 }
 

mythtv/libs/libmythtv/videosource.cpp

@@ -424 +424 @@
     QString filename = QString("%1/%2.xmltv")
         .arg(GetConfDir()).arg(parent.getSourceName());
 
+    MSqlQuery query(MSqlQuery::InitCon());
+    query.prepare(
+        "UPDATE videosource "
+        "SET configpath = :PATH "
+        "WHERE sourceid = :SOURCEID");
+
+    query.bindValue(":PATH", filename);
+    query.bindValue(":SOURCEID", parent.getSourceID());
+
+    if (!query.exec() || !query.isActive())
+    {
+        MythContext::DBError(" XMLTV_generic_config::save", query);
+        return;
+    }
+
+
     grabberArgs.push_back("--config-file");
     grabberArgs.push_back(filename);
     grabberArgs.push_back("--configure");

mythtv/programs/mythfilldatabase/filldata.cpp

@@ -343 +343 @@
     QString filename = QString(tempfilename);
 
     QString home = QDir::homeDirPath();
-    QString configfile = QString("%1/%2.xmltv").arg(GetConfDir())
-                                               .arg(source.name);
+    QString configfile;
+    
+    MSqlQuery query(MSqlQuery::InitCon());
+    QString querystr = "SELECT configpath from videosource";
+    querystr += " WHERE sourceid = :ID";
+    query.prepare(querystr);
+    query.bindValue(":ID",source.id);
+    if (!query.exec() || !query.isActive()) {
+        MythContext::DBError("FillData::grabData", query);
+        //return;
+    }
+
+
+   if (query.size() == 0) {
+        VERBOSE(VB_GENERAL, "configpath in videosource table is empty, falling back to old behavior");
+        QString home = QDir::homeDirPath();
+        configfile = QString("%1/%2.xmltv").arg(GetConfDir())
+                                                        .arg(source.name);
+    }
+    else {
+        query.next();
+        configfile = query.value(0).toString();
+    }
+
+    VERBOSE(VB_GENERAL, QString("XMLTV config file is: %1").arg(configfile));
+
+
+    
+
 
     QString command = QString("nice %1 --config-file '%2' --output %3")
         .arg(xmltv_grabber).arg(configfile).arg(filename);
@@ -377 +404 @@
     }
 
     QDateTime qdtNow = QDateTime::currentDateTime();
-    MSqlQuery query(MSqlQuery::InitCon());
+    //MSqlQuery query(MSqlQuery::InitCon());
     QString status = QObject::tr("currently running.");
 
     query.exec(QString("UPDATE settings SET data ='%1' "