lfss 0.12.3__py3-none-any.whl → 0.13.0__py3-none-any.whl

lfss/svc/app_native.py

@@ -2,7 +2,7 @@ from typing import Optional, Literal, Annotated
 from collections import OrderedDict
 
 from fastapi import Depends, Request, Response, UploadFile, Query
-from fastapi.responses import StreamingResponse, JSONResponse
+from fastapi.responses import StreamingResponse, JSONResponse, RedirectResponse
 from fastapi.exceptions import HTTPException 
 
 from ..eng.utils import ensure_uri_components
@@ -16,7 +16,7 @@ from ..eng.datatype import (
 from ..eng.error import InvalidPathError
 
 from .app_base import *
-from .common_impl import get_impl, put_file_impl, post_file_impl, delete_impl, copy_impl
+from .common_impl import get_impl, put_file_impl, post_file_impl, delete_impl, copy_impl, move_impl
 
 @router_fs.get("/{path:path}")
 @handle_exception
@@ -139,6 +139,7 @@ async def get_file_meta(path: str, user: UserRecord = Depends(registered_user)):
             record = await fconn.get_dir_record(path)
     return record
 
+# TODO: will remove in next major version, use /move and /set-perm instead
 @router_api.post("/meta")
 @handle_exception
 async def update_file_meta(
@@ -147,6 +148,7 @@ async def update_file_meta(
     new_path: Optional[str] = None,
     user: UserRecord = Depends(registered_user)
     ):
+    logger.warning("POST /meta is deprecated and will be removed in next major version")
     path = ensure_uri_components(path)
     if path.startswith("/"):
         path = path[1:]
@@ -162,18 +164,13 @@ async def update_file_meta(
             )
     
         if new_path is not None:
-            new_path = ensure_uri_components(new_path)
-            logger.info(f"Update path of {path} to {new_path}")
-            await db.move_file(path, new_path, user)
+            return await move_impl(user, path, new_path)
     
     # directory
     else:
         assert perm is None, "Permission is not supported for directory"
         if new_path is not None:
-            new_path = ensure_uri_components(new_path)
-            logger.info(f"Update path of {path} to {new_path}")
-            # will raise duplicate path error if same name path exists in the new path
-            await db.move_dir(path, new_path, user)
+            return await move_impl(user, path, new_path)
 
     return Response(status_code=200, content="OK")
 
@@ -185,15 +182,27 @@ async def copy_file(
     ):
     return await copy_impl(src_path = src, dst_path = dst, op_user = user)
 
-@router_api.get("/list-peers")
+@router_api.post("/move")
 @handle_exception
-async def list_peers(user: UserRecord = Depends(registered_user), level: AccessLevel = AccessLevel.READ, incoming: bool = False):
-    async with unique_cursor() as conn:
-        uconn = UserConn(conn)
-        peer_users = await uconn.list_peer_users(user.id, level, incoming=incoming)
-    for u in peer_users:
-        u.credential = "__HIDDEN__"
-    return peer_users
+async def move_file(
+    src: str, dst: str, 
+    user: UserRecord = Depends(registered_user)
+    ):
+    return await move_impl(src_path = src, dst_path = dst, op_user = user)
+
+@router_api.post("/set-perm")
+@handle_exception
+async def set_permission(
+    path: str, perm: int, user: UserRecord = Depends(registered_user)
+):
+    if path.endswith("/"):
+        raise HTTPException(status_code=400, detail="Path must not end with /")
+    await db.update_file_record(
+        url = ensure_uri_components(path), 
+        permission = FileReadPermission(perm), 
+        op_user = user,
+    )
+    return Response(status_code=200, content="OK")
 
 async def validate_path_read_permission(path: str, user: UserRecord):
     if not path.endswith("/"):
@@ -289,12 +298,17 @@ async def get_multiple_files(
         status_code = 206 if partial_content else 200
     )
     
-    
+
+# --------- Backward compatibility API ---------
 @router_api.get("/whoami")
 @handle_exception
-async def whoami(user: UserRecord = Depends(registered_user)):
-    user.credential = "__HIDDEN__"
-    return user
+async def whoami(r: Request):
+    return RedirectResponse(url=f"/_api/user/whoami?{r.url.query}")
+
+@router_api.get("/list-peers")
+@handle_exception
+async def list_peers(r: Request):
+    return RedirectResponse(url=f"/_api/user/list-peers?{r.url.query}")
 
 __all__ = [
     "app", "router_api", "router_fs"

lfss/svc/app_native_user.py

@@ -0,0 +1,28 @@
+from fastapi import Depends
+
+from .app_base import *
+from ..eng.datatype import UserRecord, AccessLevel
+from ..eng.database import unique_cursor, UserConn, FileConn
+
+@router_user.get("/whoami")
+@handle_exception
+async def whoami(user: UserRecord = Depends(registered_user)):
+    return user.desensitize()
+
+@router_user.get("/storage")
+@handle_exception
+async def user_storage(user: UserRecord = Depends(registered_user)):
+    async with unique_cursor() as conn:
+        fconn = FileConn(conn)
+        return {
+            "quota": user.max_storage,
+            "used": await fconn.user_size(user.id)
+        }
+
+@router_user.get("/list-peers")
+@handle_exception
+async def list_peers(user: UserRecord = Depends(registered_user), level: AccessLevel = AccessLevel.READ, incoming: bool = False):
+    async with unique_cursor() as conn:
+        uconn = UserConn(conn)
+        peer_users = await uconn.list_peer_users(user.id, level, incoming=incoming)
+    return [u.desensitize() for u in peer_users]

lfss/svc/common_impl.py

@@ -150,7 +150,10 @@ async def _get_dir_impl(
     thumb: bool = False,
     is_head = False,
     ):
-    """ handle directory query, return file under the path as json """
+    """
+    handle directory query, return file under the path as json
+    TODO: will change the behavior at next (major) version update
+    """
     assert path.endswith("/")
     async with unique_cursor() as cur:
         fconn = FileConn(cur)
@@ -180,7 +183,7 @@ async def _get_dir_impl(
                 else:
                     raise HTTPException(status_code=404, detail="User not found")
             else:
-                if await FileConn(cur).count_dir_files(path, flat=True) > 0:
+                if await fconn.is_dir_exist(path):
                     return Response(status_code=200)
                 else:
                     raise HTTPException(status_code=404, detail="Path not found")
@@ -320,15 +323,33 @@ async def copy_impl(
     if copy_type == "file":
         async with unique_cursor() as cur:
             fconn = FileConn(cur)
-            dst_record = await fconn.get_file_record(dst_path)
-        if dst_record:
-            raise HTTPException(status_code=409, detail="Destination exists")
+            if await fconn.get_file_record(dst_path, throw=False) is not None:
+                raise HTTPException(status_code=409, detail="Destination exists")
         await db.copy_file(src_path, dst_path, op_user)
     else:
         async with unique_cursor() as cur:
             fconn = FileConn(cur)
-            dst_fcount = await fconn.count_dir_files(dst_path, flat=True)
-        if dst_fcount > 0:
-            raise HTTPException(status_code=409, detail="Destination exists")
+            if await fconn.is_dir_exist(dst_path):
+                raise HTTPException(status_code=409, detail="Destination exists")
         await db.copy_dir(src_path, dst_path, op_user)
-    return Response(status_code=201, content="OK")
+    return Response(status_code=201, content="OK")
+
+async def move_impl(
+    op_user: UserRecord, src_path: str, dst_path: str,
+):
+    src_path = ensure_uri_components(src_path)
+    dst_path = ensure_uri_components(dst_path)
+
+    is_file = not src_path.endswith("/")
+    if (src_path[-1] == "/") != (dst_path[-1] == "/"):
+        raise HTTPException(status_code=400, detail="Source and destination must be same type")
+
+    if src_path == dst_path:
+        raise HTTPException(status_code=400, detail="Source and destination are the same")
+    
+    logger.info(f"Move {src_path} to {dst_path}, user: {op_user.username}")
+    if is_file:
+        await db.move_file(src_path, dst_path, op_user)
+    else:
+        await db.move_dir(src_path, dst_path, op_user)
+    return Response(status_code=200, content="OK")

{lfss-0.12.3.dist-info → lfss-0.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lfss
-Version: 0.12.3
+Version: 0.13.0
 Summary: Lite file storage service
 Home-page: https://github.com/MenxLi/lfss
 Author: Li, Mengxun

{lfss-0.12.3.dist-info → lfss-0.13.0.dist-info}/RECORD

@@ -4,27 +4,32 @@ docs/Enviroment_variables.md,sha256=CZ5DrrXSLU5RLBEVQ-gLMaOIuFthd7dEiTzO7ODrPRQ,
 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=WbbVBKfhGz1ehu7vVwGTVyF4g4Ko5glLXPr4bQwp-n8,2748
-frontend/api.js,sha256=RqvwRWhYZx7_cDlyYgWzgJAr83RxH47WzY-5KL6aRX0,22670
+docs/changelog.md,sha256=7D1nsEF4taIsXvPJ5i4uHmp2QXB7w3OCKCfcnuzpo4E,3394
+frontend/api.js,sha256=tcNneh2wswtA7xM4GrrD4dwtU5VKQ-86qwR5dZlHasw,25749
+frontend/base.css,sha256=iZwhILCy8suGM6Z5e4b4SzBK_WTItclmgwXJxC41TyY,564
+frontend/edit.css,sha256=QIIEezsLd3gMjA9q25kg2WQFsY51Zkqs72K-8cdPvUc,1932
+frontend/edit.html,sha256=ISOYQCHLojEQGTpZ2HIf3i6HNUFah59K3m5z9O1wqPs,810
+frontend/edit.js,sha256=KBS29KjoC0KDwwdkNr7rlfGXjAjkh35xMcweufZemu8,3777
 frontend/index.html,sha256=-k0bJ5FRqdl_H-O441D_H9E-iejgRCaL_z5UeYaS2qc,3384
 frontend/info.css,sha256=Ny0N3GywQ3a9q1_Qph_QFEKB4fEnTe_2DJ1Y5OsLLmQ,595
 frontend/info.js,sha256=xGUJPCSrtDhuSu0ELLQZ77PmVWldg-prU1mwQGbdEoA,5797
-frontend/login.css,sha256=VMM0QfbDFYerxKWKSGhMI1yg5IRBXg0TTdLJEEhQZNk,355
+frontend/login.css,sha256=XWVEH-J1CUDO7zdr9tm_47iNZBis9G9x7cFO92gJ7FE,383
 frontend/login.js,sha256=xJkulk8dlvV4BhevADLeUrnZwShiFTWv3Wg2iJFUZlY,2423
 frontend/popup.css,sha256=TJZYFW1ZcdD1IVTlNPYNtMWKPbN6XDbQ4hKBOFK8uLg,1284
 frontend/popup.js,sha256=cyUjtO0wbtqbEodHfwyUsak9iWbcDXeWMGDhpCPbcoE,5453
-frontend/scripts.js,sha256=awnhw4CHxE4cPvg3g9pramtyxMEo7i_ygGSCer1BsFI,24633
+frontend/scripts.js,sha256=tyBagLk3R3GJJSg56wNWAKgYdCh4hVhEbL3lxVSvQ3s,26493
 frontend/state.js,sha256=vbNL5DProRKmSEY7xu9mZH6IY0PBenF8WGxPtGgDnLI,1680
-frontend/styles.css,sha256=xcNLqI3KBsY5TLnku8UIP0Jfr7QLajr1_KNlZj9eheM,4935
+frontend/styles.css,sha256=vE_iwAzU7tiJHUeMY2pcq3BcdATDncCvF0pgBnKHGrA,4565
 frontend/thumb.css,sha256=rNsx766amYS2DajSQNabhpQ92gdTpNoQKmV69OKvtpI,295
 frontend/thumb.js,sha256=46ViD2TlTTWy0fx6wjoAs_5CQ4ajYB90vVzM7UO2IHw,6182
 frontend/utils.js,sha256=XP5hM_mROYaxK5dqn9qZVwv7GdQuiDzByilFskbrnxA,6068
-lfss/api/__init__.py,sha256=qHlQAnvw2y0FNZKhes6ikzItEEQvyJWFhVMs1GAqZiM,6822
-lfss/api/connector.py,sha256=jMgYhSYQN0yDD9B1e35F7x6ZFswR3zBKQ19TkdP2KK0,17018
-lfss/cli/__init__.py,sha256=OPJLYHvqsyNUoPRzW4ITKQ3hEuotx7u-OsN4Uoz1XvA,1132
+lfss/api/__init__.py,sha256=SoNB7vjs2I5SXrYRbfcUZgIoZUhzDsEIDSZhPMf7LiE,232
+lfss/api/bundle.py,sha256=fN0fPTURO8srRhwrZYhRUlZ9rStrevGitDz-WDbyUCk,6758
+lfss/api/connector.py,sha256=p6_kmGzGYn0Jpk2K8aHzYTcz7P25AJkuJHkJM0uGAzM,16985
+lfss/cli/__init__.py,sha256=44qzN7yOoEQO53sPPEHlGZZgT3HXnt1LbTLFS9F0DOg,1332
 lfss/cli/balance.py,sha256=fUbKKAUyaDn74f7mmxMfBL4Q4voyBLHu6Lg_g8GfMOQ,4121
-lfss/cli/cli.py,sha256=31s0sUmCdqYF9pbYsADb6TaThOs5qOga8P5Q1iUlA5I,15612
-lfss/cli/cli_lib.py,sha256=QtXB8WsThz4R5n8ZpxKF_20L1BPBpvbC1QJBeuq0-NA,2866
+lfss/cli/cli.py,sha256=m3h3fPUlJGjDtok8xyHID5CWZ2sYbwGmDpnICyrFSB4,18327
+lfss/cli/cli_lib.py,sha256=B3NuICVnTxpZ8lHc0x1KEekw9ygGNwd00U3zx3uAbBM,2783
 lfss/cli/log.py,sha256=TBlt8mhHMouv8ZBUMHYfGZiV6-0yPdajJQ5mkGHEojI,3016
 lfss/cli/panel.py,sha256=Xq3I_n-ctveym-Gh9LaUpzHiLlvt3a_nuDiwUS-MGrg,1597
 lfss/cli/serve.py,sha256=vTo6_BiD7Dn3VLvHsC5RKRBC3lMu45JVr_0SqpgHdj0,1086
@@ -34,21 +39,22 @@ lfss/eng/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lfss/eng/bounded_pool.py,sha256=BI1dU-MBf82TMwJBYbjhEty7w1jIUKc5Bn9SnZ_-hoY,1288
 lfss/eng/config.py,sha256=0dncHYn3tYw4pKBwXuP_huz0u7ud23fJ6SUmUPfLmeM,967
 lfss/eng/connection_pool.py,sha256=1aq7nSgd7hB9YNV4PjD1RDRyl_moDw3ubBtSLyfgGBs,6320
-lfss/eng/database.py,sha256=9ezwrZEPC-Jnh5dxEKahb9AsFWbSQlNcYVZqVbZrYwI,57502
-lfss/eng/datatype.py,sha256=27UB7-l9SICy5lAvKjdzpTL_GohZjzstQcr9PtAq7nM,2709
-lfss/eng/error.py,sha256=JGf5NV-f4rL6tNIDSAx5-l9MG8dEj7F2w_MuOjj1d1o,732
+lfss/eng/database.py,sha256=4qbPn-_R_-KqpGF7UrEiXj0nk_PutJu2jwv-8Wvgvs8,61220
+lfss/eng/datatype.py,sha256=hU4p5lsfhE1mPF0oHtAq1sz0rPoVOYiSt_QAoUYmGpU,3368
+lfss/eng/error.py,sha256=NpGP_9C7EWATARDb7nCoznOznIHvvRbWbvHdG6ExoMI,1174
 lfss/eng/log.py,sha256=yciFQ7Utz1AItNekS4YtdP6bM7i1krA6qSAU2wVQv24,7698
 lfss/eng/thumb.py,sha256=AFyWEkkpuCKGWOB9bLlaDwPKzQ9JtCSSmHMhX2Gu3CI,3096
 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
-lfss/svc/app_base.py,sha256=s5ieQVI4BT0CBYavRx0dyBqwts7PYnjyCovHNYPHul8,7014
+lfss/svc/app.py,sha256=GBsqrQOkl37HGb2ZLGE_fTEuyFZwcc95RVr2DP39gsI,283
+lfss/svc/app_base.py,sha256=DiAJDpDGq2Z7UwjD0irBVZBk6TxZCpWsXBGpbRCZ3gY,7091
 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/app_native.py,sha256=QSjDv2CBGKL4NneiXkXBGH8B3_MQqkGZEe3g0-ntvAo,11366
+lfss/svc/app_native_user.py,sha256=iI70MXzh5_DJ_ab64vrJpexHcB0zwuDFOuRa3KozVMo,995
+lfss/svc/common_impl.py,sha256=h1lmjFf4JUZMRwPhwfLCbsuplvAsZz59sUaYjE_QZBQ,14492
 lfss/svc/request_log.py,sha256=v8yXEIzPjaksu76Oh5vgdbUEUrw8Kt4etLAXBWSGie8,3207
-lfss-0.12.3.dist-info/METADATA,sha256=ExulCVxgaGu45rI_ksXQhAtuvVnXfjbLnWCTTL9gLuM,2818
-lfss-0.12.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-lfss-0.12.3.dist-info/entry_points.txt,sha256=M4ubn9oLYcTc9wxlLKWwljnluStPWpCDlCGuTVU8twg,255
-lfss-0.12.3.dist-info/RECORD,,
+lfss-0.13.0.dist-info/METADATA,sha256=a41tjDaHn9pEcnW-2x_YMrNbP9cLI7jv8MuQtZkJx7U,2818
+lfss-0.13.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+lfss-0.13.0.dist-info/entry_points.txt,sha256=M4ubn9oLYcTc9wxlLKWwljnluStPWpCDlCGuTVU8twg,255
+lfss-0.13.0.dist-info/RECORD,,