Ticket #10305: 10305-v1.patch

mythtv/docs/doxygen-architecture-document.cpp

@@ -576 +576 @@
   <li>Initialise the MythContext, which:</li>
   <ul>
     <li>Tries to find a database on localhost,
-        or on the host specified in mysql.txt,</li>
+        or on the host specified in config.xml,</li>
     <li>Tries to locate exactly one backend host via UPnP,
         to find its database,</li>
     <li>If possible, displays a list of all backends located via UPnP

mythtv/libs/libmyth/langsettings.cpp

@@ -187 +187 @@
     MythUIButtonListItem *item = m_languageList->GetItemCurrent();
 
     QString langCode = item->GetData().toString();
-    gCoreContext->SetSetting("Language", langCode);
     gCoreContext->SaveSetting("Language", langCode);
 
     item = m_countryList->GetItemCurrent();
 
     QString countryCode = item->GetData().toString();
-    gCoreContext->SetSetting("Country", countryCode);
     gCoreContext->SaveSetting("Country", countryCode);
 
     if (m_language != langCode)

mythtv/libs/libmyth/mythcontext.cpp

@@ -14 +14 @@
 #include "config.h"
 #include "mythcontext.h"
 #include "exitcodes.h"
-#include "oldsettings.h"
 #include "util.h"
 #include "remotefile.h"
 #include "mythplugin.h"
@@ -66 +65 @@
     void EndTempWindow(void);
 
     bool LoadDatabaseSettings(void);
+    bool SaveDatabaseParams(const DatabaseParams &params, bool force);
 
     bool    PromptForDatabaseParams(const QString &error);
     QString TestDBconnection(void);
@@ -75 +75 @@
 
     int     ChooseBackend(const QString &error);
     int     UPnPautoconf(const int milliSeconds = 2000);
-    void    StoreConnectionInfo(void);
     bool    DefaultUPnP(QString &error);
     bool    UPnPconnect(const DeviceLocation *device, const QString &PIN);
 
@@ -99 +98 @@
     DatabaseParams  m_DBparams;  ///< Current database host & WOL details
     QString         m_DBhostCp;  ///< dbHostName backup
 
-    Configuration    *m_pConfig;
+    Configuration    *m_XMLConfig;
 
     bool disableeventpopup;
     bool disablelibrarypopup;
@@ -203 +202 @@
 MythContextPrivate::MythContextPrivate(MythContext *lparent)
     : parent(lparent),
       m_gui(false),
-      m_pConfig(NULL), 
+      m_XMLConfig(NULL), 
       disableeventpopup(false),
       disablelibrarypopup(false),
       pluginmanager(NULL),
@@ -240 +239 @@
 
     SilenceDBerrors();
 
-    gCoreContext->SetSetting("Theme", DEFAULT_UI_THEME);
+    gCoreContext->OverrideSettingForSession("Theme", DEFAULT_UI_THEME);
 #ifdef Q_WS_MACX
     // Qt 4.4 has window-focus problems
-    gCoreContext->SetSetting("RunFrontendInWindow", "1");
+    gCoreContext->OverrideSettingForSession("RunFrontendInWindow", "1");
 #endif
     GetMythUI()->LoadQtConfig();
 
@@ -261 +260 @@
 void MythContextPrivate::EndTempWindow(void)
 {
     DestroyMythMainWindow();
+    gCoreContext->ClearOverrideSettingForSession("Theme");
     EnableDBerrors();
 }
 
@@ -273 +273 @@
     m_gui = gui;
 
     // We don't have a database yet, so lets use the config.xml file.
-
-    m_pConfig = UPnp::GetConfiguration();
+    m_XMLConfig = UPnp::GetConfiguration();
 
     // Creates screen saver control if we will have a GUI
     if (gui)
@@ -333 +332 @@
 
     QString failure;
 
-    // 1. Load either mysql.txt, or use sensible "localhost" defaults:
+    // 1. Load either config.xml, or use sensible "localhost" defaults:
     bool loaded = LoadDatabaseSettings();
+    DatabaseParams dbParamsFromFile = m_DBparams;
 
     // In addition to the UI chooser, we can also try to autoSelect later,
-    // but only if we're not doing manualSelect and there was no mysql.txt
+    // but only if we're not doing manualSelect and there was no
+    // valid config.xml
     bool autoSelect = !manualSelect && !loaded;
 
     // 2. If the user isn't forcing up the chooser UI, look for a default
@@ -424 +425 @@
     }
 
 DBfound:
-#if 0
     LOG(VB_GENERAL, LOG_DEBUG, "FindDatabase() - Success!");
-#endif
-    StoreConnectionInfo();
+    SaveDatabaseParams(m_DBparams, !loaded || dbParamsFromFile != m_DBparams);
     EnableDBerrors();
     ResetDatabase();
     return true;
 
 NoDBfound:
-#if 0
     LOG(VB_GENERAL, LOG_DEBUG, "FindDatabase() - failed");
-#endif
     return false;
 }
 
-/** Load database and host settings from mysql.txt or config.xml,
- *  or set some defaults.
- *  \return true if mysql.txt or config.xml was parsed
+/** Load database and host settings from config.xml, or set some defaults.
+ *  \return true if  config.xml was parsed
  */
 bool MythContextPrivate::LoadDatabaseSettings(void)
 {
-    bool ok = MythDB::LoadDatabaseParamsFromDisk(m_DBparams);
+    XmlConfiguration cfg("config.xml");
+    m_DBparams.LoadDefaults();
+    m_DBparams.dbHostName = cfg.GetValue(kDefaultBE + "DBHostName", "");
+    m_DBparams.dbUserName = cfg.GetValue(kDefaultBE + "DBUserName", "");
+    m_DBparams.dbPassword = cfg.GetValue(kDefaultBE + "DBPassword", "");
+    m_DBparams.dbName     = cfg.GetValue(kDefaultBE + "DBName", "");
+    m_DBparams.dbPort     = cfg.GetValue(kDefaultBE + "DBPort", 0);
+    bool ok = m_DBparams.IsValid("config.xml");
     if (!ok)
-    {
-        XmlConfiguration cfg("config.xml");
-        MythDB::LoadDefaultDatabaseParams(m_DBparams);
-        m_DBparams.dbHostName = cfg.GetValue(kDefaultBE + "DBHostName", "");
-        m_DBparams.dbUserName = cfg.GetValue(kDefaultBE + "DBUserName", "");
-        m_DBparams.dbPassword = cfg.GetValue(kDefaultBE + "DBPassword", "");
-        m_DBparams.dbName     = cfg.GetValue(kDefaultBE + "DBName", "");
-        m_DBparams.dbPort     = cfg.GetValue(kDefaultBE + "DBPort", 0);
-        ok = MythDB::ValidateDatabaseParams(m_DBparams, "config.xml");
-    }
-    if (!ok)
-        MythDB::LoadDefaultDatabaseParams(m_DBparams);
+        m_DBparams.LoadDefaults();
 
     gCoreContext->GetDB()->SetDatabaseParams(m_DBparams);
 
@@ -484 +476 @@
     return ok;
 }
 
+bool MythContextPrivate::SaveDatabaseParams(
+    const DatabaseParams &params, bool force)
+{
+    bool ret = true;
+
+    // only rewrite file if it has changed
+    if (params != m_DBparams || force)
+    {
+        if (m_XMLConfig)
+        {
+            m_XMLConfig->SetValue(
+                kDefaultBE + "DBHostName", params.dbHostName);
+            m_XMLConfig->SetValue(
+                kDefaultBE + "DBUserName", params.dbUserName);
+            m_XMLConfig->SetValue(
+                kDefaultBE + "DBPassword", params.dbPassword);
+            m_XMLConfig->SetValue(
+                kDefaultBE + "DBName",     params.dbName);
+            m_XMLConfig->SetValue(
+                kDefaultBE + "DBPort",     params.dbPort);
+            m_XMLConfig->Save();
+        }
+
+        // Save the new settings:
+        m_DBparams = params;
+        gCoreContext->GetDB()->SetDatabaseParams(m_DBparams);
+
+        // If database has changed, force its use:
+        ResetDatabase();
+    }
+    return ret;
+}
+
 bool MythContextPrivate::PromptForDatabaseParams(const QString &error)
 {
     bool accepted = false;
@@ -698 +723 @@
 
     LOG(VB_GENERAL, LOG_INFO, "Putting up the UPnP backend chooser");
 
-    BackendSelection::prompt(&m_DBparams, m_pConfig);
+    BackendSelection::prompt(&m_DBparams, m_XMLConfig);
 
     EndTempWindow();
 
@@ -706 +731 @@
 }
 
 /**
- * Try to store the current location of this backend in config.xml
- *
- * This is intended as a last resort for future connections
- * (e.g. Perl scripts, backend not running).
- *
- * Note that the Save() may fail (e.g. non writable ~/.mythtv)
- */
-void MythContextPrivate::StoreConnectionInfo(void)
-{
-    if (!m_pConfig)
-        return;
-
-    m_pConfig->SetValue(kDefaultBE + "DBHostName", m_DBparams.dbHostName);
-    m_pConfig->SetValue(kDefaultBE + "DBUserName", m_DBparams.dbUserName);
-    m_pConfig->SetValue(kDefaultBE + "DBPassword", m_DBparams.dbPassword);
-    m_pConfig->SetValue(kDefaultBE + "DBName",     m_DBparams.dbName);
-    m_pConfig->SetValue(kDefaultBE + "DBPort",     m_DBparams.dbPort);
-    m_pConfig->Save();
-}
-
-/**
  * If there is only a single UPnP backend, use it.
  *
  * This does <i>not</i> prompt for PIN entry. If the backend requires one,
@@ -1176 +1180 @@
 
 bool MythContext::SaveDatabaseParams(const DatabaseParams &params)
 {
-    bool ret = true;
-    DatabaseParams cur_params = GetDatabaseParams();
-
-    // only rewrite file if it has changed
-    if (params.dbHostName   != cur_params.dbHostName          ||
-        params.dbHostPing   != cur_params.dbHostPing          ||
-        params.dbPort       != cur_params.dbPort              ||
-        params.dbUserName   != cur_params.dbUserName          ||
-        params.dbPassword   != cur_params.dbPassword          ||
-        params.dbName       != cur_params.dbName              ||
-        params.dbType       != cur_params.dbType              ||
-        params.localEnabled != cur_params.localEnabled        ||
-        params.wolEnabled   != cur_params.wolEnabled          ||
-        (params.localEnabled &&
-         (params.localHostName != cur_params.localHostName))  ||
-        (params.wolEnabled &&
-         (params.wolReconnect  != cur_params.wolReconnect ||
-          params.wolRetry      != cur_params.wolRetry     ||
-          params.wolCommand    != cur_params.wolCommand)))
-    {
-        ret = MythDB::SaveDatabaseParamsToDisk(params, GetConfDir(), true);
-        if (ret)
-        {
-            // Save the new settings:
-            d->m_DBparams = params;
-            gCoreContext->GetDB()->SetDatabaseParams(d->m_DBparams);
-
-            // If database has changed, force its use:
-            d->ResetDatabase();
-        }
-    }
-    return ret;
+    return d->SaveDatabaseParams(params, false);
 }
 
 /* vim: set expandtab tabstop=4 shiftwidth=4: */

mythtv/libs/libmythbase/libmythbase.pro

@@ -27 +27 @@
 
 SOURCES += mthread.cpp mthreadpool.cpp
 SOURCES += mythsocket.cpp mythsocketthread.cpp msocketdevice.cpp
-SOURCES += mythdbcon.cpp mythdb.cpp oldsettings.cpp
+SOURCES += mythdbcon.cpp mythdb.cpp mythdbparams.cpp oldsettings.cpp
 SOURCES += mythobservable.cpp mythevent.cpp httpcomms.cpp mcodecs.cpp
 SOURCES += mythdirs.cpp mythsignalingtimer.cpp
 SOURCES += lcddevice.cpp mythstorage.cpp remotefile.cpp

mythtv/libs/libmythbase/mythcorecontext.cpp

@@ -55 +55 @@
     QString          m_appBinaryVersion;
 
     QMutex  m_hostnameLock;      ///< Locking for thread-safe copying of:
-    QString m_localHostname;     ///< hostname from mysql.txt or gethostname()
+    QString m_localHostname;     ///< hostname from config.xml or gethostname()
     QString m_masterHostname;    ///< master backend hostname
 
     QMutex      m_sockLock;      ///< protects both m_serverSock and m_eventSock
@@ -839 +839 @@
     return d->m_database->GetFloatSettingOnHost(key, host, defaultval);
 }
 
-void MythCoreContext::SetSetting(const QString &key, const QString &newValue)
-{
-    d->m_database->SetSetting(key, newValue);
-}
-
 void MythCoreContext::OverrideSettingForSession(const QString &key,
                                                 const QString &value)
 {
     d->m_database->OverrideSettingForSession(key, value);
 }
 
+void MythCoreContext::ClearOverrideSettingForSession(const QString &key)
+{
+    d->m_database->ClearOverrideSettingForSession(key);
+}
+
 bool MythCoreContext::IsUIThread(void)
 {
     return is_current_thread(d->m_UIThread);

mythtv/libs/libmythbase/mythcorecontext.h

@@ -145 +145 @@
     double GetFloatSettingOnHost(const QString &key, const QString &host,
                                  double defaultval = 0.0);
 
-    void SetSetting(const QString &key, const QString &newValue);
-
     void ClearSettingsCache(const QString &myKey = QString(""));
     void ActivateSettingsCache(bool activate = true);
     void OverrideSettingForSession(const QString &key, const QString &value);
+    void ClearOverrideSettingForSession(const QString &key);
 
     void dispatch(const MythEvent &event);
     void dispatchNow(const MythEvent &event) MDEPRECATED;

mythtv/libs/libmythbase/mythdb.cpp

@@ -12 +12 @@
 #include "mythdb.h"
 #include "mythdbcon.h"
 #include "mythlogging.h"
-#include "oldsettings.h"
 #include "mythdirs.h"
 #include "mythcorecontext.h"
 
@@ -72 +71 @@
     QString m_localhostname;
     MDBManager m_dbmanager;
 
-    Settings *m_settings;
-
     bool ignoreDatabase;
     bool suppressDBMessages;
 
@@ -93 +90 @@
 
 static const int settings_reserve = 61;
 
-MythDBPrivate::MythDBPrivate()
-    : m_settings(new Settings()),
-      ignoreDatabase(false), suppressDBMessages(true), useSettingsCache(false),
-      haveDBConnection(false), haveSchema(false)
+MythDBPrivate::MythDBPrivate() :
+    ignoreDatabase(false), suppressDBMessages(true), useSettingsCache(false),
+    haveDBConnection(false), haveSchema(false)
 {
     m_localhostname.clear();
     settingsCache.reserve(settings_reserve);
@@ -105 +101 @@
 MythDBPrivate::~MythDBPrivate()
 {
     LOG(VB_DATABASE, LOG_INFO, "Destroying MythDBPrivate");
-    delete m_settings;
 }
 
 MythDB::MythDB()
@@ -123 +118 @@
     return &(d->m_dbmanager);
 }
 
-Settings *MythDB::GetOldSettings(void)
-{
-    return d->m_settings;
-}
-
 QString MythDB::toCommaList(const QMap<QString, QVariant> &bindings,
                             uint indent, uint maxColumn)
 {
@@ -375 +365 @@
         return value;
 
     MSqlQuery query(MSqlQuery::InitCon());
-    if (!query.isConnected())
-    {
-        if (!d->suppressDBMessages)
-            LOG(VB_GENERAL, LOG_ERR,
-                QString("Database not open while trying to load setting: %1")
-                .arg(key));
-        return d->m_settings->GetSetting(key, defaultval);
-    }
-
     query.prepare(
         "SELECT data "
         "FROM settings "
@@ -407 +388 @@
         {
             value = query.value(0).toString();
         }
-        else
-        {
-            value = d->m_settings->GetSetting(key, defaultval);
-        }
     }
 
     if (d->useSettingsCache && value != kSentinelValue)
@@ -697 +674 @@
     return (retval == sentinel) ? 0.0 : retval.toDouble();
 }
 
-void MythDB::SetSetting(const QString &key, const QString &newValueRaw)
-{
-    QString newValue = (newValueRaw.isNull()) ? "" : newValueRaw;
-    d->m_settings->SetSetting(key, newValue);
-    ClearSettingsCache(key);
-}
-
 void MythDB::GetResolutionSetting(const QString &type,
                                        int &width, int &height,
                                        double &forced_aspect,
@@ -798 +768 @@
     d->settingsCacheLock.unlock();
 }
 
+/// \brief Clears session Overrides for the given setting.
+void MythDB::ClearOverrideSettingForSession(const QString &key)
+{
+    QString mk = key.toLower();
+    QString mk2 = d->m_localhostname + ' ' + mk;
+
+    d->settingsCacheLock.lockForWrite();
+
+    SettingsMap::iterator oit = d->overriddenSettings.find(mk);
+    if (oit != d->overriddenSettings.end())
+        d->overriddenSettings.erase(oit);
+
+    SettingsMap::iterator sit = d->settingsCache.find(mk);
+    if (sit != d->settingsCache.end())
+        d->settingsCache.erase(sit);
+
+    sit = d->settingsCache.find(mk2);
+    if (sit != d->settingsCache.end())
+        d->settingsCache.erase(sit);
+
+    d->settingsCacheLock.unlock();
+}
+
 static void clear(
     SettingsMap &cache, SettingsMap &overrides, const QString &myKey)
 {
@@ -866 +859 @@
     ClearSettingsCache();
 }
 
-bool MythDB::LoadDatabaseParamsFromDisk(DatabaseParams &params)
-{
-    Settings settings;
-    if (!settings.LoadSettingsFiles(
-            "mysql.txt", GetInstallPrefix(), GetConfDir()))
-    {
-        LOG(VB_GENERAL, LOG_ERR, "Unable to read configuration file mysql.txt");
-        return false;
-    }
-
-    params.dbHostName = settings.GetSetting("DBHostName");
-    params.dbHostPing = settings.GetSetting("DBHostPing") != "no";
-    params.dbPort     = settings.GetNumSetting("DBPort", 3306);
-    params.dbUserName = settings.GetSetting("DBUserName");
-    params.dbPassword = settings.GetSetting("DBPassword");
-    params.dbName     = settings.GetSetting("DBName");
-    params.dbType     = settings.GetSetting("DBType");
-
-    params.localHostName = settings.GetSetting("LocalHostName");
-    params.localEnabled  = !params.localHostName.isEmpty();
-
-    params.wolReconnect  =
-        settings.GetNumSetting("WOLsqlReconnectWaitTime");
-    params.wolEnabled = params.wolReconnect > 0;
-
-    params.wolRetry   = settings.GetNumSetting("WOLsqlConnectRetry");
-    params.wolCommand = settings.GetSetting("WOLsqlCommand");
-
-    return ValidateDatabaseParams(params, "mysql.txt");
-}
-
-bool MythDB::ValidateDatabaseParams(
-    const DatabaseParams &params, const QString &source)
-{
-    // Print some warnings if things look fishy..
-    QString msg = QString(" is not set in %1").arg(source);
-
-    if (params.dbHostName.isEmpty())
-    {
-        LOG(VB_GENERAL, LOG_ERR, "DBHostName" + msg);
-        return false;
-    }
-    if (params.dbUserName.isEmpty())
-    {
-        LOG(VB_GENERAL, LOG_ERR, "DBUserName" + msg);
-        return false;
-    }
-    if (params.dbPassword.isEmpty())
-    {
-        LOG(VB_GENERAL, LOG_ERR, "DBPassword" + msg);
-        return false;
-    }
-    if (params.dbName.isEmpty())
-    {
-        LOG(VB_GENERAL, LOG_ERR, "DBName" + msg);
-        return false;
-    }
-
-    return true;
-}
-
-// Sensible connection defaults.
-void MythDB::LoadDefaultDatabaseParams(DatabaseParams &params)
-{
-    params.dbHostName    = "localhost";
-    params.dbHostPing    = true;
-    params.dbPort        = 3306;
-    params.dbUserName    = "mythtv";
-    params.dbPassword    = "mythtv";
-    params.dbName        = "mythconverg";
-    params.dbType        = "QMYSQL";
-    params.localEnabled  = false;
-    params.localHostName = "my-unique-identifier-goes-here";
-    params.wolEnabled    = false;
-    params.wolReconnect  = 0;
-    params.wolRetry      = 5;
-    params.wolCommand    = "echo 'WOLsqlServerCommand not set'";
-}
-
-bool MythDB::SaveDatabaseParamsToDisk(
-    const DatabaseParams &params, const QString &confdir, bool overwrite)
-{
-    QString path = confdir + "/mysql.txt";
-    QFile   * f  = new QFile(path);
-
-    if (!overwrite && f->exists())
-    {
-        return false;
-    }
-
-    QString dirpath = confdir;
-    QDir createDir(dirpath);
-
-    if (!createDir.exists())
-    {
-        if (!createDir.mkdir(dirpath))
-        {
-            LOG(VB_GENERAL, LOG_ERR,
-                QString("Could not create %1").arg(dirpath));
-            return false;
-        }
-    }
-
-    if (!f->open(QIODevice::WriteOnly))
-    {
-        LOG(VB_GENERAL, LOG_ERR, QString("Could not open settings file %1 "
-                                         "for writing").arg(path));
-        return false;
-    }
-
-    LOG(VB_GENERAL, LOG_NOTICE, QString("Writing settings file %1").arg(path));
-    QTextStream s(f);
-    s << "DBHostName=" << params.dbHostName << endl;
-
-    s << "\n"
-      << "# By default, Myth tries to ping the DB host to see if it exists.\n"
-      << "# If your DB host or network doesn't accept pings, set this to no:\n"
-      << "#\n";
-
-    if (params.dbHostPing)
-        s << "#DBHostPing=no" << endl << endl;
-    else
-        s << "DBHostPing=no" << endl << endl;
-
-    if (params.dbPort)
-        s << "DBPort=" << params.dbPort << endl;
-
-    s << "DBUserName=" << params.dbUserName << endl
-      << "DBPassword=" << params.dbPassword << endl
-      << "DBName="     << params.dbName     << endl
-      << "DBType="     << params.dbType     << endl
-      << endl
-      << "# Set the following if you want to use something other than this\n"
-      << "# machine's real hostname for identifying settings in the database.\n"
-      << "# This is useful if your hostname changes often, as otherwise you\n"
-      << "# will need to reconfigure mythtv every time.\n"
-      << "# NO TWO HOSTS MAY USE THE SAME VALUE\n"
-      << "#\n";
-
-    if (params.localEnabled)
-        s << "LocalHostName=" << params.localHostName << endl;
-    else
-        s << "#LocalHostName=my-unique-identifier-goes-here\n";
-
-    s << endl
-      << "# If you want your frontend to be able to wake your MySQL server\n"
-      << "# using WakeOnLan, have a look at the following settings:\n"
-      << "#\n"
-      << "#\n"
-      << "# The time the frontend waits (in seconds) between reconnect tries.\n"
-      << "# This should be the rough time your MySQL server needs for startup\n"
-      << "#\n";
-
-    if (params.wolEnabled)
-        s << "WOLsqlReconnectWaitTime=" << params.wolReconnect << endl;
-    else
-        s << "#WOLsqlReconnectWaitTime=0\n";
-
-    s << "#\n"
-      << "#\n"
-      << "# This is the number of retries to wake the MySQL server\n"
-      << "# until the frontend gives up\n"
-      << "#\n";
-
-    if (params.wolEnabled)
-        s << "WOLsqlConnectRetry=" << params.wolRetry << endl;
-    else
-        s << "#WOLsqlConnectRetry=5\n";
-
-    s << "#\n"
-      << "#\n"
-      << "# This is the command executed to wake your MySQL server.\n"
-      << "#\n";
-
-    if (params.wolEnabled)
-        s << "WOLsqlCommand=" << params.wolCommand << endl;
-    else
-        s << "#WOLsqlCommand=echo 'WOLsqlServerCommand not set'\n";
-
-    f->close();
-    return true;
-}
-
 void MythDB::WriteDelayedSettings(void)
 {
     if (!HaveValidDatabase())

mythtv/libs/libmythbase/mythdb.h

@@ -9 +9 @@
 #include "mythdbparams.h"
 
 class MythDBPrivate;
-class Settings;
 class MDBManager;
 
 class MBASE_PUBLIC MythDB
@@ -17 +16 @@
     friend class MSqlQuery;
   public:
     MDBManager *GetDBManager(void);
-    Settings *GetOldSettings(void);
 
     static QString GetError(const QString &where, const MSqlQuery &query);
     static void DBError(const QString &where, const MSqlQuery &query);
@@ -38 +36 @@
     void ClearSettingsCache(const QString &key = QString());
     void ActivateSettingsCache(bool activate = true);
     void OverrideSettingForSession(const QString &key, const QString &newValue);
+    void ClearOverrideSettingForSession(const QString &key);
 
     void SaveSetting(const QString &key, int newValue);
     void SaveSetting(const QString &key, const QString &newValue);
@@ -71 +70 @@
     void GetResolutionSetting(const QString &type, int &width, int &height,
                               int index=-1);
 
-    void SetSetting(const QString &key, const QString &newValue);
-
     void WriteDelayedSettings(void);
 
     void SetHaveDBConnection(bool connected);
@@ -85 +82 @@
     static QString toCommaList(const QMap<QString, QVariant> &bindings,
                                uint indent = 0, uint softMaxColumn = 80);
 
-    static bool LoadDatabaseParamsFromDisk(DatabaseParams &params);
-    static bool ValidateDatabaseParams(
-        const DatabaseParams &params, const QString &source);
-    static void LoadDefaultDatabaseParams(DatabaseParams &params);
-    static bool SaveDatabaseParamsToDisk(
-        const DatabaseParams &params, const QString &confdir, bool overwrite);
-
   protected:
     MythDB();
    ~MythDB();

new file mythtv/libs/libmythbase/mythdbparams.cpp

@@ +1 @@
+#include "mythdbparams.h"
+#include "mythlogging.h"
+
+/// Load sensible connection defaults.
+void DatabaseParams::LoadDefaults(void)
+{
+    LOG(VB_GENERAL, LOG_INFO, "DatabaseParams::LoadDefaults()");
+    dbHostName    = "localhost";
+    dbHostPing    = true;
+    dbPort        = 3306;
+    dbUserName    = "mythtv";
+    dbPassword    = "mythtv";
+    dbName        = "mythconverg";
+    dbType        = "QMYSQL";
+
+    localEnabled  = false;
+    localHostName = "my-unique-identifier-goes-here";
+
+    wolEnabled    = false;
+    wolReconnect  = 0;
+    wolRetry      = 5;
+    wolCommand    = "echo 'WOLsqlServerCommand not set'";
+
+    verVersion.clear();
+    verBranch.clear();
+    verProtocol.clear();
+    verBinary.clear();
+    verSchema.clear();
+}
+
+bool DatabaseParams::IsValid(const QString &source) const
+{
+    // Print some warnings if things look fishy..
+    QString msg = QString(" is not set in %1").arg(source);
+
+    if (dbHostName.isEmpty())
+    {
+        LOG(VB_GENERAL, LOG_ERR, "DBHostName" + msg);
+        return false;
+    }
+    if (dbUserName.isEmpty())
+    {
+        LOG(VB_GENERAL, LOG_ERR, "DBUserName" + msg);
+        return false;
+    }
+    if (dbPassword.isEmpty())
+    {
+        LOG(VB_GENERAL, LOG_ERR, "DBPassword" + msg);
+        return false;
+    }
+    if (dbName.isEmpty())
+    {
+        LOG(VB_GENERAL, LOG_ERR, "DBName" + msg);
+        return false;
+    }
+
+    return true;
+}
+
+bool DatabaseParams::operator==(const DatabaseParams &other) const
+{
+    return
+        dbHostName   == other.dbHostName     &&
+        dbHostPing   == other.dbHostPing     &&
+        dbPort       == other.dbPort         &&
+        dbUserName   == other.dbUserName     &&
+        dbPassword   == other.dbPassword     &&
+        dbName       == other.dbName         &&
+        dbType       == other.dbType         &&
+        localEnabled == other.localEnabled   &&
+        wolEnabled   == other.wolEnabled     &&
+        (!localEnabled || (localHostName == other.localHostName)) &&
+        (!wolEnabled ||
+         (wolReconnect == other.wolReconnect &&
+          wolRetry     == other.wolRetry     &&
+          wolCommand   == other.wolCommand));
+}

mythtv/libs/libmythbase/mythdbparams.h

@@ -1 +1 @@
 #ifndef MYTHDBPARAMS_H_
 #define MYTHDBPARAMS_H_
 
+#include <QString>
+
 #include "mythbaseexp.h"
 
 /// Structure containing the basic Database parameters
-struct MBASE_PUBLIC DatabaseParams
+class MBASE_PUBLIC DatabaseParams
 {
+  public:
+    DatabaseParams() { LoadDefaults(); }
+
+    void LoadDefaults(void);
+    bool IsValid(const QString &source = QString("Unknown")) const;
+
+    bool operator==(const DatabaseParams &other) const;
+    bool operator!=(const DatabaseParams &other) const
+        { return !((*this)==other); }
+
     QString dbHostName;         ///< database server
     bool    dbHostPing;         ///< Can we test connectivity using ping?
     int     dbPort;             ///< database port

mythtv/libs/libmythbase/mythlocale.cpp

@@ -168 +168 @@
     {
         MythDB *mythDB = MythDB::getMythDB();
         if (overwrite || mythDB->GetSetting(it.key()).isEmpty())
-        {
-            mythDB->SetSetting(it.key(), it.value());
             mythDB->SaveSettingOnHost(it.key(), it.value(), "");
-        }
     }
 
     for (it = m_hostSettings.begin(); it != m_hostSettings.end(); ++it)
     {
         MythDB *mythDB = MythDB::getMythDB();
         if (overwrite || mythDB->GetSetting(it.key()).isEmpty())
-        {
-            mythDB->SetSetting(it.key(), it.value());
             mythDB->SaveSetting(it.key(), it.value());
-        }
     }
 }
 

mythtv/libs/libmythbase/mythtranslation.cpp

@@ -52 +52 @@
 
     if (lang == "en")
     {
-        gCoreContext->SetSetting("Language", "en_US");
         gCoreContext->SaveSetting("Language", "en_US");
         lang = "en_us";
     }

mythtv/libs/libmythmetadata/parentalcontrols.cpp

@@ -277 +277 @@
             {
                 // Two minute window
                 last_time_stamp = curr_time.toString(Qt::ISODate);
-                gCoreContext->SetSetting("VideoPasswordTime", last_time_stamp);
                 gCoreContext->SaveSetting("VideoPasswordTime", last_time_stamp);
                 return true;
             }

mythtv/libs/libmythui/myththemedmenu.cpp

@@ -424 +424 @@
                 QString timestamp_setting = QString("%1Time").arg(button.password);
                 QDateTime curr_time = QDateTime::currentDateTime();
                 QString last_time_stamp = curr_time.toString(Qt::TextDate);
-                GetMythDB()->SetSetting(timestamp_setting, last_time_stamp);
                 GetMythDB()->SaveSetting(timestamp_setting, last_time_stamp);
                 buttonAction(item, true);
             }
@@ -923 +922 @@
         if (last_time.secsTo(curr_time) < 120)
         {
             last_time_stamp = curr_time.toString(Qt::TextDate);
-            GetMythDB()->SetSetting(timestamp_setting, last_time_stamp);
             GetMythDB()->SaveSetting(timestamp_setting, last_time_stamp);
             return true;
         }

mythtv/libs/libmythupnp/configuration.cpp

@@ -21 +21 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
+#include <unistd.h> // for fsync
+
 #include <iostream>
 
 #include <QDir>
@@ -98 +100 @@
     if (m_sFileName.isEmpty())   // Special case. No file is created
         return true;
 
-    QString sName = m_sPath + '/' + m_sFileName;
+    QString config_temppath = m_sPath + '/' + m_sFileName + ".new";
+    QString config_filepath = m_sPath + '/' + m_sFileName;
+    QString config_origpath = m_sPath + '/' + m_sFileName + ".orig";
 
-    QFile file( sName );
+    QFile file(config_temppath);
     
     if (!file.exists())
     {
-        QDir createDir( m_sPath );
-
+        QDir createDir(m_sPath);
         if (!createDir.exists())
         {
             if (!createDir.mkdir(m_sPath))
@@ -117 +120 @@
         }
     }
 
-    if (!file.open( QIODevice::WriteOnly | QIODevice::Truncate ))
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate))
     {
         LOG(VB_GENERAL, LOG_ERR,
-            QString("Could not open settings file %1 for writing").arg(sName));
+            QString("Could not open settings file %1 for writing")
+            .arg(config_temppath));
 
         return false;
     }
 
-    QTextStream ts( &file );
+    {
+        QTextStream ts(&file);
+        m_config.save(ts, 2);
+    }
+
+    file.flush();
 
-    m_config.save( ts, 2 );
+    fsync(file.handle());
 
     file.close();
 
-    return true;
+    bool ok = true;
+    if (QFile::exists(config_filepath))
+        ok = QFile::rename(config_filepath, config_origpath);
+
+    if (ok)
+    {
+        ok = file.rename(config_filepath);
+        if (ok)
+            QFile::remove(config_origpath);
+        else if (QFile::exists(config_origpath))
+            QFile::rename(config_origpath, config_filepath);
+    }
+
+    if (!ok)
+    {
+        LOG(VB_GENERAL, LOG_ERR,
+            QString("Could not save settings file %1").arg(config_filepath));
+    }
+
+    return ok;
 }
 
 //////////////////////////////////////////////////////////////////////////////

mythtv/programs/mythbackend/mythsettings.cpp

@@ -355 +355 @@
     QMap<QString,QString> result;
     MSqlQuery query(MSqlQuery::InitCon());
 
-    QString list = extract_query_list(settings, MythSetting::kFile);
-    if (!list.isEmpty())
-    {
-        result = GetConfigFileSettingValues();
-        if (result.isEmpty())
-            return result;
-    }
-
-    list = extract_query_list(settings, MythSetting::kHost);
+    QString list = extract_query_list(settings, MythSetting::kHost);
     QString qstr =
         "SELECT value, data "
         "FROM settings "
@@ -474 +466 @@
     return result;
 }
 
-QMap<QString,QString> GetConfigFileSettingValues(void)
-{
-    QMap<QString,QString> map;
-    DatabaseParams params;
-    if (!MythDB::LoadDatabaseParamsFromDisk(params))
-        MythDB::LoadDefaultDatabaseParams(params);
-
-    map["dbHostName"]           = params.dbHostName;
-    map["dbPort"]               = QString::number(params.dbPort);
-    map["dbPing"]               = QString::number(params.dbHostPing);
-    map["dbName"]               = params.dbName;
-    map["dbUserName"]           = params.dbUserName;
-    map["dbPassword"]           = params.dbPassword;
-    map["dbHostID"]             = params.localHostName;
-    map["dbWOLEnabled"]         =
-        QString::number(params.wolEnabled);
-    map["dbWOLReconnectCount"]  =
-        QString::number(params.wolReconnect);
-    map["dbWOLRetryCount"]      =
-        QString::number(params.wolRetry);
-    map["dbWOLCommand"]         = params.wolCommand;
-
-    return map;
-}
-
 bool parse_dom(MythSettingList &settings, const QDomElement &element,
                const QString &filename, const QString &group,
                bool includeAllChildren, bool &foundGroup)
@@ -706 +673 @@
 {
     MSqlQuery query(MSqlQuery::InitCon());
 
-    QString list = extract_query_list(settings, MythSetting::kFile);
-    if (!list.isEmpty())
-    {
-        QMap<QString,QString> map = GetConfigFileSettingValues();
-        if (map.isEmpty())
-            return false;
-
-        MythSettingList::const_iterator it = settings.begin();
-        for (; it != settings.end(); ++it)
-            fill_setting(*it, map, MythSetting::kFile);
-    }
-
-    list = extract_query_list(settings, MythSetting::kHost);
+    QString list = extract_query_list(settings, MythSetting::kHost);
     QString qstr =
         "SELECT value, data "
         "FROM settings "

mythtv/programs/mythbackend/mythsettings.h

@@ -125 +125 @@
 QStringList           GetSettingValueList(const QString &type);
 QString               StringMapToJSON(const QMap<QString,QString> &map);
 QString               StringListToJSON(const QString &key, const QStringList &sList);
-QMap<QString,QString> GetConfigFileSettingValues();
 QMap<QString,QString> GetSettingsMap(MythSettingList &settings, const QString &hostname);
 
 #endif

mythtv/programs/mythtv-setup/main.cpp

@@ -342 +342 @@
 
     if (use_display)
     {
-        gCoreContext->SetSetting("Theme", DEFAULT_UI_THEME);
+        gCoreContext->OverrideSettingForSession("Theme", DEFAULT_UI_THEME);
         GetMythUI()->LoadQtConfig();
 
         QString fileprefix = GetConfDir();

mythtv/programs/mythtv-setup/startprompt.cpp

@@ -44 +44 @@
 void StartPrompter::leaveBackendRunning()
 {
     LOG(VB_GENERAL, LOG_INFO, "Continuing with backend running");
-    gCoreContext->SetSetting("AutoRestartBackend", "0");
+    gCoreContext->OverrideSettingForSession("AutoRestartBackend", "0");
 }
 
 void StartPrompter::stopBackend()
@@ -56 +56 @@
     {
         myth_system(commandString);
     }
-    gCoreContext->SetSetting("AutoRestartBackend", "1");
+    gCoreContext->OverrideSettingForSession("AutoRestartBackend", "1");
 }
 
 void StartPrompter::backendRunningPrompt(void)