ptrack

commit 80828d387097b7cb4cefaaf30e650bd8febcd395

Author: Connor Etherington <[email protected]>

Date:   Fri Dec 15 23:39:54 2023 +0200

    Auto-Commit Update - 20231215

---

 PKGBUILD                           |   2 +-

 README.md                          |   2 +-

 dist/ptrack-2.0.1-py3-none-any.whl | Bin 0 -> 10147 bytes

 dist/ptrack-2.0.1-py311_0.tar.bz2  | Bin 0 -> 30047 bytes

 dist/ptrack-2.0.1.tar.gz           | Bin 0 -> 9514 bytes

 ptrack/__init__.py                 |   2 +-

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

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

 recipe/meta.yaml                   |   2 +-

 setup.py                           |   2 +-

 10 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD

index 571a083..d9161c6 100644

--- a/PKGBUILD

+++ b/PKGBUILD

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

 # Maintainer: Connor Etherington <[email protected]>

 # ---

 pkgname=ptrack

-pkgver=2.0.0

+pkgver=2.0.1

 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 a3eb98b..466e124 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: 2.0.0*

+*Version: 2.0.1*

 ***

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

new file mode 100644

index 0000000..6f34ce6

Binary files /dev/null and b/dist/ptrack-2.0.1-py3-none-any.whl differ

diff --git a/dist/ptrack-2.0.1-py311_0.tar.bz2 b/dist/ptrack-2.0.1-py311_0.tar.bz2

new file mode 100644

index 0000000..fa29433

Binary files /dev/null and b/dist/ptrack-2.0.1-py311_0.tar.bz2 differ

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

new file mode 100644

index 0000000..866c65d

Binary files /dev/null and b/dist/ptrack-2.0.1.tar.gz differ

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

index 7e46d28..ffe7eee 100644

--- a/ptrack/__init__.py

+++ b/ptrack/__init__.py

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

 import argparse

-version="2.0.0"

+version="2.0.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')

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

index c7c6938..c6c6200 100644

--- a/ptrack/main.py

+++ b/ptrack/main.py

@@ -142,6 +142,16 @@ def run(process):

     return srcPaths

+def wipe():

+    sys.stdout.write("\033[F")

+    sys.stdout.write("\033[K")

+    sys.stdout.flush()

+    sys.stdout.write("\033[F")

+

+def wipe2():

+    sys.stdout.write("\033[F")

+    sys.stdout.flush()

+

 def download():

     console = Console()

     urls = sys.argv[1:]

@@ -185,12 +195,6 @@ def download():

                     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

@@ -201,6 +205,7 @@ def download():

                 size = format_file_size(total_size_in_bytes)

+                wipe2()

                 with Progress(

                     BarColumn(bar_width=50),

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

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

index d72319e..b02ca96 100644

--- a/ptrack/methods.py

+++ b/ptrack/methods.py

@@ -14,12 +14,11 @@ from concurrent.futures import ThreadPoolExecutor

 import subprocess

 import shlex

 from functools import lru_cache

-

+import shlex

 console = Console()

 operation_cancelled = False

-

 def getTotalSize(srcPaths):

     total_size = 0

     for path in srcPaths:

@@ -187,13 +186,16 @@ class CustomDLColumn(FileSizeColumn, TimeElapsedColumn):

 def isMediaUrl(url):

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

+    command = shlex.split(f'yt-dlp --get-filename -o "%(ext)s" {url}')

     try:

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

-        stdout, stderr = process.communicate()

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

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

+        stdout, _ = process.communicate()

+        if process.returncode != 0:

+            return False

+

+        file_extension = stdout.decode().strip()

+        return file_extension in ["mp3", "mp4", "ogg", "webm", "mkv", "flv", "avi", "mov", "wmv"]

     except Exception as e:

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

+        print(f"Error checking URL type with yt-dlp: {e}")

         return False

-

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

index 0402787..b17f5d1 100644

--- a/recipe/meta.yaml

+++ b/recipe/meta.yaml

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

 package:

   name: ptrack

-  version: 2.0.0

+  version: 2.0.1

 source:

   path: ..

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

index cf2e214..875d71d 100644

--- a/setup.py

+++ b/setup.py

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

 setup(

     name='ptrack',

-    version="2.0.0",

+    version="2.0.1",

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

     author='Connor Etherington',

     author_email='[email protected]',