Merge pull request #6 from unbekanntes-pferd/bugs/0.3.4

fixed imports and bulk upload display bug

.gitignore

@@ -9,4 +9,7 @@ test*
 __pycache__
 
 # builds
-/dist
+/dist
+
+#virtual environment
+.venv

dccmd/__init__.py

@@ -4,16 +4,13 @@
 
 """
 
-__version__ = "0.3.3"
+__version__ = "0.3.4"
 
 # std imports
 import sys
-import platform
 import asyncio
-from datetime import datetime
 
 # external imports
-from dracoon import DRACOON, OAuth2ConnectionType
 from dracoon.nodes.models import NodeType
 from dracoon.errors import (
     DRACOONHttpError,
@@ -22,47 +19,37 @@
     InvalidPathError,
     InvalidFileError,
     FileConflictError,
-    HTTPNotFoundError,
     HTTPUnauthorizedError
 )
 import typer
 
 
 # internal imports
 from dccmd.main.util import (
-    parse_base_url,
     parse_file_name,
     parse_path,
     parse_new_path,
     format_error_message,
     format_success_message,
     format_and_print_node,
-    graceful_exit,
     to_readable_size,
 )
 from dccmd.main.auth import auth_app
-from dccmd.main.auth.client import client_app, register_client, remove_client
-from dccmd.main.auth.util import init_dracoon, is_dracoon_url
+from dccmd.main.auth.client import client_app
+from dccmd.main.auth.util import init_dracoon
 from dccmd.main.auth.credentials import (
-    get_credentials,
     get_crypto_credentials,
-    store_crypto_credentials,
-    store_client_credentials,
-    get_client_credentials,
-    delete_client_credentials,
-    delete_credentials,
-    delete_crypto_credentials,
+    delete_credentials
 )
 
 from dccmd.main.crypto import crypto_app
 from dccmd.main.users import users_app
 from dccmd.main.crypto.keys import distribute_missing_keys
-from dccmd.main.crypto.util import get_keypair, init_keypair
+from dccmd.main.crypto.util import init_keypair
 from dccmd.main.upload import create_folder_struct, bulk_upload, is_directory, is_file
 from dccmd.main.download import create_download_list, bulk_download
 from dccmd.main.models import DCTransfer, DCTransferList
-from dccmd.main.models.errors import (DCPathParseError, DCClientParseError,
-                                      ConnectError)
+from dccmd.main.models.errors import (DCPathParseError, ConnectError)
 
 # initialize CLI app
 app = typer.Typer()
@@ -176,7 +163,10 @@ async def _upload():
                 resolution_strategy=resolution_strategy,
                 velocity=velocity,
             )
-            folder_name = parse_file_name(full_path=source_dir_path)
+            try:
+                folder_name = parse_file_name(full_path=source_dir_path)
+            except DCPathParseError:
+                folder_name = source_dir_path
             typer.echo(f'{format_success_message(f"Folder {folder_name} uploaded.")}')
         # upload a single file
         elif is_file_path:

dccmd/main/download/__init__.py

@@ -7,9 +7,6 @@
 import sys
 import asyncio
 from pathlib import Path
-from enum import Enum
-from dataclasses import dataclass
-
 
 import typer
 from tqdm import tqdm

dccmd/main/upload/__init__.py

@@ -20,9 +20,7 @@
     DRACOONHttpError,
 )
 from ..models import DCTransfer, DCTransferList
-from ..util import format_error_message, to_readable_size
-from ..auth.credentials import get_crypto_credentials, store_crypto_credentials
-
+from ..util import format_error_message
 
 class DirectoryItem:
     """object representing a directory with all required path elements"""
@@ -192,8 +190,8 @@ async def process_batch(batch):
         for reqs in dracoon.batch_process(coro_list=folder_reqs, batch_size=10):
             try:
                 await asyncio.gather(*reqs)
-            except HTTPConflictError:
-                continue
+            except HTTPConflictError:  
+                pass
             except HTTPForbiddenError:
                 await dracoon.logout()
                 typer.echo(
@@ -271,7 +269,7 @@ async def bulk_upload(
             await asyncio.gather(*batch)
         except HTTPConflictError:
             # ignore file already exists error
-            pass
+            continue
         except HTTPForbiddenError:
             await dracoon.logout()
             typer.echo(

dccmd/main/users/__init__.py

@@ -5,15 +5,10 @@
 """
 
 # std import
-import sys
 import asyncio
-import logging
 
 # external imports
 import typer
-import httpx
-
-from dracoon import DRACOON
 
 from dccmd.main.auth.util import init_dracoon
 

dccmd/main/util/__init__.py

@@ -7,10 +7,9 @@
 """
 
 
-from pathlib import Path
-import asyncio
-import math
 
+
+import math
 import typer
 
 from dracoon import DRACOON

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dccmd"
-version = "0.3.3"
+version = "0.3.4"
 description = "DRACOON Commander – CLI client for DRACOON Cloud (dracoon.com)"
 authors = ["Octavio Simone <[email protected]>"]
 license = "Apache-2.0"