From 89b1921e56e739e519ded5ae183c0841f36861da Mon Sep 17 00:00:00 2001 From: Andrew Arneson Date: Mon, 13 May 2024 20:45:37 -0600 Subject: [PATCH] Eliminate guess work on config file Removes support for directory as a `--config-file` argument --- tagstudio/src/qt/ts_qt.py | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/tagstudio/src/qt/ts_qt.py b/tagstudio/src/qt/ts_qt.py index 6a18fb52..93020fc6 100644 --- a/tagstudio/src/qt/ts_qt.py +++ b/tagstudio/src/qt/ts_qt.py @@ -188,33 +188,12 @@ class QtDriver(QObject): if self.args.config_file: path = Path(self.args.config_file) - if path.is_dir(): - path = path / "TagStudio.ini" - self.settings = QSettings(str(path), QSettings.IniFormat) - logging.info( - f"[QT DRIVER] Directory provided defaulting to TagStudio.ini in directory, using {self.settings.fileName()}" + if not path.exists(): + logging.warning( + f"[QT DRIVER] Config File does not exist creating {str(path)}" ) - elif path.is_file(): - self.settings = QSettings(str(path), QSettings.IniFormat) - logging.info( - f"[QT DRIVER] Config File exists, using {self.settings.fileName()}" - ) - else: - if path.suffix == ".ini" and path.parent.is_dir(): - self.settings = QSettings(str(path), QSettings.IniFormat) - logging.info( - f"[QT DRIVER] Config File does not exist, valid path specified using {self.settings.fileName()}" - ) - else: - self.settings = QSettings( - QSettings.IniFormat, - QSettings.UserScope, - "TagStudio", - "TagStudio", - ) - logging.warning( - f"[QT DRIVER] Config File does not exist, defaulting to {self.settings.fileName()}" - ) + logging.info(f"[QT DRIVER] Using Config File {str(path)}") + self.settings = QSettings(str(path), QSettings.IniFormat) else: self.settings = QSettings( QSettings.IniFormat, QSettings.UserScope, "TagStudio", "TagStudio"