lfss 0.7.13__py3-none-any.whl → 0.7.14__py3-none-any.whl

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>

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;

frontend/thumb.css

@@ -1,16 +1,10 @@
 
 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);
+    height: 32px;   /* smaller than backend */
+    width: 32px;
+    object-fit: contain;
+    border-radius: 0.1rem;
 }

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/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/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.dist-info → lfss-0.7.14.dist-info}/METADATA

@@ -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.dist-info → lfss-0.7.14.dist-info}/RECORD

@@ -2,15 +2,15 @@ Readme.md,sha256=vsPotlwPAaHI5plh4aaszpi3rr7ZGDn7-wLdEYTWQ0k,1275
 docs/Known_issues.md,sha256=rfdG3j1OJF-59S9E06VPyn0nZKbW-ybPxkoZ7MEZWp8,81
 docs/Permission.md,sha256=X0VNfBKU52f93QYqcVyiBFJ3yURiSkhIo9S_5fdSgzM,2265
 frontend/api.js,sha256=o1sP4rKxxnM-rebxnlMlPkhPHzKaVW4kZC7B4ufbOK4,8026
-frontend/index.html,sha256=29btC2xxSaCBhZ4ozAlK-lC7Q4FcsuRgfAop3S9nBQ8,2844
+frontend/index.html,sha256=i45ilkRCorqXP0bTfMiwT3QmmEF23V34lZJC1nODHLo,2862
 frontend/info.css,sha256=Ny0N3GywQ3a9q1_Qph_QFEKB4fEnTe_2DJ1Y5OsLLmQ,595
 frontend/info.js,sha256=WhOGaeqMoezEAfg4nIpK26hvejC7AZ-ZDLiJmRj0kDk,5758
 frontend/popup.css,sha256=TJZYFW1ZcdD1IVTlNPYNtMWKPbN6XDbQ4hKBOFK8uLg,1284
 frontend/popup.js,sha256=3PgaGZmxSdV1E-D_MWgcR7aHWkcsHA1BNKSOkmP66tA,5191
 frontend/scripts.js,sha256=hzX5kX2txIS3x2OLuYjrI3j-T5Na1M-_ktz4Rkxara4,22331
-frontend/styles.css,sha256=Xl8FTDS32DQ_dLVX-UIgvAVJlKx8csYEyeNFX5o1eUY,4502
-frontend/thumb.css,sha256=uVTt-8gDdgNiNmqJnsTVK1gvixEUabM2SRd3Ed_0Kag,319
-frontend/thumb.js,sha256=m0-Nip5bgtipdBz1GtRBk-0aaJ-4wKhlT9rEN_0oBh8,4881
+frontend/styles.css,sha256=krMo6Ulroi8pqEq1exQsFEU-FJqT9GzI8vyARiNF11k,4484
+frontend/thumb.css,sha256=1i8wudiMWGwdrnTqs6yrS8YaiPeHPR-A2YqUNJN20Ok,165
+frontend/thumb.js,sha256=MFAr_gOB-L4Su7JsnR8sy9TqP2oHR31AJAWi8nH4bXg,5296
 frontend/utils.js,sha256=IYUZl77ugiXKcLxSNOWC4NSS0CdD5yRgUsDb665j0xM,2556
 lfss/cli/balance.py,sha256=R2rbO2tg9TVnnQIVeU0GJVeMS-5LDhEdk4mbOE9qGq0,4121
 lfss/cli/cli.py,sha256=LH1nx5wI1K2DZ3hvHz7oq5HcXVDoW2V6sr7q9gJ8gqo,4621
@@ -30,11 +30,11 @@ lfss/src/database.py,sha256=w2QPE3h1Lx0D0fUmdtu9s1XHpNp9p27zqm8AVeP2UVg,32476
 lfss/src/datatype.py,sha256=WfrLALU_7wei5-i_b0TxY8xWI5mwxLUHFepHSps49zA,1767
 lfss/src/error.py,sha256=imbhwnbhnI3HLhkbfICROe3F0gleKrOk4XnqHJDOtuI,285
 lfss/src/log.py,sha256=u6WRZZsE7iOx6_CV2NHh1ugea26p408FI4WstZh896A,5139
-lfss/src/server.py,sha256=d5PdRXR2LefvbVpBk7qC-MCBXP_Z3hGL_vBceSznpw4,17344
+lfss/src/server.py,sha256=igkPC3gdJoIqcVTKBAKkVPRrclXR2ZNBdRIAEci4xMo,17717
 lfss/src/stat.py,sha256=Wr-ug_JqtbSIf3XwQnv1xheGhsDTEOlLWuYoKO_26Jo,3201
-lfss/src/thumb.py,sha256=QhFmPCBZ5fDwtNC07kt-PKttDVNtx2x0HFXphORlkes,3028
+lfss/src/thumb.py,sha256=Ml4vQEWK3R-tVAAFDt6GZUteZBUM1Q0QPVtU1zn7G44,3111
 lfss/src/utils.py,sha256=TBGYvgt6xMP8UC5wTGHAr9fmdhu0_gjOtxcSeyvGyVM,3918
-lfss-0.7.13.dist-info/METADATA,sha256=M5e-IMIsEuQaVHXwm3osFRM-yzdk6PDod6uTZnImyVI,2021
-lfss-0.7.13.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-lfss-0.7.13.dist-info/entry_points.txt,sha256=VJ8svMz7RLtMCgNk99CElx7zo7M-N-z7BWDVw2HA92E,205
-lfss-0.7.13.dist-info/RECORD,,
+lfss-0.7.14.dist-info/METADATA,sha256=ol6x7IVBcz2KtNZPPXULNiW_sztyuNvm3osrAkq4_Lk,2021
+lfss-0.7.14.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+lfss-0.7.14.dist-info/entry_points.txt,sha256=VJ8svMz7RLtMCgNk99CElx7zo7M-N-z7BWDVw2HA92E,205
+lfss-0.7.14.dist-info/RECORD,,