TonieToolbox 0.6.0rc2__tar.gz → 0.6.1__tar.gz

{tonietoolbox-0.6.0rc2/TonieToolbox.egg-info → tonietoolbox-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TonieToolbox
-Version: 0.6.0rc2
+Version: 0.6.1
 Summary: Convert audio files to Toniebox compatible format (.TAF) and interact with TeddyCloud.
 Home-page: https://github.com/Quentendo64/TonieToolbox
 Author: Quentendo64

{tonietoolbox-0.6.0rc2 → tonietoolbox-0.6.1}/TonieToolbox/__init__.py

@@ -3,4 +3,4 @@
 TonieToolbox - Convert audio files to Tonie box compatible format
 """
 
-__version__ = '0.6.0rc2'
+__version__ = '0.6.1'

{tonietoolbox-0.6.0rc2 → tonietoolbox-0.6.1}/TonieToolbox/integration.py

@@ -59,11 +59,13 @@ def handle_config():
         return
     if platform.system() == "Windows":
         from .integration_windows import WindowsClassicContextMenuIntegration as ContextMenuIntegration
-        ContextMenuIntegration._apply_config_template()
+        context_menu = ContextMenuIntegration()
+        context_menu._apply_config_template()
         os.startfile(config_path)
     elif platform.system() == "Darwin":
         from .integration_macos import MacOSContextMenuIntegration as ContextMenuIntegration
-        ContextMenuIntegration._apply_config_template()
+        context_menu = ContextMenuIntegration()
+        context_menu._apply_config_template()
         subprocess.call(["open", config_path])
     elif platform.system() == "Linux":
         subprocess.call(["xdg-open", config_path])

{tonietoolbox-0.6.0rc2 → tonietoolbox-0.6.1}/TonieToolbox/tonies_json.py

@@ -180,20 +180,23 @@ class ToniesJsonHandlerv1:
         """
         logger.trace("Entering add_entry_from_taf() with taf_file=%s, input_files=%s, artwork_url=%s", 
                     taf_file, input_files, artwork_url)
-        
         if not self.is_loaded:
             logger.error("Cannot add entry: tonies.custom.json not loaded")
             return False
         
         try:
-            logger.info("Adding entry for %s to tonies.custom.json", taf_file)            
+            logger.info("Adding entry for %s to tonies.custom.json", taf_file)
             logger.debug("Extracting metadata from input files")
             metadata = self._extract_metadata_from_files(input_files)
             logger.debug("Extracted metadata: %s", metadata)
+            logger.debug("Extracting hash and timestamp from TAF file header")
+            from .tonie_analysis import get_header_info
             with open(taf_file, 'rb') as f:
-                taf_hash = hashlib.sha1(f.read()).hexdigest().upper()
-            
-            timestamp = str(int(time.time()))
+                header_size, tonie_header, file_size, audio_size, sha1, opus_head_found, \
+                opus_version, channel_count, sample_rate, bitstream_serial_no, opus_comments = get_header_info(f)                
+                taf_hash = tonie_header.dataHash.hex().upper()
+                timestamp = str(bitstream_serial_no)
+                logger.debug("Extracted hash: %s, timestamp: %s", taf_hash, timestamp)
             series = metadata.get('albumartist', metadata.get('artist', 'Unknown Artist'))
             episodes = metadata.get('album', os.path.splitext(os.path.basename(taf_file))[0])
             copyright = metadata.get('copyright', '')
@@ -829,15 +832,20 @@ class ToniesJsonHandlerv2:
         
         try:
             logger.info("Adding entry for %s to tonies.custom.json", taf_file)
-            
             logger.debug("Extracting metadata from input files")
             metadata = self._extract_metadata_from_files(input_files)
             logger.debug("Extracted metadata: %s", metadata)
+            
+            logger.debug("Extracting hash and timestamp from TAF file header")
+            from .tonie_analysis import get_header_info
             with open(taf_file, 'rb') as f:
-                taf_hash = hashlib.sha1(f.read()).hexdigest()
+                header_size, tonie_header, file_size, audio_size, sha1, opus_head_found, \
+                opus_version, channel_count, sample_rate, bitstream_serial_no, opus_comments = get_header_info(f)                
+                taf_hash = tonie_header.dataHash.hex().upper()
+                timestamp = bitstream_serial_no
+                logger.debug("Extracted hash: %s, timestamp: %s", taf_hash, timestamp)
             
             taf_size = os.path.getsize(taf_file)
-            timestamp = int(time.time())
             series = metadata.get('albumartist', metadata.get('artist', 'Unknown Artist'))
             episode = metadata.get('album', os.path.splitext(os.path.basename(taf_file))[0])
             track_desc = metadata.get('track_descriptions', [])

{tonietoolbox-0.6.0rc2 → tonietoolbox-0.6.1/TonieToolbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TonieToolbox
-Version: 0.6.0rc2
+Version: 0.6.1
 Summary: Convert audio files to Toniebox compatible format (.TAF) and interact with TeddyCloud.
 Home-page: https://github.com/Quentendo64/TonieToolbox
 Author: Quentendo64