flacopyus 0.4.2__tar.gz → 0.4.3__tar.gz

{flacopyus-0.4.2/flacopyus.egg-info → flacopyus-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flacopyus
-Version: 0.4.2
+Version: 0.4.3
 Summary: CLI tool to mirror your FLAC audio library to a portable lossy Opus version
 Maintainer-email: curegit <contact@curegit.jp>
 License-Expression: GPL-3.0-or-later

{flacopyus-0.4.2 → flacopyus-0.4.3}/flacopyus/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.4.2"
+__version__ = "0.4.3"
 
 
 def pyinstaller_hooks_dir():

{flacopyus-0.4.2 → flacopyus-0.4.3}/flacopyus/main.py

@@ -36,6 +36,8 @@ def main(
     prefer_external: bool = False,
     verbose: bool = False,
 ) -> int:
+    summery_message: str = ""
+
     progress_display = progress_bar(error_console)
     with progress_display:
         with get_opusenc(opusenc_executable=opusenc_executable, prefer_external=prefer_external, verbose=verbose) as opusenc_binary:
@@ -214,7 +216,8 @@ def main(
                         # 42 is heuristic
                         if i % 42 == 0:
                             progress_display.update(task, total=len(pending), refresh=True)
-                    progress_display.update(task, total=len(pending), refresh=True)
+                    total_traversed_count = len(pending)
+                    progress_display.update(task, total=total_traversed_count, refresh=True)
                     # Finish remaining tasks
                     with lock_for_encoding:
                         task_e = progress_display.add_task("Encoding", total=len(for_encoding))
@@ -229,6 +232,7 @@ def main(
                                 done_encoding_count += 1
                         progress_display.update(task, advance=len(done), refresh=True)
                         progress_display.update(task_e, completed=done_encoding_count, total=len(for_encoding), refresh=True)
+                    summery_message += f"{done_encoding_count} files encoded, {total_traversed_count - done_encoding_count} files already up-to-date"
                 except KeyboardInterrupt, Exception:
                     # Exit quickly when interrupted/failed
                     executor.shutdown(cancel_futures=True)
@@ -242,11 +246,15 @@ def main(
                     sync_disk(d_fp)
 
         def copy_task(s: Path, d: Path, /):
+            is_for_copying = False
             if d.is_symlink():
                 remove_symlink_from_dest(d)
             if d.is_dir():
                 remove_folder_from_dest(d)
             if not d.exists():
+                is_for_copying = True
+                with lock_for_copying:
+                    for_copying.append(s)
                 copyfile_fsync(s, d)
                 copy_mtime(s, d)
                 if verbose:
@@ -262,6 +270,9 @@ def main(
                     if not updated_checksum:
                         updated = False
                 if not updated:
+                    is_for_copying = True
+                    with lock_for_copying:
+                        for_copying.append(s)
                     copyfile_fsync(s, d)
                     copy_mtime(mtime_sec_or_ns, d)
                     if verbose:
@@ -270,7 +281,7 @@ def main(
                 fix_case_file(d)
             with lock_delete_flags:
                 would_delete_flags[d] = False
-            return True
+            return is_for_copying
 
         def make_copy_map(pool, pending, /):
             def copy_map(s, d):
@@ -280,73 +291,98 @@ def main(
             return copy_map
 
         pending_cp: list[tuple[Path, Future[bool]]] = []
-        with ThreadPoolExecutor(max_workers=copying_concurrency) as executor_cp:
-            try:
-                for _ in itreemap(
-                    make_copy_map(executor_cp, pending_cp),
-                    src,
-                    dest=dest,
-                    extmap=copy_exts,
-                    mkdir=True,
-                    mkdir_empty=False,
-                    follow_symlinks=True,
-                    include_broken_symlinks=False,
-                    error_broken_symlinks=False,
-                    progress=False,
-                ):
-                    pass
-                task_c = progress_display.add_task("Copying", total=len(pending_cp))
+        for_copying: list[Path] = []
+        lock_for_copying = RLock()
+        if copy_exts:
+            with ThreadPoolExecutor(max_workers=copying_concurrency) as executor_cp:
+                task_c = progress_display.add_task("Traversing (copy)", total=len(pending_cp))
+                try:
+                    for i, _ in enumerate(
+                        itreemap(
+                            make_copy_map(executor_cp, pending_cp),
+                            src,
+                            dest=dest,
+                            extmap=copy_exts,
+                            mkdir=True,
+                            mkdir_empty=False,
+                            fix_case=fix_case,
+                            follow_symlinks=True,
+                            include_broken_symlinks=False,
+                            error_broken_symlinks=False,
+                            progress=False,
+                        )
+                    ):
+                        # 42 is heuristic
+                        if i % 42 == 0:
+                            progress_display.update(task_c, total=len(pending_cp), refresh=True)
+                    progress_display.update(task_c, total=len(pending_cp), refresh=True)
+                    # Finish remaining tasks
+                    with lock_for_copying:
+                        task_cp = progress_display.add_task("Copying", total=len(for_copying))
+                    done_copying_count = 0
+                    done_checking_count = 0
+                    while pending_cp:
+                        time.sleep(poll)
+                        done, pending_cp = filter_split(lambda x: x[1].done(), pending_cp)
+                        for _, fu in done:
+                            # Unwrap first for collecting exceptions
+                            really_copied = fu.result()
+                            if really_copied:
+                                done_copying_count += 1
+                        done_checking_count += len(done)
+                        progress_display.update(task_c, advance=len(done), refresh=True)
+                        progress_display.update(task_cp, completed=done_copying_count, total=len(for_copying), refresh=True)
+                    summery_message += f"\n{len(for_copying)} files copied, {done_checking_count - done_copying_count} files already up-to-date"
+                except KeyboardInterrupt, Exception:
+                    # Exit quickly when interrupted/failed
+                    executor_cp.shutdown(cancel_futures=True)
+                    raise
 
-                while pending_cp:
-                    time.sleep(poll)
-                    done, pending_cp = filter_split(lambda x: x[1].done(), pending_cp)
-                    for d, fu in done:
-                        # Unwrap for collecting exceptions
-                        fu.result()
-                    progress_display.update(task_c, advance=len(done), refresh=True)
-            except KeyboardInterrupt, Exception:
-                # Exit quickly when interrupted/failed
-                executor_cp.shutdown(cancel_futures=True)
-                raise
+    # Deletion phase
+    done_deletion_count = 0
+    for p, would_be_deleted in would_delete_flags.items():
+        if would_be_deleted:
+            p.unlink()
+            done_deletion_count += 1
+            if verbose:
+                reprint(f"{p} (Deleted)")
+    if delete:
+        summery_message += f"\n{done_deletion_count} files deleted"
 
-        # Deletion phase
-        for p, would_be_deleted in would_delete_flags.items():
-            if would_be_deleted:
-                p.unlink()
-                if verbose:
-                    reprint(f"{p} (Deleted)")
+    # Directory deletion phase
+    del_dir = delete_dir or purge_dir
+    try_del: set[Path] = set()
+    if del_dir:
+        found_emp: bool | None = None
+        while found_emp is not False:
+            found_emp = False
+            for d, s, is_empty in itreemap(
+                lambda d, s: not any(d.iterdir()),
+                dest,
+                src,
+                file=False,
+                directory=True,
+                mkdir=False,
+                follow_symlinks=True,
+                include_broken_symlinks=False,
+                error_broken_symlinks=False,
+                progress=False,
+            ):
+                if is_empty:
+                    if d.is_symlink():
+                        if d not in try_del:
+                            found_emp = True
+                            try_del.add(d)
+                            d.unlink()
+                            break
+                    if purge_dir or not s.exists() or not s.is_dir():
+                        if d not in try_del:
+                            found_emp = True
+                            try_del.add(d)
+                            d.rmdir()
+                            break
 
-        # Directory deletion phase
-        del_dir = delete_dir or purge_dir
-        try_del: set[Path] = set()
-        if del_dir:
-            found_emp: bool | None = None
-            while found_emp is not False:
-                found_emp = False
-                for d, s, is_empty in itreemap(
-                    lambda d, s: not any(d.iterdir()),
-                    dest,
-                    src,
-                    file=False,
-                    directory=True,
-                    mkdir=False,
-                    follow_symlinks=True,
-                    include_broken_symlinks=False,
-                    error_broken_symlinks=False,
-                    progress=False,
-                ):
-                    if is_empty:
-                        if d.is_symlink():
-                            if d not in try_del:
-                                found_emp = True
-                                try_del.add(d)
-                                d.unlink()
-                                break
-                        if purge_dir or not s.exists() or not s.is_dir():
-                            if d not in try_del:
-                                found_emp = True
-                                try_del.add(d)
-                                d.rmdir()
-                                break
+    if summery_message:
+        reprint(summery_message)
 
     return 0

{flacopyus-0.4.2 → flacopyus-0.4.3/flacopyus.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flacopyus
-Version: 0.4.2
+Version: 0.4.3
 Summary: CLI tool to mirror your FLAC audio library to a portable lossy Opus version
 Maintainer-email: curegit <contact@curegit.jp>
 License-Expression: GPL-3.0-or-later