ptrack

commit 10e281a67d4d73e059989654db399521dfdb21b1

Author: Connor Etherington <[email protected]>

Date:   Tue Nov 21 01:16:11 2023 +0200

    Auto-Commit Update - 20231121

---

 PKGBUILD                             |   2 +-

 README.md                            |   2 +-

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

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

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

 dist/ptrack-1.0.0-py3-none-any.whl   | Bin 6744 -> 0 bytes

 dist/ptrack-1.0.0.tar.gz             | Bin 6921 -> 0 bytes

 ptrack.1.gz                          | Bin 808 -> 807 bytes

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

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

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

 ptrack/media.py                      | 113 ++++++++++++++++++

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

 ptrack/urlDeconstruct.py             |  85 ++++++++++++++

 recipe/meta.yaml                     |   2 +-

 requirements.txt                     |   6 +

 setup.py                             |   2 +-

 22 files changed, 366 insertions(+), 473 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD

index 8a3542f..4714fd3 100644

--- a/PKGBUILD

+++ b/PKGBUILD

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

 # Maintainer: Connor Etherington <[email protected]>

 # ---

 pkgname=ptrack

-pkgver=1.0.0

+pkgver=2.0.0

 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 631b844..a3eb98b 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 concise, efficient and performance-optimized, ptrack works swiftly and accurately, while providing in-depth insight into the progress of the task at hand.

-*Version: 1.0.0*

+*Version: 2.0.0*

 ***

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

deleted file mode 100644

index bf11915..0000000

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

+++ /dev/null

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

-import argparse

-version="1.0.0"

-

-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 44e9aa6..0000000

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

+++ /dev/null

@@ -1,215 +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)

-    destination_path = os.path.join(dst_dir, os.path.basename(srcPaths[0]) if not new_name else new_name)

-

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

-            TextColumn("-[bold yellow] {task.fields[current_file_name]}[/bold yellow]"),

-            console=console,

-            auto_refresh=False

-        ) as progress:

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

-

-            try:

-                for src_path in srcPaths:

-                    if os.path.isfile(src_path):

-                        src_file_path = src_path

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

-                        file_premissions = os.stat(src_file_path).st_mode

-                        progress.update(task, current_file_name=os.path.basename(src_path), refresh=True)  # Force refresh

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

-                            os.chmod(dst_file_path, file_premissions)

-

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

-                                progress.update(task, current_file_name=file, refresh=True)  # Force refresh

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

-

-            except KeyboardInterrupt:

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

-            destination_path = re.findall('filename="(.+)"', content_disposition)[0] if content_disposition and re.findall('filename="(.+)"', content_disposition) else 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 01a2d63..0000000

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

+++ /dev/null

@@ -1,147 +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

-import shutil

-

-console = Console()

-operation_cancelled = False

-

-

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

-

-    global operation_cancelled

-

-    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

-                filePremissions = os.stat(src).st_mode

-                fdst.write(buf)

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

-                progress.refresh()

-

-                os.chmod(dst, filePremissions)

-

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

-

-                    shutil.copystat(src, dst)

-

-        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-1.0.0-py3-none-any.whl b/dist/ptrack-1.0.0-py3-none-any.whl

deleted file mode 100644

index c1fa573..0000000

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

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

deleted file mode 100644

index c127219..0000000

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

diff --git a/ptrack.1.gz b/ptrack.1.gz

index 4833759..2933b5f 100644

Binary files a/ptrack.1.gz and b/ptrack.1.gz differ

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

deleted file mode 100644

index e28cefc..0000000

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

+++ /dev/null

@@ -1,13 +0,0 @@

-Metadata-Version: 2.1

-Name: ptrack

-Version: 1.0.0

-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

-Requires-Dist: rich

-Requires-Dist: argparse

-Requires-Dist: requests

-Requires-Dist: validators

-Requires-Dist: setuptools

-Requires-Dist: humanize

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 bf11915..7e46d28 100644

--- a/ptrack/__init__.py

+++ b/ptrack/__init__.py

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

 import argparse

-version="1.0.0"

+version="2.0.0"

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

@@ -14,3 +14,4 @@ verbose = args.verbose

 copy = args.copy

 move = args.move

 download = args.download

+

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

index 44e9aa6..c7c6938 100644

--- a/ptrack/main.py

+++ b/ptrack/main.py

@@ -2,20 +2,24 @@ import os

 import re

 import sys

 import ptrack

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

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

+from ptrack.media import mediaDownload

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

 from rich.console import Console

 from datetime import timedelta

+from concurrent.futures import ThreadPoolExecutor, as_completed

 import shutil

 import requests

 import validators

+from threading import Lock

+

+lock = Lock()

 verbose = ptrack.verbose

 argCopy = ptrack.copy

 argMove = ptrack.move

 argDownload = ptrack.download

-

 def run(process):

     console = Console()

@@ -45,7 +49,6 @@ def run(process):

     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)

-    destination_path = os.path.join(dst_dir, os.path.basename(srcPaths[0]) if not new_name else new_name)

     current_file = 1

@@ -78,7 +81,7 @@ def run(process):

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

                             sys.exit(1)

     else:

-        with Progress(

+        columns= [

             BarColumn(bar_width=50),

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

             TimeRemainingColumn(),

@@ -87,35 +90,50 @@ def run(process):

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

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

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

-            TextColumn("-[bold yellow] {task.fields[current_file_name]}[/bold yellow]"),

-            console=console,

-            auto_refresh=False

-        ) as progress:

+            "[bold purple] - [/bold purple]",

+            TextColumn("[bold yellow]{task.fields[current_file_name]}[/bold yellow]", justify="left"),

+        ]

+

+        with Progress(*columns, console=console, auto_refresh=False) as progress:

+

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

+            def threaded_copy(src, dst, file_permissions, console, task, progress):

+                terminate = regular_copy(src, dst, console, task, progress, lock)

+                if terminate != 'c':

+                    os.chmod(dst, file_permissions)

+

             try:

-                for src_path in srcPaths:

-                    if os.path.isfile(src_path):

-                        src_file_path = src_path

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

-                        file_premissions = os.stat(src_file_path).st_mode

-                        progress.update(task, current_file_name=os.path.basename(src_path), refresh=True)  # Force refresh

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

+                with ThreadPoolExecutor() as executor:

+                    futures = []

+                    for src_path in srcPaths:

+                        if os.path.isfile(src_path):

+                            src_file_path = src_path

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

+                            file_permissions = os.stat(src_file_path).st_mode

+                            progress.update(task, current_file_name=os.path.basename(src_path), refresh=True)

+                            future = executor.submit(threaded_copy, src_path, dst_file_path, file_permissions, console, task, progress)

+                            futures.append(future)

+

+                        for future in as_completed(futures):

+                            with lock:

+                                progress.update(task, advance=future.result())

+

                         else:

-                            os.chmod(dst_file_path, file_premissions)

-

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

-                                progress.update(task, current_file_name=file, refresh=True)  # Force refresh

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

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

+                                    file_permissions = os.stat(src_file_path).st_mode

+                                    progress.update(task, current_file_name=file, refresh=True)

+                                    future = executor.submit(threaded_copy, src_path, dst_file_path, file_permissions, console, task, progress)

+                                    futures.append(future)

+

+                                for future in as_completed(futures):

+                                    with lock:

+                                        progress.update(task, advance=future.result())

             except KeyboardInterrupt:

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

@@ -147,29 +165,63 @@ def download():

         try:

             if url.startswith('-'):

                 continue

+            else:

+                downloaded_size = 0

+                total_size = 0

+

+                custom_columns = [

+                    BarColumn(bar_width=50),

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

+                    TimeRemainingColumn(),

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

+                    FileSizeColumn(),

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

+                    TextColumn(f"[bold cyan]{total_size}[/bold cyan]"),

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

+                    TextColumn(f"[bold purple] - [/bold purple][bold yellow]{url}[/bold yellow][bold purple] | [/bold purple]Processing filetype...", justify="left"),

+                ]

+

+                with Progress(*custom_columns) as progress:

+                    task = progress.add_task("", total=100, file_size="0 KB", start=False)

+

+                    if isMediaUrl(url):

+                        def wipe():

+                            sys.stdout.write("\033[F")  # Cursor up one line

+                            sys.stdout.write("\033[K")  # Clear to the end of line

+                            sys.stdout.flush()

+                            sys.stdout.write("\033[F")  # Cursor up one line

+

+                        mediaDownload(url, progress, wipe)

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

+                destination_path = re.findall('filename="(.+)"', content_disposition)[0] if content_disposition and re.findall('filename="(.+)"', content_disposition) else os.path.basename(url)

+

+                size = format_file_size(total_size_in_bytes)

+

+                with Progress(

+                    BarColumn(bar_width=50),

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

+                    TimeRemainingColumn(),

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

+                    FileSizeColumn(),

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

+                    TextColumn(f"[bold cyan]{size}[/bold cyan]"),

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

+                    "[bold purple] - [/bold purple]",

+                    TextColumn(f"[bold yellow]{destination_path}[/bold yellow]", justify="left"),

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

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

-            destination_path = re.findall('filename="(.+)"', content_disposition)[0] if content_disposition and re.findall('filename="(.+)"', content_disposition) else 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)

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

new file mode 100644

index 0000000..8699ada

--- /dev/null

+++ b/ptrack/media.py

@@ -0,0 +1,113 @@

+

+import subprocess

+from ptrack.urlDeconstruct import get_urls

+from ptrack.methods import CustomFileSizeColumn, format_file_size

+import ptrack

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

+from rich.console import Console

+import threading

+import time

+import os

+

+console = Console()

+

+def run_ffmpeg(ffmpeg_command):

+    with subprocess.Popen(ffmpeg_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True) as process:

+        while True:

+            line = process.stderr.readline()

+            if not line:

+                break

+

+def get_file_size(filename):

+    return os.path.getsize(filename) if os.path.exists(filename) else 0

+

+

+#def FileSizeColumn(file):

+#    global file_size

+#    file_size = get_file_size(file) if os.path.exists(file) else 0

+#

+#    return f"[bold green]{format_file_size(file_size)}[/bold green]"

+

+

+def download_with_progress(ffmpeg_command, title, size, accuracy, progress, wipe):

+    output_file = ffmpeg_command[-1]

+    downloaded_size = format_file_size(get_file_size(output_file))

+    total_size = format_file_size(size)

+

+    if not accuracy:

+        title = f"[bold purple]- [/bold purple]⚠  [#ea2a6f]Filesize may be inaccurate[/#ea2a6f][bold purple] - [/bold purple][bold yellow]{title}[/bold yellow]"

+    else:

+        title = f"[bold purple]- [/bold purple][bold yellow]{title}[/bold yellow]"

+

+    ffmpeg_command.extend(['-flush_packets', '1'])

+

+    custom_columns = [

+        BarColumn(bar_width=50),

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

+        TimeRemainingColumn(),

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

+        FileSizeColumn(),

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

+        TextColumn(f"[bold cyan]{total_size}[/bold cyan]"),

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

+        TextColumn(title, justify="left"),

+    ]

+

+    progress.stop()

+    wipe()

+

+    with Progress(*custom_columns) as progress:

+        task = progress.add_task("", total=size, downloaded_size=format_file_size(get_file_size(output_file)))

+        process = subprocess.Popen(ffmpeg_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)

+

+        while True:

+            output = process.stderr.readline()

+            if output == '' and process.poll() is not None:

+                break

+            if output:

+                progress.update(task, completed=get_file_size(output_file))

+

+            time.sleep(0.3)

+

+        if process.returncode == 0:

+            progress.columns = list(progress.columns)

+            progress.columns[-1].renderable = TextColumn(f"[bold yellow]{title}i[/bold yellow][bold green] ✓[/bold green]")

+            progress.columns = tuple(progress.columns)

+        else:

+            progress.columns = list(progress.columns)

+            progress.columns[-1].renderable = TextColumn(f"[bold yellow]{title}[/bold yellow][bold red] ✗[/bold red]")

+            progress.columns = tuple(progress.columns)

+

+

+

+        progress.stop()

+

+

+def mediaDownload(url, progress, wipe):

+

+    fetched_urls = get_urls([url])

+

+    print()

+

+    for fetched_url in fetched_urls:

+        if fetched_url:

+            video_url, audio_url, title, size, accuracy = fetched_url

+            safe_name = make_filename_safe(title)

+            ffmpeg_command = [

+                'ffmpeg', '-i', video_url, '-i', audio_url,

+                '-c:v', 'libx264', '-c:a', 'aac', '-strict', 'experimental',

+                '-b:v', '1M', '-b:a', '128k', f'{safe_name}.mp4'

+            ] if video_url.endswith('.m3u8') else [

+                'ffmpeg', '-i', video_url, '-i', audio_url,

+                '-c:v', 'copy', '-c:a', 'copy', f'{safe_name}.mp4'

+            ]

+

+            download_with_progress(ffmpeg_command, title, size, accuracy, progress, wipe)

+        else:

+            print("Error: Unable to fetch URLs for one of the videos.")

+

+

+

+def make_filename_safe(name):

+    return name.replace(' ', '_').replace('(', '').replace(')', '').replace('/', '_')

+

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

index 01a2d63..d72319e 100644

--- a/ptrack/methods.py

+++ b/ptrack/methods.py

@@ -6,7 +6,15 @@ from rich.progress import Progress, TextColumn, BarColumn, TimeRemainingColumn,

 from rich.text import Text

 from datetime import timedelta

 from humanize import naturalsize

+from bs4 import BeautifulSoup

 import shutil

+import mimetypes

+import re

+from concurrent.futures import ThreadPoolExecutor

+import subprocess

+import shlex

+from functools import lru_cache

+

 console = Console()

 operation_cancelled = False

@@ -75,7 +83,7 @@ def verbose_copy(src, dst, console, current, total_files, file_name):

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

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

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

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

+        f"({current} of {total_files})[bold purple] - [/bold purple][bold yellow]{file_name}[/bold yellow]",

         console=console,

         auto_refresh=False

     ) as progress:

@@ -145,3 +153,47 @@ class CustomFileSizeColumn(FileSizeColumn, TimeElapsedColumn):

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

             size /= 1024.0

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

+

+class CustomDLColumn(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"

+

+

+def isMediaUrl(url):

+    command = shlex.split(f'yt-dlp --get-url {url}')

+    try:

+        process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)

+        stdout, stderr = process.communicate()

+        return process.returncode == 0 and bool(stdout.strip())

+    except Exception as e:

+        print(f"Error checking URL type: {e}")

+        return False

+

+

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

new file mode 100644

index 0000000..23f9c89

--- /dev/null

+++ b/ptrack/urlDeconstruct.py

@@ -0,0 +1,85 @@

+import requests

+from bs4 import BeautifulSoup

+import subprocess

+from tempfile import NamedTemporaryFile

+from yt_dlp import main as yt_dlp

+import json

+import ascii_magic

+import tkinter as tk

+from PIL import Image, ImageTk

+from io import BytesIO

+from urllib3 import PoolManager

+

+

+def getData(url):

+    process = subprocess.Popen(['yt-dlp', '--format',  'bestvideo+bestaudio/best', url, '--dump-json'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)

+    out, err = process.communicate()

+    if err:

+        print(f"Error: {err}")

+        return None

+    try:

+        data = json.loads(out)

+        return data

+    except json.JSONDecodeError:

+        print("Failed to decode JSON from yt-dlp output.")

+

+

+

+def download_image(url):

+    response = requests.get(url)

+    if response.status_code == 200:

+        with NamedTemporaryFile(delete=False, suffix='.png') as img_temp:

+            img = Image.open(requests.get(url, stream=True).raw)

+            img.save(img_temp, 'PNG')

+            return img_temp.name