tictacsync 1.0.2a0__py3-none-any.whl → 1.2.0b0__py3-none-any.whl

tictacsync/mamsync.py

@@ -9,17 +9,19 @@ try:
     from . import device_scanner
     from . import timeline
     from . import multi2polywav
+    from . import mamconf
 except:
     import yaltc
     import device_scanner
     import timeline
     import multi2polywav
+    import mamconf
 
 import argparse, tempfile, configparser
 from loguru import logger
 from pathlib import Path
 # import os, sys
-import os, sys, sox, platformdirs
+import os, sys, sox, platformdirs, shutil, filecmp
 from rich.progress import track
 # from pprint import pprint
 from rich.console import Console
@@ -30,8 +32,8 @@ from pprint import pprint, pformat
 import numpy as np
 
 DEL_TEMP = False
-CONF_FILE = 'mamsync.cfg'
-LOG_FILE = 'mamdone.txt'
+# CONF_FILE = 'mamsync.cfg'
+# LOG_FILE = 'mamdone.txt'
 
 av_file_extensions = \
 """MOV webm mkv flv flv vob ogv ogg drc gif gifv mng avi MTS M2TS TS mov qt
@@ -40,12 +42,10 @@ m4v svi 3gp 3g2 mxf roq nsv flv f4v f4p f4a f4b 3gp aa aac aax act aiff alac
 amr ape au awb dss dvf flac gsm iklax ivs m4a m4b m4p mmf mp3 mpc msv nmf
 ogg oga mogg opus ra rm raw rf64 sln tta voc vox wav wma wv webm 8svx cda""".split()
 
+logger.remove()
 # logger.add(sys.stdout, level="DEBUG")
-
-
-# logger.add(sys.stdout, filter=lambda r: r["function"] == "scan_media_and_build_devices_UID")
 # logger.add(sys.stdout, filter=lambda r: r["function"] == "main")
-
+# logger.add(sys.stdout, filter=lambda r: r["function"] == "_write_ISOs")
 
 def process_single(file, args):
     # argument is a single file
@@ -112,102 +112,53 @@ def process_lag_adjustement(media_object):
     logger.debug('trimmed_multichanfile %s'%timeline._pathname(trimmed_multichanfile))
     Path(timeline._pathname(trimmed_multichanfile)).replace(media_object.path)
 
-def print_out_conf(raw_root, synced_root, snd_root):
-    print(f'RAWROOT (source with TC): "{raw_root}"')
-    print(f'SYNCEDROOT (destination of synced clips): "{synced_root}"')
-    print(f'SNDROOT (destination of ISOs files): "{snd_root}"')
-
-def clear_log():
-    # clear the file logging clips already synced
-    data_dir = platformdirs.user_data_dir('mamsync', 'plutz', ensure_exists=True)
-    log_file = Path(data_dir)/LOG_FILE
-    print('Clearing log file "%s"'%log_file)
-    with open(log_file, 'w') as fh:
-        fh.write('done:\n')
-
-def write_conf(raw_root, synced_root, snd_root):
-    # args are pahtlib.Paths.
-    # RAWROOT: files with TC (and ROLL folders), as is from cameras
-    # SYNCEDROOT: synced and no more TC (ROLL flattened)
-    # Writes configuration on filesystem for later retrieval
-    # Clears log of already synced clips.
-    conf_dir = platformdirs.user_config_dir('mamsync', 'plutz', ensure_exists=True)
-    logger.debug(f'will start project with raw_root:{raw_root}, synced_root:{synced_root}')
-    conf_file = Path(conf_dir)/CONF_FILE
-    logger.debug('writing config in %s'%conf_file)
-    print(f'\nWriting folders paths in configuration file "{conf_file}"')
-    print_out_conf(raw_root, synced_root, snd_root)
-    conf_prs = configparser.ConfigParser()
-    conf_prs['SECTION1'] = {'RAWROOT': raw_root,
-                            'SYNCEDROOT': synced_root,
-                            'SNDROOT': snd_root}
-    with open(conf_file, 'w') as configfile_handle:
-        conf_prs.write(configfile_handle)
-    with open(conf_file, 'r') as configfile_handle:
-        logger.debug(f'config file content: \n{configfile_handle.read()}')
-    clear_log()
+def copy_to_syncedroot(raw_root, synced_root):
+    # args are str
+    # copy dirs and non AV files
+    logger.debug(f'raw_root {raw_root}')
+    logger.debug(f'synced_root {synced_root}')
+    for raw_path in Path(raw_root).rglob('*'):
+        ext = raw_path.suffix[1:]
+        is_DS_Store = raw_path.name ==  '.DS_Store'# mac os
+        if ext not in av_file_extensions and not is_DS_Store:
+            logger.debug(f'raw_path: {raw_path}')
+            # dont copy WAVs either, they will be in ISOs 
+            # synced_path = Path(synced_root)/str(raw_path)[1:] # cant join abs. paths
+            rel = raw_path.relative_to(raw_root)
+            logger.debug(f'relative path {rel}')
+            synced_path = Path(synced_root)/Path(raw_root).name/rel
+            logger.debug(f'synced_path: {synced_path}')
+            if raw_path.is_dir():
+                    synced_path.mkdir(parents=True, exist_ok=True)
+                    continue
+            # if here, it's a file
+            if not synced_path.exists():
+                print(f'will mirror non AV file {synced_path}')
+                logger.debug(f'will mirror non AV file at {synced_path}')
+                shutil.copy2(raw_path, synced_path)
+                continue
+            # file exists, check if same
+            same = filecmp.cmp(raw_path, synced_path, shallow=False)
+            logger.debug(f'copy exists of:\n{raw_path}\n{synced_path}')
+            if not same:
+                print(f'file changed, copying again\n{raw_path}')
+                shutil.copy2(raw_path, synced_path)
+            else:
+                logger.debug('same content, next')
+                continue # next raw_path in loop
 
+def copy_raw_root_tree_to_sndroot(raw_root, snd_root):
+    # args are str
+    # copy only tree structure, no files
+    for raw_path in Path(raw_root).rglob('*'):
+        synced_path = Path(snd_root)/str(raw_path)[1:] # cant join abs. paths
+        if raw_path.is_dir():
+            synced_path.mkdir(parents=True, exist_ok=True)
 
 
-    # if known_values != ():
-    #     RAWROOT, SYNCEDROOTS = known_values
-    #     print('Warning: there is a current project')
-    #     print('with source (RAW) folder: %s\nand destination (synced) folder: %s'%
-    #                                         (RAWROOT, SYNCEDROOTS))
-    #     answer = input("\nDo you want to change values? [YES|NO]")
-    #     if answer.upper()[0] in ["Y", "YES"]:
-    #         _write_cfg()
-    #         return folders
-    #     elif answer.upper()[0] in ["N", "NO"]:
-    #         print('Ok, will keep old ones')
-    #         return RAWROOT, SYNCEDROOTS
-    # else:
-    #     _write_cfg()
-    #     return folders
-    # sys.exit(0)
 
-def get_proj(print_conf_stdout=False):
-    # check if user started a project before.
-    # stored in platformdirs.user_config_dir
-    # returns (RAWROOT, SYNCEDROOTS) if any, () otherwise.
-    # print location of conf file if print_conf_stdout
-    conf_dir = platformdirs.user_config_dir('mamsync', 'plutz')
-    conf_file = Path(conf_dir)/CONF_FILE
-    logger.debug('try reading config in %s'%conf_file)
-    if print_conf_stdout:
-        print(f'\nReading configuration from file {conf_file}')
-    if conf_file.exists():
-        conf_prs = configparser.ConfigParser()
-        conf_prs.read(conf_file)
-        RAWROOT = conf_prs.get('SECTION1', 'RAWROOT')
-        SYNCEDROOT = conf_prs.get('SECTION1', 'SYNCEDROOT')
-        SNDROOT = conf_prs.get('SECTION1', 'SNDROOT')
-        logger.debug('read from conf: RAWROOT= %s SYNCEDROOT= %s SNDROOT=%s'%
-                                            (RAWROOT, SYNCEDROOT, SNDROOT))
-        return RAWROOT, SYNCEDROOT, SNDROOT
-    else:
-        logger.debug(f'no config file found at {conf_file}')
-        return ()
-
-
-def main():
+def new_parser():
     parser = argparse.ArgumentParser()
-    parser.add_argument('--rawfolder',
-                        nargs = 1,
-                        dest='rawfolder',
-                        help='Sets new value for raw root folder (i.e.: clips with TC)')
-    parser.add_argument('--syncedfolder',
-                        nargs = 1,
-                        dest='syncedfolder',
-                        help='Sets new value for synced root folder (i.e.: synced clips without TC)')
-    parser.add_argument('--sndfolder',
-                        nargs = 1,
-                        dest='sndfolder',
-                        help='Sets new value for sound folder (where ISOs will be stored)')
-    parser.add_argument('--showconf',
-                    action='store_true',
-                    dest='showconf',
-                    help='Show current configured values.')
     parser.add_argument('--resync',
                     action='store_true',
                     dest='resync',
@@ -222,47 +173,51 @@ def main():
                     action='store_true',
                     dest='terse',
                     help='Terse output')
-    parser.add_argument('--isos',
-                    action='store_true',
-                    dest='write_ISOs',
-                    help='Cut ISO sound files')
+    # parser.add_argument('--isos', # default True in mamsync
+    #                 action='store_true',
+    #                 dest='write_ISOs',
+    #                 help='Cut ISO sound files')
     parser.add_argument('-t','--timelineoffset',
                     nargs=1,
                     default=['00:00:00:00'],
                     dest='timelineoffset',
                     help='When processing multicam, where to place clips on NLE timeline (HH:MM:SS:FF)')
+    return parser
+
+def clear_log():
+    # clear the file logging clips already synced
+    data_dir = platformdirs.user_data_dir('mamsync', 'plutz', ensure_exists=True)
+    log_file = Path(data_dir)/mamconf.LOG_FILE
+    print('Clearing log file of synced clips: "%s"'%log_file)
+    with open(log_file, 'w') as fh:
+        fh.write('done:\n')
+
+def main():
+    parser = new_parser()
     args = parser.parse_args()
     logger.debug(f'arguments from argparse {args}')
-    # check --rawfolder, --syncedfolder and --sndfolder are used together
-    at_least_one = args.rawfolder != None or args.syncedfolder != None or args.sndfolder != None
-    tous = args.rawfolder != None and args.syncedfolder != None and args.sndfolder != None
-    if at_least_one:
-        if not tous:
-            print('Error: all --rawfolder, --syncedfolder and --sndfolder must be specified.')
+    roots_strings = mamconf.get_proj(False)
+    roots_pathlibPaths = [Path(s) for s in mamconf.get_proj(False)]
+    logger.debug(f'roots_strings from mamconf.get_proj {roots_strings}')
+    logger.debug(f'roots_pathlibPaths from mamconf.get_proj {roots_pathlibPaths}')
+    # check all have values, except for PROXIES, the last one
+    if any([r == '' for r in roots_strings][:-1]):
+        print("Can't sync if some folders are not set:")
+        mamconf.print_out_conf(*mamconf.get_proj())
+        print('Bye.')
+        sys.exit(0)
+    # because optional PROXIES folder '' yields a '.' path, exclude it
+    for r in [rp for rp in roots_pathlibPaths if rp != Path('.')]:
+        if not r.is_absolute():
+            print(f'\rError: folder {r} must be an absolute path. Bye')
             sys.exit(0)
-        # check the 3 paths are ok
-        roots = [Path(e) for e in [args.rawfolder[0],
-                    args.syncedfolder[0], args.sndfolder[0]]]
-        for r in roots:
-            if not r.is_absolute():
-                print(f'\rError: folder {r} must be an absolute path. Bye')
-                sys.exit(0)
-            if not r.exists():
-                print(f'\rError: folder {r} does not exist. Bye')
-                sys.exit(0)
-            if not r.is_dir():
-                print(f'\rError: path {r} is not a folder. Bye')
-                sys.exit(0)
-            # if still here, everything in 3 folders is ok
-            write_conf(*roots)
+        if not r.exists():
+            print(f'\rError: folder {r} does not exist. Bye')
             sys.exit(0)
-    if args.showconf:
-        raw_root, synced_root = get_proj(True)
-        print_out_conf(raw_root, synced_root)
-        sys.exit(0)
-    # if still here,  no rawfolder, --syncedfolder --sndfolder or --showconf
-    # so go for a scan and sync, maybe with a sub_dir
-    raw_root, synced_root, snd_root = get_proj(False)
+        if not r.is_dir():
+            print(f'\rError: path {r} is not a folder. Bye')
+            sys.exit(0)
+    raw_root, synced_root, snd_root, _ = roots_pathlibPaths
     if args.sub_dir != None:
         top_dir = args.sub_dir
         logger.debug(f'sub _dir: {args.sub_dir}')
@@ -273,6 +228,9 @@ def main():
         top_dir = raw_root
     if args.resync:
         clear_log()
+    # go, mamsync!
+    copy_to_syncedroot(raw_root, synced_root)
+    # copy_raw_root_tree_to_sndroot(raw_root, snd_root) # why?
     multi2polywav.poly_all(top_dir)
     scanner = device_scanner.Scanner(top_dir, stay_silent=args.terse)
     scanner.scan_media_and_build_devices_UID(synced_root=synced_root)
@@ -285,31 +243,6 @@ def main():
                 process_lag_adjustement(m)
     audio_REC_only = all([m.device.dev_type == 'REC' for m
                                         in scanner.found_media_files])
-    # if audio_REC_only:
-    #     if scanner.input_structure != 'ordered':
-    #         print('For merging audio only, use a directory per device, quitting')
-    #         sys.exit(1)
-    #     print('\n\n\nOnly audio recordings are present')
-    #     print('Which device should be the reference?\n')
-    #     devices = scanner.get_devices()
-    #     maxch = len(devices)
-    #     for i, d in enumerate(devices):
-    #         print('\t%i - %s'%(i+1, d.name))
-    #     while True:
-    #         print('\nEnter your choice:', end='')
-    #         choice = input()
-    #         try:
-    #             choice = int(choice)
-    #         except:
-    #             print('Please use numeric digits.')
-    #             continue
-    #         if choice not in list(range(1, maxch + 1)):
-    #             print('Please enter a number in [1..%i]'%maxch)
-    #             continue
-    #         break
-    #     ref_device = list(devices)[choice - 1]
-    #     # ref_device = list(devices)[3 - 1]
-    #     print('When only audio recordings are present, ISOs files will be cut and written.')
     if not args.terse:
         if scanner.input_structure == 'ordered':
             print('\nDetected structured folders')
@@ -345,7 +278,6 @@ def main():
             print('resulting in undefined results: quitting...')
             quit()
         print()
-    # recordings, rec_with_TTC = process_files(scanner.found_media_files, args)
     recordings = [yaltc.Recording(m, do_plots=False) for m 
                                             in scanner.found_media_files]
     recordings_with_time =  [
@@ -353,11 +285,6 @@ def main():
         for rec in recordings
         if rec.get_start_time()
         ]
-    # if audio_REC_only:
-    #     for rec in recordings:
-    #     # print(rec, rec.device == ref_device)
-    #         if rec.device == ref_device:
-    #             rec.is_reference = True
     if not args.terse:    
         table = Table(title="tictacsync results")
         table.add_column("Recording\n", justify="center", style='gold1')
@@ -404,24 +331,24 @@ def main():
         if not args.terse:
             print('\nNothing to sync, bye.\n')
         sys.exit(1)
-    asked_ISOs = args.write_ISOs
-    if asked_ISOs and scanner.input_structure != 'ordered':
-        print('Warning, can\'t write ISOs without structured folders: [gold1]--isos[/gold1] option ignored.\n')
-        asked_ISOs = False
-    # output_dir = args.o
-    # if args.verbose_output or args.terse: # verbose, so no progress bars
+    if scanner.input_structure != 'ordered':
+        print('Warning, can\'t run mamsync without structured folders: [gold1]--isos[/gold1] option ignored.\n')
     print('Merging...')
+    asked_ISOs = True # par defaut
+    dont_write_cam_folder = False # write them
     for merger in matcher.mergers:
-        merger.build_audio_and_write_merged_media(top_dir,
-        False, # args.dont_write_cam_folder,
+        merger._build_audio_and_write_video(top_dir,
+        dont_write_cam_folder,
         asked_ISOs,
-        audio_REC_only)
+        synced_root = synced_root,
+        snd_root = snd_root,
+        raw_root = raw_root)
     if not args.terse:
         print("\n")
     # find out where files were written
     # a_merger = matcher.mergers[0]
     # log file
-    p = Path(platformdirs.user_data_dir('mamsync', 'plutz'))/LOG_FILE
+    p = Path(platformdirs.user_data_dir('mamsync', 'plutz'))/mamconf.LOG_FILE
     log_filehandle = open(p, 'a')
     for merger in matcher.mergers:
         print('[gold1]%s[/gold1]'%merger.videoclip.AVpath.name, end='')
@@ -448,7 +375,7 @@ def main():
             print('\nThere are synced multicam clips but without structured folders')
             print('they were not grouped together under the same folder.')
         else:
-            matcher.move_multicam_to_dir()
+            matcher.move_multicam_to_dir(raw_root=raw_root, synced_root=synced_root)
     else:
         logger.debug('not really a multicam cluster, nothing to move')
     sys.exit(0)

tictacsync/multi2polywav.py

@@ -83,7 +83,9 @@ def build_poly_name(multifiles):
 def jump_metadata(from_file, to_file):
     tempfile_for_metadata = tempfile.NamedTemporaryFile(suffix='.wav', delete=True)
     tempfile_for_metadata = tempfile_for_metadata.name
-    process_list = ['ffmpeg', '-loglevel', 'quiet', '-nostats', '-hide_banner', '-i', from_file, '-i', to_file, '-map_metadata', '0', '-c', 'copy', tempfile_for_metadata]
+    # ffmpeg -i 32ch-44100-bwf.wav -i onechan.wav -map 1 -map_metadata 0 -c copy outmeta.wav
+    process_list = ['ffmpeg', '-loglevel', 'quiet', '-nostats', '-hide_banner', '-i', from_file, '-i', to_file, '-map', '1',
+                                     '-map_metadata', '0', '-c', 'copy', tempfile_for_metadata]
     # ss = shlex.split("ffmpeg  -i %s -i %s -map_metadata 0 -c copy %s"%(from_file, to_file, tempfile_for_metadata))
     # print(ss)
     # logger.debug('process %s'%process_list)