ptrack

commit 972c9829e0755b28fb0013bcf95cab96e8f55d6d

Author: Connor Etherington <[email protected]>

Date:   Sat Jul 29 13:13:32 2023 +0200

    Auto-Commit Update 29.07.2023 - 13:13:32

---

 PKGBUILD                             |  2 +-

 ptrack.egg-info/PKG-INFO             |  7 ----

 ptrack.egg-info/SOURCES.txt          | 12 ------

 ptrack.egg-info/dependency_links.txt |  1 -

 ptrack.egg-info/entry_points.txt     |  4 --

 ptrack.egg-info/requires.txt         |  3 --

 ptrack.egg-info/top_level.txt        |  1 -

 ptrack/__init__.py                   |  2 +

 ptrack/main.py                       | 25 +++++++++---

 ptrack/methods.py                    | 75 ++++++++++++++++++++++++------------

 recipe/meta.yaml                     | 29 ++++++++++++++

 setup.py                             |  2 +-

 12 files changed, 103 insertions(+), 60 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD

index 3e6a68c..ba4b793 100644

--- a/PKGBUILD

+++ b/PKGBUILD

@@ -1,7 +1,7 @@

 # Maintainer: Connor Etherington <[email protected]>

 # ---

 pkgname=ptrack

-pkgver=0.1.0

+pkgver=0.1.2

 pkgrel=1

 pkgdesc="A simple CLI utility for asthetically tracking progress when copying or moving files"

 arch=(x86_64)

diff --git a/ptrack.egg-info/PKG-INFO b/ptrack.egg-info/PKG-INFO

deleted file mode 100644

index e347788..0000000

--- a/ptrack.egg-info/PKG-INFO

+++ /dev/null

@@ -1,7 +0,0 @@

-Metadata-Version: 2.1

-Name: ptrack

-Version: 0.1.0

-Summary: A simple CLI utility for asthetically tracking progress when copying or moving files.

-Author: Connor Etherington

-Author-email: [email protected]

-License-File: LICENSE

diff --git a/ptrack.egg-info/SOURCES.txt b/ptrack.egg-info/SOURCES.txt

deleted file mode 100644

index 086a784..0000000

--- a/ptrack.egg-info/SOURCES.txt

+++ /dev/null

@@ -1,12 +0,0 @@

-LICENSE

-README.md

-setup.py

-ptrack/__init__.py

-ptrack/main.py

-ptrack/methods.py

-ptrack.egg-info/PKG-INFO

-ptrack.egg-info/SOURCES.txt

-ptrack.egg-info/dependency_links.txt

-ptrack.egg-info/entry_points.txt

-ptrack.egg-info/requires.txt

-ptrack.egg-info/top_level.txt

diff --git a/ptrack.egg-info/dependency_links.txt b/ptrack.egg-info/dependency_links.txt

deleted file mode 100644

index 8b13789..0000000

--- a/ptrack.egg-info/dependency_links.txt

+++ /dev/null

@@ -1 +0,0 @@

-

diff --git a/ptrack.egg-info/entry_points.txt b/ptrack.egg-info/entry_points.txt

deleted file mode 100644

index 32a28e4..0000000

--- a/ptrack.egg-info/entry_points.txt

+++ /dev/null

@@ -1,4 +0,0 @@

-[console_scripts]

-ptc = ptrack.main:copy

-ptm = ptrack.main:move

-ptrack = ptrack.main:main

diff --git a/ptrack.egg-info/requires.txt b/ptrack.egg-info/requires.txt

deleted file mode 100644

index 382c1b3..0000000

--- a/ptrack.egg-info/requires.txt

+++ /dev/null

@@ -1,3 +0,0 @@

-rich

-argparse

-argcomplete

diff --git a/ptrack.egg-info/top_level.txt b/ptrack.egg-info/top_level.txt

deleted file mode 100644

index c003217..0000000

--- a/ptrack.egg-info/top_level.txt

+++ /dev/null

@@ -1 +0,0 @@

-ptrack

diff --git a/ptrack/__init__.py b/ptrack/__init__.py

index 919fce7..8104dff 100644

--- a/ptrack/__init__.py

+++ b/ptrack/__init__.py

@@ -1,10 +1,12 @@

 import argparse

 import argcomplete

+version = '0.1.2'

 parser = argparse.ArgumentParser(description='A simple CLI utility for asthetically tracking progress when copying or moving files.')

 parser.add_argument('-v', '--verbose', action='store_true', help='verbose output')

 parser.add_argument('-c', '--copy', action='store_true', help='copy files (You can use `ptc` instead of `ptrack -c`)')

 parser.add_argument('-m', '--move', action='store_true', help='move files (You can use `ptm` instead of `ptrack -m`)')

+parser.add_argument('-V', '--version', action='version', version='%(prog)s ' + version)

 argcomplete.autocomplete(parser)

 args, unknown = parser.parse_known_args()

diff --git a/ptrack/main.py b/ptrack/main.py

index e52edf0..cc43997 100644

--- a/ptrack/main.py

+++ b/ptrack/main.py

@@ -1,7 +1,7 @@

 import os

 import sys

 import ptrack

-from ptrack.methods import format_file_size, regular_copy, verbose_copy, hlp

+from ptrack.methods import format_file_size, regular_copy, verbose_copy, hlp, getTotalSize

 from rich.progress import Progress, BarColumn, TextColumn, TimeRemainingColumn, FileSizeColumn

 from rich.console import Console

 import shutil

@@ -39,7 +39,8 @@ def run(process):

         new_name = os.path.basename(dst)

     total_files = sum(len(files) for path in srcPaths for r, d, files in os.walk(path) if os.path.isdir(path)) + sum(1 for path in srcPaths if os.path.isfile(path))

-    total_size = sum(os.path.getsize(os.path.join(r, f)) for path in srcPaths for r, d, files in os.walk(path) for f in files) + sum(os.path.getsize(path) for path in srcPaths if os.path.isfile(path))

+    total_size = getTotalSize(srcPaths)

+

     current_file = 1

     if total_files > 1:

@@ -53,8 +54,11 @@ def run(process):

         for src_path in srcPaths:

             if os.path.isfile(src_path):

                 dst_path = os.path.join(dst_dir, os.path.basename(src_path) if not new_name else new_name)

-                verbose_copy(src_path, dst_path, console, current_file, total_files)

+                terminate = verbose_copy(src_path, dst_path, console, current_file, total_files)

                 current_file += 1

+                if terminate == 'c':

+                    console.print("\n[bold red]\[-][/bold red][bold white] Operation cancelled by user.[/bold white]\n")

+                    sys.exit(1)

             else:

                 for root, dirs, files in os.walk(src_path):

                     for file in files:

@@ -62,8 +66,11 @@ def run(process):

                         relative_path = os.path.relpath(src_file_path, start=src_path)

                         dst_file_path = os.path.join(dst_dir, os.path.basename(src_path) if not new_name else new_name, relative_path)

                         os.makedirs(os.path.dirname(dst_file_path), exist_ok=True)

-                        verbose_copy(src_file_path, dst_file_path, console, current_file, total_files)

+                        terminate = verbose_copy(src_file_path, dst_file_path, console, current_file, total_files)

                         current_file += 1

+                        if terminate == 'c':

+                            console.print("\n[bold red]\[-][/bold red][bold white] Operation cancelled by user.[/bold white]\n")

+                            sys.exit(1)

     else:

         with Progress(

             BarColumn(bar_width=50),

@@ -82,7 +89,10 @@ def run(process):

             for src_path in srcPaths:

                 if os.path.isfile(src_path):

                     dst_file_path = os.path.join(dst_dir, os.path.basename(src_path) if not new_name else new_name)

-                    regular_copy(src_path, dst_file_path, console, task, progress)

+                    terminate = regular_copy(src_path, dst_file_path, console, task, progress)

+                    if terminate == 'c':

+                        console.print("\n[bold red]\[-][/bold red][bold white] Operation cancelled by user.[/bold white]\n")

+                        sys.exit(1)

                 else:

                     for root, dirs, files in os.walk(src_path):

                         for file in files:

@@ -90,7 +100,10 @@ def run(process):

                             relative_path = os.path.relpath(src_file_path, start=src_path)

                             dst_file_path = os.path.join(dst_dir, os.path.basename(src_path) if not new_name else new_name, relative_path)

                             os.makedirs(os.path.dirname(dst_file_path), exist_ok=True)

-                            regular_copy(src_file_path, dst_file_path, console, task, progress)

+                            terminate = regular_copy(src_file_path, dst_file_path, console, task, progress)

+                            if terminate == 'c':

+                                console.print("\n[bold red]\[-][/bold red][bold white] Operation cancelled by user.[/bold white]\n")

+                                sys.exit(1)

     return srcPaths

diff --git a/ptrack/methods.py b/ptrack/methods.py

index 1c5e851..674c7e3 100644

--- a/ptrack/methods.py

+++ b/ptrack/methods.py

@@ -2,30 +2,52 @@ import os

 from rich.progress import Progress, BarColumn, TextColumn, TimeRemainingColumn, FileSizeColumn

+def getTotalSize(srcPaths):

+    total_size = 0

+    for path in srcPaths:

+        if os.path.isfile(path):

+            total_size += os.path.getsize(path)

+        else:

+            for r, d, files in os.walk(path):

+                for f in files:

+                    fp = os.path.join(r, f)

+                    total_size += os.path.getsize(fp)

+    return total_size

+

+

 def format_file_size(file_size):

-    if file_size >= 1024 * 1024 * 1024:

-        return f"{file_size / (1024*1024*1024):.2f} GB"

-    elif file_size >= 1024 * 1024:

-        return f"{file_size / (1024*1024):.2f} MB"

-    elif file_size >= 1024:

-        return f"{file_size / 1024:.2f} kB"

-    else:

+    if file_size >= 1000 ** 4:  # Terabyte

+        return f"{round(file_size / (1000 ** 4))} TB"

+    elif file_size >= 1000 ** 3:  # Gigabyte

+        return f"{round(file_size / (1000 ** 3))} GB"

+    elif file_size >= 1000 ** 2:  # Megabyte

+        return f"{round(file_size / (1000 ** 2))} MB"

+    elif file_size >= 1000:  # Kilobyte

+        return f"{round(file_size / 1000)} kB"

+    else:  # Byte

         return f"{file_size} bytes"

 def regular_copy(src, dst, console, task, progress):

-    with open(src, 'rb') as fsrc, open(dst, 'wb') as fdst:

-        while True:

-            buf = fsrc.read(1024*1024)

-            if not buf:

-                break

-            fdst.write(buf)

-            progress.update(task, advance=len(buf))

-            progress.refresh()

+    operation_cancelled = False

+    try:

+        with open(src, 'rb') as fsrc, open(dst, 'wb') as fdst:

+            while True:

+                buf = fsrc.read(1024*1024)

+                if operation_cancelled:

+                    return "c"

+                fdst.write(buf)

+                progress.update(task, advance=len(buf))

+                progress.refresh()

+    except KeyboardInterrupt:

+        operation_cancelled = True

+        progress.stop()

+        return "c"

-def verbose_copy(src, dst, console, current, total_files):

+def verbose_copy(src, dst, console, current, total_files):

+    operation_cancelled = False

     file_size = os.path.getsize(src)

     with Progress(

@@ -43,14 +65,19 @@ def verbose_copy(src, dst, console, current, total_files):

     ) as progress:

         task = progress.add_task("", total=file_size, file_size=format_file_size(file_size))

-        with open(src, 'rb') as fsrc, open(dst, 'wb') as fdst:

-            while not progress.finished:

-                buf = fsrc.read(1024*1024)

-                if not buf:

-                    break

-                fdst.write(buf)

-                progress.update(task, advance=len(buf))

-                progress.refresh()

+        try:

+            with open(src, 'rb') as fsrc, open(dst, 'wb') as fdst:

+                while not progress.finished:

+                    buf = fsrc.read(1024*1024)

+                    if operation_cancelled:

+                        return "c"

+                    fdst.write(buf)

+                    progress.update(task, advance=len(buf))

+                    progress.refresh()

+        except KeyboardInterrupt:

+            operation_cancelled = True

+            progress.stop()

+            return "c"

 def hlp():

diff --git a/recipe/meta.yaml b/recipe/meta.yaml

new file mode 100644

index 0000000..a42a955

--- /dev/null

+++ b/recipe/meta.yaml

@@ -0,0 +1,29 @@

+package:

+  name: ptrack

+  version: 0.1.2

+

+source:

+  path: ..

+

+build:

+  number: 0

+  script: '{{ PYTHON }} -m pip install . --no-deps -vv'

+

+requirements:

+  host:

+    - python

+    - pip

+  run:

+    - python

+    - "numpy<=1.24"

+    - pandas

+

+about:

+  home: https://gitlab.com/a4to/ptrack

+  license: MIT

+  license_file: LICENSE

+  summary: 'A simple CLI utility for aesthetically tracking progress when copying or moving files'

+

+extra:

+  recipe-maintainers:

+    - concise

diff --git a/setup.py b/setup.py

index fdea560..b67d259 100644

--- a/setup.py

+++ b/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages

 setup(

     name='ptrack',

-    version='0.1.0',

+    version='0.1.2',

     description='A simple CLI utility for asthetically tracking progress when copying or moving files.',

     author='Connor Etherington',

     author_email='[email protected]',