diff --git a/tagstudio/src/core/library.py b/tagstudio/src/core/library.py index d312102..5d09eaa 100644 --- a/tagstudio/src/core/library.py +++ b/tagstudio/src/core/library.py @@ -89,17 +89,17 @@ class Entry: __value = cast(Self, object) if os.name == "nt": return ( - int(self.id) == int(__value.id) #type: ignore - and self.filename.lower() == __value.filename.lower() #type: ignore - and self.path.lower() == __value.path.lower() #type: ignore - and self.fields == __value.fields #type: ignore + int(self.id) == int(__value.id) + and self.filename.lower() == __value.filename.lower() + and self.path.lower() == __value.path.lower() + and self.fields == __value.fields ) else: return ( - int(self.id) == int(__value.id) #type: ignore - and self.filename == __value.filename #type: ignore - and self.path == __value.path #type: ignore - and self.fields == __value.fields #type: ignore + int(self.id) == int(__value.id) + and self.filename == __value.filename + and self.path == __value.path + and self.fields == __value.fields ) def compressed_dict(self) -> JsonEntry: @@ -450,9 +450,8 @@ class Library: path = os.path.normpath(path).rstrip("\\") # If '.TagStudio' is included in the path, trim the path up to it. - if TS_FOLDER_NAME in str(path): - # TODO: Native Path method instead of this casting. - path = Path(str(path).split(TS_FOLDER_NAME)[0]) + if TS_FOLDER_NAME in path: + path = path.split(TS_FOLDER_NAME)[0] try: self.clear_internal_vars() diff --git a/tagstudio/src/qt/ts_qt.py b/tagstudio/src/qt/ts_qt.py index e140ccc..a34e10e 100644 --- a/tagstudio/src/qt/ts_qt.py +++ b/tagstudio/src/qt/ts_qt.py @@ -1392,7 +1392,7 @@ class QtDriver(QObject): self.save_library() self.lib.clear_internal_vars() - self.main_window.statusbar.showMessage(f"Opening Library {str(path)}", 3) + self.main_window.statusbar.showMessage(f"Opening Library {path}", 3) return_code = self.lib.open_library(path) if return_code == 1: # if self.args.external_preview: