lfss 0.7.14__tar.gz → 0.7.15__tar.gz

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

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

{lfss-0.7.14 → lfss-0.7.15}/frontend/scripts.js

@@ -1,12 +1,13 @@
-import Connector from './api.js';
 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';
+import { store } from './state.js';
 
-const conn = new Connector();
+/** @type {import('./api.js').UserRecord}*/
 let userRecord = null;
+
 const ensureSlashEnd = (path) => {
     return path.endsWith('/') ? path : path + '/';
 }
@@ -26,25 +27,16 @@ 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;
+const conn = store.conn;
+store.init();
 
 {
-    const endpoint = window.localStorage.getItem('endpoint');
-    if (endpoint){
-        endpointInput.value = endpoint;
-        conn.config.endpoint = endpoint;
-    }
-    const token = window.localStorage.getItem('token');
-    if (token){
-        tokenInput.value = token;
-        conn.config.token = token;
-    }
-    const path = window.localStorage.getItem('path');
-    if (path){
-        pathInput.value = path;
-    }
+    tokenInput.value = store.token;
+    endpointInput.value = store.endpoint;
+    pathInput.value = store.dirpath;
     uploadFilePrefixLabel.textContent = pathInput.value;
+    sortBySelect.value = store.sortby;
+    sortOrderSelect.value = store.sortorder;
     maybeRefreshUserRecord().then(
         () => maybeRefreshFileList()
     );
@@ -52,20 +44,18 @@ conn.config.token = tokenInput.value;
 
 function onPathChange(){
     uploadFilePrefixLabel.textContent = pathInput.value;
-    window.localStorage.setItem('path', pathInput.value);
+    store.dirpath = pathInput.value;
     maybeRefreshFileList();
 }
 
 endpointInput.addEventListener('blur', () => {
-    conn.config.endpoint = endpointInput.value;
-    window.localStorage.setItem('endpoint', endpointInput.value);
+    store.endpoint = endpointInput.value;
     maybeRefreshUserRecord().then(
         () => maybeRefreshFileList()
     );
 });
 tokenInput.addEventListener('blur', () => {
-    conn.config.token = tokenInput.value;
-    window.localStorage.setItem('token', tokenInput.value);
+    store.token = tokenInput.value;
     maybeRefreshUserRecord().then(
         () => maybeRefreshFileList()
     );
@@ -94,7 +84,7 @@ function onFileNameInpuChange(){
         uploadFileNameInput.classList.remove('duplicate');
     }
     else {
-        const p = ensurePathURI(pathInput.value + fileName);
+        const p = ensurePathURI(store.dirpath + fileName);
         conn.getMetadata(p).then(
             (data) => {
                 console.log("Got file meta", data);
@@ -126,7 +116,7 @@ uploadFileSelector.addEventListener('change', () => {
 });
 uploadButton.addEventListener('click', () => {
     const file = uploadFileSelector.files[0];
-    let path = pathInput.value;
+    let path = store.dirpath;
     let fileName = uploadFileNameInput.value;
     if (fileName.length === 0){
         throw new Error('File name cannot be empty');
@@ -172,7 +162,7 @@ uploadFileNameInput.addEventListener('input', debounce(onFileNameInpuChange, 500
             uploadFileNameInput.focus();
         }
         else if (files.length > 1){
-            let dstPath = pathInput.value + uploadFileNameInput.value;
+            let dstPath = store.dirpath + uploadFileNameInput.value;
             if (!dstPath.endsWith('/')){ dstPath += '/'; }
             if (!confirm(`
 You are trying to upload multiple files at once. 
@@ -216,52 +206,50 @@ Are you sure you want to proceed?
 
 function maybeRefreshFileList(){
     if (
-        pathInput.value && pathInput.value.length > 0 && pathInput.value.endsWith('/')
+        store.dirpath && store.dirpath.length > 0 && store.dirpath.endsWith('/')
     ){
         refreshFileList();
     }
 }
 
-let sortBy = sortBySelect.value;
-let sortOrder = sortOrderSelect.value;
 /** @param {import('./api.js').DirectoryRecord} dirs */
 function sortDirList(dirs){
-    if (sortBy === 'name'){
+    if (store.sortby === 'name'){
         dirs.sort((a, b) => { return a.url.localeCompare(b.url); });
     }
-    if (sortOrder === 'desc'){ dirs.reverse(); }
+    if (store.sortorder === 'desc'){ dirs.reverse(); }
 }
 /** @param {import('./api.js').FileRecord} files */
 function sortFileList(files){
     function timestr2num(timestr){
         return new Date(timestr).getTime();
     }
-    if (sortBy === 'name'){
+    if (store.sortby === 'name'){
         files.sort((a, b) => { return a.url.localeCompare(b.url); });
     }
-    if (sortBy === 'size'){
+    if (store.sortby === 'size'){
         files.sort((a, b) => { return a.file_size - b.file_size; });
     }
-    if (sortBy === 'access'){
+    if (store.sortby === 'access'){
         files.sort((a, b) => { return timestr2num(a.access_time) - timestr2num(b.access_time); });
     }
-    if (sortBy === 'create'){
+    if (store.sortby === 'create'){
         files.sort((a, b) => { return timestr2num(a.create_time) - timestr2num(b.create_time); });
     }
-    if (sortBy === 'mime'){
+    if (store.sortby === 'mime'){
         files.sort((a, b) => { return a.mime_type.localeCompare(b.mime_type); });
     }
-    if (sortOrder === 'desc'){ files.reverse(); }
+    if (store.sortorder === 'desc'){ files.reverse(); }
 }
-sortBySelect.addEventListener('change', (elem) => {sortBy = elem.target.value; refreshFileList();});
-sortOrderSelect.addEventListener('change', (elem) => {sortOrder = elem.target.value; refreshFileList();});
+sortBySelect.addEventListener('change', (elem) => {store.sortby = elem.target.value; refreshFileList();});
+sortOrderSelect.addEventListener('change', (elem) => {store.sortorder = elem.target.value; refreshFileList();});
 
 function refreshFileList(){
-    conn.listPath(pathInput.value)
+    conn.listPath(store.dirpath)
         .then(data => {
             pathHintDiv.classList.remove('disconnected');
             pathHintDiv.classList.add('connected');
-            pathHintLabel.textContent = pathInput.value;
+            pathHintLabel.textContent = store.dirpath;
             tbody.innerHTML = '';
 
             console.log("Got data", data);
@@ -520,7 +508,7 @@ function refreshFileList(){
         (err) => {
             pathHintDiv.classList.remove('connected');
             pathHintDiv.classList.add('disconnected');
-            pathHintLabel.textContent = pathInput.value;
+            pathHintLabel.textContent = store.dirpath;
             tbody.innerHTML = '';
             console.log("Error");
             console.error(err);
@@ -530,7 +518,7 @@ function refreshFileList(){
 
 
 async function maybeRefreshUserRecord(){
-    if (endpointInput.value && tokenInput.value){
+    if (store.endpoint && store.token){
         await refreshUserRecord();
     }
 }
@@ -545,9 +533,6 @@ async function refreshUserRecord(){
         console.error("Failed to get user record");
         return false;
     }
-
-    // UI updates.
-
     return true;
 }
 

lfss-0.7.15/frontend/state.js

@@ -0,0 +1,57 @@
+
+import Connector from './api.js';
+
+function loadPersistedState(key, defaultValue) {
+    const persistedValue = window.localStorage.getItem(key);
+    return persistedValue ? persistedValue : defaultValue;
+}
+
+function setPersistedState(key, value) {
+    window.localStorage.setItem(key, value);
+}
+
+export const store = {
+    conn: new Connector(),
+
+    init() {
+        this.conn.config.token = this.token;
+        this.conn.config.endpoint = this.endpoint;
+    },
+
+    get token() {
+        return loadPersistedState('token', '');
+    },
+    set token(t) {
+        setPersistedState('token', t);
+        this.conn.config.token = t;
+    },
+
+    get endpoint() {
+        return loadPersistedState('endpoint', 'http://localhost:8000');
+    },
+    set endpoint(url) {
+        setPersistedState('endpoint', url);
+        this.conn.config.endpoint = url;
+    }, 
+
+    get dirpath() {
+        return loadPersistedState('dirpath', '/');
+    },
+    set dirpath(pth) {
+        setPersistedState('dirpath', pth);
+    },
+
+    get sortby () {
+        return loadPersistedState('sortby', 'none');
+    }, 
+    set sortby (sb) {
+        setPersistedState('sortby', sb);
+    }, 
+
+    get sortorder () {
+        return loadPersistedState('sortorder', 'asc');
+    },
+    set sortorder (so) {
+        setPersistedState('sortorder', so);
+    },
+};

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

@@ -24,25 +24,26 @@ function getIconSVGFromMimeType(mimeType){
     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;
+
+    if (['application/pdf', 'application/x-pdf'].includes(mimeType)){
+        return ICON_PDF;
+    }
+    if (['application/x-msdownload', 'application/x-msdos-program', 'application/x-msi', 'application/x-ms-wim', 'application/octet-stream', 'application/x-apple-diskimage'].includes(mimeType)){
+        return ICON_EXE;
+    }
+    if (['application/zip', 'application/x-zip-compressed', 'application/x-7z-compressed', 'application/x-rar-compressed', 'application/x-tar', 'application/x-gzip'].includes(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"
+    ].includes(mimeType)){
+        return ICON_CODE;
     }
+
+    return ICON_FILE;
 }
 
 function getSafeIconUrl(icon_str){
@@ -66,10 +67,20 @@ export function makeThumbHtml(c, r){
     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>
-`;
+
+    if (mtype.startsWith('image/')){
+        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>
+        `;
+    }
+    else{
+        return `
+        <div class="thumb" id="${thumb_id}"> \
+            <img src="${getSafeIconUrl(getIconSVGFromMimeType(mtype))}" alt="${r.url}" class="thumb thumb-svg"/ >
+        </div>
+        `;
+    }
 }

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

@@ -5,6 +5,7 @@ from typing import Optional
 from PIL import Image
 from io import BytesIO
 import aiosqlite
+from contextlib import asynccontextmanager
 
 async def _maybe_init_thumb(c: aiosqlite.Cursor):
     await c.execute('''
@@ -49,6 +50,13 @@ async def _delete_cache_thumb(c: aiosqlite.Cursor, path: str):
     ''', (path, ))
     await c.execute('COMMIT')
 
+@asynccontextmanager
+async def cache_cursor():
+    async with aiosqlite.connect(THUMB_DB) as conn:
+        cur = await conn.cursor()
+        await _maybe_init_thumb(cur)
+        yield cur
+
 async def get_thumb(path: str) -> Optional[tuple[bytes, str]]:
     """
     returns [image bytes of thumbnail, mime type] if supported, 
@@ -58,20 +66,17 @@ async def get_thumb(path: str) -> Optional[tuple[bytes, str]]:
     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:
+    async with unique_cursor() as main_c:
+        fconn = FileConn(main_c)
+        r = await fconn.get_file_record(path)
+        if r is None:
+            async with cache_cursor() as cur:
                 await _delete_cache_thumb(cur, path)
-                raise FileNotFoundError(f'File not found: {path}')
-        
-            if not r.mime_type.startswith('image/'):
-                return None
+            raise FileNotFoundError(f'File not found: {path}')
+        if not r.mime_type.startswith('image/'):
+            return None
 
+    async with cache_cursor() as cur:
         c_time = r.create_time
         thumb_blob = await _get_cache_thumb(cur, path, c_time)
         if thumb_blob is not None:

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

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