lfss 0.8.3__tar.gz → 0.8.4__tar.gz

{lfss-0.8.3 → lfss-0.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lfss
-Version: 0.8.3
+Version: 0.8.4
 Summary: Lightweight file storage service
 Home-page: https://github.com/MenxLi/lfss
 Author: li, mengxun
@@ -24,9 +24,17 @@ Description-Content-Type: text/markdown
 # Lightweight File Storage Service (LFSS)
 [![PyPI](https://img.shields.io/pypi/v/lfss)](https://pypi.org/project/lfss/)
 
-My experiment on a lightweight and high-performance file/object storage service.  
+My experiment on a lightweight and high-performance file/object storage service...  
+
+**Highlights:**
+
+- User storage limit and access control.
+- Pagination and sorted file listing for vast number of files.  
+- High performance: high concurrency, near-native speed on stress tests.
+- Support range requests, so you can stream large files / resume download.
+
 It stores small files and metadata in sqlite, large files in the filesystem.  
-Tested on 2 million files, and it works fine... 
+Tested on 2 million files, and it is still fast.
 
 Usage: 
 ```sh
@@ -45,8 +53,8 @@ lfss-panel --open
 Or, you can start a web server at `/frontend` and open `index.html` in your browser. 
 
 The API usage is simple, just `GET`, `PUT`, `DELETE` to the `/<username>/file/url` path.  
-Authentication is done via `Authorization` header with the value `Bearer <token>`, or through the `token` query parameter.  
-You can refer to `frontend` as an application example, and `frontend/api.js` or `lfss/api/connector.py` for the API usage.
+Authentication via `Authorization` header with the value `Bearer <token>`, or through the `token` query parameter.  
+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.  

{lfss-0.8.3 → lfss-0.8.4}/Readme.md

@@ -1,9 +1,17 @@
 # Lightweight File Storage Service (LFSS)
 [![PyPI](https://img.shields.io/pypi/v/lfss)](https://pypi.org/project/lfss/)
 
-My experiment on a lightweight and high-performance file/object storage service.  
+My experiment on a lightweight and high-performance file/object storage service...  
+
+**Highlights:**
+
+- User storage limit and access control.
+- Pagination and sorted file listing for vast number of files.  
+- High performance: high concurrency, near-native speed on stress tests.
+- Support range requests, so you can stream large files / resume download.
+
 It stores small files and metadata in sqlite, large files in the filesystem.  
-Tested on 2 million files, and it works fine... 
+Tested on 2 million files, and it is still fast.
 
 Usage: 
 ```sh
@@ -22,8 +30,8 @@ lfss-panel --open
 Or, you can start a web server at `/frontend` and open `index.html` in your browser. 
 
 The API usage is simple, just `GET`, `PUT`, `DELETE` to the `/<username>/file/url` path.  
-Authentication is done via `Authorization` header with the value `Bearer <token>`, or through the `token` query parameter.  
-You can refer to `frontend` as an application example, and `frontend/api.js` or `lfss/api/connector.py` for the API usage.
+Authentication via `Authorization` header with the value `Bearer <token>`, or through the `token` query parameter.  
+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.  

{lfss-0.8.3 → lfss-0.8.4}/frontend/thumb.js

@@ -39,10 +39,14 @@ function getIconSVGFromMimeType(mimeType){
         return ICON_ZIP;
     }
     if ([
-        "text/html", "application/xhtml+xml", "application/xml", "text/css", "application/javascript", "text/javascript", "application/json", "text/x-python", "text/x-java-source",
-        "application/x-httpd-php", "text/x-ruby", "text/x-perl", "application/x-sh", "application/sql", "text/x-c", "text/x-c++", "text/x-csharp", "text/x-go", "text/x-haskell",
-        "text/x-lua", "text/x-markdown", "application/wasm", "application/x-tcl", "text/x-yaml", "application/x-latex", "application/x-tex", "text/x-scss", "application/x-lisp",
-        "application/x-rust", "application/x-ruby", "text/x-asm"
+        "text/html", "application/xhtml+xml", "application/xml", "text/css", "text/x-scss", "application/javascript", "text/javascript",
+        "application/json", "text/x-yaml", "text/x-markdown", "application/wasm", 
+        "text/x-ruby", "application/x-ruby", "text/x-perl", "application/x-lisp", 
+        "text/x-haskell", "text/x-lua", "application/x-tcl", 
+        "text/x-python", "text/x-java-source", "text/x-go", "application/x-rust", "text/x-asm", 
+        "application/sql", "text/x-c", "text/x-c++", "text/x-csharp", 
+        "application/x-httpd-php", "application/x-sh", "application/x-shellscript", 
+        "application/x-latex", "application/x-tex", 
     ].includes(mimeType)){
         return ICON_CODE;
     }

{lfss-0.8.3 → lfss-0.8.4}/lfss/api/connector.py

@@ -114,7 +114,6 @@ class Connector:
         
         if isinstance(file, str):
             assert os.path.exists(file), "File does not exist on disk"
-            fsize = os.path.getsize(file)
 
         with open(file, 'rb') if isinstance(file, str) else SpooledTemporaryFile(max_size=1024*1024*32) as fp:
 
@@ -124,7 +123,6 @@ class Connector:
                 fp.seek(0)
 
             # https://stackoverflow.com/questions/12385179/
-            print(f"Uploading {fsize} bytes")
             response = self._fetch_factory('POST', path, search_params={
                 'permission': int(permission),
                 'conflict': conflict

{lfss-0.8.3 → lfss-0.8.4}/lfss/cli/cli.py

@@ -1,6 +1,6 @@
-from lfss.api import Connector, upload_directory, upload_file, download_file, download_directory
 from pathlib import Path
 import argparse, typing
+from lfss.api import Connector, upload_directory, upload_file, download_file, download_directory
 from lfss.src.datatype import FileReadPermission, FileSortKey, DirSortKey
 from lfss.src.utils import decode_uri_compnents
 from . import catch_request_error, line_sep
@@ -18,7 +18,6 @@ def parse_permission(s: str) -> FileReadPermission:
 
 def parse_arguments():
     parser = argparse.ArgumentParser(description="Command line interface, please set LFSS_ENDPOINT and LFSS_TOKEN environment variables.")
-    parser.add_argument("-v", "--verbose", action="store_true", help="Verbose output")
 
     sp = parser.add_subparsers(dest="command", required=True)
 
@@ -26,6 +25,7 @@ def parse_arguments():
     sp_upload = sp.add_parser("upload", help="Upload files")
     sp_upload.add_argument("src", help="Source file or directory", type=str)
     sp_upload.add_argument("dst", help="Destination url path", type=str)
+    sp_upload.add_argument("-v", "--verbose", action="store_true", help="Verbose output")
     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")
@@ -36,6 +36,7 @@ def parse_arguments():
     sp_download = sp.add_parser("download", help="Download files")
     sp_download.add_argument("src", help="Source url path", type=str)
     sp_download.add_argument("dst", help="Destination file or directory", type=str)
+    sp_download.add_argument("-v", "--verbose", action="store_true", help="Verbose output")
     sp_download.add_argument("-j", "--jobs", type=int, default=1, help="Number of concurrent downloads")
     sp_download.add_argument("--interval", type=float, default=0, help="Interval between files, only works with directory download")
     sp_download.add_argument("--overwrite", action="store_true", help="Overwrite existing files")

{lfss-0.8.3 → lfss-0.8.4}/lfss/src/datatype.py

@@ -1,5 +1,6 @@
 from enum import IntEnum
 import dataclasses, typing
+from .utils import fmt_storage_size
 
 class FileReadPermission(IntEnum):
     UNSET = 0           # not set
@@ -18,8 +19,12 @@ class UserRecord:
     max_storage: int
     permission: 'FileReadPermission'
 
+    def __post_init__(self):
+        self.permission = FileReadPermission(self.permission)
+
     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})"
+        return  f"User {self.username} (id={self.id}, admin={self.is_admin}, created at {self.create_time}, last active at {self.last_active}, " + \
+                f"storage={fmt_storage_size(self.max_storage)}, permission={self.permission.name})"
 
 @dataclasses.dataclass
 class FileRecord:
@@ -33,9 +38,12 @@ class FileRecord:
     external: bool
     mime_type: str
 
+    def __post_init__(self):
+        self.permission = FileReadPermission(self.permission)
+
     def __str__(self):
         return  f"File {self.url} [{self.mime_type}] (owner={self.owner_id}, created at {self.create_time}, accessed at {self.access_time}, " + \
-                f"file_id={self.file_id}, permission={self.permission}, size={self.file_size}, external={self.external})"
+                f"file_id={self.file_id}, permission={self.permission.name}, size={fmt_storage_size(self.file_size)}, external={self.external})"
 
 @dataclasses.dataclass
 class DirectoryRecord:
@@ -47,7 +55,7 @@ class DirectoryRecord:
     n_files: int = -1
 
     def __str__(self):
-        return f"Directory {self.url} (size={self.size}, created at {self.create_time}, updated at {self.update_time}, accessed at {self.access_time}, n_files={self.n_files})"
+        return f"Directory {self.url} (size={fmt_storage_size(self.size)}, created at {self.create_time}, updated at {self.update_time}, accessed at {self.access_time}, n_files={self.n_files})"
 
 @dataclasses.dataclass
 class PathContents:

{lfss-0.8.3 → lfss-0.8.4}/pyproject.toml

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