tictacsync 0.99a0__py3-none-any.whl → 1.0.1a0__py3-none-any.whl

tictacsync/device_scanner.py

@@ -3,7 +3,7 @@
 # while inotifywait --recursive -e close_write . ; do python entry.py  tests/multi2/; done
 # above for linux
 
-TRACKSFN = 'tracks.txt'
+TRACKSFILE = 'tracks.txt'
 SILENT_TRACK_TOKENS = '-0n'
 
 av_file_extensions = \
@@ -413,19 +413,19 @@ class Scanner:
 
     def _get_tracks_from_file(self, device) -> Tracks:
         """        
-        Look for eventual track names in TRACKSFN file, stored inside the
+        Look for eventual track names in TRACKSFILE file, stored inside the
         recorder folder alongside the audio files. If there, returns a Tracks
         object, if not returns None. 
         """        
         source_audio_folder = device.folder
-        tracks_file = source_audio_folder/TRACKSFN
+        tracks_file = source_audio_folder/TRACKSFILE
         track_names = False
         a_recording = [m for m in self.found_media_files
                                                 if m.device == device][0]
         logger.debug('a_recording for device %s : %s'%(device, a_recording))
         nchan = sox.file_info.channels(str(a_recording.path))
         if os.path.isfile(tracks_file):
-            logger.debug('found file: %s'%(TRACKSFN))
+            logger.debug('found file: %s'%(TRACKSFILE))
             tracks = self._parse_track_values(tracks_file)
             if tracks.error_msg:
                 print('\nError parsing [gold1]%s[/gold1] file: %s, quitting.\n'%

tictacsync/newmix.py

@@ -0,0 +1,323 @@
+import os, itertools, argparse, ffmpeg, tempfile
+from pathlib import Path
+from loguru import logger
+import shutil, sys, re, sox
+from pprint import pformat
+from rich import print
+
+OUT_DIR_DEFAULT = 'SyncedMedia'
+MCCDIR = 'SyncedMulticamClips'
+SEC_DELAY_CHANGED_SND = 10 #sec, SND_DIR changed if diff time is bigger
+DEL_TEMP = True
+
+logger.level("DEBUG", color="<yellow>")
+logger.remove()
+# logger.add(sys.stdout, filter=lambda r: r["function"] == "_change_audio4video")
+# logger.add(sys.stdout, filter=lambda r: r["function"] == "find_SND_vids_pairs_in_dir")
+
+video_extensions = \
+"""webm mkv flv flv vob ogv  ogg drc gif gifv mng avi mov 
+qt wmv yuv rm rmvb viv asf  mp4  m4p m4v mpg  mp2  mpeg  mpe 
+mpv mpg  mpeg  m2v m4v svi 3gp 3g2 mxf roq nsv""".split() # from wikipedia
+
+def _pathname(tempfile_or_path) -> str:
+    # utility for obtaining a str from different filesystem objects
+    if isinstance(tempfile_or_path, str):
+        return tempfile_or_path
+    if isinstance(tempfile_or_path, Path):
+        return str(tempfile_or_path)
+    if isinstance(tempfile_or_path, tempfile._TemporaryFileWrapper):
+        return tempfile_or_path.name
+    else:
+        raise Exception('%s should be Path or tempfile...'%tempfile_or_path)
+
+def is_synced_video(f):
+    # True if name as video extension
+    # and is under SyncedMedia or SyncedMulticamClips folders
+    # f is a Path
+    ext = f.suffix[1:] # removing leading '.'
+    ok_ext = ext.lower() in video_extensions
+    f_parts = f.parts
+    ok_folders = OUT_DIR_DEFAULT in f_parts or MCCDIR in f_parts
+    # logger.debug('ok_ext: %s ok_folders: %s'%(ok_ext, ok_folders))
+    return ok_ext and ok_folders
+
+def find_SND_vids_pairs_in_dir(top):
+    # look for matching video name and SND dir name
+    # eg: IMG04.mp4 and IMG04_SND
+    # maybe IMG04v2.mp4 if audio changed before (than it will be IMG04v3.mp4)
+    # returns list of matches
+    # recursively search from 'top' argument
+    vids = []
+    SNDs = []
+    for (root,dirs,files) in os.walk(top):
+        for d in dirs:
+            if d[-4:] == '_SND':
+                SNDs.append(Path(root)/d)
+        for f in files:
+            if is_synced_video(Path(root)/f): # add being in SyncedMedia or SyncedMulticamClips folder
+                vids.append(Path(root)/f)
+    logger.debug('vids %s SNDs %s'%(pformat(vids), pformat(SNDs)))
+    matches = []
+    def _names_match(vidname, SND_name):
+        # vidname is a str and has no extension
+        # vidname could have vNN suffix as in DSC_8064v31 so matches DSC_8064
+        if vidname == SND_name: # no suffix presents
+            return True
+        m = re.match(SND_name + r'v(\d+)', vidname)
+        if m != None:
+            logger.debug('its a natch and N= %s'%m.groups()[0])
+        return m != None
+    for pair in list(itertools.product(SNDs, vids)):
+        # print(pair)
+        SND, vid = pair # Paths
+        vidname, ext = vid.name.split('.') # string
+        if _names_match(vidname, SND.name[:-4]):
+            logger.debug('SND %s matches video %s'%(
+                Path('').joinpath(*SND.parts[-2:]),
+                Path('').joinpath(*vid.parts[-3:])))
+            matches.append(pair) # list of Paths
+    logger.debug('matches: %s'%pformat(matches))
+    return matches
+
+def parse_and_check_arguments():
+    # parses directories from command arguments
+    # check for consistencies and warn user and exits,
+    # if returns, gives:
+    #  proxies_dir, originals_dir, audio_dir, both_audio_vid, scan_only
+    parser = argparse.ArgumentParser()
+    # parser.add_argument('-v',
+    #                 nargs=1,
+    #                 dest='video_dirs',
+    #                 help='Where proxy clips and/or originals are stored')
+    # parser.add_argument('-a',
+    #                 nargs=1,
+    #                 dest='audio_dir',
+    #                 help='Contains newly changed mix files')
+    parser.add_argument('-b',
+                    nargs=1,
+                    dest='both_audio_vid',
+                    help='Directory scanned for both audio and video, when tictacsync was used in "alongside mode"')
+    parser.add_argument('--dry',
+                    action='store_true',
+                    dest='scan_only',
+                    help="Just display changed audio, don't merge")
+    args = parser.parse_args()
+    logger.debug('args %s'%args)
+    # ok cases:
+    # -p -o -a + no -b
+    # -o -a + no -b
+    # args_set = [args.originals_dir != None,
+    #                 args.audio_dir != None,
+    #                 args.both_audio_vid != None,
+    #                 ]
+    # p, o, a, b = args_set
+    # check that argument -b (both_audio_vid) is used alone
+    # if b and any([o, a, p]):
+    #     print("\nDon't specify other argument than -b if both audio and video searched in the same directory.\n") 
+    #     parser.print_help(sys.stderr)
+    #     sys.exit(0)
+    # check that if proxies (-p) are specified, orginals too (-o)
+    # if p and not o:
+    #     print("\nIf proxies directory is specified, so should originals directory.\n") 
+    #     parser.print_help(sys.stderr)
+    #     sys.exit(0)
+    # check that -o and -a are used together
+    # if not b and not (o and a):
+    #     print("\nAt least originals and audio directories must be given (-o and -a) when audio and video are in different dir.\n") 
+    #     parser.print_help(sys.stderr)
+    #     sys.exit(0)
+    # # work in progress (aug 2025), so limit to -b:
+    # if not b :
+    #     print("\nFor now, only -b argument is supported (a directory scanned for both audio and video) .\n") 
+    #     parser.print_help(sys.stderr)
+    #     sys.exit(0)
+    # list of singletons, so flatten. Keep None and False as is
+    if args.scan_only:
+        print('Sorry, --dry option not implemented yet, bye.')
+        sys.exit(0)
+    return args
+
+def get_recent_mix(SND_dir, vid):
+    # check if there are mixl, mixr or mix files in SND_dir
+    # and return the paths if they are more recent than vid.
+    # returns empty tuple otherwise
+    # arguments SND_dir, vid and returned values are of Path type
+    wav_files = list(SND_dir.iterdir())
+    logger.debug(f'wav_files {wav_files} in {SND_dir}')
+    def is_mix(p):
+        re_result = re.match(r'mix([lrLR])*', p.name)
+        logger.debug(f'for {p.name} re_result {re_result}')
+        return re_result is not None
+    mix_files = [p for p in wav_files if is_mix(p)]
+    if len(mix_files) == 0:
+        return ()
+    # consistency check, should be 1 or 2 files
+    if not len(mix_files) in (1,2):
+        print(f'\nError: too many mix files in [bold]{SND_dir}[/bold], bye.')
+        sys.exit(0)
+    # one file? it must be mix.wav
+    if len(mix_files) == 1:
+        fn = mix_files[0].name
+        if fn.upper() != 'MIX.WAV':
+            print(f'\nError in [bold]{SND_dir}[/bold], the only file should be mix.wav, not [bold]{fn}[/bold][/bold]; bye.')
+            sys.exit(0)
+    # two files? verify they are mixL and mixR and mono each
+    if len(mix_files) == 2:
+        first3uppercase = [p.name[:4].upper() for p in mix_files]
+        first3uppercase.sort()
+        first3uppercase = ''.join(first3uppercase)
+        if first3uppercase != 'MIXLMIXR':
+            print(f'\nError: mix names mismatch in [bold]{SND_dir}[/bold];')
+            print(f'names are [bold]{[p.name for p in mix_files]}[/bold], check they are simply mixL.wav and mixR.wav; bye.')
+            sys.exit(0)
+        def _nch(p):
+            return sox.file_info.channels(str(p))
+        are_mono = [_nch(p) == 1 for p in mix_files]
+        logger.debug('are_mono: %s'%are_mono)
+        if not all(are_mono):
+            print(f'\nError in [bold]{SND_dir}[/bold], some files are not mono, bye.')
+            sys.exit(0)
+    logger.debug(f'mix_files: {mix_files}')
+    # check dates, if two files, take first
+    mix_modification_time = mix_files[0].stat().st_mtime
+    vid_mod_time = vid.stat().st_mtime
+    # difference of modification time in secs
+    mix_more_recent_by = mix_modification_time - vid_mod_time
+    logger.debug('mix_more_recent_by: %s'%mix_more_recent_by)
+    if mix_more_recent_by > SEC_DELAY_CHANGED_SND:
+        if len(mix_files) == 1:
+            two_folders_up = mix_files[0]
+            # two_folders_up = Path('').joinpath(*mix_files[0].parts[-3:])
+            print(f'\nFound new mix: [bold]{two_folders_up}[/bold]')
+        return mix_files
+    else:
+        return ()
+
+def _keep_VIDEO_only(video_path):
+    # return file handle to a temp video file formed from the video_path
+    # stripped of its sound
+    in1 = ffmpeg.input(_pathname(video_path))
+    video_extension = video_path.suffix
+    silenced_opts = ["-loglevel", "quiet", "-nostats", "-hide_banner"]
+    file_handle = tempfile.NamedTemporaryFile(suffix=video_extension,
+        delete=DEL_TEMP)
+    out1 = in1.output(file_handle.name, map='0:v', vcodec='copy')
+    ffmpeg.run([out1.global_args(*silenced_opts)], overwrite_output=True)
+    return file_handle
+
+def _change_audio4video(audio_path: Path, video: Path):
+    """
+    Replace audio in video (argument)  by the audio contained in
+    audio_path (argument) returns nothing
+    If name has version number, bump it (DSC_8064v13.MOV -> DSC_8064v14.MOV)
+
+    """
+    vidname, video_ext = video.name.split('.')
+    vid_only_handle = _keep_VIDEO_only(video)
+    a_n = _pathname(audio_path)
+    v_n = _pathname(vid_only_handle)
+    # check v suffix
+    m = re.match(f'(.*)v(\\d+)', vidname)
+    if m == None:
+        # no suffix, add one
+        out_path = video.parent / f'{vidname}v2.{video_ext}'
+        out_n = _pathname(out_path)
+    else:
+        base, number_str = m.groups()
+        logger.debug(f'base {base}, number_str {number_str}')
+        up_tick =  1 + int(number_str)
+        out_path = video.parent / f'{base}v{up_tick}.{video_ext}'
+        out_n = _pathname(out_path)
+    print(f'Video [bold]{video}[/bold] \nhas new sound and is now [bold]{out_path}[/bold]')
+    video.unlink()
+    # building args for debug purpose only:
+    ffmpeg_args = (
+        ffmpeg
+        .input(v_n)
+        .output(out_n, vcodec='copy')
+        # .output(out_n, shortest=None, vcodec='copy')
+        .global_args('-i', a_n, "-hide_banner")
+        .overwrite_output()
+        .get_args()
+    )
+    logger.debug('ffmpeg args: %s'%' '.join(ffmpeg_args))
+    try: # for real now
+        _, out = (
+        ffmpeg
+        .input(v_n)
+        # .output(out_n, shortest=None, vcodec='copy')
+        .output(out_n, vcodec='copy')
+        .global_args('-i', a_n, "-hide_banner")
+        .overwrite_output()
+        .run(capture_stderr=True)
+        )
+        logger.debug('ffmpeg output')
+        for l in out.decode("utf-8").split('\n'):
+            logger.debug(l)
+    except ffmpeg.Error as e:
+        print('ffmpeg.run error merging: \n\t %s + %s = %s\n'%(
+            audio_path,
+            video_path,
+            synced_clip_file
+            ))
+        print(e)
+        print(e.stderr.decode('UTF-8'))
+        sys.exit(1)
+
+def _sox_combine(paths) -> Path:
+    """
+    Combines (stacks) files referred by the list of Path into a new temporary
+    files passed on return each files are stacked in a different channel, so
+    len(paths) == n_channels
+    """
+    if len(paths) == 1: # one device only, nothing to stack
+        logger.debug('one device only, nothing to stack')
+        return paths[0] ########################################################
+    out_file_handle = tempfile.NamedTemporaryFile(suffix='.wav',
+        delete=DEL_TEMP)
+    filenames = [_pathname(p) for p in paths]
+    out_file_name = _pathname(out_file_handle)
+    logger.debug('combining files: %s into %s'%(
+        filenames,
+        out_file_name))
+    cbn = sox.Combiner()
+    cbn.set_input_format(file_type=['wav']*len(paths))
+    status = cbn.build(
+        filenames,
+        out_file_name,
+        combine_type='merge')
+    logger.debug('sox.build status: %s'%status)
+    if status != True:
+        print('Error, sox did not merge files in _sox_combine()')
+        sys.exit(1)
+    merged_duration = sox.file_info.duration(
+        _pathname(out_file_handle))
+    nchan = sox.file_info.channels(
+        _pathname(out_file_handle)) 
+    logger.debug('merged file duration %f s with %i channels '%
+        (merged_duration, nchan))
+    return out_file_handle
+
+
+def main():
+    # proxies_dir, originals_dir, audio_dir, both_audio_vid, scan_only = \
+    #     parse_and_check_arguments()
+    args = parse_and_check_arguments()
+    matching_pairs = find_SND_vids_pairs_in_dir(args.both_audio_vid[0])
+    for SND_dir, vid in matching_pairs:
+        new_mix_files = get_recent_mix(SND_dir, vid)
+        # logger.debug('new_mix_files: %s'%str(new_mix_files))
+        if new_mix_files != ():
+            logger.debug(f'new mixes {new_mix_files} in {SND_dir} for {vid.name}')
+            if len(new_mix_files) == 2:
+                new_audio_wav = _sox_combine(new_mix_files)
+                logger.debug('stereo_wav: %s'%new_audio_wav)
+            else: # len == 1, mono wav file
+                new_audio_wav = new_mix_files[0]
+            _change_audio4video(new_audio_wav, vid)
+            # print('\nVideo %s has new audio'%vid)
+
+
+if __name__ == '__main__':
+    main()

tictacsync/timeline.py

@@ -27,6 +27,7 @@ DB_OSX_NORM = -6 #dB
 OUT_DIR_DEFAULT = 'SyncedMedia'
 MCCDIR = 'SyncedMulticamClips'
 
+
 # utility to lock ISO audio files
 def remove_write_permissions(path):
     """Remove write permissions from this path, while keeping all other permissions intact.
@@ -201,7 +202,7 @@ def _sox_multi2stereo(multichan_tmpfl, stereo_trxs) -> tempfile.NamedTemporaryFi
     stereo_tempfile = tempfile.NamedTemporaryFile(suffix='.wav',
                     delete=DEL_TEMP)
     tfm = sox.Transformer()
-    tfm.channels(1)
+    tfm.channels(1) # why ? https://pysox.readthedocs.io/en/latest/api.html?highlight=channels#sox.transform.Transformer.channels
     status = tfm.build(_pathname(multichan_tmpfl),_pathname(stereo_tempfile))
     logger.debug('n chan ouput: %s'%
                 sox.file_info.channels(_pathname(stereo_tempfile)))
@@ -655,7 +656,7 @@ class AudioStitcherVideoMerger:
         """
         Writes isolated audio files that were synced to synced_clip_file,
         each track will have its dedicated monofile, named sequentially or with
-        the name find in TRACKSFN if any, see Scanner._get_tracks_from_file()
+        the name find in TRACKSFILE if any, see Scanner._get_tracks_from_file()
 
         edited_audio_all_devices:
             a list of (name, mono_tempfile)
@@ -711,7 +712,8 @@ class AudioStitcherVideoMerger:
         synced_clip_dir = synced_clip_file.parent
         # build ISOs subfolders structure, see comment string below
         video_stem_WO_suffix = synced_clip_file.stem
-        ISOdir = synced_clip_dir/(video_stem_WO_suffix + '_ISO')
+        # ISOdir = synced_clip_dir/(video_stem_WO_suffix + 'ISO')
+        ISOdir = synced_clip_dir/(video_stem_WO_suffix + '_SND')/'ISOfiles'
         os.makedirs(ISOdir, exist_ok=True)
         logger.debug('edited_audio_all_devices %s'%edited_audio_all_devices)
         logger.debug('ISOdir %s'%ISOdir)
@@ -794,7 +796,7 @@ class AudioStitcherVideoMerger:
             print('Error: TicTacCode channel detected is [gold1]%i[/gold1]'%
                 (device.ttc), end=' ')
             print('and [gold1]%s[/gold1] for the device [gold1]%s[/gold1] specifies channel [gold1]%i[/gold1],'%
-                (device_scanner.TRACKSFN,
+                (device_scanner.TRACKSFILE,
                 device.name, device.tracks.ttc-1))
             print('Please correct the discrepancy and rerun. Quitting.')
             sys.exit(1)

{tictacsync-0.99a0.dist-info → tictacsync-1.0.1a0.dist-info}/METADATA

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

tictacsync-1.0.1a0.dist-info/RECORD

@@ -0,0 +1,17 @@
+tictacsync/LTCcheck.py,sha256=IEfpB_ZajWuRTWtqji0H-B2g7GQvWmGVjfT0Icumv7o,15704
+tictacsync/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tictacsync/device_scanner.py,sha256=lNoOyPuAsPzjGs5a6iKJQ-BAVXKKINk8fvTEgXgFeK0,35593
+tictacsync/entry.py,sha256=KOhB8ivgme3GPpWShad2adS1lvIU9v0yMFY0CELwAmM,20673
+tictacsync/multi2polywav.py,sha256=-nX5reZo6QNxFYdhsliHTs8bTfMjPzcONDT8vJbkZUA,7291
+tictacsync/newmix.py,sha256=HB5lThhSr1oVtUyIordaB-lwAxm4bbuijRr-MBdZWhA,13161
+tictacsync/remergemix.py,sha256=bRyi1hyNcyM1rTkHh8DmSsIQjYpwPprxSyyVipnxz30,9909
+tictacsync/remrgmx.py,sha256=FxaAo5qqynpj6O56ekQGD31YP6X2g-kEdwVpHSCoh4Q,4265
+tictacsync/synciso.py,sha256=XmUcdUF9rl4VdCm7XW4PeYWYWM0vgAY9dC2hapoul9g,4821
+tictacsync/timeline.py,sha256=aMu1ntVrpFtH1YfyIgp80k7DT2RFo5B0E-BlMWE8wAs,72723
+tictacsync/yaltc.py,sha256=xbMucI19UJKrEvIzyfpOsi3piSWzqM1gKgooeT9DV8g,53167
+tictacsync-1.0.1a0.dist-info/LICENSE,sha256=ZAOPXLh1zlQAnhHUd7oLslKM01YZ5UiAu3STYjwIxck,1068
+tictacsync-1.0.1a0.dist-info/METADATA,sha256=3LdhjwU_XGS8-rBcRvROlH54wnUyrG6q06cMJSr5XhE,5697
+tictacsync-1.0.1a0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+tictacsync-1.0.1a0.dist-info/entry_points.txt,sha256=bMsk7T_7fwCtAOUbFyvECvHOzCJb2fmWjkUKQTkwbsc,131
+tictacsync-1.0.1a0.dist-info/top_level.txt,sha256=eaCWG-BsYTRR-gLTJbK4RfcaXajr0gjQ6wG97MkGRrg,11
+tictacsync-1.0.1a0.dist-info/RECORD,,

{tictacsync-0.99a0.dist-info → tictacsync-1.0.1a0.dist-info}/entry_points.txt

@@ -1,4 +1,4 @@
 [console_scripts]
 multi2polywav = tictacsync.multi2polywav:main
-remergemix = tictacsync.remergemix:main
+newmix = tictacsync.newmix:main
 tictacsync = tictacsync.entry:main

tictacsync-0.99a0.dist-info/RECORD

@@ -1,16 +0,0 @@
-tictacsync/LTCcheck.py,sha256=IEfpB_ZajWuRTWtqji0H-B2g7GQvWmGVjfT0Icumv7o,15704
-tictacsync/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tictacsync/device_scanner.py,sha256=A41PmzI6jr4zCKRm3BL5aBQkdJImpN3DH4QIicCZolA,35585
-tictacsync/entry.py,sha256=KOhB8ivgme3GPpWShad2adS1lvIU9v0yMFY0CELwAmM,20673
-tictacsync/multi2polywav.py,sha256=-nX5reZo6QNxFYdhsliHTs8bTfMjPzcONDT8vJbkZUA,7291
-tictacsync/remergemix.py,sha256=bRyi1hyNcyM1rTkHh8DmSsIQjYpwPprxSyyVipnxz30,9909
-tictacsync/remrgmx.py,sha256=FxaAo5qqynpj6O56ekQGD31YP6X2g-kEdwVpHSCoh4Q,4265
-tictacsync/synciso.py,sha256=XmUcdUF9rl4VdCm7XW4PeYWYWM0vgAY9dC2hapoul9g,4821
-tictacsync/timeline.py,sha256=DW_24cddLIxmcAEywy_sU46lBc7bJLhpVSVi7TlWV4E,72531
-tictacsync/yaltc.py,sha256=xbMucI19UJKrEvIzyfpOsi3piSWzqM1gKgooeT9DV8g,53167
-tictacsync-0.99a0.dist-info/LICENSE,sha256=ZAOPXLh1zlQAnhHUd7oLslKM01YZ5UiAu3STYjwIxck,1068
-tictacsync-0.99a0.dist-info/METADATA,sha256=XRzYPb479yzUd7SgUf5YagcDHeQqREeTUTOZnZyXWCE,5696
-tictacsync-0.99a0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-tictacsync-0.99a0.dist-info/entry_points.txt,sha256=g3tdFFrVRcrKpuyKOCLUVBMgYfV65q9kpLZUOD_XCKg,139
-tictacsync-0.99a0.dist-info/top_level.txt,sha256=eaCWG-BsYTRR-gLTJbK4RfcaXajr0gjQ6wG97MkGRrg,11
-tictacsync-0.99a0.dist-info/RECORD,,