tempspace-cli 1.1.1__tar.gz → 1.2.0__tar.gz

{tempspace_cli-1.1.1 → tempspace_cli-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tempspace-cli
-Version: 1.1.1
+Version: 1.2.0
 Summary: A command-line tool for uploading files to Tempspace.
 Author-email: Tempspace <mcbplay1@gmail.com>
 License: MIT License
@@ -9,7 +9,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 Requires-Dist: requests==2.31.0
-Requires-Dist: tqdm==4.66.1
 Requires-Dist: requests-toolbelt==1.0.0
 Requires-Dist: rich==13.7.1
 Requires-Dist: qrcode==8.2

{tempspace_cli-1.1.1 → tempspace_cli-1.2.0}/cli/tempspace.py

@@ -4,7 +4,6 @@ import os
 import sys
 import hashlib
 import multiprocessing
-from tqdm import tqdm
 from requests_toolbelt.multipart.encoder import MultipartEncoder, MultipartEncoderMonitor
 import math
 from rich.console import Console
@@ -13,6 +12,9 @@ from rich.table import Table
 from rich import box
 import qrcode
 from rich.prompt import Prompt, Confirm
+from rich.progress import Progress, BarColumn, TextColumn, TransferSpeedColumn, TimeRemainingColumn
+from rich.console import Group
+from rich.live import Live
 
 # Default configuration
 DEFAULT_SERVER_URL = "https://tempspace.fly.dev/"
@@ -41,18 +43,6 @@ def parse_time(time_str: str) -> int:
         except ValueError:
             return None
 
-def calculate_file_hash(filepath: str) -> str:
-    """Calculate the SHA256 hash of a file in chunks."""
-    sha256_hash = hashlib.sha256()
-    try:
-        with open(filepath, "rb") as f:
-            for byte_block in iter(lambda: f.read(CHUNK_SIZE), b""):
-                sha256_hash.update(byte_block)
-        return sha256_hash.hexdigest()
-    except IOError as e:
-        print(f"Error reading file for hashing: {e}", file=sys.stderr)
-        sys.exit(1)
-
 def format_size(size_bytes: int) -> str:
     """Converts a size in bytes to a human-readable format."""
     if size_bytes == 0:
@@ -117,47 +107,77 @@ def main():
     console.print(table)
 
 
-    # --- Hashing ---
-    console.print("[cyan]Calculating file hash...[/]")
-    client_hash = calculate_file_hash(args.filepath)
-    console.print(f"  [cyan]- Hash:[/] {client_hash}")
-
     # --- Prepare Upload ---
-    upload_url = f"{args.url.rstrip('/')}/upload"
+    upload_url = f"{args.url.rstrip('/')}"
     filename = os.path.basename(args.filepath)
     file_size = os.path.getsize(args.filepath)
 
-    fields = {
-        'hours': str(hours),
-        'one_time': str(args.one_time).lower(),
-        'client_hash': client_hash,
-        'file': (filename, open(args.filepath, 'rb'), 'application/octet-stream')
-    }
-    if args.password:
-        fields['password'] = args.password
-
-    encoder = MultipartEncoder(fields=fields)
+    # --- Chunked Upload ---
     response = None
-
     try:
-        bar_format = "{desc}: {percentage:3.0f}%|{bar}| {n_fmt}/{total_fmt} [Speed: {rate_fmt}, ETA: {remaining}]"
-        with tqdm(total=encoder.len, unit='B', unit_scale=True, desc=f"Uploading {filename}", bar_format=bar_format) as pbar:
-            monitor = MultipartEncoderMonitor(encoder, lambda m: pbar.update(m.bytes_read - pbar.n))
-            response = requests.post(upload_url, data=monitor, headers={'Content-Type': monitor.content_type})
+        # 1. Initiate Upload
+        initiate_response = requests.post(f"{upload_url}/upload/initiate")
+        initiate_response.raise_for_status()
+        upload_id = initiate_response.json()['upload_id']
+
+        # 2. Upload Chunks
+        progress = Progress(
+            TextColumn("[bold blue]{task.description}", justify="right"),
+            BarColumn(bar_width=None),
+            "[progress.percentage]{task.percentage:>3.1f}%", "•",
+            TransferSpeedColumn(), "•",
+            TimeRemainingColumn(),
+        )
+
+        with Live(Panel(progress, title="[cyan]Uploading[/cyan]", border_style="cyan", title_align="left")) as live:
+            task_id = progress.add_task(filename, total=file_size)
+            with open(args.filepath, 'rb') as f:
+                chunk_number = 0
+                while chunk := f.read(CHUNK_SIZE):
+                    chunk_number += 1
+                    chunk_data = {
+                        'upload_id': upload_id,
+                        'chunk_number': str(chunk_number)
+                    }
+                    files = {'file': (f'chunk_{chunk_number}', chunk, 'application/octet-stream')}
+
+                    chunk_response = requests.post(
+                        f"{upload_url}/upload/chunk",
+                        data=chunk_data,
+                        files=files
+                    )
+                    chunk_response.raise_for_status()
+                    progress.update(task_id, advance=len(chunk))
+
+        # 3. Finalize Upload
+        console.print(Panel("[bold green]Finalizing upload...[/bold green]", border_style="green"))
+        finalize_data = {
+            'upload_id': upload_id,
+            'filename': filename,
+            'hours': str(hours),
+            'one_time': str(args.one_time).lower(),
+        }
+        if args.password:
+            finalize_data['password'] = args.password
+
+        response = requests.post(f"{upload_url}/upload/finalize", data=finalize_data)
+        response.raise_for_status()
 
     except FileNotFoundError:
         console.print(Panel(f"[bold red]Error:[/] The file '{args.filepath}' was not found.", title="[bold red]Error[/bold red]", border_style="red"))
         sys.exit(1)
     except requests.exceptions.RequestException as e:
-        console.print(Panel(f"[bold red]An error occurred while connecting to the server:[/]\n{e}", title="[bold red]Error[/bold red]", border_style="red"))
+        error_message = str(e)
+        if e.response:
+            try:
+                error_message = e.response.json().get('detail', e.response.text)
+            except:
+                error_message = e.response.text
+        console.print(Panel(f"[bold red]An error occurred:[/] {error_message}", title="[bold red]Error[/bold red]", border_style="red"))
         sys.exit(1)
     except Exception as e:
         console.print(Panel(f"[bold red]An unexpected error occurred:[/] {e}", title="[bold red]Error[/bold red]", border_style="red"))
         sys.exit(1)
-    finally:
-        # Ensure the file handle is closed
-        if 'file' in fields and not fields['file'][1].closed:
-            fields['file'][1].close()
 
     # --- Handle Response ---
     if response is not None:

{tempspace_cli-1.1.1 → tempspace_cli-1.2.0}/pyproject.toml

@@ -7,7 +7,7 @@ packages = ["cli"]
 
 [project]
 name = "tempspace-cli"
-version = "1.1.1"
+version = "1.2.0"
 authors = [
     { name="Tempspace", email="mcbplay1@gmail.com" },
 ]
@@ -21,7 +21,6 @@ classifiers = [
 ]
 dependencies = [
     "requests==2.31.0",
-    "tqdm==4.66.1",
     "requests-toolbelt==1.0.0",
     "rich==13.7.1",
     "qrcode==8.2",

{tempspace_cli-1.1.1 → tempspace_cli-1.2.0}/tempspace_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tempspace-cli
-Version: 1.1.1
+Version: 1.2.0
 Summary: A command-line tool for uploading files to Tempspace.
 Author-email: Tempspace <mcbplay1@gmail.com>
 License: MIT License
@@ -9,7 +9,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 Requires-Dist: requests==2.31.0
-Requires-Dist: tqdm==4.66.1
 Requires-Dist: requests-toolbelt==1.0.0
 Requires-Dist: rich==13.7.1
 Requires-Dist: qrcode==8.2

{tempspace_cli-1.1.1 → tempspace_cli-1.2.0}/tempspace_cli.egg-info/requires.txt

@@ -1,5 +1,4 @@
 requests==2.31.0
-tqdm==4.66.1
 requests-toolbelt==1.0.0
 rich==13.7.1
 qrcode==8.2