lfss 0.7.5__py3-none-any.whl → 0.7.6__py3-none-any.whl

lfss/cli/cli.py

@@ -1,7 +1,18 @@
 from lfss.client import Connector, upload_directory, upload_file, download_file, download_directory
-from lfss.src.datatype import FileReadPermission
 from pathlib import Path
 import argparse
+from lfss.src.datatype import FileReadPermission
+
+def parse_permission(s: str) -> FileReadPermission:
+    if s.lower() == "public":
+        return FileReadPermission.PUBLIC
+    if s.lower() == "protected":
+        return FileReadPermission.PROTECTED
+    if s.lower() == "private":
+        return FileReadPermission.PRIVATE
+    if s.lower() == "unset":
+        return FileReadPermission.UNSET
+    raise ValueError(f"Invalid permission {s}")
 
 def parse_arguments():
     parser = argparse.ArgumentParser(description="Command line interface, please set LFSS_ENDPOINT and LFSS_TOKEN environment variables.")
@@ -16,7 +27,7 @@ def parse_arguments():
     sp_upload.add_argument("-j", "--jobs", type=int, default=1, help="Number of concurrent uploads")
     sp_upload.add_argument("--interval", type=float, default=0, help="Interval between files, only works with directory upload")
     sp_upload.add_argument("--conflict", choices=["overwrite", "abort", "skip", "skip-ahead"], default="abort", help="Conflict resolution")
-    sp_upload.add_argument("--permission", type=FileReadPermission, default=FileReadPermission.UNSET, help="File permission")
+    sp_upload.add_argument("--permission", type=parse_permission, default=FileReadPermission.UNSET, help="File permission, can be public, protected, private, or unset")
     sp_upload.add_argument("--retries", type=int, default=0, help="Number of retries")
 
     # download

lfss/cli/user.py

@@ -1,5 +1,6 @@
 import argparse, asyncio
 from contextlib import asynccontextmanager
+from .cli import parse_permission, FileReadPermission
 from ..src.database import Database, FileReadPermission, transaction, UserConn
 from ..src.connection_pool import global_entrance
 
@@ -21,9 +22,9 @@ async def _main():
     sp_add = sp.add_parser('add')
     sp_add.add_argument('username', type=str)
     sp_add.add_argument('password', type=str)
-    sp_add.add_argument('--admin', action='store_true')
-    sp_add.add_argument('--permission', type=FileReadPermission, default=FileReadPermission.UNSET)
-    sp_add.add_argument('--max-storage', type=parse_storage_size, default="1G")
+    sp_add.add_argument('--admin', action='store_true', help='Set user as admin')
+    sp_add.add_argument("--permission", type=parse_permission, default=FileReadPermission.UNSET, help="File permission, can be public, protected, private, or unset")
+    sp_add.add_argument('--max-storage', type=parse_storage_size, default="1G", help="Maximum storage size, e.g. 1G, 100M, 10K")
     
     sp_delete = sp.add_parser('delete')
     sp_delete.add_argument('username', type=str)

{lfss-0.7.5.dist-info → lfss-0.7.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lfss
-Version: 0.7.5
+Version: 0.7.6
 Summary: Lightweight file storage service
 Home-page: https://github.com/MenxLi/lfss
 Author: li, mengxun

{lfss-0.7.5.dist-info → lfss-0.7.6.dist-info}/RECORD

@@ -9,10 +9,10 @@ frontend/scripts.js,sha256=hQ8m3L7P-LplLqrPUWD6pBo4C_tCUl2XZKRNtkWBy8I,21155
 frontend/styles.css,sha256=wly8O-zF4EUgV12Tv1bATSfmJsLITv2u3_SiyXVaxv4,4096
 frontend/utils.js,sha256=Ts4nlef8pkrEgpwX-uQwAhWvwxlIzex8ijDLNCa22ps,2372
 lfss/cli/balance.py,sha256=heOgwH6oNnfYsKJfA4VxWKdEXPstdVbbRXWxcDqLIS0,4176
-lfss/cli/cli.py,sha256=Yup3xIVEQPu10uM8dq1bvre1fK5ngweQHxXZsgQq4Hc,4187
+lfss/cli/cli.py,sha256=LH1nx5wI1K2DZ3hvHz7oq5HcXVDoW2V6sr7q9gJ8gqo,4621
 lfss/cli/panel.py,sha256=iGdVmdWYjA_7a78ZzWEB_3ggIOBeUKTzg6F5zLaB25c,1401
 lfss/cli/serve.py,sha256=bO3GT0kuylMGN-7bZWP4e71MlugGZ_lEMkYaYld_Ntg,985
-lfss/cli/user.py,sha256=h-USWF6lB0Ztm9vwQznqsghKJ5INq5mBmaQeX2D5F-w,3490
+lfss/cli/user.py,sha256=-ePmx_jhqfPQDl_9i_C_St9ujlCyyWSqNJUvc26v4_4,3686
 lfss/client/__init__.py,sha256=8uvcKs3PYQamDd_cjfN-fX9QUohEzJqeJlOYkBlzC3M,4556
 lfss/client/api.py,sha256=kSkB4wADTu012-1wl6v90OiZrw6aTQ42GU4jtV4KO0k,5764
 lfss/sql/init.sql,sha256=C-JtQAlaOjESI8uoF1Y_9dKukEVSw5Ll-7yA3gG-XHU,1210
@@ -27,7 +27,7 @@ lfss/src/log.py,sha256=xOnkuH-gB_jSVGqNnDVEW05iki6SCJ2xdEhjz5eEsMo,5136
 lfss/src/server.py,sha256=EA5fK4qc98tF8qoS9F6VaxIE65D5X8Ztkjqy8EUYIv8,16276
 lfss/src/stat.py,sha256=hTMtQyM_Ukmhc33Bb9FGCfBMIX02KrGHQg8nL7sC8sU,2082
 lfss/src/utils.py,sha256=miGsv7udupDtSpVSd66IvUt0_QMi3JXYCp_BjdPJY-M,2134
-lfss-0.7.5.dist-info/METADATA,sha256=cGOrCSM3pjCqYJdrFNrLfO2P08zx1cmwgfmAmTT4MJg,1967
-lfss-0.7.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-lfss-0.7.5.dist-info/entry_points.txt,sha256=d_Ri3GXxUW-S0E6q953A8od0YMmUAnZGlJSKS46OiW8,172
-lfss-0.7.5.dist-info/RECORD,,
+lfss-0.7.6.dist-info/METADATA,sha256=QAv2WFiNKWUy8Dl42v0Of0B7uCkiyyoYwZ2EiVxq-ZM,1967
+lfss-0.7.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+lfss-0.7.6.dist-info/entry_points.txt,sha256=d_Ri3GXxUW-S0E6q953A8od0YMmUAnZGlJSKS46OiW8,172
+lfss-0.7.6.dist-info/RECORD,,