lfss 0.12.1__py3-none-any.whl → 0.12.2__py3-none-any.whl

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
 ```

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, 

docs/changelog.md

@@ -1,5 +1,9 @@
 ## 0.12
 
+### 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/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)
@@ -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")
 

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.dist-info → lfss-0.12.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lfss
-Version: 0.12.1
+Version: 0.12.2
 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.dist-info → lfss-0.12.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
-Readme.md,sha256=B-foESzFWoSI5MEd89AWUzKcVRrTwipM28TK8GN0o8c,1920
-docs/Client.md,sha256=hoF_LrMiGJelEwNIO06aidhEVc0AphaeK-iA-6lxvrU,891
+Readme.md,sha256=1HRivj2C8TV_64XvIjjlM_a5qMSuzDygl40pXwcvIao,1927
+docs/Client.md,sha256=qjsRiZat3hmQ-w7U0JrPKsPiuX2OgijL-6NzufgwVtM,860
 docs/Enviroment_variables.md,sha256=CZ5DrrXSLU5RLBEVQ-gLMaOIuFthd7dEiTzO7ODrPRQ,788
 docs/Known_issues.md,sha256=ZqETcWP8lzTOel9b2mxEgCnADFF8IxOrEtiVO1NoMAk,251
 docs/Permission.md,sha256=thUJx7YRoU63Pb-eqo5l5450DrZN3QYZ36GCn8r66no,3152
 docs/Webdav.md,sha256=-Ja-BTWSY1BEMAyZycvEMNnkNTPZ49gSPzmf3Lbib70,1547
-docs/changelog.md,sha256=yusNvAGnSZCBGSYsWKLyYENw6rgqCtN83FBgSeY0Ax8,2536
+docs/changelog.md,sha256=bl1MMXooqR-_VxMBHVfzR23HPdBY_2UBnM-eop6fTFk,2634
 frontend/api.js,sha256=RqvwRWhYZx7_cDlyYgWzgJAr83RxH47WzY-5KL6aRX0,22670
 frontend/index.html,sha256=-k0bJ5FRqdl_H-O441D_H9E-iejgRCaL_z5UeYaS2qc,3384
 frontend/info.css,sha256=Ny0N3GywQ3a9q1_Qph_QFEKB4fEnTe_2DJ1Y5OsLLmQ,595
@@ -23,7 +23,7 @@ lfss/api/__init__.py,sha256=qHlQAnvw2y0FNZKhes6ikzItEEQvyJWFhVMs1GAqZiM,6822
 lfss/api/connector.py,sha256=jMgYhSYQN0yDD9B1e35F7x6ZFswR3zBKQ19TkdP2KK0,17018
 lfss/cli/__init__.py,sha256=OPJLYHvqsyNUoPRzW4ITKQ3hEuotx7u-OsN4Uoz1XvA,1132
 lfss/cli/balance.py,sha256=fUbKKAUyaDn74f7mmxMfBL4Q4voyBLHu6Lg_g8GfMOQ,4121
-lfss/cli/cli.py,sha256=FK8XZZnHxvw8AhnPkQXWc-hwnj4Kxt4N5CQZUrVF5Fw,15019
+lfss/cli/cli.py,sha256=9N8Ar9DfgAvDtIpMcJ2tC6K62WNUpi6mEqU8CbcePjA,15169
 lfss/cli/cli_lib.py,sha256=QtXB8WsThz4R5n8ZpxKF_20L1BPBpvbC1QJBeuq0-NA,2866
 lfss/cli/log.py,sha256=TBlt8mhHMouv8ZBUMHYfGZiV6-0yPdajJQ5mkGHEojI,3016
 lfss/cli/panel.py,sha256=Xq3I_n-ctveym-Gh9LaUpzHiLlvt3a_nuDiwUS-MGrg,1597
@@ -39,7 +39,7 @@ lfss/eng/datatype.py,sha256=27UB7-l9SICy5lAvKjdzpTL_GohZjzstQcr9PtAq7nM,2709
 lfss/eng/error.py,sha256=JGf5NV-f4rL6tNIDSAx5-l9MG8dEj7F2w_MuOjj1d1o,732
 lfss/eng/log.py,sha256=yciFQ7Utz1AItNekS4YtdP6bM7i1krA6qSAU2wVQv24,7698
 lfss/eng/thumb.py,sha256=AFyWEkkpuCKGWOB9bLlaDwPKzQ9JtCSSmHMhX2Gu3CI,3096
-lfss/eng/utils.py,sha256=SlgiC5S0V42n9JczFF04jl5tKC7R6gN-FkuqqNoF7co,6688
+lfss/eng/utils.py,sha256=LB84nX-fEgMlWMPo5ByU48U7RCy8EcxqIHAMWP8d-8w,6773
 lfss/sql/init.sql,sha256=FBmVzkNjYUnWjEELRFzf7xb50GngmzmeDVffT1Uk8u8,1625
 lfss/sql/pragma.sql,sha256=uENx7xXjARmro-A3XAK8OM8v5AxDMdCCRj47f86UuXg,206
 lfss/svc/app.py,sha256=r1KUO3sPaaJWbkJF0bcVTD7arPKLs2jFlq52Ixicomo,220
@@ -48,7 +48,7 @@ lfss/svc/app_dav.py,sha256=DRMgByUAQ3gD6wL9xmikV5kvVmATN7QkxGSttFTYxFU,18245
 lfss/svc/app_native.py,sha256=imqnuAoseTS2CmztUI0yQ0Jjq_jqbjxYG-_FFnYp6u0,11040
 lfss/svc/common_impl.py,sha256=wlTQm8zEGAfyw9FJvK9zqgLQw47MzNq6IT3OgwdUaCw,13736
 lfss/svc/request_log.py,sha256=v8yXEIzPjaksu76Oh5vgdbUEUrw8Kt4etLAXBWSGie8,3207
-lfss-0.12.1.dist-info/METADATA,sha256=AMMYCFIaaEcI51q1QuFyL3DGJ6TjnbnBmdpWYd_bgNI,2725
-lfss-0.12.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-lfss-0.12.1.dist-info/entry_points.txt,sha256=M4ubn9oLYcTc9wxlLKWwljnluStPWpCDlCGuTVU8twg,255
-lfss-0.12.1.dist-info/RECORD,,
+lfss-0.12.2.dist-info/METADATA,sha256=8SehEBbT6HyYdWWswTdfsoAtuMp1QNib7mkmrg8t0To,2818
+lfss-0.12.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+lfss-0.12.2.dist-info/entry_points.txt,sha256=M4ubn9oLYcTc9wxlLKWwljnluStPWpCDlCGuTVU8twg,255
+lfss-0.12.2.dist-info/RECORD,,