ptrack

commit cc55e9e86f3475baffaab759f44808cd85962c3d

Author: Connor Etherington <[email protected]>

Date:   Fri Aug 4 06:32:27 2023 +0200

    Auto-Commit Update - 20230804

---

 .gitignore                                  |   3 +

 PKGBUILD                                    |   2 +-

 README.md                                   |  36 +++++---

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

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

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

 dist/ptrack-0.1.4-py3-none-any.whl          | Bin 5267 -> 0 bytes

 dist/ptrack-0.1.4.tar.gz                    | Bin 4096 -> 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            |   4 -

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

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

 ptrack/__init__.py                          |   4 +-

 ptrack/__pycache__/__init__.cpython-310.pyc | Bin 799 -> 0 bytes

 ptrack/__pycache__/main.cpython-310.pyc     | Bin 3732 -> 0 bytes

 ptrack/__pycache__/methods.cpython-310.pyc  | Bin 2831 -> 0 bytes

 ptrack/download.py                          |  15 ++++

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

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

 setup.py                                    |   8 +-

 22 files changed, 167 insertions(+), 297 deletions(-)

diff --git a/.gitignore b/.gitignore

index d7f7a42..f58297f 100644

--- a/.gitignore

+++ b/.gitignore

@@ -1 +1,4 @@

 .mypy_cache

+__pycache__

+ptrack/.mypy_cache

+ptrack/__pycache__

diff --git a/PKGBUILD b/PKGBUILD

index c8e5899..f6154f2 100644

--- a/PKGBUILD

+++ b/PKGBUILD

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

 # Maintainer: Connor Etherington <[email protected]>

 # ---

 pkgname=ptrack

-pkgver=0.1.4

+pkgver=0.2.1

 pkgrel=1

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

 arch=(x86_64)

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

index dc1cb89..43cfe50 100644

--- a/README.md

+++ b/README.md

@@ -1,9 +1,9 @@

 # P-Track - Progress Tracker

-### Welcome to ptrack, a powerful and user-friendly command line interface (CLI) utility built to transform the way you handle file operations. Whether you're copying or moving files, ptrack provides a real-time, beautifully formatted progress bar alongside key statistics about your ongoing operation.

-### As an incredibly efficient and performance-optimized tool, ptrack works swiftly, ensuring your file operations are completed accurately and quickly.

+### 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.1.4*

+*Version: 0.2.1*

 ***

@@ -13,9 +13,11 @@

 + Progress Bar: ptrack comes equipped with an aesthetically pleasing progress bar that updates in real-time, giving you a visual representation of your ongoing file operation.

 + Verbose Mode: If you prefer a more in-depth perspective, ptrack has a verbose mode which displays detailed information about each file being processed.

-+ Copy and Move Support: Whether you need to copy or move files, ptrack has you covered. You can use ptrack with -c for copy operations and -m for move operations.

++ Copying and Moving Files: ptrack supports both copying and moving files on any unix-like opperating system, including Linux, macOS, and BSD.

++ Downloading Files: ptrack can be used to download files from specified URLs. It will display the progress of the download in real-time, and will also display the download speed.

 + 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.

++

 ## Installation:

@@ -44,23 +46,31 @@

 The basic usage of ptrack isvery simple:

+`ptrack [-h] [-v] [-c] [-m] [-d] [-V] [SOURCE...] [DESTINATION]`

+

 ```bash

-### For Copying

-  ptc [OPTIONS] SOURCE... DESTINATION

-### For Moving

-  ptm [OPTIONS] SOURCE... DESTINATION

+### Copying Files

+  ptc [OPTIONS] SOURCE... DESTINATION   ( or ptrack -c SOURCE... DESTINATION )

+

+### Moving Files

+  ptm [OPTIONS] SOURCE... DESTINATION   ( or ptrack -m SOURCE... DESTINATION )

+

+### Downloading Files

+  ptd [OPTIONS] URL(S)                  ( or ptrack -d URL(S) )

 ```

 Refer to the User Guide for more detailed instructions and use-cases.

 ## Options:

-+ -h, --help: Show help message and exit.

-+ -v, --verbose: Enable 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.

-+ -V, --version: Show version number and exit.

+

+* -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

 ![Regular Copy](./.gitlab/media/copy.gif)

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

deleted file mode 100644

index 57693c9..0000000

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

+++ /dev/null

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

-import argparse

-import argcomplete

-version="0.1.4"

-

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

-

-verbose = args.verbose

-copy = args.copy

-move = args.move

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

deleted file mode 100644

index cc43997..0000000

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

+++ /dev/null

@@ -1,134 +0,0 @@

-import os

-import sys

-import ptrack

-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

-

-verbose = ptrack.verbose

-argCopy = ptrack.copy

-argMove = ptrack.move

-

-

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

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

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

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

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

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

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

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

+++ /dev/null

@@ -1,94 +0,0 @@

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

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

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

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

-

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

-""")

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

deleted file mode 100644

index 43fa218..0000000

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

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

deleted file mode 100644

index 5363d37..0000000

Binary files a/dist/ptrack-0.1.4.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 f873109..0000000

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

+++ /dev/null

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

-Metadata-Version: 2.1

-Name: ptrack

-Version: 0.1.4

-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 57693c9..9b03a65 100644

--- a/ptrack/__init__.py

+++ b/ptrack/__init__.py

@@ -1,11 +1,12 @@

 import argparse

 import argcomplete

-version="0.1.4"

+version="0.2.1"

 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)

 argcomplete.autocomplete(parser)

@@ -14,3 +15,4 @@ args, unknown = parser.parse_known_args()

 verbose = args.verbose

 copy = args.copy

 move = args.move

+download = args.download

diff --git a/ptrack/__pycache__/__init__.cpython-310.pyc b/ptrack/__pycache__/__init__.cpython-310.pyc

deleted file mode 100644

index 08193c2..0000000

Binary files a/ptrack/__pycache__/__init__.cpython-310.pyc and /dev/null differ

diff --git a/ptrack/__pycache__/main.cpython-310.pyc b/ptrack/__pycache__/main.cpython-310.pyc

deleted file mode 100644

index 2c99988..0000000

Binary files a/ptrack/__pycache__/main.cpython-310.pyc and /dev/null differ

diff --git a/ptrack/__pycache__/methods.cpython-310.pyc b/ptrack/__pycache__/methods.cpython-310.pyc

deleted file mode 100644

index d4080cd..0000000

Binary files a/ptrack/__pycache__/methods.cpython-310.pyc and /dev/null differ

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

new file mode 100644

index 0000000..35c5705

--- /dev/null

+++ b/ptrack/download.py

@@ -0,0 +1,15 @@

+import os

+import requests

+from rich.text import Text

+from rich.console import Console

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

+from ptrack.methods import CustomFileSizeColumn

+from datetime import timedelta

+

+import sys

+from humanize import naturalsize  # Make sure to install this package using pip

+

+

+

+

+

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

index cc43997..5730123 100644

--- a/ptrack/main.py

+++ b/ptrack/main.py

@@ -1,14 +1,18 @@

 import os

 import sys

 import ptrack

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

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

@@ -108,6 +112,68 @@ def run(process):

     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)

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

+            destination_path = os.path.basename(url)

+

+            with Progress(

+                BarColumn(bar_width=50),

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

+                TimeRemainingColumn(),

+                "[#ea2a6f][[/#ea2a6f]",

+                CustomFileSizeColumn(),

+                "[#ea2a6f]][/#ea2a6f]",

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

@@ -126,6 +192,8 @@ def main():

         move()

     elif argCopy:

         copy()

+    elif argDownload:

+        download()

     else:

         hlp()

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

index cbe9420..1c7482c 100644

--- a/ptrack/methods.py

+++ b/ptrack/methods.py

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

 import os

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

+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  # Make sure to install this package using pip

+

+console = Console()

 def getTotalSize(srcPaths):

@@ -82,13 +90,47 @@ def verbose_copy(src, dst, console, current, total_files):

 def hlp():

     print("""

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

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

+  -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/setup.py b/setup.py

index 9447900..a769eb4 100644

--- a/setup.py

+++ b/setup.py

@@ -2,20 +2,22 @@ from setuptools import setup, find_packages

 setup(

     name='ptrack',

-    version="0.1.4",

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

+    version="0.2.1",

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

     author='Connor Etherington',

     author_email='[email protected]',

     packages=find_packages(),

     install_requires=[

         'rich',

         'argparse',

-        'argcomplete',

+        'requests',

+        'validators',

     ],

     entry_points={

         'console_scripts': [

             'ptc=ptrack.main:copy',

             'ptm=ptrack.main:move',

+            'ptd=ptrack.main:download',

             'ptrack=ptrack.main:main',

         ]

     }