Skip to content

Commit 89b1921

Browse files
Andrew ArnesonAndrew Arneson
authored andcommitted
Eliminate guess work on config file
Removes support for directory as a `--config-file` argument
1 parent e7318c7 commit 89b1921

1 file changed

Lines changed: 5 additions & 26 deletions

File tree

tagstudio/src/qt/ts_qt.py

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -188,33 +188,12 @@ def __init__(self, core, args):
188188

189189
if self.args.config_file:
190190
path = Path(self.args.config_file)
191-
if path.is_dir():
192-
path = path / "TagStudio.ini"
193-
self.settings = QSettings(str(path), QSettings.IniFormat)
194-
logging.info(
195-
f"[QT DRIVER] Directory provided defaulting to TagStudio.ini in directory, using {self.settings.fileName()}"
196-
)
197-
elif path.is_file():
198-
self.settings = QSettings(str(path), QSettings.IniFormat)
199-
logging.info(
200-
f"[QT DRIVER] Config File exists, using {self.settings.fileName()}"
191+
if not path.exists():
192+
logging.warning(
193+
f"[QT DRIVER] Config File does not exist creating {str(path)}"
201194
)
202-
else:
203-
if path.suffix == ".ini" and path.parent.is_dir():
204-
self.settings = QSettings(str(path), QSettings.IniFormat)
205-
logging.info(
206-
f"[QT DRIVER] Config File does not exist, valid path specified using {self.settings.fileName()}"
207-
)
208-
else:
209-
self.settings = QSettings(
210-
QSettings.IniFormat,
211-
QSettings.UserScope,
212-
"TagStudio",
213-
"TagStudio",
214-
)
215-
logging.warning(
216-
f"[QT DRIVER] Config File does not exist, defaulting to {self.settings.fileName()}"
217-
)
195+
logging.info(f"[QT DRIVER] Using Config File {str(path)}")
196+
self.settings = QSettings(str(path), QSettings.IniFormat)
218197
else:
219198
self.settings = QSettings(
220199
QSettings.IniFormat, QSettings.UserScope, "TagStudio", "TagStudio"

0 commit comments

Comments
 (0)