lfss 0.9.1__py3-none-any.whl → 0.9.4__py3-none-any.whl

lfss/svc/common_impl.py

@@ -7,7 +7,7 @@ from ..eng.datatype import UserRecord, FileRecord, PathContents, AccessLevel, Fi
 from ..eng.database import FileConn, UserConn, delayed_log_access, check_file_read_permission, check_path_permission
 from ..eng.thumb import get_thumb
 from ..eng.utils import format_last_modified, ensure_uri_compnents
-from ..eng.config import CHUNK_SIZE
+from ..eng.config import CHUNK_SIZE, DEBUG_MODE
 
 from .app_base import skip_request_log, db, logger
 
@@ -60,10 +60,15 @@ async def emit_file(
     else:
         arng_e = range_end
     
-    if arng_s >= file_record.file_size or arng_e >= file_record.file_size:
-        raise HTTPException(status_code=416, detail="Range not satisfiable")
-    if arng_s > arng_e:
-        raise HTTPException(status_code=416, detail="Invalid range")
+    if file_record.file_size > 0:
+        if arng_s >= file_record.file_size or arng_e >= file_record.file_size:
+            if DEBUG_MODE: print(f"[Invalid range] Actual range: {arng_s}-{arng_e} (size: {file_record.file_size})")
+            raise HTTPException(status_code=416, detail="Range not satisfiable")
+        if arng_s > arng_e:
+            raise HTTPException(status_code=416, detail="Invalid range")
+    else:
+        if not (arng_s == 0 and arng_e == -1):
+            raise HTTPException(status_code=416, detail="Invalid range (file size is 0)")
 
     headers = {
         "Content-Disposition": f"{disposition}; filename={fname}", 
@@ -87,7 +92,7 @@ async def emit_file(
         status_code=206 if range_start != -1 or range_end != -1 else 200
     )
 
-async def get_file_impl(
+async def get_impl(
     request: Request,
     user: UserRecord, 
     path: str, 
@@ -96,30 +101,12 @@ async def get_file_impl(
     is_head = False,
     ):
     path = ensure_uri_compnents(path)
+    if path.startswith("/"): path = path[1:]
 
     # handle directory query
     if path == "": path = "/"
     if path.endswith("/"):
-        # return file under the path as json
-        async with unique_cursor() as cur:
-            fconn = FileConn(cur)
-            if user.id == 0:
-                raise HTTPException(status_code=401, detail="Permission denied, credential required")
-            if thumb:
-                return await emit_thumbnail(path, download, create_time=None)
-            
-            if path == "/":
-                peer_users = await UserConn(cur).list_peer_users(user.id, AccessLevel.READ)
-                return PathContents(
-                    dirs = await fconn.list_root_dirs(user.username, *[x.username for x in peer_users], skim=True) \
-                        if not user.is_admin else await fconn.list_root_dirs(skim=True),
-                    files = []
-                )
-
-            if not await check_path_permission(path, user, cursor=cur) >= AccessLevel.READ:
-                raise HTTPException(status_code=403, detail="Permission denied")
-
-            return await fconn.list_path(path)
+        return await _get_dir_impl(user=user, path=path, download=download, thumb=thumb, is_head=is_head)
     
     # handle file query
     async with unique_cursor() as cur:
@@ -147,6 +134,9 @@ async def get_file_impl(
     else:
         range_start, range_end = -1, -1
     
+    if DEBUG_MODE:
+        print(f"Get range: {range_start}-{range_end}")
+    
     if thumb:
         if (range_start != -1 or range_end != -1): logger.warning("Range request for thumbnail")
         return await emit_thumbnail(path, download, create_time=file_record.create_time, is_head=is_head)
@@ -156,11 +146,55 @@ async def get_file_impl(
         else:
             return await emit_file(file_record, None, "inline", is_head = is_head, range_start=range_start, range_end=range_end)
 
+async def _get_dir_impl(
+    user: UserRecord, 
+    path: str, 
+    download: bool = False, 
+    thumb: bool = False,
+    is_head = False,
+    ):
+    """ handle directory query, return file under the path as json """
+    assert path.endswith("/")
+    async with unique_cursor() as cur:
+        fconn = FileConn(cur)
+        if user.id == 0:
+            raise HTTPException(status_code=401, detail="Permission denied, credential required")
+        if thumb:
+            return await emit_thumbnail(path, download, create_time=None)
+        
+        if path == "/":
+            if is_head: return Response(status_code=200)
+            peer_users = await UserConn(cur).list_peer_users(user.id, AccessLevel.READ)
+            return PathContents(
+                dirs = await fconn.list_root_dirs(user.username, *[x.username for x in peer_users], skim=True) \
+                    if not user.is_admin else await fconn.list_root_dirs(skim=True),
+                files = []
+            )
+
+        if not await check_path_permission(path, user, cursor=cur) >= AccessLevel.READ:
+            raise HTTPException(status_code=403, detail="Permission denied")
+        
+        path_sp = path.split("/")
+        if is_head:
+            if len(path_sp) == 2:
+                assert path_sp[1] == ""
+                if await UserConn(cur).get_user(path_sp[0]):
+                    return Response(status_code=200)
+                else:
+                    raise HTTPException(status_code=404, detail="User not found")
+            else:
+                if await FileConn(cur).count_path_files(path, flat=True) > 0:
+                    return Response(status_code=200)
+                else:
+                    raise HTTPException(status_code=404, detail="Path not found")
+
+        return await fconn.list_path(path)
+    
 async def put_file_impl(
     request: Request, 
     user: UserRecord, 
     path: str, 
-    conflict: Literal["overwrite", "skip", "abort"] = "abort",
+    conflict: Literal["overwrite", "skip", "abort"] = "overwrite",
     permission: int = 0,
     ):
     path = ensure_uri_compnents(path)
@@ -187,7 +221,9 @@ async def put_file_impl(
         exists_flag = True
         if await check_path_permission(path, user) < AccessLevel.WRITE:
             raise HTTPException(status_code=403, detail="Permission denied, cannot overwrite other's file")
-        await db.delete_file(path)
+        old_record = await db.delete_file(path)
+        if old_record and permission == FileReadPermission.UNSET.value:
+            permission = old_record.permission.value    # inherit permission
     
     # check content-type
     content_type = request.headers.get("Content-Type", "application/octet-stream")
@@ -213,7 +249,7 @@ async def post_file_impl(
     path: str, 
     user: UserRecord, 
     file: UploadFile,
-    conflict: Literal["overwrite", "skip", "abort"] = "abort",
+    conflict: Literal["overwrite", "skip", "abort"] = "overwrite",
     permission: int = 0,
 ):
     path = ensure_uri_compnents(path)
@@ -240,7 +276,9 @@ async def post_file_impl(
         exists_flag = True
         if await check_path_permission(path, user) < AccessLevel.WRITE: 
             raise HTTPException(status_code=403, detail="Permission denied, cannot overwrite other's file")
-        await db.delete_file(path)
+        old_record = await db.delete_file(path)
+        if old_record and permission == FileReadPermission.UNSET.value:
+            permission = old_record.permission.value    # inherit permission
     
     async def blob_reader():
         nonlocal file
@@ -252,7 +290,7 @@ async def post_file_impl(
         "Content-Type": "application/json",
     }, content=json.dumps({"url": path}))
 
-async def delete_file_impl(path: str, user: UserRecord):
+async def delete_impl(path: str, user: UserRecord):
     path = ensure_uri_compnents(path)
     if await check_path_permission(path, user) < AccessLevel.WRITE:
         raise HTTPException(status_code=403, detail="Permission denied")
@@ -268,3 +306,32 @@ async def delete_file_impl(path: str, user: UserRecord):
         return Response(status_code=200, content="Deleted")
     else:
         return Response(status_code=404, content="Not found")
+
+async def copy_impl(
+    op_user: UserRecord, src_path: str, dst_path: str,
+):
+    src_path = ensure_uri_compnents(src_path)
+    dst_path = ensure_uri_compnents(dst_path)
+    copy_type = "file" if not src_path[-1] == "/" else "directory"
+    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"Copy {src_path} to {dst_path}, user: {op_user.username}")
+    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")
+        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_path_files(dst_path, flat=True)
+        if dst_fcount > 0:
+            raise HTTPException(status_code=409, detail="Destination exists")
+        await db.copy_path(src_path, dst_path, op_user)
+    return Response(status_code=201, content="OK")

{lfss-0.9.1.dist-info → lfss-0.9.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lfss
-Version: 0.9.1
+Version: 0.9.4
 Summary: Lightweight file storage service
 Home-page: https://github.com/MenxLi/lfss
 Author: li_mengxun
@@ -57,10 +57,12 @@ The API usage is simple, just `GET`, `PUT`, `DELETE` to the `/<username>/file/ur
 The authentication can be acheived through one of the following methods:
 1. `Authorization` header with the value `Bearer sha256(<username><password>)`.
 2. `token` query parameter with the value `sha256(<username><password>)`.
-3. HTTP Basic Authentication with the username and password. 
+3. HTTP Basic Authentication with the username and password (If WebDAV is enabled).
 
 You can refer to `frontend` as an application example, `lfss/api/connector.py` for more APIs. 
 
 By default, the service exposes all files to the public for `GET` requests, 
 but file-listing is restricted to the user's own files.  
-Please refer to [docs/Permission.md](./docs/Permission.md) for more details on the permission system.
+Please refer to [docs/Permission.md](./docs/Permission.md) for more details on the permission system. 
+
+More can be found in the [docs](./docs) directory.

{lfss-0.9.1.dist-info → lfss-0.9.4.dist-info}/RECORD

@@ -1,8 +1,10 @@
-Readme.md,sha256=6gOvhb93ma83VKC4-pfi4TccZxCq4kj3GEB9qa9ols4,1759
-docs/Known_issues.md,sha256=rfdG3j1OJF-59S9E06VPyn0nZKbW-ybPxkoZ7MEZWp8,81
+Readme.md,sha256=JVe9T6N1Rz4hTiiCVoDYe2VB0dAi60VcBgb2twQdfZc,1834
+docs/Changelog.md,sha256=3mRHcda4UK8c105XtBfbeTWij0S4xNc-U8JTTPUqCJk,769
+docs/Enviroment_variables.md,sha256=LUZF1o70emp-5UPsvXPjcxapP940OqEZzSyyUUT9bEQ,569
+docs/Known_issues.md,sha256=ZqETcWP8lzTOel9b2mxEgCnADFF8IxOrEtiVO1NoMAk,251
 docs/Permission.md,sha256=mvK8gVBBgoIFJqikcaReU_bUo-mTq_ECqJaDDJoQF7Q,3126
-docs/Webdav.md,sha256=9Q41ROEJodVVAnlo1Tf0jqsyrbuHhv_ElSsXbIPXYIg,1547
-frontend/api.js,sha256=hMV6Fc1JxkFQgv7BV1Y_Su7pqsWeF_92hPMmDBcXC04,18485
+docs/Webdav.md,sha256=-Ja-BTWSY1BEMAyZycvEMNnkNTPZ49gSPzmf3Lbib70,1547
+frontend/api.js,sha256=GlQsNoZFEcy7QUUsLbXv7aP-KxRnIxM37FQHTaakGiQ,19387
 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
@@ -10,14 +12,14 @@ frontend/login.css,sha256=VMM0QfbDFYerxKWKSGhMI1yg5IRBXg0TTdLJEEhQZNk,355
 frontend/login.js,sha256=QoO8yKmBHDVP-ZomCMOaV7xVUVIhpl7esJrb6T5aHQE,2466
 frontend/popup.css,sha256=TJZYFW1ZcdD1IVTlNPYNtMWKPbN6XDbQ4hKBOFK8uLg,1284
 frontend/popup.js,sha256=3PgaGZmxSdV1E-D_MWgcR7aHWkcsHA1BNKSOkmP66tA,5191
-frontend/scripts.js,sha256=nWH6NgavZTVmjK44i2DeRi6mJzGSe4qeQPUbDaEVt58,21735
+frontend/scripts.js,sha256=2-Omsb1-s4Wc859_SYw8JGyeUSiADaH9va4w87Mozns,24134
 frontend/state.js,sha256=vbNL5DProRKmSEY7xu9mZH6IY0PBenF8WGxPtGgDnLI,1680
 frontend/styles.css,sha256=xcNLqI3KBsY5TLnku8UIP0Jfr7QLajr1_KNlZj9eheM,4935
 frontend/thumb.css,sha256=rNsx766amYS2DajSQNabhpQ92gdTpNoQKmV69OKvtpI,295
 frontend/thumb.js,sha256=46ViD2TlTTWy0fx6wjoAs_5CQ4ajYB90vVzM7UO2IHw,6182
 frontend/utils.js,sha256=IYUZl77ugiXKcLxSNOWC4NSS0CdD5yRgUsDb665j0xM,2556
 lfss/api/__init__.py,sha256=8IJqrpWK1doIyVVbntvVic82A57ncwl5b0BRHX4Ri6A,6660
-lfss/api/connector.py,sha256=gLn-eW1m6trjqj54YXzPqByQFT56WlSy08kUm1UX4LE,11573
+lfss/api/connector.py,sha256=hHSEEWecKQGZH6oxAmYoG3q7lFfacCbOKVZiUIXT2y8,11819
 lfss/cli/__init__.py,sha256=lPwPmqpa7EXQ4zlU7E7LOe6X2kw_xATGdwoHphUEirA,827
 lfss/cli/balance.py,sha256=fUbKKAUyaDn74f7mmxMfBL4Q4voyBLHu6Lg_g8GfMOQ,4121
 lfss/cli/cli.py,sha256=aYjB8d4k6JUd9efxZK-XOj-mlG4JeOr_0lnj2qqCiK0,8066
@@ -28,22 +30,22 @@ lfss/cli/vacuum.py,sha256=GOG72d3NYe9bYCNc3y8JecEmM-DrKlGq3JQcisv_xBg,3702
 lfss/eng/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lfss/eng/bounded_pool.py,sha256=BI1dU-MBf82TMwJBYbjhEty7w1jIUKc5Bn9SnZ_-hoY,1288
 lfss/eng/config.py,sha256=DmnUYMeLOL-45OstysyMpSBPmLofgzvcSrsWjHvssYs,915
-lfss/eng/connection_pool.py,sha256=-tePasJxiZZ73ymgWf_kFnaKouc4Rrr4K6EXwjb7Mm4,6141
-lfss/eng/database.py,sha256=81wp6LczdByk05RYcJfLjd0tx4ZT3Ue2k994UYMiDZI,47172
+lfss/eng/connection_pool.py,sha256=4xOF1kXXGqCWeLX5ZVFALKjdY8N1VVAVSSTRfCzbj94,6141
+lfss/eng/database.py,sha256=2i8gbh1odOA09tS5VU9cUZy3poZUdCx3XX7UX7umtxw,47188
 lfss/eng/datatype.py,sha256=27UB7-l9SICy5lAvKjdzpTL_GohZjzstQcr9PtAq7nM,2709
-lfss/eng/error.py,sha256=61hcjeQ-y5htKhImDtDuWDf0GPrwbj5LySibeHiKFxc,529
+lfss/eng/error.py,sha256=dAlQHXOnQcSkA2vTugJFSxcyDqoFlPucBoFpTZ7GI6w,654
 lfss/eng/log.py,sha256=u6WRZZsE7iOx6_CV2NHh1ugea26p408FI4WstZh896A,5139
-lfss/eng/thumb.py,sha256=YO1yTI8WzW7pBpQN9x5PtPayxhftb32IJl1zPSS9mks,3243
-lfss/eng/utils.py,sha256=zZ7r9BsNV8XJJVNOxfIqRCO1bxNzh7bc9vEJiCkgbKI,6208
+lfss/eng/thumb.py,sha256=x9jIHHU1tskmp-TavPPcxGpbmEjCp9gbH6ZlsEfqUxY,3383
+lfss/eng/utils.py,sha256=CYEQvPiM28k53hCJBE7N6O6a1xC_wvnP3KZx4DCnD0k,6723
 lfss/sql/init.sql,sha256=8LjHx0TBCkBD62xFfssSeHDqKYVQQJkZAg4rSm046f4,1496
 lfss/sql/pragma.sql,sha256=uENx7xXjARmro-A3XAK8OM8v5AxDMdCCRj47f86UuXg,206
-lfss/svc/app.py,sha256=XK0hx5yKMk8JViJ2BXgsFr3hgSdWn_equJ0JoJwMiuc,221
-lfss/svc/app_base.py,sha256=LjH9tJzaFcP7PB8OBUizG9kvNhts2eq0JxNMBUCoHw0,6312
-lfss/svc/app_dav.py,sha256=8Etdoh_NmvZpEG8J9m97xRF4i-GNGJNvNfgjfLIDjzk,17224
-lfss/svc/app_native.py,sha256=ML-PR-zdoi5j3-KrGhIaYPMbSoW9Lesh7NROPNPUINU,9221
-lfss/svc/common_impl.py,sha256=m3lMA97a4yd_VFG3IrVYIsDzyUEseX7sU633qj7iyDI,10858
+lfss/svc/app.py,sha256=ftWCpepBx-gTSG7i-TB-IdinPPstAYYQjCgnTfeMZeI,219
+lfss/svc/app_base.py,sha256=BU_DndHW4sYiWUQcTis8iGljmUy8FHfZrzCkE0d1z-Y,6717
+lfss/svc/app_dav.py,sha256=D0KSgjtTktPjIhyIKG5eRmBdh5X8HYFYH151E6gzlbc,18245
+lfss/svc/app_native.py,sha256=6yBRJB8_p4RZgDVheDTv1ClBGc3etrQm94j1NiR4FUQ,9349
+lfss/svc/common_impl.py,sha256=0fjbqHWgqDhLfBEu6aC0Z5qgNt67C7z0Qroj7aV3Iq4,13830
 lfss/svc/request_log.py,sha256=v8yXEIzPjaksu76Oh5vgdbUEUrw8Kt4etLAXBWSGie8,3207
-lfss-0.9.1.dist-info/METADATA,sha256=CZuVoVTKJG002grUK_hXtgy0b_j3m-eNHDK0SRyVLL4,2519
-lfss-0.9.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-lfss-0.9.1.dist-info/entry_points.txt,sha256=VJ8svMz7RLtMCgNk99CElx7zo7M-N-z7BWDVw2HA92E,205
-lfss-0.9.1.dist-info/RECORD,,
+lfss-0.9.4.dist-info/METADATA,sha256=3wUuwMRn55Z2lnX9wZRGMVxLbfphSLOk1gX01haFaOw,2594
+lfss-0.9.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+lfss-0.9.4.dist-info/entry_points.txt,sha256=VJ8svMz7RLtMCgNk99CElx7zo7M-N-z7BWDVw2HA92E,205
+lfss-0.9.4.dist-info/RECORD,,