lfss 0.7.12__tar.gz → 0.7.14__tar.gz

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

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

{lfss-0.7.12 → lfss-0.7.14}/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; font-size: small;">
+                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.12 → lfss-0.7.14}/frontend/scripts.js

@@ -3,6 +3,7 @@ import { permMap } from './api.js';
 import { showFloatingWindowLineInput, showPopup } from './popup.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');
@@ -253,10 +293,7 @@ function refreshFileList(){
                     dirLink.href = '#';
                     const nameDiv = document.createElement('div');
                     nameDiv.classList.add('filename-container');
-                    const thumbImg = document.createElement('img');
-                    thumbImg.classList.add('thumb');
-                    thumbImg.src = conn.config.endpoint + '/' + ensureSlashEnd(dir.url) + '?token=' + conn.config.token + '&thumb=true';
-                    nameDiv.appendChild(thumbImg);
+                    nameDiv.innerHTML = makeThumbHtml(conn, dir);
                     nameDiv.appendChild(dirLink);
                     nameTd.appendChild(nameDiv);
 
@@ -353,7 +390,7 @@ function refreshFileList(){
 
                     nameTd.innerHTML = `
                     <div class="filename-container">
-                        <img class="thumb" src="${conn.config.endpoint}/${file.url}?token=${conn.config.token}&thumb=true" />
+                        ${makeThumbHtml(conn, file)}
                         <span>${asHtmlText(fileName)}</span>
                     </div>
                     `

{lfss-0.7.12 → lfss-0.7.14}/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;
@@ -186,14 +194,7 @@ div.filename-container{
     flex-direction: row;
     align-items: center;
     gap: 0.5rem;
-    height: 32px; /* same as thumbnail */
 }
-img.thumb{
-    max-height: 32px;   /* smaller than backend */
-    max-width: 32px;
-    border-radius: 0.25rem;
-}
-
 label#upload-file-prefix{
     width: 800px;
     text-align: right;

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.14/frontend/thumb.js

@@ -0,0 +1,75 @@
+
+/**
+ * @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/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;
+    }
+}
+
+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);
+}
+
+let thumb_counter = 0;
+/**
+ * @param {Connector} c
+ * @param {FileRecord | DirectoryRecord} r
+ * @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}/${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.12 → lfss-0.7.14}/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.12 → 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
@@ -127,7 +138,9 @@ async def emit_thumbnail(
         fname = path.split("/")[-2]
     else:
         fname = path.split("/")[-1]
-    thumb_blob, mime_type = await get_thumb(path)
+    if (thumb_res := await get_thumb(path)) is None:
+        return Response(status_code=415, content="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",

lfss-0.7.14/lfss/src/thumb.py

@@ -0,0 +1,92 @@
+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
+        )
+    ''')
+    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('''
+        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.12 → lfss-0.7.14}/pyproject.toml

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

lfss-0.7.12/lfss/src/thumb.py

@@ -1,121 +0,0 @@
-from lfss.src.config import DATA_HOME
-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
-
-def prepare_svg(svg_str: str):
-    """
-    Injects grey color to the svg string, and encodes it to bytes
-    """
-    color = "#666"
-    x = svg_str.replace('<path', '<path fill="{}"'.format(color))
-    x = x.replace('<svg', '<svg fill="{}"'.format(color))
-    return x.encode()
-
-# from: https://pictogrammers.com/library/mdi/
-ICON_FOLER = prepare_svg('<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>')
-ICON_FILE = prepare_svg('<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>')
-ICON_PDF = prepare_svg('<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>')
-ICON_EXE = prepare_svg('<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>')
-ICON_ZIP = prepare_svg('<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>')
-ICON_CODE = prepare_svg('<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>')
-
-THUMB_DB = DATA_HOME / 'thumbs.db'
-THUMB_SIZE = (48, 48)
-
-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) -> 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 ICON_FOLER, 'image/svg+xml'
-
-    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/'):
-                match r.mime_type:
-                    case 'application/pdf' | 'application/x-pdf':
-                        return ICON_PDF, 'image/svg+xml'
-                    case 'application/x-msdownload' | 'application/x-msdos-program' | 'application/x-msi' | 'application/octet-stream':
-                        return ICON_EXE, 'image/svg+xml'
-                    case 'application/zip' | 'application/x-zip-compressed' | 'application/x-zip' | 'application/x-compressed' | 'application/x-compress':
-                        return ICON_ZIP, 'image/svg+xml'
-                    case 'text/plain' | 'text/x-python' | 'text/x-c' | 'text/x-c++' | 'text/x-java' | 'text/x-php' | 'text/x-shellscript' | 'text/x-perl' | 'text/x-ruby' | 'text/x-go' | 'text/x-rust' | 'text/x-haskell' | 'text/x-lisp' | 'text/x-lua' | 'text/x-tcl' | 'text/x-sql' | 'text/x-yaml' | 'text/x-xml' | 'text/x-markdown' | 'text/x-tex' | 'text/x-asm' | 'text/x-fortran' | 'text/x-pascal' | 'text/x-erlang' | 'text/x-ocaml' | 'text/x-matlab' | 'text/x-csharp' | 'text/x-swift' | 'text/x-kotlin' | 'text/x-dart' | 'text/x-julia' | 'text/x-scala' | 'text/x-clojure' | 'text/x-elm' | 'text/x-crystal' | 'text/x-nim' | 'text/x-zig':
-                        return ICON_CODE, 'image/svg+xml'
-                    case _:
-                        return ICON_FILE, 'image/svg+xml'
-
-        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"