tictacsync 0.3a3__tar.gz → 0.4a0__tar.gz

{tictacsync-0.3a3/tictacsync.egg-info → tictacsync-0.4a0}/PKG-INFO

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

{tictacsync-0.3a3 → tictacsync-0.4a0}/setup.py

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

{tictacsync-0.3a3 → tictacsync-0.4a0}/tictacsync/device_scanner.py

@@ -77,6 +77,7 @@ class Device:
     name: str
     dev_type: str # CAM or REC
     n_chan: int
+    ttc: int
     tracks: Tracks
     def __hash__(self):
         return self.UID
@@ -115,7 +116,7 @@ def media_at_path(input_structure, p):
     logger.debug('for file %s dev_UID established %s'%(p.name, dev_UID))
     return Media(p,
         Device(UID=dev_UID, folder=p.parent, name=dev_name, dev_type=dt,
-                n_chan=n, tracks=None))
+                n_chan=n, ttc=None, tracks=None))
 
 def get_device_ffprobe_UID(file):
     """
@@ -230,21 +231,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 +238,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:
@@ -341,32 +343,22 @@ class Scanner:
             ntracks += len(tracks.others)
             ntracks += 1 # for ttc track
             logger.debug(' n chan: %i n tracks file: %i'%(nchan, ntracks))
-            # if ntracks != nchan:
-            #     print('\nError parsing %s content'%tracks_file)
-            #     print('incoherent number of tracks, %i vs %i quitting\n'%
-            #                                         (nchan, ntracks))
-                # sys.exit(1)
+            if ntracks != nchan:
+                print('\nError parsing %s content'%tracks_file)
+                print('incoherent number of tracks, %i vs %i quitting\n'%
+                                                    (nchan, ntracks))
+                sys.exit(1)
             err_msg = tracks.error_msg
             if  err_msg != None:
                 print('Error, quitting: in file %s, %s'%(tracks_file, err_msg))
                 raise Exception
             else:
+                logger.debug('tracks object%s'%tracks)
                 return tracks
         else:
             logger.debug('no tracks.txt file found')
             return None
 
-    # def _use_folder_as_device_name(self):
-    #     """
-    #     For each media in self.found_media_files replace existing Device.name by
-    #     folder name.
-
-    #     Returns nothing
-    #     """
-    #     for m in self.found_media_files:
-    #         m.device.name = m.path.parent.name
-    #     logger.debug(self.found_media_files)
-
     def _check_folders_have_same_device(self):
         """
         Since input_structure == 'folder_is_device,

{tictacsync-0.3a3 → tictacsync-0.4a0}/tictacsync/entry.py

@@ -126,10 +126,10 @@ 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"] == "_get_mix")
-    logger.add(sys.stdout, filter=lambda r: r["function"] == "_sox_mix")
+    # logger.add(sys.stdout, filter=lambda r: r["function"] == "_get_tracks_from_file")
+    # logger.add(sys.stdout, filter=lambda r: r["function"] == "_get_device_mix")
+    # logger.add(sys.stdout, filter=lambda r: r["function"] == "_sox_mono2stereo")
+    # logger.add(sys.stdout, filter=lambda r: r["function"] == "_sox_mix_files")
     top_dir = args.directory[0]
     if os.path.isfile(top_dir):
         file = top_dir
@@ -234,7 +234,7 @@ def main():
             print('\nNothing to sync, exiting.\n')
         sys.exit(1)
     matcher = timeline.Matcher(recordings_with_time)
-    matcher.scan_audio_for_each_ref_rec()
+    matcher.scan_audio_for_each_videoclip()
     if not matcher.video_mergers:
         if not args.terse:
             print('\nNothing to sync, bye.\n')
@@ -263,11 +263,11 @@ def main():
     print('\nWrote output in folder [gold1]%s[/gold1]'%(
             a_stitcher.synced_clip_dir))
     for stitcher in matcher.video_mergers:
-        print('[gold1]%s[/gold1]'%stitcher.ref_recording.AVpath.name, end='')
+        print('[gold1]%s[/gold1]'%stitcher.videoclip.AVpath.name, end='')
         for audio in stitcher.get_matched_audio_recs():
             print(' + [gold1]%s[/gold1]'%audio.AVpath.name, end='')
-        new_file = stitcher.ref_recording.final_synced_file.parts
-        print(' became [gold1]%s[/gold1]'%stitcher.ref_recording.final_synced_file.name)
+        new_file = stitcher.videoclip.final_synced_file.parts
+        print(' became [gold1]%s[/gold1]'%stitcher.videoclip.final_synced_file.name)
         # matcher._build_otio_tracks_for_cam()
     matcher.shrink_gaps_between_takes()
     sys.exit(0)