tictacsync 0.3a2__tar.gz → 0.3a4__tar.gz

{tictacsync-0.3a2/tictacsync.egg-info → tictacsync-0.3a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tictacsync
-Version: 0.3a2
+Version: 0.3a4
 Summary: command for syncing audio video recordings
 Home-page: https://tictacsync.org/
 Author: Raymond Lutz

{tictacsync-0.3a2 → tictacsync-0.3a4}/setup.py

@@ -31,7 +31,7 @@ setup(
         'multi2polywav = tictacsync.multi2polywav:main',
         ]
         },
-    version = '0.3a2',
+    version = '0.3a4',
     description = "command for syncing audio video recordings",
     long_description_content_type='text/markdown',
     long_description = long_descr,

{tictacsync-0.3a2 → tictacsync-0.3a4}/tictacsync/device_scanner.py

@@ -230,21 +230,6 @@ class Scanner:
         Sets Scanner.input_structure = 'loose'|'folder_is_device'
 
         """
-        visible = [f for f in listdir(self.top_directory) if f[0] != '.']
-        logger.debug('visible: %s'%visible)
-        are_dir = all([isdir(join(self.top_directory, f)) for f in visible])
-        are_files = all([isfile(join(self.top_directory, f)) for f in visible])
-        logger.debug('dir: %s'%[isdir(join(self.top_directory, f)) for f
-              in visible])
-        if are_dir:
-            visible = [e for e in visible if e != 'SyncedMedia']
-            print('\nAssuming those are device folders: ',end='')
-            [print('[gold1]%s[/gold1]'%f, end=', ') for f in visible[:-1]]
-            print('[gold1]%s[/gold1].'%visible[-1])
-            self.input_structure = 'folder_is_device'
-        else: # are_files
-            self.input_structure = 'loose'
-            self.top_dir_has_multicam = False
         files = Path(self.top_directory).rglob('*.*')
         paths = [
             p
@@ -252,17 +237,33 @@ class Scanner:
             if p.suffix[1:] in av_file_extensions
             and 'SyncedMedia' not in p.parts
         ]
+        logger.debug('found media files %s'%paths)
+        parents = [p.parent for p in paths]
+        logger.debug('found parents %s'%parents)
+        def _list_all_the_same(a_list):
+            return a_list.count(a_list[0]) == len(a_list)
+        all_parents_are_the_same = _list_all_the_same(parents)
+        logger.debug('all_parents_are_the_same %s'%all_parents_are_the_same)
+        if all_parents_are_the_same:
+            # all media (video + audio) are in a same folder, so this is loose
+            self.input_structure = 'loose'
+            # for now (TO DO?) 'loose' == no multi-cam
+            self.top_dir_has_multicam = False
+        else:
+            # check later if inside each folder, media have same device,
+            # for now, we'll guess structure is 'folder_is_device'
+            self.input_structure = 'folder_is_device'
         for p in paths:
             new_media = media_at_path(self.input_structure, p) # dev UID set here
             self.found_media_files.append(new_media)
         # files from devices without UID or name
-        def _same(l):
-            return all(e == l[0] for e in l)
+        # def _list_all_the_same(l):
+        #     return all(e == l[0] for e in l)
         def _try_name(medias):
             # return common first strings in filename
             names = [m.path.name for m in medias]
             transposed_names = list(map(list, zip(*names)))
-            same = list(map(_same, transposed_names))
+            same = list(map(_list_all_the_same, transposed_names))
             try:
                 first_diff = same.index(False)
             except:

{tictacsync-0.3a2 → tictacsync-0.3a4}/tictacsync/entry.py

@@ -126,8 +126,8 @@ def main():
     # logger.add(sys.stdout, filter="__main__")
     # logger.add(sys.stdout, filter="device_scanner")
     # logger.add(sys.stdout, filter="yaltc") _extract_sound_to_merge
-    # logger.add(sys.stdout, filter=lambda r: r["function"] == "build_audio_and_write_video")
-    # logger.add(sys.stdout, filter=lambda r: r["function"] == "_get_audio_devices")
+    # logger.add(sys.stdout, filter=lambda r: r["function"] == "scan_media_and_build_devices_UID")
+    # logger.add(sys.stdout, filter=lambda r: r["function"] == "_sox_multi2mono")
     # logger.add(sys.stdout, filter=lambda r: r["function"] == "_get_mix")
     # logger.add(sys.stdout, filter=lambda r: r["function"] == "_sox_mix")
     top_dir = args.directory[0]

{tictacsync-0.3a2 → tictacsync-0.3a4}/tictacsync/timeline.py

@@ -66,24 +66,23 @@ def _sox_keep(audio_file, kept_channels) -> tempfile.NamedTemporaryFile:
     """
     Returns a NamedTemporaryFile containing the selected kept_channels
 
-    Building dict according to pysox.remix format.
-    https://pysox.readthedocs.io/en/latest/api.html#sox.transform.Transformer.remix
-    eg: 4 channels with TicTacCode_channel at #2 
-    returns {1: [1], 2: [3], 3: [4]}
-    ie the number of channels drops by one and chan 2 is missing
-    excluded_channels is a list of Zero Based indexing chan numbers
-
+    if len(kept_channels) == 1 then it's a mono mix on the specified track
+    if len(kept_channels) == 2 then it's a stereo mix on the specified tracks
     """
+
+
+
+
     audio_file = _pathname(audio_file)
     nchan = sox.file_info.channels(audio_file)
     logger.debug('in file of %i chan, have to keep %s'%
         (nchan, kept_channels))
     all_channels = range(1, nchan + 1) # from 1 to nchan included
-    # list of list for pysox API
-    # eg [[1], [3], [4]]
+    # Building dict according to pysox.remix format.
+    # https://pysox.readthedocs.io/en/latest/api.html#sox.transform.Transformer.remix
+    # eg:   {1: [3], 2: [4]} to keep channels 3 & 4    
     kept_channels = [[n] for n in kept_channels]
     sox_remix_dict = dict(zip(all_channels, kept_channels))
-    # {1: [1], 2: [3], 3: [4]} -> from 4 to 3 chan and chan 2 is dropped
     output_fh = tempfile.NamedTemporaryFile(suffix='.wav', delete=DEL_TEMP)
     out_file = _pathname(output_fh)
     logger.debug('sox in and out files: %s %s'%(audio_file, out_file))
@@ -159,6 +158,26 @@ def _sox_combine(paths) -> Path:
         (merged_duration, nchan))
     return out_file_handle
 
+def _sox_multi2mono(multichan_tmpfl) -> tempfile.NamedTemporaryFile:
+    # return a mono mix down
+    n_chan_input = sox.file_info.channels(_pathname(multichan_tmpfl))
+    logger.debug('n chan input: %s'%n_chan_input)
+    if n_chan_input == 1: # nothing to mix down
+        return multichan_tmpfl
+    mono_tpfl = tempfile.NamedTemporaryFile(suffix='.wav',
+                    delete=DEL_TEMP)
+    tfm = sox.Transformer()
+    tfm.channels(1)
+    status = tfm.build(_pathname(multichan_tmpfl),_pathname(mono_tpfl))
+    logger.debug('n chan ouput: %s'%
+                sox.file_info.channels(_pathname(mono_tpfl)))
+    logger.debug('sox.build status for _sox_multi2mono(): %s'%status)
+    if status != True:
+        print('Error, sox did not normalize file in _sox_multi2mono()')
+        sys.exit(1)
+    return mono_tpfl
+
+
 def _sox_mix(paths:list) -> tempfile.NamedTemporaryFile:
     """
     mix files referred by the list of Path into a new temporary files passed on return
@@ -183,6 +202,8 @@ def _sox_mix(paths:list) -> tempfile.NamedTemporaryFile:
     cbn.set_input_format(file_type=['wav']*N)
     filenames = [_pathname(p) for p in paths]
     logger.debug('%i files to mix %s'%(N, filenames))
+    logger.debug('nchan for each file %s'%[sox.file_info.channels(f) for
+                                    f in filenames])
     mixed_tempf = tempfile.NamedTemporaryFile(suffix='.wav',delete=DEL_TEMP)
     status = cbn.build(filenames,
                 _pathname(mixed_tempf),
@@ -580,35 +601,65 @@ class AudioStitcherVideoMerger:
         stereo) mix track, returns a tmpfl containing the corresponding
         tracks. If not, mix all the tracks with sox.
 
+        If no L-R tracks are declared in tracks.txt, a mono mix is returned;
+        If some
+        micL micR or mixL mixR
+
         """
-        if device.tracks != None:
-            mix_tracks = device.tracks.mix
-            if len(mix_tracks) > 0:
-                logger.debug('%s has mix %s'%(device.name, mix_tracks))
-                logger.debug('device %s'%device)
-                if 'ttc' in device.tracks.rawtrx:
-                    sox_TTC_chan = device.tracks.rawtrx.index('ttc')
-                elif 'tc' in device.tracks.rawtrx:
-                    sox_TTC_chan = device.tracks.rawtrx.index('tc')
-                else:
-                    print('Error: no tc or ttc tag in track.txt')
-                    sys.exit(1)
-                sox_TTC_chan += 1 # sox NZBIDX
-                logger.debug('TTC chan %i'%sox_TTC_chan)
-                # redo indexing since tracks.txt numbers refere to complete
-                # files and here audio file had TTC and muted channels
-                # removed.
-                shift = 0
-                if mix_tracks[0] > sox_TTC_chan:
+        if device.tracks is None:
+            logger.debug('no tracks.txt, mixing all')
+            return _sox_multi2mono(multichan_tmpfl)
+        mix_tracks = device.tracks.mix
+        if mix_tracks == []:
+            logger.debug('tracks.txt present but no mix trx, mixing all')
+            return _sox_multi2mono(multichan_tmpfl)
+        # if here, mix exists
+        logger.debug('%s has mix %s'%(device.name, mix_tracks))
+        logger.debug('device %s'%device)
+        if 'ttc' in device.tracks.rawtrx:
+            sox_TTC_chan = device.tracks.rawtrx.index('ttc')
+        elif 'tc' in device.tracks.rawtrx:
+            sox_TTC_chan = device.tracks.rawtrx.index('tc')
+        else:
+            print('Error: no tc or ttc tag in track.txt')
+            sys.exit(1)
+        sox_TTC_chan += 1 # sox Not ZBIDX
+        logger.debug('TTC chan %i'%sox_TTC_chan)
+        # redo indexing since tracks.txt numbers refere to complete
+        # files and here audio file had TTC and muted channels
+        # removed:
+        if len(mix_tracks) == 2: # two tracks to shift
+            mixL_chan, mixR_chan = mix_tracks
+            # shifting left chan if necessary
+            shift = 0
+            if mixL_chan > sox_TTC_chan:
+                shift += 1
+            for unused_tr in device.tracks.unused:
+                if mixL_chan > unused_tr:
+                    shift += 1
+            mixL_chan -= shift
+            # shifting right chan if necessary
+            shift = 0
+            if mixR_chan > sox_TTC_chan:
+                shift += 1
+            for unused_tr in device.tracks.unused:
+                if mixR_chan > unused_tr:
+                    shift += 1
+            mixR_chan -= shift
+            mix_tracks = [mixL_chan, mixR_chan]
+        else: # mono, one track to shift
+            monomix_chan = mix_tracks[0]
+            shift = 0
+            if monomix_chan > sox_TTC_chan:
+                shift += 1
+            for unused_tr in device.tracks.unused:
+                if monomix_chan > unused_tr:
                     shift += 1
-                for unused_tr in device.tracks.unused:
-                    if mix_tracks[0] > unused_tr:
-                        shift += 1
-                mix_tracks = [t-shift for t in mix_tracks]
-                logger.debug('new mix_tracks: %s'%mix_tracks)
-                return _sox_keep(multichan_tmpfl, mix_tracks)
-        else: # no tracks declaration, mix programmatically
-            return _sox_mix(_split_channels(multichan_tmpfl))
+            monomix_chan -= shift
+            mix_tracks = [monomix_chan]
+        logger.debug('new mix_tracks: %s'%mix_tracks)
+        return _sox_keep(multichan_tmpfl, mix_tracks)
+            
 
     def build_audio_and_write_video(self, top_dir, output_dir,
                                     write_multicam_structure,
@@ -690,8 +741,6 @@ class AudioStitcherVideoMerger:
         logger.debug('there are %i dev mixes'%len(mixes))
         logger.debug('mixes %s'%mixes)
         dev_mixes_mix = _sox_mix(mixes)
-        # dev_mixes_mix = _sox_combine([audio for _, audio
-        #         in merged_audio_files_by_device]) # all devices
         logger.debug('will merge with %s'%(_pathname(dev_mixes_mix)))
         self.ref_recording.synced_audio = dev_mixes_mix
         logger.debug('dev_mixes_mix n chan: %i'%

{tictacsync-0.3a2 → tictacsync-0.3a4/tictacsync.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tictacsync
-Version: 0.3a2
+Version: 0.3a4
 Summary: command for syncing audio video recordings
 Home-page: https://tictacsync.org/
 Author: Raymond Lutz