improved the progressbar & remaingin time logic heavily & elasped tim…

…e now shows hours

README.md

@@ -1,5 +1,5 @@
 # PyDVPL Cli Converter
-- A Cli Tool Coded In Python3 To Convert WoTB ( Dava ) SmartDLC DVPL File Based On LZ4 Compression.
+- A Cli Tool Coded In Python3 To Convert WoTB ( Dava ) SmartDLC DVPL Files Based On LZ4 Compression.
 
 Package & Module Structure :
 

pyproject.toml

@@ -2,7 +2,7 @@
 name = "pydvpl"
 description = "A CLI Tool Coded In Python3 To Convert WoTB ( Dava ) SmartDLC DVPL File Based On LZ4 High Compression."
 readme = "README.md"
-version = "0.8.0"
+version = "0.9.0"
 authors = [{ name = "RifsxD", email = "support@rxd-mods.xyz" }]
 license = { text = "MIT License" }
 requires-python = ">=3.10"
@@ -14,6 +14,8 @@ classifiers = [
 ]
 dependencies = [
 	"lz4>=4.3.3",
+	"setuptools>=69.2.0",
+	"requests>=2.31.0"
 ]
 
 [project.scripts]

src/pydvpl/_pydvpl.py

@@ -6,7 +6,6 @@
 import threading
 import sys
 import multiprocessing
-import queue
 from pathlib import Path
 from functools import partial
 
@@ -88,35 +87,39 @@ def brand_ascii():
 
 output_lock = threading.Lock()
 
-# Define a thread-safe queue to store processed files
-processed_queue = queue.Queue()
+def print_remaining_time(processed_files, total_files, start_time):
+    elapsed_time = time.time() - start_time
+    if processed_files.value > 0:
+        avg_processing_time_per_file = elapsed_time / processed_files.value
+        remaining_files = total_files - processed_files.value
+        remaining_time = remaining_files * avg_processing_time_per_file
+        if remaining_time < 1:
+            print(f" | Remaining time: {Color.GREEN}{int(remaining_time * 1000)} ms{Color.RESET}", end='')
+        elif remaining_time < 60:
+            print(f" | Remaining time: {Color.YELLOW}{int(remaining_time)} s{Color.RESET}", end='')
+        elif remaining_time < 3600:
+            print(f" | Remaining time: {Color.ORANGE}{int(remaining_time / 60)} min(s){Color.RESET}\r", end='')
+        else:
+            print(f" | Remaining time: {Color.RED}{int(remaining_time / 3600)} hour(s){Color.RESET}", end='')
 
 
 def print_progress_bar_with_time(processed_files, total_files, start_time):
     with output_lock:
         progress = min(processed_files.value / total_files, 1.0)  # Ensure progress doesn't exceed 100%
         bar_length = 50
         filled_length = int(bar_length * progress)
-        bar = '=' * filled_length + '-' * (bar_length - filled_length)
+        gap_length = 1  # Adjust gap length as needed
+        if filled_length < bar_length:  # If progress is less than 100%
+            gap_bar = f'{Color.GREY} {Color.RESET}' * gap_length
+        else:
+            gap_bar = ''
+        filled_bar = f'{Color.GREEN}━{Color.RESET}' * filled_length
+        unfilled_bar = f'{Color.GREY}━{Color.RESET}' * (bar_length - filled_length - gap_length)
+        bar = filled_bar + gap_bar + unfilled_bar
         percentage = progress * 100
         sys.stdout.write('\rProcessing: [{:<50}] {:.2f}%'.format(bar, percentage))
         sys.stdout.flush()
-
-        # Calculate remaining time
-        if progress > 0:
-            elapsed_time = time.time() - start_time
-            remaining_files = total_files - processed_files.value
-            if processed_files.value > 0:
-                avg_time_per_file = elapsed_time / processed_files.value
-                remaining_time = remaining_files * avg_time_per_file
-                if remaining_time < 60:
-                    remaining_time_str = f"{int(remaining_time)} s"
-                elif remaining_time < 3600:
-                    remaining_time_str = f"{int(remaining_time / 60)} min"
-                else:
-                    remaining_time_str = f"{int(remaining_time / 3600)} h"
-                sys.stdout.write(f' | Remaining time: {remaining_time_str}')
-                sys.stdout.flush()
+        print_remaining_time(processed_files, total_files, start_time)
 
 
 def count_total_files(directory):
@@ -298,14 +301,14 @@ def process_mode(directory_or_file, config):
 
 def confirm_upgrade():
     while True:
-        user_input = input("Are you sure you want to upgrade pydvpl? (y, yes / n, no): ").strip().lower()
+        user_input = input("Are you sure you want to upgrade pydvpl? 'yes' (y) or 'no' (n): ").strip().lower()
         if user_input in ['yes', 'y']:
             return True
         elif user_input in ['no', 'n']:
             return False
         else:
             print("Invalid input. Please enter 'yes' (y) or 'no' (n).")
-            sys.exit(1)  # Exit the script if invalid input is provided
+            sys.exit(1)
 
 
 
@@ -433,8 +436,10 @@ def print_elapsed_time(elapsed_time):
         print(f"\nProcessing took {Color.GREEN}{int(elapsed_time * 1000)} ms{Color.RESET}\n")
     elif elapsed_time < 60:
         print(f"\nProcessing took {Color.YELLOW}{int(elapsed_time)} s{Color.RESET}\n")
+    elif elapsed_time < 3600:
+        print(f"\nProcessing took {Color.ORANGE}{int(elapsed_time / 60)} min(s){Color.RESET}\n")
     else:
-        print(f"\nProcessing took {Color.RED}{int(elapsed_time / 60)} min{Color.RESET}\n")
+        print(f"\nProcessing took {Color.RED}{int(elapsed_time / 3600)} hour(s){Color.RESET}\n")
 
 
 def cli():

src/pydvpl/color/_color.py

@@ -3,4 +3,6 @@ class Color:
     GREEN = '\033[32m'
     BLUE = '\033[34m'
     YELLOW = '\033[33m'
+    GREY = '\033[90m'
+    ORANGE = '\033[38;5;208m'
     RESET = '\033[0m'

src/pydvpl/version/_version.py

@@ -1,6 +1,6 @@
 __title__ = "PyDVPL"
-__description__ = "A CLI Tool Coded In Python3 To Convert WoTB ( Dava ) SmartDLC DVPL File Based On LZ4 Compression."
-__version__ = "0.8.0"
+__description__ = "A CLI Tool Coded In Python3 To Convert WoTB ( Dava ) SmartDLC DVPL Files Based On LZ4 Compression."
+__version__ = "0.9.0"
 __author__ = "RifsxD"
 __repo__ = "https://github.com/rifsxd/pydvpl"
 __license__ = "MIT"