lfss 0.12.1__tar.gz → 0.12.3__tar.gz

{lfss-0.12.1 → lfss-0.12.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lfss
-Version: 0.12.1
+Version: 0.12.3
 Summary: Lite file storage service
 Home-page: https://github.com/MenxLi/lfss
 Author: Li, Mengxun
@@ -10,16 +10,15 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: aiofiles (==24.*)
-Requires-Dist: aiosqlite (==0.*)
-Requires-Dist: fastapi (==0.*)
-Requires-Dist: mimesniff (==1.*)
-Requires-Dist: pillow
-Requires-Dist: python-multipart
+Provides-Extra: all
+Requires-Dist: aiofiles (==24.*) ; extra == "all"
+Requires-Dist: aiosqlite (==0.*) ; extra == "all"
+Requires-Dist: fastapi[standard] (==0.*) ; extra == "all"
+Requires-Dist: mimesniff (==1.*) ; extra == "all"
+Requires-Dist: pillow ; extra == "all"
 Requires-Dist: requests (==2.*)
-Requires-Dist: rich
-Requires-Dist: stream-zip (==0.*)
-Requires-Dist: uvicorn (==0.*)
+Requires-Dist: rich ; extra == "all"
+Requires-Dist: stream-zip (==0.*) ; extra == "all"
 Project-URL: Repository, https://github.com/MenxLi/lfss
 Description-Content-Type: text/markdown
 
@@ -41,7 +40,7 @@ Tested on 2 million files, and it is still fast.
 
 Usage: 
 ```sh
-pip install lfss
+pip install "lfss[all]"
 lfss-user add <username> <password>
 lfss-serve
 ```

{lfss-0.12.1 → lfss-0.12.3}/Readme.md

@@ -16,7 +16,7 @@ Tested on 2 million files, and it is still fast.
 
 Usage: 
 ```sh
-pip install lfss
+pip install "lfss[all]"
 lfss-user add <username> <password>
 lfss-serve
 ```

{lfss-0.12.1 → lfss-0.12.3}/docs/Client.md

@@ -3,8 +3,7 @@
 
 To install python CLI tools without dependencies (to avoid conflicts with your existing packages):
 ```sh
-pip install requests
-pip install lfss --no-deps
+pip install lfss
 ```
 
 Then set the `LFSS_ENDPOINT`, `LFSS_TOKEN` environment variables, 

{lfss-0.12.1 → lfss-0.12.3}/docs/changelog.md

@@ -1,5 +1,14 @@
 ## 0.12
 
+### 0.12.3
+- Show partial list hint
+- Delete command alias `rm`
+- Fix download single file with overwrite option
+
+### 0.12.2
+- Setup optional dependencies
+- Present only the name by default for CLI list command
+
 ### 0.12.1
 - Add `cat` command
 - Use unicode icons for CLI list command

{lfss-0.12.1 → lfss-0.12.3}/lfss/cli/cli.py

@@ -55,14 +55,18 @@ def print_path_list(
                 print("[F]", end=" ")
             case _:
                 print("[?]", end=" ")
-        print(decode_uri_components(r.url), end="")
-        if detailed:
-            if isinstance(r, FileRecord):
-                print(f" | {fmt_storage_size(r.file_size)}, permission={r.permission.name}, created={r.create_time}, accessed={r.access_time}")
+        # if not detailed, only print name
+        if not detailed:
+            if isinstance(r, DirectoryRecord):
+                assert r.url.endswith("/")
+                print(decode_uri_components(r.url).rstrip("/").split("/")[-1], end="/")
             else:
-                print()
+                print(decode_uri_components(r.url).split("/")[-1], end="")
         else:
-            print()
+            print(decode_uri_components(r.url), end="")
+            if isinstance(r, FileRecord):
+                print(f" :: {fmt_storage_size(r.file_size)} {r.permission.name}", end="")
+        print()
     
     for d in line_sep(dirs, end=False):
         print_ln(d)
@@ -108,7 +112,7 @@ def parse_arguments():
     sp_query.add_argument("path", help="Path to query", nargs="+", type=str)
 
     # delete
-    sp_delete = sp.add_parser("delete", help="Delete files or directories", aliases=["del"])
+    sp_delete = sp.add_parser("delete", help="Delete files or directories", aliases=["del", "rm"])
     sp_delete.add_argument("path", help="Path to delete", nargs="+", type=str)
     sp_delete.add_argument("-y", "--yes", action="store_true", help="Confirm deletion without prompt")
 
@@ -117,7 +121,7 @@ def parse_arguments():
     sp_list.add_argument("path", help="Path to list", type=str)
     sp_list.add_argument("--offset", type=int, default=0, help="Offset of the list")
     sp_list.add_argument("--limit", type=int, default=100, help="Limit of the list")
-    sp_list.add_argument("-l", "--long", action="store_true", help="Detailed list, including all metadata")
+    sp_list.add_argument("-l", "--long", action="store_true", help="Detailed list")
     sp_list.add_argument("--order", "--order-by", type=str, help="Order of the list", default="", choices=typing.get_args(FileSortKey))
     sp_list.add_argument("--reverse", "--order-desc", action="store_true", help="Reverse the list order")
 
@@ -126,7 +130,7 @@ def parse_arguments():
     sp_list_d.add_argument("path", help="Path to list", type=str)
     sp_list_d.add_argument("--offset", type=int, default=0, help="Offset of the list")
     sp_list_d.add_argument("--limit", type=int, default=100, help="Limit of the list")
-    sp_list_d.add_argument("-l", "--long", action="store_true", help="Detailed list, including all metadata")
+    sp_list_d.add_argument("-l", "--long", action="store_true", help="Detailed list")
     sp_list_d.add_argument("--order", "--order-by", type=str, help="Order of the list", default="", choices=typing.get_args(DirSortKey))
     sp_list_d.add_argument("--reverse", "--order-desc", action="store_true", help="Reverse the list order")
 
@@ -136,7 +140,7 @@ def parse_arguments():
     sp_list_f.add_argument("--offset", type=int, default=0, help="Offset of the list")
     sp_list_f.add_argument("--limit", type=int, default=100, help="Limit of the list")
     sp_list_f.add_argument("-r", "--recursive", "--flat", action="store_true", help="List files recursively")
-    sp_list_f.add_argument("-l", "--long", action="store_true", help="Detailed list, including all metadata")
+    sp_list_f.add_argument("-l", "--long", action="store_true", help="Detailed list")
     sp_list_f.add_argument("--order", "--order-by", type=str, help="Order of the list", default="", choices=typing.get_args(FileSortKey))
     sp_list_f.add_argument("--reverse", "--order-desc", action="store_true", help="Reverse the list order")
 
@@ -223,12 +227,12 @@ def main():
                 verbose=not args.quiet,
                 n_retries=args.retries, 
                 interval=args.interval,
-                overwrite=args.overwrite
+                overwrite=args.conflict == "overwrite"
             )
             if not success:
                 print("\033[91mFailed to download: \033[0m", msg, file=sys.stderr)
-    
-    elif args.command in ["delete", "del"]:
+
+    elif args.command in ["delete", "del", "rm"]:
         if not args.yes:
             print("You are about to delete the following paths:")
             for path in args.path:
@@ -261,9 +265,10 @@ def main():
                 order_desc=args.reverse,
             )
             print_path_list(res, detailed=args.long)
-            if len(res.dirs) + len(res.files) == args.limit:
-                print(f"\033[33m[Warning] List limit reached, use --offset and --limit to list more items.\033[0m")
-    
+            if args.path != "/" and len(res.dirs) + len(res.files) == args.limit:
+                _len_str = f"{args.offset + 1}-{args.offset + len(res.dirs) + len(res.files)}/{connector.count_dirs(args.path) + connector.count_files(args.path)}"
+                print(f"{_len_str} items listed.")
+
     elif args.command in ["lsf", "list-f"]:
         with catch_request_error(default_error_handler_dict(args.path)):
             res = connector.list_files(
@@ -275,8 +280,12 @@ def main():
                 order_desc=args.reverse,
             )
             print_path_list(res, detailed=args.long)
-            if len(res) == args.limit:
-                print(f"\033[33m[Warning] List limit reached, use --offset and --limit to list more files.\033[0m")
+            if args.path != "/" and len(res) == args.limit:
+                if args.recursive:
+                    _len_str = f"{args.offset + 1}-{args.offset + len(res)}/{connector.count_files(args.path, flat=True)}"
+                else:
+                    _len_str = f"{args.offset + 1}-{args.offset + len(res)}/{connector.count_files(args.path)}"
+                print(f"{_len_str} files listed.")
         
     elif args.command in ["lsd", "list-d"]:
         with catch_request_error(default_error_handler_dict(args.path)):
@@ -289,8 +298,9 @@ def main():
                 order_desc=args.reverse,
             )
             print_path_list(res, detailed=args.long)
-            if len(res) == args.limit:
-                print(f"\033[33m[Warning] List limit reached, use --offset and --limit to list more directories.\033[0m")
+            if args.path != "/" and len(res) == args.limit:
+                _len_str = f"{args.offset + 1}-{args.offset + len(res)}/{connector.count_dirs(args.path)}"
+                print(f"{_len_str} items listed.")
     
     elif args.command in ["cat", "concatenate"]:
         for _p in args.path:

{lfss-0.12.1 → lfss-0.12.3}/lfss/eng/utils.py

@@ -3,7 +3,6 @@ import urllib.parse
 import pathlib
 import functools
 import hashlib
-import aiofiles
 import asyncio
 from asyncio import Lock
 from collections import OrderedDict
@@ -11,6 +10,11 @@ from concurrent.futures import ThreadPoolExecutor
 from typing import TypeVar, Callable, Awaitable
 from functools import wraps, partial
 from uuid import uuid4
+try:
+    # optional dependency for client-side
+    import aiofiles     
+except ImportError:
+    pass
 
 async def copy_file(source: str|pathlib.Path, destination: str|pathlib.Path):
     async with aiofiles.open(source, mode='rb') as src:

{lfss-0.12.1 → lfss-0.12.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "lfss"
-version = "0.12.1"
+version = "0.12.3"
 description = "Lite file storage service"
 authors = ["Li, Mengxun <mengxunli@whu.edu.cn>"]
 readme = "Readme.md"
@@ -11,15 +11,16 @@ include = ["Readme.md", "docs/*", "frontend/*", "lfss/sql/*"]
 [tool.poetry.dependencies]
 python = ">=3.10"   # PEP-622
 requests = "2.*"
-aiosqlite = "0.*"
-aiofiles = "24.*"
-mimesniff = "1.*"
-fastapi = "0.*"
-uvicorn = "0.*"
-stream-zip = "0.*"
-python-multipart = "*"
-pillow = "*"
-rich = "*"
+aiosqlite = {"version" = "0.*", "optional" = true}
+aiofiles = {"version" = "24.*", "optional" = true}
+mimesniff = {"version" = "1.*", "optional" = true}
+stream-zip = {"version" = "0.*", "optional" = true}
+pillow = {"version" = "*", "optional" = true}
+rich = {"version" = "*", "optional" = true}
+fastapi = {"version" = "0.*", "optional" = true, "extras" = ["standard"]}
+
+[tool.poetry.extras]
+all = ["aiosqlite", "aiofiles", "mimesniff", "fastapi", "stream-zip", "pillow", "rich"]
 
 [tool.poetry.dev-dependencies]
 pytest = "*"