Merge pull request #1 from dobraczka/add-ls-command

Add ls command

CHANGELOG.md

@@ -5,8 +5,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.0] - 2023-09-13
+
+### Fixed
+
+- Reading dotenv when using cli
+
+### Added
+
+- Added `ls` command for cli
+
+
 ## [0.1.0] - 2023-08-07
 
 First release
 
 [0.1.0]: https://github.com/dobraczka/nephelai/releases/tag/v0.1.0
+[0.2.0]: https://github.com/dobraczka/nephelai/releases/tag/v0.2.0

README.md

@@ -67,6 +67,13 @@ This download the folder as:
         └── testfile.txt
 ```
 
+Using 
+
+```bash
+nephelai ls tests
+```
+you can show the files in the `tests` directory.
+
 You can get help for each command via the `--help` flag.
 
 Via Python:

docs/index.md

@@ -67,6 +67,13 @@ This download the folder as:
         └── testfile.txt
 ```
 
+Using 
+
+```bash
+nephelai ls tests
+```
+you can show the files in the `tests` directory.
+
 You can get help for each command via the `--help` flag.
 
 Via Python:

src/nephelai/api.py

@@ -6,7 +6,7 @@
 
 import bitmath
 import owncloud
-from dotenv import load_dotenv
+from dotenv import find_dotenv, load_dotenv
 from tqdm.auto import tqdm, trange
 
 _DEFAULT_CHUNK_SIZE = 10 * 1024 * 1024
@@ -29,6 +29,17 @@
 ]
 
 
+def get_oc():
+    if not find_dotenv():
+        load_dotenv(".env")
+    else:
+        load_dotenv()
+    return owncloud.Client.from_public_link(
+        os.environ[NEXTCLOUD_FOLDER_URI_KEY],
+        folder_password=os.environ[NEXTCLOUD_FOLDER_PW_KEY],
+    )
+
+
 def _remove_commonpath(full_path: str, base: str):
     return os.path.relpath(full_path, os.path.commonpath([base, full_path]))
 
@@ -167,12 +178,7 @@ def upload(
             chunk_size = int(chunk_size)
         except ValueError:
             chunk_size = int(bitmath.parse_string(chunk_size).bytes)
-    load_dotenv()
-    oc = owncloud.Client.from_public_link(
-        os.environ[NEXTCLOUD_FOLDER_URI_KEY],
-        folder_password=os.environ[NEXTCLOUD_FOLDER_PW_KEY],
-        debug=debug,
-    )
+    oc = get_oc()
     if file_to_upload.is_dir():
         create_nc_folders(file_to_upload, oc)
         for subfile in file_to_upload.iterdir():
@@ -323,11 +329,7 @@ def download(remote_path: str, local_path: Optional[str] = None) -> Optional[boo
     Returns:
         True if successful, else None
     """
-    load_dotenv()
-    oc = owncloud.Client.from_public_link(
-        os.environ[NEXTCLOUD_FOLDER_URI_KEY],
-        folder_password=os.environ[NEXTCLOUD_FOLDER_PW_KEY],
-    )
+    oc = get_oc()
     if local_path is None:
         local_path = pathlib.Path(remote_path).name
     if not remote_path.startswith("/"):

src/nephelai/main.py

@@ -5,6 +5,7 @@
 from typing_extensions import Annotated
 
 from .api import download as nephelai_download
+from .api import get_oc
 from .api import upload as nephelai_upload
 
 app = typer.Typer()
@@ -59,5 +60,12 @@ def download(remote_path: str, local_path: Optional[str] = None):
     nephelai_download(remote_path=remote_path, local_path=local_path)
 
 
+@app.command()
+def ls(remote_path: str):
+    oc = get_oc()
+    for file in oc.list(remote_path):
+        typer.echo(file.path)
+
+
 if __name__ == "__main__":
     app()