Ticket #5659: xmltv_config_path_fixes.diff

libs/libmythtv/videosource.cpp

@@ -451 +451 @@
     QString filename = QString("%1/%2.xmltv")
         .arg(MythContext::GetConfDir()).arg(parent.getSourceName());
 
+    gContext->SaveSetting(QString("XMLTVConfig.%1").arg(parent.getSourceName()), filename);
+
     command = QString("%1 --config-file '%2' --configure")
         .arg(grabber).arg(filename);
 

programs/mythfilldatabase/filldata.cpp

@@ -315 +315 @@
 
     QString filename = QString(tempfilename);
 
-    QString home = QDir::homeDirPath();
-    QString configfile = QString("%1/%2.xmltv").arg(MythContext::GetConfDir())
+    QString configfile = gContext->GetSetting(QString("XMLTVConfig.%1").arg(source.name),NULL);
+
+    if (configfile == NULL) {
+    
+        VERBOSE(VB_GENERAL, "XMLTVConfig entry in settings table missing, falling back to old behavior");
+        QString home = QDir::homeDirPath();
+        configfile = QString("%1/%2.xmltv").arg(MythContext::GetConfDir())
                                                        .arg(source.name);
+    }
 
+    VERBOSE(VB_GENERAL, QString("XMLTV config file is: %1").arg(configfile));
+
     QString command  = QString("nice %1 --config-file '%2' --output %3")
                             .arg(xmltv_grabber.ascii())
                             .arg(configfile.ascii())