lfss 0.7.13__tar.gz → 0.7.14__tar.gz

{lfss-0.7.13 → lfss-0.7.14}/PKG-INFO

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

{lfss-0.7.13 → lfss-0.7.14}/frontend/index.html

@@ -30,7 +30,7 @@
                 <label></label>
             </div>
             <div>
-                <span style="margin-right: 0.25rem; color: #999;">
+                <span style="margin-right: 0.25rem; color: #999; font-size: small;">
                 Sort by</span>
                 <select id="sort-by-sel">
                     <option value="none">None</option>

{lfss-0.7.13 → lfss-0.7.14}/frontend/styles.css

@@ -194,7 +194,6 @@ div.filename-container{
     flex-direction: row;
     align-items: center;
     gap: 0.5rem;
-    height: 32px;
 }
 label#upload-file-prefix{
     width: 800px;

lfss-0.7.14/frontend/thumb.css

@@ -0,0 +1,10 @@
+
+div.thumb{
+    display: contents;
+}
+img.thumb{
+    height: 32px;   /* smaller than backend */
+    width: 32px;
+    object-fit: contain;
+    border-radius: 0.1rem;
+}

{lfss-0.7.13 → lfss-0.7.14}/frontend/thumb.js

@@ -35,10 +35,10 @@ function getIconSVGFromMimeType(mimeType){
             'application/zip' || 'application/x-zip-compressed' || 'application/x-7z-compressed' || 'application/x-rar-compressed' || 'application/x-tar' || 'application/x-gzip':
             return ICON_ZIP;
         case 
-            'text/x-python' || 'text/x-c' || 'text/x-c++' || 'text/x-java' || 'text/x-javascript' || 'text/x-php' || 'text/x-rust' || 'text/x-go' || 'text/x-csharp' || 'text/x-typescript' || 
-            'text/x-html' || 'text/x-css' || 'text/x-sql' || 'text/x-xml' || 'text/x-yaml' || 'text/x-json' || 'text/x-markdown' || 'text/x-shellscript' ||
-            'text/x-bat' || 'text/x-powershell' || 'text/x-bash' || 'text/x-perl' || 'text/x-ruby' || 'text/x-lua' || 'text/x-tcl' || 'text/x-lisp' || 
-            'text/x-haskell' || 'text/x-elm' || 'text/x-crystal' || 'text/x-nim' || 'text/x-zig':
+            "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-csrc" || "text/x-c++src" || "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-rustsrc" || "application/x-ruby" || "text/x-asm":
             return ICON_CODE;
         default: 
             return ICON_FILE;
@@ -46,6 +46,11 @@ function getIconSVGFromMimeType(mimeType){
 }
 
 function getSafeIconUrl(icon_str){
+    // change icon color
+    const color = '#345';
+    icon_str = icon_str
+        .replace(/<svg/, `<svg fill="${color}"`)
+        .replace(/<path/, `<path fill="${color}"`);
     return 'data:image/svg+xml,' + encodeURIComponent(icon_str);
 }
 
@@ -56,12 +61,14 @@ let thumb_counter = 0;
  * @returns {string}
  */
 export function makeThumbHtml(c, r){
+    function ensureSlashEnd(url){ return url.endsWith('/')? url : url + '/'; }
     const token = c.config.token;
     const mtype = r.mime_type? r.mime_type : 'directory';
     const thumb_id = `thumb-${thumb_counter++}`;
+    const url = mtype == 'directory'? ensureSlashEnd(r.url) : r.url;
     return `
 <div class="thumb" id="${thumb_id}"> \
-    <img src="${c.config.endpoint}/${r.url}?token=${token}&thumb=true" alt="${r.url}" class="thumb" \
+    <img src="${c.config.endpoint}/${url}?token=${token}&thumb=true" alt="${r.url}" class="thumb" \
     onerror="this.src='${getSafeIconUrl(getIconSVGFromMimeType(mtype))}';this.classList.add('thumb-svg');" \
 </div>
 `;

{lfss-0.7.13 → lfss-0.7.14}/lfss/src/server.py

@@ -101,9 +101,11 @@ async def log_requests(request: Request, call_next):
     response_time = end_time - start_time
     response.headers["X-Response-Time"] = str(response_time)
 
+    if response.headers.get("X-Skip-Log", None) is not None:
+        return response
+
     if response.status_code >= 400:
         logger_failed_request.error(f"{request.method} {request.url.path} {response.status_code}")
-        
     await req_conn.log_request(
         request_time_stamp, 
         request.method, request.url.path, response.status_code, response_time,
@@ -114,11 +116,20 @@ async def log_requests(request: Request, call_next):
         response_size = int(response.headers.get("Content-Length", 0))
     )
     await req_conn.ensure_commit_once()
-
     return response
 
+def skip_request_log(fn):
+    @wraps(fn)
+    async def wrapper(*args, **kwargs):
+        response = await fn(*args, **kwargs)
+        assert isinstance(response, Response), "Response expected"
+        response.headers["X-Skip-Log"] = "1"
+        return response
+    return wrapper
+
 router_fs = APIRouter(prefix="")
 
+@skip_request_log
 async def emit_thumbnail(
     path: str, download: bool,
     create_time: Optional[str] = None
@@ -128,7 +139,7 @@ async def emit_thumbnail(
     else:
         fname = path.split("/")[-1]
     if (thumb_res := await get_thumb(path)) is None:
-        raise HTTPException(status_code=415, detail="Thumbnail not supported")
+        return Response(status_code=415, content="Thumbnail not supported")
     thumb_blob, mime_type = thumb_res
     disp = "inline" if not download else "attachment"
     headers = {

{lfss-0.7.13 → lfss-0.7.14}/lfss/src/thumb.py

@@ -14,6 +14,7 @@ async def _maybe_init_thumb(c: aiosqlite.Cursor):
             thumb BLOB
         )
     ''')
+    await c.execute('CREATE INDEX IF NOT EXISTS thumbs_path_idx ON thumbs (path)')
 
 async def _get_cache_thumb(c: aiosqlite.Cursor, path: str, ctime: str) -> Optional[bytes]:
     res = await c.execute('''

{lfss-0.7.13 → lfss-0.7.14}/pyproject.toml

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

lfss-0.7.13/frontend/thumb.css

@@ -1,16 +0,0 @@
-
-div.thumb{
-    height: 32px;
-    width: 32px;
-    border-radius: 0.25rem;
-    display: contents;
-}
-img.thumb{
-    max-height: 32px;   /* smaller than backend */
-    max-width: 32px;
-    border-radius: 0.25rem;
-}
-img.thumb-svg{
-    /* dark blue */
-    filter: invert(30%) sepia(100%) saturate(80%) hue-rotate(180deg);
-}