Merge pull request #1791 from agueybanapr/patch-1

Refactor config import logic for legacy column references

server/initialise.py

@@ -230,17 +230,14 @@ def importConfigs(pm, db, all_plugins):
     # get config file name
     config_file = Path(fullConfPath)
 
-    # Only import file if the file was modifed since last import.
+    # Only import file if the file was modified since last import.
     # this avoids time zone issues as we just compare the previous timestamp to the current time stamp
 
     # rename settings that have changed names due to code cleanup and migration to plugins
     # renameSettings(config_file)
 
-    # rename legacy DB column references in user config values (e.g. templates, WATCH lists)
-    renameColumnReferences(config_file)
-
     fileModifiedTime = os.path.getmtime(config_file)
-
+    
     mylog("debug", ["[Import Config] checking config file "])
     mylog("debug", ["[Import Config] lastImportedConfFile     :", conf.lastImportedConfFile],)
     mylog("debug", ["[Import Config] fileModifiedTime         :", fileModifiedTime])
@@ -249,6 +246,9 @@ def importConfigs(pm, db, all_plugins):
         mylog("debug", ["[Import Config] skipping config file import"])
         return pm, all_plugins, False
 
+    # rename legacy column references only when the config file actually changed
+    renameColumnReferences(config_file)
+
     # Header
     updateState("Import config", showSpinner=True)