refactoring

Author: tworkool

src/modules/audio_converter.py

@@ -57,7 +57,7 @@ def generate_file_tree(self, path, mirror_file_structure=True):
                     if self.is_file_type_correct(file):
                         self.save_print(f"\t* {file}")
                         converted_without_errors = self.convert_file_to_wav(
-                            Path(f"{root}\\{file}"), converted_files_subdir_abs)
+                            Path.joinpath(root, file), converted_files_subdir_abs)
                         if converted_without_errors:
                             summary["converted"] += 1
                         else:
@@ -106,7 +106,7 @@ def convert_file_to_wav(self, file_path: Path, target_path):
 
         try:
             complete_file_name = str(
-                Path(f"{target_path}\\{new_file_name}.{export_file_format}").resolve())
+                Path.joinpath(target_path, f"{new_file_name}.{export_file_format}").resolve())
             flac_tmp_audio_data.export(
                 complete_file_name,
                 format=export_file_format,

src/modules/config.py

@@ -1,24 +1,47 @@
 import configparser
+import sys
 from pathlib import Path
 
 config_parser = configparser.ConfigParser()
-config_parser.read(f'{Path(__file__).parent.parent.resolve()}\\config.ini')
 
-def get_config():
+if getattr(sys, 'frozen', False):
+    application_path = Path(sys.executable).parent.resolve()
+elif __file__:
+    application_path = Path(__file__).parent.parent.resolve()
+
+config_path = Path.joinpath(application_path, 'config.ini')
+print(f'INFO: Looking for config file in directory "{config_path}"')
+config_parser.read(config_path)
+
+
+def try_config_get(section, key, fallback):
+    fallback_type = type(fallback)
     try:
-        return {
-            "FileFilter": config_parser.get('AUDIOPARSER', 'FileFilter'),
-            "ExportFormat": config_parser.get('AUDIOPARSER', 'ExportFormat'),
-            "ConvertedFilesDirName": config_parser.get('AUDIOPARSER', 'ConvertedFilesDirName'),
-            "RemoveConvertedFiles": config_parser.getboolean('AUDIOPARSER', 'RemoveConvertedFiles'),
-            "MirrorFileStructure": config_parser.getboolean('AUDIOPARSER', 'MirrorFileStructure'),
-            "TitleSeparator": config_parser.get('AUDIOPARSER/FILENAMEMODIFICATIONS', 'TitleSeparator'),
-            "CustomRegexReplacement": config_parser.get('AUDIOPARSER/FILENAMEMODIFICATIONS', 'CustomRegexReplacement'),
-            "RecreateFileNameFromMetadata": config_parser.getboolean('AUDIOPARSER/FILENAMEMODIFICATIONS', 'RecreateFileNameFromMetadata'),
-        }
-    except ValueError as e:
-        print("ERROR: cannot parse config file values, the following error occured: ")
-        print(e)
-        return {}
+        if fallback_type is int:
+            return config_parser.getint(section, key)
+        elif fallback_type is bool:
+            return config_parser.getboolean(section, key)
+        elif fallback_type is float:
+            return config_parser.getfloat(section, key)
+        else:
+            return config_parser.get(section, key)
+    except Exception:
+        print(
+            f"ERROR: could not parse value of {section}/{key}, returning fallback value")
+        return fallback
+
+
+def get_config():
+    return {
+        "FileFilter": try_config_get('AUDIOPARSER', 'FileFilter', fallback='flac|m4a'),
+        "ExportFormat": try_config_get('AUDIOPARSER', 'ExportFormat', fallback='wav'),
+        "ConvertedFilesDirName": try_config_get('AUDIOPARSER', 'ConvertedFilesDirName', fallback='converted'),
+        "RemoveConvertedFiles": try_config_get('AUDIOPARSER', 'RemoveConvertedFiles', fallback=False),
+        "MirrorFileStructure": try_config_get('AUDIOPARSER', 'MirrorFileStructure', fallback=True),
+        "TitleSeparator": try_config_get('AUDIOPARSER/FILENAMEMODIFICATIONS', 'TitleSeparator', fallback='-'),
+        "CustomRegexReplacement": try_config_get('AUDIOPARSER/FILENAMEMODIFICATIONS', 'CustomRegexReplacement', fallback=''),
+        "RecreateFileNameFromMetadata": try_config_get('AUDIOPARSER/FILENAMEMODIFICATIONS', 'RecreateFileNameFromMetadata', fallback=True),
+    }
+
 
 config = get_config()