lfss 0.3.0__tar.gz → 0.3.1__tar.gz

{lfss-0.3.0 → lfss-0.3.1}/PKG-INFO

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

{lfss-0.3.0 → lfss-0.3.1}/frontend/index.html

@@ -48,9 +48,11 @@
         <div class="input-group">
             <input type="file" id="file-selector" accept="*">
             <label for="file-name" id="upload-file-prefix"></label>
-            <input type="text" id="file-name" placeholder="Destination file path" autocomplete="off">
-            <span id='randomize-fname-btn'>🎲</span>
-            <button id="upload-btn">Upload</button>
+            <div class="input-group">
+                <input type="text" id="file-name" placeholder="Destination file path" autocomplete="off">
+                <span id='randomize-fname-btn'>🎲</span>
+                <button id="upload-btn">Upload</button>
+            </div>
         </div>
     </div>
 

{lfss-0.3.0 → lfss-0.3.1}/frontend/scripts.js

@@ -264,7 +264,9 @@ function refreshFileList(){
 
                     const downloadButton = document.createElement('a');
                     downloadButton.textContent = 'Download';
-                    downloadButton.href = conn.config.endpoint + '/_api/bundle?path=' + dir.url + (dir.url.endsWith('/') ? '' : '/');
+                    downloadButton.href = conn.config.endpoint + '/_api/bundle?' + 
+                        'token=' + conn.config.token + '&' +
+                        'path=' + dir.url + (dir.url.endsWith('/') ? '' : '/');
                     actContainer.appendChild(downloadButton);
 
                     const deleteButton = document.createElement('a');

{lfss-0.3.0 → lfss-0.3.1}/lfss/client/api.py

@@ -3,7 +3,7 @@ import os
 import requests
 import urllib.parse
 from lfss.src.database import (
-    FileReadPermission, FileDBRecord, DBUserRecord, PathContents
+    FileReadPermission, FileRecord, UserRecord, PathContents
     )
 
 _default_endpoint = os.environ.get('LFSS_ENDPOINT', 'http://localhost:8000')
@@ -58,11 +58,11 @@ class Connector:
             path = path[1:]
         self._fetch('DELETE', path)()
     
-    def get_metadata(self, path: str) -> Optional[FileDBRecord]:
+    def get_metadata(self, path: str) -> Optional[FileRecord]:
         """Gets the metadata for the file at the specified path."""
         try:
             response = self._fetch('GET', '_api/fmeta', {'path': path})()
-            return FileDBRecord(**response.json())
+            return FileRecord(**response.json())
         except requests.exceptions.HTTPError as e:
             if e.response.status_code == 404:
                 return None
@@ -85,7 +85,7 @@ class Connector:
             headers = {'Content-Type': 'application/www-form-urlencoded'}
         )
         
-    def whoami(self) -> DBUserRecord:
+    def whoami(self) -> UserRecord:
         """Gets information about the current user."""
         response = self._fetch('GET', '_api/whoami')()
-        return DBUserRecord(**response.json())
+        return UserRecord(**response.json())

{lfss-0.3.0 → lfss-0.3.1}/lfss/src/database.py

@@ -1,5 +1,5 @@
 
-from typing import Optional, overload, Literal
+from typing import Optional, overload, Literal, AsyncIterable
 from abc import ABC, abstractmethod
 
 import urllib.parse
@@ -58,7 +58,7 @@ class FileReadPermission(IntEnum):
     PRIVATE = 3         # accessible by owner only (including admin)
 
 @dataclasses.dataclass
-class DBUserRecord:
+class UserRecord:
     id: int
     username: str
     credential: str
@@ -71,12 +71,12 @@ class DBUserRecord:
     def __str__(self):
         return f"User {self.username} (id={self.id}, admin={self.is_admin}, created at {self.create_time}, last active at {self.last_active}), storage={self.max_storage}, permission={self.permission}"
 
-DECOY_USER = DBUserRecord(0, 'decoy', 'decoy', False, '2021-01-01 00:00:00', '2021-01-01 00:00:00', 0, FileReadPermission.PRIVATE)
+DECOY_USER = UserRecord(0, 'decoy', 'decoy', False, '2021-01-01 00:00:00', '2021-01-01 00:00:00', 0, FileReadPermission.PRIVATE)
 class UserConn(DBConnBase):
 
     @staticmethod
-    def parse_record(record) -> DBUserRecord:
-        return DBUserRecord(*record)
+    def parse_record(record) -> UserRecord:
+        return UserRecord(*record)
 
     async def init(self):
         await super().init()
@@ -102,21 +102,21 @@ class UserConn(DBConnBase):
 
         return self
     
-    async def get_user(self, username: str) -> Optional[DBUserRecord]:
+    async def get_user(self, username: str) -> Optional[UserRecord]:
         async with self.conn.execute("SELECT * FROM user WHERE username = ?", (username, )) as cursor:
             res = await cursor.fetchone()
         
         if res is None: return None
         return self.parse_record(res)
     
-    async def get_user_by_id(self, user_id: int) -> Optional[DBUserRecord]:
+    async def get_user_by_id(self, user_id: int) -> Optional[UserRecord]:
         async with self.conn.execute("SELECT * FROM user WHERE id = ?", (user_id, )) as cursor:
             res = await cursor.fetchone()
         
         if res is None: return None
         return self.parse_record(res)
     
-    async def get_user_by_credential(self, credential: str) -> Optional[DBUserRecord]:
+    async def get_user_by_credential(self, credential: str) -> Optional[UserRecord]:
         async with self.conn.execute("SELECT * FROM user WHERE credential = ?", (credential, )) as cursor:
             res = await cursor.fetchone()
         
@@ -182,7 +182,7 @@ class UserConn(DBConnBase):
         self.logger.info(f"Delete user {username}")
 
 @dataclasses.dataclass
-class FileDBRecord:
+class FileRecord:
     url: str
     owner_id: int
     file_id: str      # defines mapping from fmata to fdata
@@ -206,13 +206,13 @@ class DirectoryRecord:
 @dataclasses.dataclass
 class PathContents:
     dirs: list[DirectoryRecord]
-    files: list[FileDBRecord]
+    files: list[FileRecord]
     
 class FileConn(DBConnBase):
 
     @staticmethod
-    def parse_record(record) -> FileDBRecord:
-        return FileDBRecord(*record)
+    def parse_record(record) -> FileRecord:
+        return FileRecord(*record)
     
     async def init(self):
         await super().init()
@@ -259,26 +259,26 @@ class FileConn(DBConnBase):
 
         return self
     
-    async def get_file_record(self, url: str) -> Optional[FileDBRecord]:
+    async def get_file_record(self, url: str) -> Optional[FileRecord]:
         async with self.conn.execute("SELECT * FROM fmeta WHERE url = ?", (url, )) as cursor:
             res = await cursor.fetchone()
         if res is None:
             return None
         return self.parse_record(res)
     
-    async def get_file_records(self, urls: list[str]) -> list[FileDBRecord]:
+    async def get_file_records(self, urls: list[str]) -> list[FileRecord]:
         async with self.conn.execute("SELECT * FROM fmeta WHERE url IN ({})".format(','.join(['?'] * len(urls))), urls) as cursor:
             res = await cursor.fetchall()
         if res is None:
             return []
         return [self.parse_record(r) for r in res]
     
-    async def get_user_file_records(self, owner_id: int) -> list[FileDBRecord]:
+    async def get_user_file_records(self, owner_id: int) -> list[FileRecord]:
         async with self.conn.execute("SELECT * FROM fmeta WHERE owner_id = ?", (owner_id, )) as cursor:
             res = await cursor.fetchall()
         return [self.parse_record(r) for r in res]
     
-    async def get_path_records(self, url: str) -> list[FileDBRecord]:
+    async def get_path_records(self, url: str) -> list[FileRecord]:
         async with self.conn.execute("SELECT * FROM fmeta WHERE url LIKE ?", (url + '%', )) as cursor:
             res = await cursor.fetchall()
         return [self.parse_record(r) for r in res]
@@ -301,11 +301,11 @@ class FileConn(DBConnBase):
             return dirs
     
     @overload
-    async def list_path(self, url: str, flat: Literal[True]) -> list[FileDBRecord]:...
+    async def list_path(self, url: str, flat: Literal[True]) -> list[FileRecord]:...
     @overload
     async def list_path(self, url: str, flat: Literal[False]) -> PathContents:...
     
-    async def list_path(self, url: str, flat: bool = False) -> list[FileDBRecord] | PathContents:
+    async def list_path(self, url: str, flat: bool = False) -> list[FileRecord] | PathContents:
         """
         List all files and directories under the given path, 
         if flat is True, return a list of FileDBRecord, recursively including all subdirectories. 
@@ -495,7 +495,7 @@ def validate_url(url: str, is_file = True):
     if not ret:
         raise InvalidPathError(f"Invalid URL: {url}")
 
-async def get_user(db: "Database", user: int | str) -> Optional[DBUserRecord]:
+async def get_user(db: "Database", user: int | str) -> Optional[UserRecord]:
     if isinstance(user, str):
         return await db.user.get_user(user)
     elif isinstance(user, int):
@@ -591,7 +591,7 @@ class Database:
 
         return blob
 
-    async def delete_file(self, url: str) -> Optional[FileDBRecord]:
+    async def delete_file(self, url: str) -> Optional[FileRecord]:
         validate_url(url)
 
         async with transaction(self):
@@ -631,32 +631,37 @@ class Database:
             await self.file.delete_file_blobs([r.file_id for r in records])
             await self.file.delete_user_file_records(user.id)
             await self.user.delete_user(user.username)
-
-    async def zip_path(self, top_url: str, urls: Optional[list[str]]) -> io.BytesIO:
+    
+    async def iter_path(self, top_url: str, urls: Optional[list[str]]) -> AsyncIterable[tuple[FileRecord, bytes]]:
         if urls is None:
             urls = [r.url for r in await self.file.list_path(top_url, flat=True)]
 
+        for url in urls:
+            if not url.startswith(top_url):
+                continue
+            r = await self.file.get_file_record(url)
+            if r is None:
+                continue
+            f_id = r.file_id
+            blob = await self.file.get_file_blob(f_id)
+            if blob is None:
+                self.logger.warning(f"Blob not found for {url}")
+                continue
+            yield r, blob
+
+    async def zip_path(self, top_url: str, urls: Optional[list[str]]) -> io.BytesIO:
+        if top_url.startswith('/'):
+            top_url = top_url[1:]
         buffer = io.BytesIO()
         with zipfile.ZipFile(buffer, 'w') as zf:
-            for url in urls:
-                if not url.startswith(top_url):
-                    continue
-                r = await self.file.get_file_record(url)
-                if r is None:
-                    continue
-                f_id = r.file_id
-                blob = await self.file.get_file_blob(f_id)
-                if blob is None:
-                    continue
-
-                rel_path = url[len(top_url):]
+            async for (r, blob) in self.iter_path(top_url, urls):
+                rel_path = r.url[len(top_url):]
                 rel_path = decode_uri_compnents(rel_path)
                 zf.writestr(rel_path, blob)
-
         buffer.seek(0)
         return buffer
 
-def check_user_permission(user: DBUserRecord, owner: DBUserRecord, file: FileDBRecord) -> tuple[bool, str]:
+def check_user_permission(user: UserRecord, owner: UserRecord, file: FileRecord) -> tuple[bool, str]:
     if user.is_admin:
         return True, ""
     

{lfss-0.3.0 → lfss-0.3.1}/lfss/src/server.py

@@ -15,7 +15,7 @@ from .error import *
 from .log import get_logger
 from .config import MAX_BUNDLE_BYTES, MAX_FILE_BYTES
 from .utils import ensure_uri_compnents
-from .database import Database, DBUserRecord, DECOY_USER, FileDBRecord, check_user_permission, FileReadPermission
+from .database import Database, UserRecord, DECOY_USER, FileRecord, check_user_permission, FileReadPermission
 
 logger = get_logger("server")
 conn = Database()
@@ -78,7 +78,7 @@ app.add_middleware(
 router_fs = APIRouter(prefix="")
 
 @router_fs.get("/{path:path}")
-async def get_file(path: str, download = False, user: DBUserRecord = Depends(get_current_user)):
+async def get_file(path: str, download = False, user: UserRecord = Depends(get_current_user)):
     path = ensure_uri_compnents(path)
 
     # handle directory query
@@ -130,7 +130,7 @@ async def get_file(path: str, download = False, user: DBUserRecord = Depends(get
         return await send(None, "inline")
 
 @router_fs.put("/{path:path}")
-async def put_file(request: Request, path: str, user: DBUserRecord = Depends(get_current_user)):
+async def put_file(request: Request, path: str, user: UserRecord = Depends(get_current_user)):
     path = ensure_uri_compnents(path)
     if user.id == 0:
         logger.debug("Reject put request from DECOY_USER")
@@ -185,7 +185,7 @@ async def put_file(request: Request, path: str, user: DBUserRecord = Depends(get
         }, content=json.dumps({"url": path}))
 
 @router_fs.delete("/{path:path}")
-async def delete_file(path: str, user: DBUserRecord = Depends(get_current_user)):
+async def delete_file(path: str, user: UserRecord = Depends(get_current_user)):
     path = ensure_uri_compnents(path)
     if user.id == 0:
         raise HTTPException(status_code=401, detail="Permission denied")
@@ -207,7 +207,7 @@ async def delete_file(path: str, user: DBUserRecord = Depends(get_current_user))
 router_api = APIRouter(prefix="/_api")
 
 @router_api.get("/bundle")
-async def bundle_files(path: str, user: DBUserRecord = Depends(get_current_user)):
+async def bundle_files(path: str, user: UserRecord = Depends(get_current_user)):
     logger.info(f"GET bundle({path}), user: {user.username}")
     if user.id == 0:
         raise HTTPException(status_code=401, detail="Permission denied")
@@ -218,7 +218,7 @@ async def bundle_files(path: str, user: DBUserRecord = Depends(get_current_user)
         path = path[1:]
     
     owner_records_cache = {}     # cache owner records, ID -> UserRecord
-    async def is_access_granted(file_record: FileDBRecord):
+    async def is_access_granted(file_record: FileRecord):
         owner_id = file_record.owner_id
         owner = owner_records_cache.get(owner_id, None)
         if owner is None:
@@ -249,7 +249,7 @@ async def bundle_files(path: str, user: DBUserRecord = Depends(get_current_user)
     )
 
 @router_api.get("/fmeta")
-async def get_file_meta(path: str, user: DBUserRecord = Depends(get_current_user)):
+async def get_file_meta(path: str, user: UserRecord = Depends(get_current_user)):
     logger.info(f"GET meta({path}), user: {user.username}")
     if path.endswith("/"):
         raise HTTPException(status_code=400, detail="Invalid path")
@@ -264,7 +264,7 @@ async def update_file_meta(
     path: str, 
     perm: Optional[int] = None, 
     new_path: Optional[str] = None,
-    user: DBUserRecord = Depends(get_current_user)
+    user: UserRecord = Depends(get_current_user)
     ):
     if user.id == 0:
         raise HTTPException(status_code=401, detail="Permission denied")
@@ -293,7 +293,7 @@ async def update_file_meta(
     return Response(status_code=200, content="OK")
     
 @router_api.get("/whoami")
-async def whoami(user: DBUserRecord = Depends(get_current_user)):
+async def whoami(user: UserRecord = Depends(get_current_user)):
     if user.id == 0:
         raise HTTPException(status_code=401, detail="Login required")
     user.credential = "__HIDDEN__"

{lfss-0.3.0 → lfss-0.3.1}/pyproject.toml

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