TonieToolbox 0.6.0rc3__py3-none-any.whl → 0.6.1__py3-none-any.whl

TonieToolbox/__init__.py

@@ -3,4 +3,4 @@
 TonieToolbox - Convert audio files to Tonie box compatible format
 """
 
-__version__ = '0.6.0rc3'
+__version__ = '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.0rc3.dist-info → tonietoolbox-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TonieToolbox
-Version: 0.6.0rc3
+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.0rc3.dist-info → tonietoolbox-0.6.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-TonieToolbox/__init__.py,sha256=SnLbjapelQMeop1rcfF4RL0Kmq7TLiIQfGk2MnhySp8,118
+TonieToolbox/__init__.py,sha256=viFuWgxjToGcxMcK5fE58lpecgEZU6BiY5xg2LsoPOw,115
 TonieToolbox/__main__.py,sha256=KSDasW-QaTzStXSKtemMKxoFV8IWvCmq1Oig5yo8BQs,41573
 TonieToolbox/artwork.py,sha256=BhAjLWqzui8zUOU9z9P4H3zbCCTOB94aT0MPlqEvZoY,5605
 TonieToolbox/audio_conversion.py,sha256=xXXsRGPS_yQ_mqtFJiqupLbeXN8__Q2Hg05C94EPC_8,17199
@@ -20,11 +20,11 @@ TonieToolbox/tonie_analysis.py,sha256=KkaZ6vt4sntMTfutyQApI8gvCirMjTW8aeIBSbhtll
 TonieToolbox/tonie_file.py,sha256=z7yRmK0ujZ6SjF78-xJImGmQ2bS-Q7b-6d2ryYJnmwA,21769
 TonieToolbox/tonie_header.proto,sha256=WaWfwO4VrwGtscK2ujfDRKtpeBpaVPoZhI8iMmR-C0U,202
 TonieToolbox/tonie_header_pb2.py,sha256=s5bp4ULTEekgq6T61z9fDkRavyPM-3eREs20f_Pxxe8,3665
-TonieToolbox/tonies_json.py,sha256=Icu5ClFbRK0gFuefJkHQNRjeOW79tQV-GZ3hoIATo3M,60768
+TonieToolbox/tonies_json.py,sha256=EULEKA8qYmL5QTLC9jds1o9iiCjJGWZQv4gwrvajkkg,61628
 TonieToolbox/version_handler.py,sha256=Q-i5_0r5lX3dlwDLI2lMAx4X10UZGN2rvMcntmyuiT4,9862
-tonietoolbox-0.6.0rc3.dist-info/licenses/LICENSE.md,sha256=rGoga9ZAgNco9fBapVFpWf6ri7HOBp1KRnt1uIruXMk,35190
-tonietoolbox-0.6.0rc3.dist-info/METADATA,sha256=2tycPL42jf92Um34ATsD24dePbCIMH97HsIcV-Sc5Q0,29087
-tonietoolbox-0.6.0rc3.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-tonietoolbox-0.6.0rc3.dist-info/entry_points.txt,sha256=oqpeyBxel7aScg35Xr4gZKnf486S5KW9okqeBwyJxxc,60
-tonietoolbox-0.6.0rc3.dist-info/top_level.txt,sha256=Wkkm-2p7I3ENfS7ZbYtYUB2g-xwHrXVlERHfonsOPuE,13
-tonietoolbox-0.6.0rc3.dist-info/RECORD,,
+tonietoolbox-0.6.1.dist-info/licenses/LICENSE.md,sha256=rGoga9ZAgNco9fBapVFpWf6ri7HOBp1KRnt1uIruXMk,35190
+tonietoolbox-0.6.1.dist-info/METADATA,sha256=-fZc3ny_XZsj5E7zYF7f1xA2cciJqh7HAcmwg004IbI,29084
+tonietoolbox-0.6.1.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+tonietoolbox-0.6.1.dist-info/entry_points.txt,sha256=oqpeyBxel7aScg35Xr4gZKnf486S5KW9okqeBwyJxxc,60
+tonietoolbox-0.6.1.dist-info/top_level.txt,sha256=Wkkm-2p7I3ENfS7ZbYtYUB2g-xwHrXVlERHfonsOPuE,13
+tonietoolbox-0.6.1.dist-info/RECORD,,

{tonietoolbox-0.6.0rc3.dist-info → tonietoolbox-0.6.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any