lfss 0.7.11__tar.gz → 0.7.13__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lfss
-Version: 0.7.11
+Version: 0.7.13
 Summary: Lightweight file storage service
 Home-page: https://github.com/MenxLi/lfss
 Author: li, mengxun
@@ -15,6 +15,7 @@ Requires-Dist: aiofiles (==23.*)
 Requires-Dist: aiosqlite (==0.*)
 Requires-Dist: fastapi (==0.*)
 Requires-Dist: mimesniff (==1.*)
+Requires-Dist: pillow
 Requires-Dist: uvicorn (==0.*)
 Project-URL: Repository, https://github.com/MenxLi/lfss
 Description-Content-Type: text/markdown

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

@@ -24,9 +24,27 @@
     </div>
 
     <div class="container content" id="view">
-        <div id="position-hint" class='disconnected'>
-            <span></span>
-            <label></label>
+        <div id="top-bar">
+            <div id="position-hint" class='disconnected'>
+                <span></span>
+                <label></label>
+            </div>
+            <div>
+                <span style="margin-right: 0.25rem; color: #999;">
+                Sort by</span>
+                <select id="sort-by-sel">
+                    <option value="none">None</option>
+                    <option value="name">Name</option>
+                    <option value="size">Size</option>
+                    <option value="access">Accessed</option>
+                    <option value="create">Created</option>
+                    <option value="mime">Type</option>
+                </select>
+                <select id="sort-order-sel">
+                    <option value="asc">Ascending</option>
+                    <option value="desc">Descending</option>
+                </select>
+            </div>
         </div>
         <table id="files">
             <thead>

{lfss-0.7.11 → lfss-0.7.13}/frontend/scripts.js

@@ -1,8 +1,9 @@
 import Connector from './api.js';
 import { permMap } from './api.js';
 import { showFloatingWindowLineInput, showPopup } from './popup.js';
-import { formatSize, decodePathURI, ensurePathURI, getRandomString, cvtGMT2Local, debounce, encodePathURI } from './utils.js';
+import { formatSize, decodePathURI, ensurePathURI, getRandomString, cvtGMT2Local, debounce, encodePathURI, asHtmlText } from './utils.js';
 import { showInfoPanel, showDirInfoPanel } from './info.js';
+import { makeThumbHtml } from './thumb.js';
 
 const conn = new Connector();
 let userRecord = null;
@@ -22,6 +23,8 @@ const uploadFileSelector = document.querySelector('#file-selector');
 const uploadFileNameInput = document.querySelector('#file-name');
 const uploadButton = document.querySelector('#upload-btn');
 const randomizeFnameButton = document.querySelector('#randomize-fname-btn');
+const sortBySelect = document.querySelector('#sort-by-sel');
+const sortOrderSelect = document.querySelector('#sort-order-sel');
 
 conn.config.endpoint = endpointInput.value;
 conn.config.token = tokenInput.value;
@@ -219,6 +222,40 @@ function maybeRefreshFileList(){
     }
 }
 
+let sortBy = sortBySelect.value;
+let sortOrder = sortOrderSelect.value;
+/** @param {import('./api.js').DirectoryRecord} dirs */
+function sortDirList(dirs){
+    if (sortBy === 'name'){
+        dirs.sort((a, b) => { return a.url.localeCompare(b.url); });
+    }
+    if (sortOrder === 'desc'){ dirs.reverse(); }
+}
+/** @param {import('./api.js').FileRecord} files */
+function sortFileList(files){
+    function timestr2num(timestr){
+        return new Date(timestr).getTime();
+    }
+    if (sortBy === 'name'){
+        files.sort((a, b) => { return a.url.localeCompare(b.url); });
+    }
+    if (sortBy === 'size'){
+        files.sort((a, b) => { return a.file_size - b.file_size; });
+    }
+    if (sortBy === 'access'){
+        files.sort((a, b) => { return timestr2num(a.access_time) - timestr2num(b.access_time); });
+    }
+    if (sortBy === 'create'){
+        files.sort((a, b) => { return timestr2num(a.create_time) - timestr2num(b.create_time); });
+    }
+    if (sortBy === 'mime'){
+        files.sort((a, b) => { return a.mime_type.localeCompare(b.mime_type); });
+    }
+    if (sortOrder === 'desc'){ files.reverse(); }
+}
+sortBySelect.addEventListener('change', (elem) => {sortBy = elem.target.value; refreshFileList();});
+sortOrderSelect.addEventListener('change', (elem) => {sortOrder = elem.target.value; refreshFileList();});
+
 function refreshFileList(){
     conn.listPath(pathInput.value)
         .then(data => {
@@ -232,6 +269,9 @@ function refreshFileList(){
             if (!data.dirs){ data.dirs = []; }
             if (!data.files){ data.files = []; }
 
+            sortDirList(data.dirs);
+            sortFileList(data.files);
+
             data.dirs.forEach(dir => {
                 const tr = document.createElement('tr');
                 const sizeTd = document.createElement('td');
@@ -251,7 +291,11 @@ function refreshFileList(){
                         onPathChange();
                     });
                     dirLink.href = '#';
-                    nameTd.appendChild(dirLink);
+                    const nameDiv = document.createElement('div');
+                    nameDiv.classList.add('filename-container');
+                    nameDiv.innerHTML = makeThumbHtml(conn, dir);
+                    nameDiv.appendChild(dirLink);
+                    nameTd.appendChild(nameDiv);
 
                     tr.appendChild(nameTd);
                     tbody.appendChild(tr);
@@ -343,7 +387,13 @@ function refreshFileList(){
                     const nameTd = document.createElement('td');
                     const plainUrl = decodePathURI(file.url);
                     const fileName = plainUrl.split('/').pop();
-                    nameTd.textContent = fileName;
+
+                    nameTd.innerHTML = `
+                    <div class="filename-container">
+                        ${makeThumbHtml(conn, file)}
+                        <span>${asHtmlText(fileName)}</span>
+                    </div>
+                    `
                     tr.appendChild(nameTd);
                     tbody.appendChild(tr);
                 }

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

@@ -1,5 +1,6 @@
 @import "./popup.css";
 @import "./info.css";
+@import "./thumb.css";
 
 body{
     font-family: Arial, sans-serif;
@@ -120,6 +121,13 @@ input#path{
     cursor: pointer;
 }
 
+div#top-bar{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    gap: 1rem;
+}
 div#position-hint{
     color: rgb(138, 138, 138);
     border-radius: 0.5rem;
@@ -181,6 +189,13 @@ table#files tr td:nth-child(3), table#files tr td:nth-child(5){
     width: 12%;
 }
 
+div.filename-container{
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 0.5rem;
+    height: 32px;
+}
 label#upload-file-prefix{
     width: 800px;
     text-align: right;

lfss-0.7.13/frontend/thumb.css

@@ -0,0 +1,16 @@
+
+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);
+}

lfss-0.7.13/frontend/thumb.js

@@ -0,0 +1,68 @@
+
+/**
+ * @import { FileRecord, DirectoryRecord } from './api.js'
+ */
+import Connector from './api.js';
+
+// from: https://pictogrammers.com/library/mdi/
+const ICON_FOLDER = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>folder-outline</title><path d="M20,18H4V8H20M20,6H12L10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6Z" /></svg>';
+const ICON_FILE = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>file-document-outline</title><path d="M6,2A2,2 0 0,0 4,4V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V8L14,2H6M6,4H13V9H18V20H6V4M8,12V14H16V12H8M8,16V18H13V16H8Z" /></svg>'
+const ICON_PDF = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>file-pdf-box</title><path d="M19 3H5C3.9 3 3 3.9 3 5V19C3 20.1 3.9 21 5 21H19C20.1 21 21 20.1 21 19V5C21 3.9 20.1 3 19 3M9.5 11.5C9.5 12.3 8.8 13 8 13H7V15H5.5V9H8C8.8 9 9.5 9.7 9.5 10.5V11.5M14.5 13.5C14.5 14.3 13.8 15 13 15H10.5V9H13C13.8 9 14.5 9.7 14.5 10.5V13.5M18.5 10.5H17V11.5H18.5V13H17V15H15.5V9H18.5V10.5M12 10.5H13V13.5H12V10.5M7 10.5H8V11.5H7V10.5Z" /></svg>'
+const ICON_EXE = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>application-brackets-outline</title><path d="M9.5,8.5L11,10L8,13L11,16L9.5,17.5L5,13L9.5,8.5M14.5,17.5L13,16L16,13L13,10L14.5,8.5L19,13L14.5,17.5M21,2H3A2,2 0 0,0 1,4V20A2,2 0 0,0 3,22H21A2,2 0 0,0 23,20V4A2,2 0 0,0 21,2M21,20H3V6H21V20Z" /></svg>'
+const ICON_ZIP = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>zip-box-outline</title><path d="M12 17V15H14V17H12M14 13V11H12V13H14M14 9V7H12V9H14M10 11H12V9H10V11M10 15H12V13H10V15M21 5V19C21 20.1 20.1 21 19 21H5C3.9 21 3 20.1 3 19V5C3 3.9 3.9 3 5 3H19C20.1 3 21 3.9 21 5M19 5H12V7H10V5H5V19H19V5Z" /></svg>'
+const ICON_CODE = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>file-code-outline</title><path d="M14 2H6C4.89 2 4 2.9 4 4V20C4 21.11 4.89 22 6 22H18C19.11 22 20 21.11 20 20V8L14 2M18 20H6V4H13V9H18V20M9.54 15.65L11.63 17.74L10.35 19L7 15.65L10.35 12.3L11.63 13.56L9.54 15.65M17 15.65L13.65 19L12.38 17.74L14.47 15.65L12.38 13.56L13.65 12.3L17 15.65Z" /></svg>'
+const ICON_VIDEO = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>television-play</title><path d="M21,3H3C1.89,3 1,3.89 1,5V17A2,2 0 0,0 3,19H8V21H16V19H21A2,2 0 0,0 23,17V5C23,3.89 22.1,3 21,3M21,17H3V5H21M16,11L9,15V7" /></svg>'
+const ICON_IMAGE = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>image-outline</title><path d="M19,19H5V5H19M19,3H5A2,2 0 0,0 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5A2,2 0 0,0 19,3M13.96,12.29L11.21,15.83L9.25,13.47L6.5,17H17.5L13.96,12.29Z" /></svg>'
+
+function getIconSVGFromMimeType(mimeType){
+    if (mimeType == 'directory'){
+        return ICON_FOLDER;
+    }
+    if (mimeType.startsWith('video/')){
+        return ICON_VIDEO;
+    }
+    if (mimeType.startsWith('image/')){
+        return ICON_IMAGE;
+    }
+    switch (mimeType){
+        case 
+            'application/pdf' || 'application/x-pdf':
+            return ICON_PDF;
+        case 
+            'application/x-msdownload' || 'application/x-msdos-program' || 'application/x-msi' || 'application/x-ms-wim' || 'application/octet-stream' || 'application/x-apple-diskimage':
+            return ICON_EXE;
+        case 
+            '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':
+            return ICON_CODE;
+        default: 
+            return ICON_FILE;
+    }
+}
+
+function getSafeIconUrl(icon_str){
+    return 'data:image/svg+xml,' + encodeURIComponent(icon_str);
+}
+
+let thumb_counter = 0;
+/**
+ * @param {Connector} c
+ * @param {FileRecord | DirectoryRecord} r
+ * @returns {string}
+ */
+export function makeThumbHtml(c, r){
+    const token = c.config.token;
+    const mtype = r.mime_type? r.mime_type : 'directory';
+    const thumb_id = `thumb-${thumb_counter++}`;
+    return `
+<div class="thumb" id="${thumb_id}"> \
+    <img src="${c.config.endpoint}/${r.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.11 → lfss-0.7.13}/frontend/utils.js

@@ -86,4 +86,11 @@ export function debounce(fn,wait){
         if (timeout) clearTimeout(timeout);
         timeout = setTimeout(() => fn.apply(context, args), wait);
     }
+}
+
+export function asHtmlText(text){
+    const anonElem = document.createElement('div');
+    anonElem.textContent = text;
+    const htmlText = anonElem.innerHTML;
+    return htmlText;
 }

{lfss-0.7.11 → lfss-0.7.13}/lfss/client/__init__.py

@@ -1,7 +1,7 @@
 import os, time, pathlib
 from threading import Lock
-from concurrent.futures import ThreadPoolExecutor
 from .api import Connector
+from ..src.bounded_pool import BoundedThreadPoolExecutor
 
 def upload_file(
     connector: Connector, 
@@ -68,7 +68,7 @@ def upload_directory(
             ):
             faild_files.append(file_path)
 
-    with ThreadPoolExecutor(n_concurrent) as executor:
+    with BoundedThreadPoolExecutor(n_concurrent) as executor:
         for root, dirs, files in os.walk(directory):
             for file in files:
                 executor.submit(put_file, os.path.join(root, file))
@@ -149,7 +149,7 @@ def download_directory(
             ):
             failed_files.append(src_url)
         
-    with ThreadPoolExecutor(n_concurrent) as executor:
+    with BoundedThreadPoolExecutor(n_concurrent) as executor:
         for file in connector.list_path(src_path, flat=True).files:
             executor.submit(get_file, file.url)
     return failed_files

{lfss-0.7.11 → lfss-0.7.13}/lfss/client/api.py

@@ -31,8 +31,9 @@ class Connector:
             headers.update({
                 'Authorization': f"Bearer {self.config['token']}",
             })
-            response = requests.request(method, url, headers=headers, **kwargs)
-            response.raise_for_status()
+            with requests.Session() as s:
+                response = s.request(method, url, headers=headers, **kwargs)
+                response.raise_for_status()
             return response
         return f
 

lfss-0.7.13/lfss/src/bounded_pool.py

@@ -0,0 +1,44 @@
+"""
+Code modified from: https://github.com/mowshon/bounded_pool_executor
+"""
+
+import multiprocessing
+import concurrent.futures
+import multiprocessing.synchronize
+import threading
+from typing import Optional
+
+class _BoundedPoolExecutor:
+
+    semaphore: Optional[multiprocessing.synchronize.BoundedSemaphore | threading.BoundedSemaphore] = None
+    _max_workers: int
+
+    def acquire(self):
+        assert self.semaphore is not None
+        self.semaphore.acquire()
+
+    def release(self, fn):
+        assert self.semaphore is not None
+        self.semaphore.release()
+
+    def submit(self, fn, *args, **kwargs):
+        self.acquire()
+        future = super().submit(fn, *args, **kwargs)    # type: ignore
+        future.add_done_callback(self.release)
+
+        return future
+
+
+class BoundedProcessPoolExecutor(_BoundedPoolExecutor, concurrent.futures.ProcessPoolExecutor):
+
+    def __init__(self, max_workers=None):
+        super().__init__(max_workers)
+        self.semaphore = multiprocessing.BoundedSemaphore(self._max_workers * 2)
+
+
+class BoundedThreadPoolExecutor(_BoundedPoolExecutor, concurrent.futures.ThreadPoolExecutor):
+
+    def __init__(self, max_workers=None):
+        super().__init__(max_workers)
+        self.semaphore = threading.BoundedSemaphore(self._max_workers * 2)
+

{lfss-0.7.11 → lfss-0.7.13}/lfss/src/config.py

@@ -21,3 +21,6 @@ else:
 MAX_FILE_BYTES = 512 * 1024 * 1024   # 512MB
 MAX_BUNDLE_BYTES = 512 * 1024 * 1024   # 512MB
 CHUNK_SIZE = 1024 * 1024   # 1MB chunks for streaming (on large files)
+
+THUMB_DB = DATA_HOME / 'thumbs.db'
+THUMB_SIZE = (48, 48)

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

@@ -19,6 +19,7 @@ from .config import MAX_BUNDLE_BYTES, MAX_FILE_BYTES, LARGE_FILE_BYTES, CHUNK_SI
 from .utils import ensure_uri_compnents, format_last_modified, now_stamp
 from .connection_pool import global_connection_init, global_connection_close, unique_cursor
 from .database import Database, UserRecord, DECOY_USER, FileRecord, check_user_permission, FileReadPermission, UserConn, FileConn, PathContents
+from .thumb import get_thumb
 
 logger = get_logger("server", term_level="DEBUG")
 logger_failed_request = get_logger("failed_requests", term_level="INFO")
@@ -49,7 +50,7 @@ def handle_exception(fn):
             if isinstance(e, FileNotFoundError): raise HTTPException(status_code=404, detail=str(e))
             if isinstance(e, FileExistsError): raise HTTPException(status_code=409, detail=str(e))
             logger.error(f"Uncaptured error in {fn.__name__}: {e}")
-            raise HTTPException(status_code=500, detail=str(e))
+            raise 
     return wrapper
 
 async def get_credential_from_params(request: Request):
@@ -118,9 +119,61 @@ async def log_requests(request: Request, call_next):
 
 router_fs = APIRouter(prefix="")
 
+async def emit_thumbnail(
+    path: str, download: bool,
+    create_time: Optional[str] = None
+    ):
+    if path.endswith("/"):
+        fname = path.split("/")[-2]
+    else:
+        fname = path.split("/")[-1]
+    if (thumb_res := await get_thumb(path)) is None:
+        raise HTTPException(status_code=415, detail="Thumbnail not supported")
+    thumb_blob, mime_type = thumb_res
+    disp = "inline" if not download else "attachment"
+    headers = {
+        "Content-Disposition": f"{disp}; filename={fname}.thumb.jpg",
+        "Content-Length": str(len(thumb_blob)),
+    }
+    if create_time is not None:
+        headers["Last-Modified"] = format_last_modified(create_time)
+    return Response(
+        content=thumb_blob, media_type=mime_type, headers=headers
+    )
+async def emit_file(
+    file_record: FileRecord, 
+    media_type: Optional[str] = None, 
+    disposition = "attachment"
+    ):
+    if media_type is None:
+        media_type = file_record.mime_type
+    path = file_record.url
+    fname = path.split("/")[-1]
+    if not file_record.external:
+        fblob = await db.read_file(path)
+        return Response(
+            content=fblob, media_type=media_type, headers={
+                "Content-Disposition": f"{disposition}; filename={fname}", 
+                "Content-Length": str(len(fblob)), 
+                "Last-Modified": format_last_modified(file_record.create_time)
+            }
+        )
+    else:
+        return StreamingResponse(
+            await db.read_file_stream(path), media_type=media_type, headers={
+                "Content-Disposition": f"{disposition}; filename={fname}", 
+                "Content-Length": str(file_record.file_size),
+                "Last-Modified": format_last_modified(file_record.create_time)
+            }
+        )
+
 @router_fs.get("/{path:path}")
 @handle_exception
-async def get_file(path: str, download: bool = False, flat: bool = False, user: UserRecord = Depends(get_current_user)):
+async def get_file(
+    path: str, 
+    download: bool = False, flat: bool = False, thumb: bool = False,
+    user: UserRecord = Depends(get_current_user)
+    ):
     path = ensure_uri_compnents(path)
 
     # handle directory query
@@ -131,6 +184,9 @@ async def get_file(path: str, download: bool = False, flat: bool = False, user:
             fconn = FileConn(conn)
             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 flat:
                     raise HTTPException(status_code=400, detail="Flat query not supported for root path")
@@ -145,6 +201,7 @@ async def get_file(path: str, download: bool = False, flat: bool = False, user:
 
             return await fconn.list_path(path, flat = flat)
     
+    # handle file query
     async with unique_cursor() as conn:
         fconn = FileConn(conn)
         file_record = await fconn.get_file_record(path)
@@ -159,32 +216,13 @@ async def get_file(path: str, download: bool = False, flat: bool = False, user:
     if not allow_access:
         raise HTTPException(status_code=403, detail=reason)
     
-    fname = path.split("/")[-1]
-    async def send(media_type: Optional[str] = None, disposition = "attachment"):
-        if media_type is None:
-            media_type = file_record.mime_type
-        if not file_record.external:
-            fblob = await db.read_file(path)
-            return Response(
-                content=fblob, media_type=media_type, headers={
-                    "Content-Disposition": f"{disposition}; filename={fname}", 
-                    "Content-Length": str(len(fblob)), 
-                    "Last-Modified": format_last_modified(file_record.create_time)
-                }
-            )
-        else:
-            return StreamingResponse(
-                await db.read_file_stream(path), media_type=media_type, headers={
-                    "Content-Disposition": f"{disposition}; filename={fname}", 
-                    "Content-Length": str(file_record.file_size),
-                    "Last-Modified": format_last_modified(file_record.create_time)
-                }
-            )
-    
-    if download:
-        return await send('application/octet-stream', "attachment")
+    if thumb:
+        return await emit_thumbnail(path, download, create_time=file_record.create_time)
     else:
-        return await send(None, "inline")
+        if download:
+            return await emit_file(file_record, 'application/octet-stream', "attachment")
+        else:
+            return await emit_file(file_record, None, "inline")
 
 @router_fs.put("/{path:path}")
 @handle_exception

lfss-0.7.13/lfss/src/thumb.py

@@ -0,0 +1,91 @@
+from lfss.src.config import THUMB_DB, THUMB_SIZE
+from lfss.src.database import FileConn
+from lfss.src.connection_pool import unique_cursor
+from typing import Optional
+from PIL import Image
+from io import BytesIO
+import aiosqlite
+
+async def _maybe_init_thumb(c: aiosqlite.Cursor):
+    await c.execute('''
+        CREATE TABLE IF NOT EXISTS thumbs (
+            path TEXT PRIMARY KEY,
+            ctime TEXT,
+            thumb BLOB
+        )
+    ''')
+
+async def _get_cache_thumb(c: aiosqlite.Cursor, path: str, ctime: str) -> Optional[bytes]:
+    res = await c.execute('''
+        SELECT ctime, thumb FROM thumbs WHERE path = ? 
+    ''', (path, ))
+    row = await res.fetchone()
+    if row is None:
+        return None
+    # check if ctime matches, if not delete and return None
+    if row[0] != ctime:
+        await _delete_cache_thumb(c, path)
+        return None
+    blob: bytes = row[1]
+    return blob
+    
+async def _save_cache_thumb(c: aiosqlite.Cursor, path: str, ctime: str, raw_bytes: bytes) -> bytes:
+    raw_img = Image.open(BytesIO(raw_bytes))
+    raw_img.thumbnail(THUMB_SIZE)
+    img = raw_img.convert('RGB')
+    bio = BytesIO()
+    img.save(bio, 'JPEG')
+    blob = bio.getvalue()
+    await c.execute('''
+        INSERT OR REPLACE INTO thumbs (path, ctime, thumb) VALUES (?, ?, ?)
+    ''', (path, ctime, blob))
+    await c.execute('COMMIT')  # commit immediately
+    return blob
+
+async def _delete_cache_thumb(c: aiosqlite.Cursor, path: str):
+    await c.execute('''
+        DELETE FROM thumbs WHERE path = ?
+    ''', (path, ))
+    await c.execute('COMMIT')
+
+async def get_thumb(path: str) -> Optional[tuple[bytes, str]]:
+    """
+    returns [image bytes of thumbnail, mime type] if supported, 
+    or None if not supported. 
+    Raises FileNotFoundError if file does not exist
+    """
+    if path.endswith('/'):
+        return None
+
+    async with aiosqlite.connect(THUMB_DB) as conn:
+        cur = await conn.cursor()
+        await _maybe_init_thumb(cur)
+
+        async with unique_cursor() as main_c:
+            fconn = FileConn(main_c)
+            r = await fconn.get_file_record(path)
+            if r is None:
+                await _delete_cache_thumb(cur, path)
+                raise FileNotFoundError(f'File not found: {path}')
+        
+            if not r.mime_type.startswith('image/'):
+                return None
+
+        c_time = r.create_time
+        thumb_blob = await _get_cache_thumb(cur, path, c_time)
+        if thumb_blob is not None:
+            return thumb_blob, "image/jpeg"
+        
+        # generate thumb
+        async with unique_cursor() as main_c:
+            fconn = FileConn(main_c)
+            if r.external:
+                data = b""
+                async for chunk in fconn.get_file_blob_external(r.file_id):
+                    data += chunk
+            else:
+                data = await fconn.get_file_blob(r.file_id)
+            assert data is not None
+        
+        thumb_blob = await _save_cache_thumb(cur, path, c_time, data)
+        return thumb_blob, "image/jpeg"

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "lfss"
-version = "0.7.11"
+version = "0.7.13"
 description = "Lightweight file storage service"
 authors = ["li, mengxun <limengxun45@outlook.com>"]
 readme = "Readme.md"
@@ -15,6 +15,7 @@ aiofiles = "23.*"
 mimesniff = "1.*"
 fastapi = "0.*"
 uvicorn = "0.*"
+pillow = "*"
 
 [tool.poetry.dev-dependencies]
 pytest = "*"