TonieToolbox 0.6.0a1__tar.gz → 0.6.0a2__tar.gz

{tonietoolbox-0.6.0a1/TonieToolbox.egg-info → tonietoolbox-0.6.0a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TonieToolbox
-Version: 0.6.0a1
+Version: 0.6.0a2
 Summary: Create files for the Tonie box and interact with TeddyCloud servers
 Home-page: https://github.com/Quentendo64/TonieToolbox
 Author: Quentendo64
@@ -225,7 +225,7 @@ docker run --rm -v "$(pwd)/input:/tonietoolbox/input" -v "$(pwd)/output:/tonieto
 docker run --rm -v "%cd%\input:/tonietoolbox/input" -v "%cd%\output:/tonietoolbox/output" quentendo64/tonietoolbox input/my-audio-file.mp3
 ```
 
-**Or using docker-compose**
+**Or using docker-compose:**
 
 ```shell
 docker-compose run --rm tonietoolbox input/my-audio-file.mp3

{tonietoolbox-0.6.0a1 → tonietoolbox-0.6.0a2}/README.md

@@ -192,7 +192,7 @@ docker run --rm -v "$(pwd)/input:/tonietoolbox/input" -v "$(pwd)/output:/tonieto
 docker run --rm -v "%cd%\input:/tonietoolbox/input" -v "%cd%\output:/tonietoolbox/output" quentendo64/tonietoolbox input/my-audio-file.mp3
 ```
 
-**Or using docker-compose**
+**Or using docker-compose:**
 
 ```shell
 docker-compose run --rm tonietoolbox input/my-audio-file.mp3

{tonietoolbox-0.6.0a1 → tonietoolbox-0.6.0a2}/TonieToolbox/__init__.py

@@ -2,4 +2,4 @@
 TonieToolbox - Convert audio files to Tonie box compatible format
 """
 
-__version__ = '0.6.0a1'
+__version__ = '0.6.0a2'

{tonietoolbox-0.6.0a1 → tonietoolbox-0.6.0a2}/TonieToolbox/__main__.py

@@ -21,7 +21,7 @@ from .teddycloud import TeddyCloudClient
 from .tags import get_tags
 from .tonies_json import fetch_and_update_tonies_json_v1, fetch_and_update_tonies_json_v2
 from .artwork import upload_artwork
-from .integration import handle_integration
+from .integration import handle_integration, handle_config
 
 def main():
     """Entry point for the TonieToolbox application."""
@@ -101,6 +101,8 @@ def main():
     parser.add_argument('-D', '--detailed-compare', action='store_true',
                        help='Show detailed OGG page differences when comparing files')  
     # ------------- Parser - Context Menu Integration -------------
+    parser.add_argument('--config-integration', action='store_true',
+                       help='Configure context menu integration')
     parser.add_argument('--install-integration', action='store_true',
                        help='Integrate with the system (e.g., create context menu entries)')
     parser.add_argument('--uninstall-integration', action='store_true',
@@ -133,7 +135,7 @@ def main():
     args = parser.parse_args()
     
     # ------------- Parser - Source Input -------------
-    if args.input_filename is None and not (args.get_tags or args.upload or args.install_integration or args.uninstall_integration):
+    if args.input_filename is None and not (args.get_tags or args.upload or args.install_integration or args.uninstall_integration or args.config_integration):
         parser.error("the following arguments are required: SOURCE")
 
     # ------------- Logging -------------
@@ -185,6 +187,10 @@ def main():
         else:
             logger.error("Failed to handle context menu integration")
         sys.exit(0)
+    if args.config_integration:
+        logger.debug("Opening configuration file for editing")
+        handle_config()
+        sys.exit(0)
         # ------------- Normalize Path Input -------------
     if args.input_filename:
         logger.debug("Original input path: %s", args.input_filename)

{tonietoolbox-0.6.0a1 → tonietoolbox-0.6.0a2}/TonieToolbox/constants.py

@@ -171,4 +171,21 @@ TAG_MAPPINGS = {
     'albuminterpret': 'albumartist',  # German tag name
     'interpret': 'artist',            # German tag name
 
+}
+
+CONFIG_TEMPLATE = {
+    "metadata": {
+        "description": "TonieToolbox configuration",
+        "config_version": "1.0"     
+    },
+    "log_level": "silent", # Options: trace, debug, info, warning, error, critical, silent
+    "log_to_file": False, # True if you want to log to a file ~\.tonietoolbox\logs
+    "upload": {
+        "url": [""], # https://teddycloud.example.com        
+        "ignore_ssl_verify": False, # True if you want to ignore SSL certificate verification
+        "username": "", # Basic Auth username
+        "password": "", # Basic Auth password
+        "client_cert_path": "", # Path to client certificate file
+        "client_cert_key_path": "" # Path to client certificate key file
+    }
 }

tonietoolbox-0.6.0a2/TonieToolbox/integration.py

@@ -0,0 +1,68 @@
+import platform
+from .logger import get_logger
+
+logger = get_logger(__name__)
+
+def handle_integration(args):
+    import platform
+    if platform.system() == 'Windows':
+        from .integration_windows import WindowsClassicContextMenuIntegration as ContextMenuIntegration
+        if args.install_integration:
+            success = ContextMenuIntegration.install()
+            if success:
+                logger.info("Integration installed successfully.")
+                return True
+            else:
+                logger.error("Integration installation failed.")
+                return False
+        elif args.uninstall_integration:
+            success = ContextMenuIntegration.uninstall()
+            if success:
+                logger.info("Integration uninstalled successfully.")
+                return True
+            else:
+                logger.error("Integration uninstallation failed.")
+                return False
+    elif platform.system() == 'Darwin':
+        from .integration_macos import MacOSContextMenuIntegration as ContextMenuIntegration
+        if args.install_integration:
+            success = ContextMenuIntegration.install()
+            if success:
+                logger.info("Integration installed successfully.")
+                return True
+            else:
+                logger.error("Integration installation failed.")
+                return False
+        elif args.uninstall_integration:
+            success = ContextMenuIntegration.uninstall()
+            if success:
+                logger.info("Integration uninstalled successfully.")
+                return True
+            else:
+                logger.error("Integration uninstallation failed.")
+                return False
+    elif platform.system() == 'Linux':
+        raise NotImplementedError("Context menu integration is not supported on Linux YET. But Soon™")
+    else:
+        raise NotImplementedError(f"Context menu integration is not supported on this OS: {platform.system()}")
+    
+def handle_config():
+    """Opens the configuration file in the default text editor."""
+    import os
+    import platform
+    import subprocess
+
+    config_path = os.path.join(os.path.expanduser("~"), ".tonietoolbox", "config.json")
+
+    if not os.path.exists(config_path):
+        logger.info(f"Configuration file not found at {config_path}.")
+        logger.info("Creating a new configuration file. Using --install-integration will create a new config file.")
+        return
+    if platform.system() == "Windows":
+        os.startfile(config_path)
+    elif platform.system() == "Darwin":
+        subprocess.call(["open", config_path])
+    elif platform.system() == "Linux":
+        subprocess.call(["xdg-open", config_path])
+    else:
+        logger.error(f"Unsupported OS: {platform.system()}")

{tonietoolbox-0.6.0a1 → tonietoolbox-0.6.0a2}/TonieToolbox/integration_macos.py

@@ -5,7 +5,7 @@ import json
 import plistlib
 import subprocess
 from pathlib import Path
-from .constants import SUPPORTED_EXTENSIONS
+from .constants import SUPPORTED_EXTENSIONS, CONFIG_TEMPLATE
 from .logger import get_logger
 
 logger = get_logger('integration_macos')
@@ -28,7 +28,7 @@ class MacOSContextMenuIntegration:
         self.success_handling = 'echo "Command completed successfully"\nsleep 2'
         
         # Load configuration
-        self.config = self._load_config()
+        self.config = self._apply_config_template()
         
         # Ensure these attributes always exist
         self.upload_url = ''
@@ -145,6 +145,18 @@ class MacOSContextMenuIntegration:
         self.upload_folder_artwork_cmd = self._build_cmd(f'{log_level_arg}', is_recursive=True, is_folder=True, use_upload=True, use_artwork=True, log_to_file=self.log_to_file)
         self.upload_folder_artwork_json_cmd = self._build_cmd(f'{log_level_arg}', is_recursive=True, is_folder=True, use_upload=True, use_artwork=True, use_json=True, log_to_file=self.log_to_file)
 
+    def _apply_config_template(self):
+        """Apply the default configuration template if config.json is missing or invalid."""
+        config_path = os.path.join(self.output_dir, 'config.json')
+        if not os.path.exists(config_path):
+            with open(config_path, 'w') as f:
+                json.dump(CONFIG_TEMPLATE, f, indent=4)
+            logger.debug(f"Default configuration created at {config_path}")
+            return CONFIG_TEMPLATE
+        else:
+            logger.debug(f"Configuration file found at {config_path}")
+            return self._load_config()
+            
     def _load_config(self):
         """Load configuration settings from config.json"""
         config_path = os.path.join(self.output_dir, 'config.json')
@@ -371,58 +383,95 @@ class MacOSContextMenuIntegration:
                 "TonieToolbox - Convert Folder, Upload with Artwork and JSON (recursive)",
                 self.upload_folder_artwork_json_cmd,
                 directory_based=True
-            )
-
+            )    
+    
     def install_quick_actions(self):
-        """Install all Quick Actions."""
-        # Ensure Services directory exists
-        os.makedirs(self.services_dir, exist_ok=True)
-        
-        # Check if the icon exists, copy default if needed
-        if not os.path.exists(self.icon_path):
-            # Include code to extract icon from resources
-            logger.debug(f"Icon not found at {self.icon_path}, using default")
-        
-        # Generate Quick Actions for different file types
-        self._generate_audio_extension_actions()
-        self._generate_taf_file_actions()
-        self._generate_folder_actions()
-        
-        # Refresh the Services menu by restarting the Finder
-        subprocess.run(["killall", "-HUP", "Finder"], check=False)
+        """
+        Install all Quick Actions.
         
-        print("TonieToolbox Quick Actions installed successfully.")
-        print("You'll find them in the Services menu when right-clicking on audio files, TAF files, or folders.")
+        Returns:
+            bool: True if all actions were installed successfully, False otherwise.
+        """
+        try:
+            # Ensure Services directory exists
+            os.makedirs(self.services_dir, exist_ok=True)
+            
+            # Check if the icon exists, copy default if needed
+            if not os.path.exists(self.icon_path):
+                # Include code to extract icon from resources
+                logger.debug(f"Icon not found at {self.icon_path}, using default")
+            
+            # Generate Quick Actions for different file types
+            self._generate_audio_extension_actions()
+            self._generate_taf_file_actions()
+            self._generate_folder_actions()
+            
+            # Refresh the Services menu by restarting the Finder
+            result = subprocess.run(["killall", "-HUP", "Finder"], check=False, 
+                                   capture_output=True, text=True)
+            
+            print("TonieToolbox Quick Actions installed successfully.")
+            print("You'll find them in the Services menu when right-clicking on audio files, TAF files, or folders.")
+            
+            return True
+        except Exception as e:
+            logger.error(f"Failed to install Quick Actions: {e}")
+            return False
 
     def uninstall_quick_actions(self):
-        """Uninstall all TonieToolbox Quick Actions."""
-        # Find and remove all TonieToolbox Quick Actions
-        for item in os.listdir(self.services_dir):
-            if item.startswith("TonieToolbox - ") and item.endswith(".workflow"):
-                action_path = os.path.join(self.services_dir, item)
-                try:
-                    subprocess.run(["rm", "-rf", action_path], check=True)
-                    print(f"Removed: {item}")
-                except subprocess.CalledProcessError:
-                    print(f"Failed to remove: {item}")
-        
-        # Refresh the Services menu
-        subprocess.run(["killall", "-HUP", "Finder"], check=False)
+        """
+        Uninstall all TonieToolbox Quick Actions.
         
-        print("TonieToolbox Quick Actions uninstalled successfully.")
-
-    @classmethod
+        Returns:
+            bool: True if all actions were uninstalled successfully, False otherwise.
+        """
+        try:
+            any_failures = False
+            for item in os.listdir(self.services_dir):
+                if item.startswith("TonieToolbox - ") and item.endswith(".workflow"):
+                    action_path = os.path.join(self.services_dir, item)
+                    try:
+                        subprocess.run(["rm", "-rf", action_path], check=True)
+                        print(f"Removed: {item}")
+                    except subprocess.CalledProcessError as e:
+                        print(f"Failed to remove: {item}")
+                        logger.error(f"Error removing {item}: {e}")
+                        any_failures = True            
+            subprocess.run(["killall", "-HUP", "Finder"], check=False)
+            
+            print("TonieToolbox Quick Actions uninstalled successfully.")
+            
+            return not any_failures
+        except Exception as e:
+            logger.error(f"Failed to uninstall Quick Actions: {e}")
+            return False    @classmethod
     def install(cls):
         """
         Generate Quick Actions and install them.
+        
+        Returns:
+            bool: True if installation was successful, False otherwise.
         """
         instance = cls()
-        instance.install_quick_actions()
+        if instance.install_quick_actions():
+            logger.info("macOS integration installed successfully.")
+            return True
+        else:
+            logger.error("macOS integration installation failed.")
+            return False
 
     @classmethod
     def uninstall(cls):
         """
         Uninstall all TonieToolbox Quick Actions.
+        
+        Returns:
+            bool: True if uninstallation was successful, False otherwise.
         """
         instance = cls()
-        instance.uninstall_quick_actions()
+        if instance.uninstall_quick_actions():
+            logger.info("macOS integration uninstalled successfully.")
+            return True
+        else:
+            logger.error("macOS integration uninstallation failed.")
+            return False

{tonietoolbox-0.6.0a1 → tonietoolbox-0.6.0a2}/TonieToolbox/integration_windows.py

@@ -2,7 +2,7 @@
 import os
 import sys
 import json
-from .constants import SUPPORTED_EXTENSIONS
+from .constants import SUPPORTED_EXTENSIONS, CONFIG_TEMPLATE
 from .logger import get_logger
 
 logger = get_logger('integration_windows')
@@ -24,8 +24,7 @@ class WindowsClassicContextMenuIntegration:
         self.separator_above = '"CommandFlags"=dword:00000020'
         self.error_handling = r' && if %ERRORLEVEL% neq 0 (echo Error: Command failed with error code %ERRORLEVEL% && pause && exit /b %ERRORLEVEL%) else (echo Command completed successfully && ping -n 2 127.0.0.1 > nul)'
         self.show_info_error_handling = r' && if %ERRORLEVEL% neq 0 (echo Error: Command failed with error code %ERRORLEVEL% && pause && exit /b %ERRORLEVEL%) else (echo. && echo Press any key to close this window... && pause > nul)'
-        self.config = self._load_config()
-        # Ensure these attributes always exist
+        self.config = self._apply_config_template()
         self.upload_url = ''
         self.log_level = self.config.get('log_level', 'SILENT')
         self.log_to_file = self.config.get('log_to_file', False)
@@ -127,6 +126,18 @@ class WindowsClassicContextMenuIntegration:
         self.upload_folder_artwork_cmd = self._build_cmd(f'{log_level_arg}', is_recursive=True, is_folder=True, use_upload=True, use_artwork=True, log_to_file=self.log_to_file)
         self.upload_folder_artwork_json_cmd = self._build_cmd(f'{log_level_arg}', is_recursive=True, is_folder=True, use_upload=True, use_artwork=True, use_json=True, log_to_file=self.log_to_file)
 
+    def _apply_config_template(self):
+        """Apply the default configuration template if config.json is missing or invalid."""
+        config_path = os.path.join(self.output_dir, 'config.json')
+        if not os.path.exists(config_path):
+            with open(config_path, 'w') as f:
+                json.dump(CONFIG_TEMPLATE, f, indent=4)
+            logger.debug(f"Default configuration created at {config_path}")
+            return CONFIG_TEMPLATE
+        else:
+            logger.debug(f"Configuration file found at {config_path}")
+            return self._load_config()
+
     def _load_config(self):
         """Load configuration settings from config.json"""
         config_path = os.path.join(self.output_dir, 'config.json')
@@ -360,11 +371,14 @@ class WindowsClassicContextMenuIntegration:
             f.write('\n'.join(unreg_lines))
         
         return reg_path
-
+        
     def install_registry_files(self, uninstall=False):
         """
         Import the generated .reg file into the Windows registry with UAC elevation.
         If uninstall is True, imports the uninstaller .reg file.
+        
+        Returns:
+            bool: True if registry import was successful, False otherwise.
         """
         import subprocess
         reg_file = os.path.join(
@@ -372,18 +386,27 @@ class WindowsClassicContextMenuIntegration:
             'remove_tonietoolbox_context.reg' if uninstall else 'tonietoolbox_context.reg'
         )
         if not os.path.exists(reg_file):
-            raise FileNotFoundError(f"Registry file not found: {reg_file}")
+            logger.error(f"Registry file not found: {reg_file}")
+            return False
     
-        # Use PowerShell to run reg.exe import as administrator (fix argument passing)
         ps_command = (
-            f"Start-Process reg.exe -ArgumentList @('import', '{reg_file}') -Verb RunAs"
+            f"Start-Process reg.exe -ArgumentList @('import', '{reg_file}') -Verb RunAs -Wait -PassThru"
         )
         try:
-            subprocess.run(["powershell.exe", "-Command", ps_command], check=True)
-            print(f"{'Uninstallation' if uninstall else 'Installation'} registry import completed.")
-        except subprocess.CalledProcessError as e:
-            print(f"Failed to import registry file: {e}")
-            raise
+            result = subprocess.run(["powershell.exe", "-Command", ps_command], check=False, 
+                                   capture_output=True, text=True)
+                        
+            if result.returncode == 0:
+                logger.info(f"{'Uninstallation' if uninstall else 'Installation'} registry import completed.")
+                return True
+            else:
+                logger.error(f"Registry import command failed with return code {result.returncode}")
+                logger.error(f"STDERR: {result.stderr}")
+                return False
+                
+        except subprocess.SubprocessError as e:
+            logger.error(f"Failed to import registry file: {e}")
+            return False
 
     @classmethod
     def install(cls):
@@ -392,7 +415,12 @@ class WindowsClassicContextMenuIntegration:
         """
         instance = cls()
         instance.generate_registry_files()
-        instance.install_registry_files(uninstall=False)
+        if instance.install_registry_files(uninstall=False):
+            logger.info("Integration installed successfully.")
+            return True
+        else:
+            logger.error("Integration installation failed.")
+            return False
 
     @classmethod
     def uninstall(cls):
@@ -401,4 +429,9 @@ class WindowsClassicContextMenuIntegration:
         """
         instance = cls()
         instance.generate_registry_files()
-        instance.install_registry_files(uninstall=True)
+        if instance.install_registry_files(uninstall=True):
+            logger.info("Integration uninstalled successfully.")
+            return True
+        else:
+            logger.error("Integration uninstallation failed.")
+            return False

{tonietoolbox-0.6.0a1 → tonietoolbox-0.6.0a2/TonieToolbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TonieToolbox
-Version: 0.6.0a1
+Version: 0.6.0a2
 Summary: Create files for the Tonie box and interact with TeddyCloud servers
 Home-page: https://github.com/Quentendo64/TonieToolbox
 Author: Quentendo64
@@ -225,7 +225,7 @@ docker run --rm -v "$(pwd)/input:/tonietoolbox/input" -v "$(pwd)/output:/tonieto
 docker run --rm -v "%cd%\input:/tonietoolbox/input" -v "%cd%\output:/tonietoolbox/output" quentendo64/tonietoolbox input/my-audio-file.mp3
 ```
 
-**Or using docker-compose**
+**Or using docker-compose:**
 
 ```shell
 docker-compose run --rm tonietoolbox input/my-audio-file.mp3

{tonietoolbox-0.6.0a1 → tonietoolbox-0.6.0a2}/TonieToolbox.egg-info/SOURCES.txt

@@ -7,7 +7,6 @@ TonieToolbox/__init__.py
 TonieToolbox/__main__.py
 TonieToolbox/artwork.py
 TonieToolbox/audio_conversion.py
-TonieToolbox/config.py
 TonieToolbox/constants.py
 TonieToolbox/dependency_manager.py
 TonieToolbox/filename_generator.py

tonietoolbox-0.6.0a1/TonieToolbox/config.py

@@ -1 +0,0 @@
-## TODO: Add config.py

tonietoolbox-0.6.0a1/TonieToolbox/integration.py

@@ -1,20 +0,0 @@
-import platform
-
-def handle_integration(args):
-    import platform
-    if platform.system() == 'Windows':
-        from .integration_windows import WindowsClassicContextMenuIntegration as ContextMenuIntegration
-        if args.install_integration:
-            ContextMenuIntegration.install()
-        elif args.uninstall_integration:
-            ContextMenuIntegration.uninstall()
-    elif platform.system() == 'Darwin':
-        from .integration_macos import MacOSContextMenuIntegration as ContextMenuIntegration
-        if args.install_integration:
-            ContextMenuIntegration.install()
-        elif args.uninstall_integration:
-            ContextMenuIntegration.uninstall()
-    elif platform.system() == 'Linux':
-        raise NotImplementedError("Context menu integration is not supported on Linux YET. But Soon™")
-    else:
-        raise NotImplementedError(f"Context menu integration is not supported on this OS: {platform.system()}")