lfss 0.7.5__tar.gz → 0.7.6__tar.gz

{lfss-0.7.5 → lfss-0.7.6}/PKG-INFO

@@ -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 → lfss-0.7.6}/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-0.7.5 → lfss-0.7.6}/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 → lfss-0.7.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "lfss"
-version = "0.7.5"
+version = "0.7.6"
 description = "Lightweight file storage service"
 authors = ["li, mengxun <limengxun45@outlook.com>"]
 readme = "Readme.md"