ptrack

commit f5744e306760ef0d65590370eba5a746b71e67dc

Author: Connor Etherington <[email protected]>

Date:   Sun Aug 27 21:01:32 2023 +0200

    Auto-Commit Update 27.08.2023 - 21:01:32

---

 .gitlab/media/new-download.gif       | Bin 0 -> 3910164 bytes

 PKGBUILD                             |   2 +-

 README.md                            |   9 +-

 build/lib/ptrack/__init__.py         |  16 ---

 build/lib/ptrack/main.py             | 207 -----------------------------------

 build/lib/ptrack/methods.py          | 136 -----------------------

 dist/ptrack-0.2.2-py3-none-any.whl   | Bin 6551 -> 0 bytes

 dist/ptrack-0.2.2.tar.gz             | Bin 6568 -> 0 bytes

 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     |   5 -

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

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

 ptrack/__init__.py                   |   2 +-

 recipe/meta.yaml                     |   2 +-

 setup.py                             |   2 +-

 17 files changed, 12 insertions(+), 396 deletions(-)

diff --git a/.gitlab/media/new-download.gif b/.gitlab/media/new-download.gif

new file mode 100644

index 0000000..6d77a66

Binary files /dev/null and b/.gitlab/media/new-download.gif differ

diff --git a/PKGBUILD b/PKGBUILD

index 29ada20..7e7c626 100644

--- a/PKGBUILD

+++ b/PKGBUILD

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

 # Maintainer: Connor Etherington <[email protected]>

 # ---

 pkgname=ptrack

-pkgver=0.2.2

+pkgver=0.2.3

 pkgrel=1

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

 arch=(x86_64)

diff --git a/README.md b/README.md

index f1130dd..d15ed1f 100644

--- a/README.md

+++ b/README.md

@@ -3,7 +3,7 @@

 ### Welcome to ptrack, a powerful and user-friendly CLI utility for tracking the progress of your file operations.

 ### Designed to be as concise, efficient and performance-optimized, ptrack works swiftly and accurately, while providing insight into the progress of the task at hand.

-*Version: 0.2.2*

+*Version: 0.2.3*

 ***

@@ -18,6 +18,13 @@

 + Interruption Handling: ptrack is built to respect your system's interruption signals. It will promptly stop operations when such signals are received, reducing the risk of data corruption.

 + High Performance: Above all, ptrack stands out for its speed and accuracy. It ensures your file operations are executed swiftly and with a high degree of precision.

+## Introducing the new ptrack file downloader

+

+### In the latest release, ptrack has made all around changes increasing the visible stats/details of file opperaitions.

+### This is easily noticable in features such as ptracks new file/URL downloader (ptd) or (ptrack -d):

+

+![New Downloads Update](./.gitlab/media/download-new.gif)

+

 ## Installation:

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

deleted file mode 100644

index 112f15e..0000000

--- a/build/lib/ptrack/__init__.py

+++ /dev/null

@@ -1,16 +0,0 @@

-import argparse

-version="0.2.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('-d', '--download', action='store_true', help='download files (You can use `ptd` instead of `ptrack -d`)')

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

-

-args, unknown = parser.parse_known_args()

-

-verbose = args.verbose

-copy = args.copy

-move = args.move

-download = args.download

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

deleted file mode 100644

index 48523fa..0000000

--- a/build/lib/ptrack/main.py

+++ /dev/null

@@ -1,207 +0,0 @@

-import os

-import re

-import sys

-import ptrack

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

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

-from rich.console import Console

-from datetime import timedelta

-import shutil

-import requests

-import validators

-

-verbose = ptrack.verbose

-argCopy = ptrack.copy

-argMove = ptrack.move

-argDownload = ptrack.download

-

-

-def run(process):

-    console = Console()

-

-    if len(sys.argv) < 3:

-        hlp()

-        if process == "Copying":

-            console.print("[bold cyan]Usage: ptc [OPTIONS] SOURCE... DESTINATION[/bold cyan]")

-        elif process == "Moving":

-            console.print("[bold cyan]Usage: ptm [OPTIONS] SOURCE... DESTINATION[/bold cyan]")

-        sys.exit(1)

-

-    src_paths = sys.argv[1:-1]

-    dst = sys.argv[-1]

-    srcPaths = []

-

-    for path in src_paths:

-        if path.endswith('/'):

-            path = path[:-1]

-        srcPaths.append(path)

-

-    if os.path.isdir(dst):

-        dst_dir = dst

-        new_name = None

-    else:

-        dst_dir = os.path.dirname(dst)

-        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 = getTotalSize(srcPaths)

-

-    current_file = 1

-

-    if total_files > 1:

-        console.print(f"\n[#ea2a6f]{process}:[/#ea2a6f] [bold cyan]{total_files} files[/bold cyan]\n")

-    else:

-        for src_path in srcPaths:

-            if os.path.isfile(src_path):

-                console.print(f"\n[#ea2a6f]{process}:[/#ea2a6f] [bold cyan] {os.path.basename(src_path)} [/bold cyan]\n")

-

-    if verbose:

-        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)

-                terminate = verbose_copy(src_path, dst_path, console, current_file, total_files, file_name=os.path.basename(src_path))

-                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:

-                        src_file_path = os.path.join(root, file)

-                        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(src_file_path), exist_ok=True)

-                        terminate = verbose_copy(src_file_path, dst_file_path, console, current_file, total_files, file_name=file)

-                        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),

-            "[progress.percentage]{task.percentage:>3.0f}%",

-            TimeRemainingColumn(),

-            "[#ea2a6f][[/#ea2a6f]",

-            FileSizeColumn(),

-            "[#ea2a6f]/[/#ea2a6f]",

-            TextColumn("[bold cyan]{task.fields[total_size]}[/bold cyan]"),

-            "[#ea2a6f]][/#ea2a6f]",

-            console=console,

-            auto_refresh=False

-        ) as progress:

-            task = progress.add_task("", total=total_size, total_size=format_file_size(total_size))

-

-            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)

-                    terminate = regular_copy(src_path, dst_file_path, console, task, progress, file_name=os.path.basename(src_path))

-                    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:

-                            src_file_path = os.path.join(root, file)

-                            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)

-                            terminate = regular_copy(src_file_path, dst_file_path, console, task, progress, file_name=file)

-                            if terminate == 'c':

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

-                                sys.exit(1)

-

-    return srcPaths

-

-

-def download():

-    console = Console()

-    urls = sys.argv[1:]

-

-    if len(urls) == 0:

-        console.print("\n[bold red][-][/bold red] No URL provided.\n")

-        sys.exit()

-

-    num_urls = len(urls)

-    for url in urls:

-        if url.startswith('-'):

-            num_urls -= 1

-        elif not validators.url(url):

-            console.print(f"\n[bold red][-][/bold red] Invalid URL: [bold yellow]{url}[/bold yellow]\n")

-            sys.exit()

-

-    console.print(f"\n[#ea2a6f]Downloading:[/#ea2a6f] [bold yellow]{num_urls}[/bold yellow] [bold cyan]files[/bold cyan]\n")

-

-    errors = []

-    for url in urls:

-        try:

-            if url.startswith('-'):

-                continue

-

-            response = requests.get(url, stream=True, allow_redirects=True)

-            total_size_in_bytes = int(response.headers.get('content-length', 0))

-            content_disposition = response.headers.get('content-disposition')

-            if content_disposition:

-                destination_path = re.findall('filename="(.+)"', content_disposition)[0]

-            else:

-                destination_path = os.path.basename(url)

-

-            with Progress(

-                BarColumn(bar_width=50),

-                "[progress.percentage]{task.percentage:>3.0f}%",

-                TimeRemainingColumn(),

-                "[#ea2a6f][[/#ea2a6f]",

-                CustomFileSizeColumn(),

-                "[#ea2a6f]][/#ea2a6f]",

-                f" {destination_path}",  # This line will print the filename at the end

-                console=console,

-                auto_refresh=True

-            ) as progress:

-                task_id = progress.add_task("Downloading", total=total_size_in_bytes)

-                block_size = 1024  # 1 Kibibyte

-                with open(destination_path, 'wb') as file:

-                    for data in response.iter_content(block_size):

-                        file.write(data)

-                        progress.update(task_id, advance=block_size)

-        except KeyboardInterrupt:

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

-            sys.exit(1)

-

-        except Exception as e:

-            console.print(f"\n[bold red]\[-][/bold red][bold white] Could not download file: [bold yellow]{url}[/bold yellow]\n")

-            print(e)

-            errors.append(url)

-

-    if len(errors) == 0:

-        console.print("\n[bold green]Download completed![/bold green]\n")

-    else:

-        console.print("[bold red]The following files could not be downloaded:[/bold red]\n")

-        for error in errors:

-            console.print(f"[bold red]   -[/bold red][bold yellow]{error}[/bold yellow]\n")

-

-

-def copy():

-    run('Copying')

-

-

-def move():

-    src_paths = run('Moving')

-    for src_path in src_paths:

-        if os.path.isfile(src_path):

-            os.remove(src_path)

-        else:

-            shutil.rmtree(src_path)

-

-

-def main():

-    if argMove:

-        move()

-    elif argCopy:

-        copy()

-    elif argDownload:

-        download()

-    else:

-        hlp()

-

-

-if __name__ == "__main__":

-    main()

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

deleted file mode 100644

index d79173d..0000000

--- a/build/lib/ptrack/methods.py

+++ /dev/null

@@ -1,136 +0,0 @@

-import os

-import sys

-import requests

-from rich.console import Console

-from rich.progress import Progress, TextColumn, BarColumn, TimeRemainingColumn, FileSizeColumn, Task, DownloadColumn, TimeElapsedColumn

-from rich.text import Text

-from datetime import timedelta

-from humanize import naturalsize

-

-console = Console()

-

-

-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 >= 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, file_name):

-    operation_cancelled = False

-    try:

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

-            while True:

-                buf = fsrc.read(1024*1024)

-                if not buf or operation_cancelled:

-                    break

-                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, file_name):

-    operation_cancelled = False

-    file_size = os.path.getsize(src)

-

-    with Progress(

-        BarColumn(bar_width=50),

-        "[progress.percentage]{task.percentage:>3.0f}%",

-        TimeRemainingColumn(),

-        "[#ea2a6f][[/#ea2a6f]",

-        FileSizeColumn(),

-        "[#ea2a6f]/[/#ea2a6f]",

-        TextColumn(f"[bold cyan]{format_file_size(file_size)}[/bold cyan]"),

-        "[#ea2a6f]][/#ea2a6f]",

-        f"({current} of {total_files}) - {file_name}",

-        console=console,

-        auto_refresh=False

-    ) as progress:

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

-

-        try:

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

-                while not progress.finished:

-                    buf = fsrc.read(1024*1024)

-                    if not buf or operation_cancelled:

-                        break

-                    fdst.write(buf)

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

-                    progress.refresh()

-        except KeyboardInterrupt:

-            operation_cancelled = True

-            progress.stop()

-            return "c"

-

-

-def hlp():

-    print("""

-usage: ptrack [-h] [-v] [-c] [-m] [-d] [-V]

-

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

-

-options:

-  -h, --help      show this help message and exit

-  -v, --verbose   verbose output

-  -c, --copy      copy files (You can use `ptc` instead of `ptrack -c`)

-  -m, --move      move files (You can use `ptm` instead of `ptrack -m`)

-  -d, --download  download files (You can use `ptd` instead of `ptrack -d`)

-  -V, --version   show program's version number and exit

-""")

-

-

-class CustomFileSizeColumn(FileSizeColumn, TimeElapsedColumn):

-    def render(self, task):

-        completed = task.completed

-        total = task.total

-        elapsed = task.elapsed

-

-        if elapsed > 0.0:  # Prevent division by zero

-            download_speed = completed / elapsed  # calculate download rate

-        else:

-            download_speed = 0

-

-        if total:

-            size = Text.assemble(

-                (f"{self._human_readable_size(completed)}", "green"),  # completed

-                (" / ", "none"),  # separator

-                (f"{self._human_readable_size(total)}", "red"),  # total

-                (" [", "none"),  # opening square bracket

-                (f"{self._human_readable_size(download_speed)}/s", "blue"),  # download rate

-                ("]", "none"),  # closing square bracket

-            )

-        else:

-            size = Text(str(self._human_readable_size(completed)))

-        return size

-

-    def _human_readable_size(self, size: int) -> str:

-        for unit in ['B', 'KB', 'MB', 'GB', 'TB']:

-            if abs(size) < 1024.0:

-                return f"{size:.1f}{unit}"

-            size /= 1024.0

-        return f"{size:.1f}PB"

diff --git a/dist/ptrack-0.2.2-py3-none-any.whl b/dist/ptrack-0.2.2-py3-none-any.whl

deleted file mode 100644

index b1836bd..0000000

Binary files a/dist/ptrack-0.2.2-py3-none-any.whl and /dev/null differ

diff --git a/dist/ptrack-0.2.2.tar.gz b/dist/ptrack-0.2.2.tar.gz

deleted file mode 100644

index ac589df..0000000

Binary files a/dist/ptrack-0.2.2.tar.gz and /dev/null differ

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

deleted file mode 100644

index 2ce3426..0000000

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

+++ /dev/null

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

-Metadata-Version: 2.1

-Name: ptrack

-Version: 0.2.2

-Summary: A simple CLI utility for asthetically tracking progress when copying, moving or downloading 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 ea851b3..0000000

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

+++ /dev/null

@@ -1,5 +0,0 @@

-[console_scripts]

-ptc = ptrack.main:copy

-ptd = ptrack.main:download

-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 d19a378..0000000

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

+++ /dev/null

@@ -1,6 +0,0 @@

-rich

-argparse

-requests

-validators

-setuptools

-humanize

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 112f15e..efccb54 100644

--- a/ptrack/__init__.py

+++ b/ptrack/__init__.py

@@ -1,5 +1,5 @@

 import argparse

-version="0.2.2"

+version="0.2.3"

 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')

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

index 3747a0a..34421b8 100644

--- a/recipe/meta.yaml

+++ b/recipe/meta.yaml

@@ -1,6 +1,6 @@

 package:

   name: ptrack

-  version: 0.2.2

+  version: 0.2.3

 source:

   path: ..

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

index 4728915..5c4abc3 100644

--- a/setup.py

+++ b/setup.py

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

 setup(

     name='ptrack',

-    version="0.2.2",

+    version="0.2.3",

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

     author='Connor Etherington',

     author_email='[email protected]',