lfss 0.7.6__tar.gz → 0.7.7__tar.gz

{lfss-0.7.6 → lfss-0.7.7}/PKG-INFO

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

{lfss-0.7.6 → lfss-0.7.7}/frontend/api.js

@@ -20,6 +20,7 @@
  * @property {number} file_size - the size of the file, in bytes
  * @property {string} create_time - the time the file was created
  * @property {string} access_time - the time the file was last accessed
+ * @property {string} mime_type - the mime type of the file
  * 
  * Partially complete...
  * @typedef {Object} DirectoryRecord

{lfss-0.7.6 → lfss-0.7.7}/frontend/index.html

@@ -31,10 +31,9 @@
         <table id="files">
             <thead>
                 <tr>
-                    <th>File</th>
+                    <th>Name</th>
                     <th>Size</th>
                     <th>Accessed</th>
-                    <th>Created</th>
                     <th>Read access</th>
                     <th>Actions</th>
                 </tr>

lfss-0.7.7/frontend/info.css

@@ -0,0 +1,36 @@
+
+div.info-container {
+    display: flex;
+    flex-direction: column;
+    margin: 1rem;
+    gap: 1rem;
+}
+div.info-container-left {
+    margin: 0 auto;
+    padding: 10px;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    background-color: #f9f9f9;
+}
+
+td {
+    text-align: left;
+    text-wrap: nowrap;
+    width: fit-content;
+}
+td.info-table-key {
+    font-weight: bold;
+    padding-right: 1rem;
+}
+
+div.info-container-right {
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
+    width: 100%;
+}
+div.info-path-copy {
+    display: flex;
+    gap: 0.5rem;
+    align-items: center;
+}

lfss-0.7.7/frontend/info.js

@@ -0,0 +1,137 @@
+/**
+ * @import { UserRecord, FileRecord, DirectoryRecord } from "./api.js";
+ */
+import Connector from "./api.js";
+import { createFloatingWindow, showPopup } from "./popup.js";
+import { cvtGMT2Local, formatSize, decodePathURI, copyToClipboard } from "./utils.js";
+
+const ensureSlashEnd = (path) => {
+    return path.endsWith('/') ? path : path + '/';
+}
+
+/**
+ * @param {FileRecord} r
+ * @param {UserRecord} u
+ */
+export function showInfoPanel(r, u){
+    const innerHTML = `
+<div class="info-container">
+    <div class="info-container-left">
+        <table class="info-table">
+            <tr>
+                <td class="info-table-key">Filename</td>
+                <td class="info-table-value">${decodePathURI(r.url).split('/').pop()}</td>
+            </tr>
+            <tr>
+                <td class="info-table-key">File-Type</td>
+                <td class="info-table-value">${r.mime_type}</td>
+            </tr>
+            <tr>
+                <td class="info-table-key">Size</td>
+                <td class="info-table-value">${formatSize(r.file_size)}</td>
+            </tr>
+            <tr>
+                <td class="info-table-key">Owner</td>
+                <td class="info-table-value">${r.owner_id}</td>
+            </tr>
+            <tr>
+                <td class="info-table-key">Create-Time</td>
+                <td class="info-table-value">${cvtGMT2Local(r.create_time)}</td>
+            </td>
+            <tr>
+                <td class="info-table-key">Access-Time</td>
+                <td class="info-table-value">${cvtGMT2Local(r.access_time)}</td>
+            </tr>
+        </table>
+    </div>
+    <div class="info-container-right">
+        <div class="info-path-copy">
+            <input type="text" value="${window.location.origin}/${r.url}" readonly>
+            <button class="copy-button" id='copy-btn-full-path'>📋</button>
+        </div>
+        <div class="info-path-copy">
+            <input type="text" value="${r.url}" readonly>
+            <button class="copy-button" id='copy-btn-rel-path'>📋</button>
+        </div>
+    </div>
+</div>
+    `
+    const [win, closeWin] = createFloatingWindow(innerHTML, {title: 'File Info'});
+    document.getElementById('copy-btn-full-path').onclick = () => {
+        copyToClipboard(window.location.origin + '/' + r.url);
+        showPopup('Path copied to clipboard', {timeout: 2000, level: 'success'});
+    }
+    document.getElementById('copy-btn-rel-path').onclick = () => {
+        copyToClipboard(r.url);
+        showPopup('Path copied to clipboard', {timeout: 2000, level: 'success'});
+    }
+}
+
+/**
+ * @param {DirectoryRecord} r
+ * @param {UserRecord} u
+ * @param {Connector} c
+ */
+export function showDirInfoPanel(r, u, c){
+    let fmtPath = decodePathURI(r.url);
+    if (fmtPath.endsWith('/')) {
+        fmtPath = fmtPath.slice(0, -1);
+    }
+    const innerHTML = `
+<div class="info-container">
+    <div class="info-container-left">
+        <table class="info-table">
+            <tr>
+                <td class="info-table-key">Pathname</td>
+                <td class="info-table-value" id="info-table-pathname">${fmtPath.split('/').pop()}</td>
+            </tr>
+            <tr>
+                <td class="info-table-key">Size</td>
+                <td class="info-table-value" id="info-table-pathsize">N/A</td>
+            </tr>
+            <tr>
+                <td class="info-table-key">Access-Time</td>
+                <td class="info-table-value" id="info-table-accesstime">1970-01-01 00:00:00</td>
+            </tr>
+            <tr>
+                <td class="info-table-key">Create-Time</td>
+                <td class="info-table-value" id="info-table-createtime">1970-01-01 00:00:00</td>
+            </td>
+        </table>
+    </div>
+    <div class="info-container-right">
+        <div class="info-path-copy">
+            <input type="text" value="${window.location.origin}/${ensureSlashEnd(r.url)}" readonly>
+            <button class="copy-button" id='copy-btn-full-path'>📋</button>
+        </div>
+        <div class="info-path-copy">
+            <input type="text" value="${ensureSlashEnd(r.url)}" readonly>
+            <button class="copy-button" id='copy-btn-rel-path'>📋</button>
+        </div>
+    </div>
+</div>
+    `
+    const [win, closeWin] = createFloatingWindow(innerHTML, {title: 'File Info'});
+    document.getElementById('copy-btn-full-path').onclick = () => {
+        copyToClipboard(window.location.origin + '/' + ensureSlashEnd(r.url));
+        showPopup('Path copied to clipboard', {timeout: 2000, level: 'success'});
+    }
+    document.getElementById('copy-btn-rel-path').onclick = () => {
+        copyToClipboard(ensureSlashEnd(r.url));
+        showPopup('Path copied to clipboard', {timeout: 2000, level: 'success'});
+    }
+
+    const sizeValTd = document.querySelector('.info-table-value#info-table-pathsize');
+    const createTimeValTd = document.querySelector('.info-table-value#info-table-createtime');
+    const accessTimeValTd = document.querySelector('.info-table-value#info-table-accesstime');
+    // console.log(sizeValTd, createTimeValTd, accessTimeValTd)
+    c.getMetadata(ensureSlashEnd(r.url)).then((meta) => {
+        if (!meta) {
+            console.error('Failed to fetch metadata for: ' + r.url);
+            return;
+        }
+        sizeValTd.textContent = formatSize(meta.size);
+        createTimeValTd.textContent = cvtGMT2Local(meta.create_time);
+        accessTimeValTd.textContent = cvtGMT2Local(meta.access_time);
+    });
+}

{lfss-0.7.6 → lfss-0.7.7}/frontend/popup.css

@@ -39,6 +39,7 @@ div.popup-window{
     display: block;
     text-align: left;
     animation: popup-appear 0.5s ease;
+    z-index: 102;
 }
 
 @keyframes popup-appear{

{lfss-0.7.6 → lfss-0.7.7}/frontend/scripts.js

@@ -1,7 +1,8 @@
 import Connector from './api.js';
 import { permMap } from './api.js';
 import { showFloatingWindowLineInput, showPopup } from './popup.js';
-import { formatSize, decodePathURI, ensurePathURI, copyToClipboard, getRandomString, cvtGMT2Local, debounce, encodePathURI } from './utils.js';
+import { formatSize, decodePathURI, ensurePathURI, getRandomString, cvtGMT2Local, debounce, encodePathURI } from './utils.js';
+import { showInfoPanel, showDirInfoPanel } from './info.js';
 
 const conn = new Connector();
 let userRecord = null;
@@ -235,7 +236,6 @@ function refreshFileList(){
                 const tr = document.createElement('tr');
                 const sizeTd = document.createElement('td');
                 const accessTimeTd = document.createElement('td');
-                const createTimeTd = document.createElement('td');
                 {
                     const nameTd = document.createElement('td');
                     if (dir.url.endsWith('/')){
@@ -262,8 +262,6 @@ function refreshFileList(){
                     tr.appendChild(sizeTd);
                     accessTimeTd.textContent = cvtGMT2Local(dir.access_time);
                     tr.appendChild(accessTimeTd);
-                    createTimeTd.textContent = cvtGMT2Local(dir.create_time);
-                    tr.appendChild(createTimeTd);
                 }
                 {
                     const accessTd = document.createElement('td');
@@ -275,21 +273,14 @@ function refreshFileList(){
                     const actContainer = document.createElement('div');
                     actContainer.classList.add('action-container');
 
-                    const showMetaButton = document.createElement('a');
-                    showMetaButton.textContent = 'Reveal';
-                    showMetaButton.style.cursor = 'pointer';
-                    showMetaButton.addEventListener('click', () => {
-                        const dirUrlEncap = dirurl;
-                        conn.getMetadata(dirUrlEncap).then(
-                            (meta) => {
-                                sizeTd.textContent = formatSize(meta.size);
-                                accessTimeTd.textContent = cvtGMT2Local(meta.access_time);
-                                createTimeTd.textContent = cvtGMT2Local(meta.create_time);
-                            }
-                        );
-                        showPopup('Fetching metadata...', {level: 'info', timeout: 3000});
+                    const infoButton = document.createElement('a');
+                    infoButton.style.cursor = 'pointer';
+                    infoButton.textContent = 'Details';
+                    infoButton.style.width = '100%';
+                    infoButton.addEventListener('click', () => {
+                        showDirInfoPanel(dir, userRecord, conn);
                     });
-                    actContainer.appendChild(showMetaButton);
+                    actContainer.appendChild(infoButton);
 
                     const moveButton = document.createElement('a');
                     moveButton.textContent = 'Move';
@@ -369,13 +360,6 @@ function refreshFileList(){
                     tr.appendChild(dateTd);
                 }
 
-                {
-                    const dateTd = document.createElement('td');
-                    const createTime = file.create_time;
-                    dateTd.textContent = cvtGMT2Local(createTime);
-                    tr.appendChild(dateTd);
-                }
-
                 {
                     const accessTd = document.createElement('td');
                     if (file.owner_id === userRecord.id || userRecord.is_admin){
@@ -416,14 +400,13 @@ function refreshFileList(){
                     const actContainer = document.createElement('div');
                     actContainer.classList.add('action-container');
 
-                    const copyButton = document.createElement('a');
-                    copyButton.style.cursor = 'pointer';
-                    copyButton.textContent = 'Share';
-                    copyButton.addEventListener('click', () => {
-                        copyToClipboard(conn.config.endpoint + '/' + file.url);
-                        showPopup('Link copied to clipboard', {level: "success"});
+                    const infoButton = document.createElement('a');
+                    infoButton.style.cursor = 'pointer';
+                    infoButton.textContent = 'Details';
+                    infoButton.addEventListener('click', () => {
+                        showInfoPanel(file, userRecord);
                     });
-                    actContainer.appendChild(copyButton);
+                    actContainer.appendChild(infoButton);
 
                     const viewButton = document.createElement('a');
                     viewButton.textContent = 'View';

{lfss-0.7.6 → lfss-0.7.7}/frontend/styles.css

@@ -1,4 +1,5 @@
 @import "./popup.css";
+@import "./info.css";
 
 body{
     font-family: Arial, sans-serif;
@@ -173,10 +174,10 @@ table#files tr:hover {
     background-color: #eaeaea;
     transition: all 0.2s;
 }
-table#files tr td:nth-child(2), table#files tr td:nth-child(5){
+table#files tr td:nth-child(2), table#files tr td:nth-child(4){
     width: 1%;
 }
-table#files tr td:nth-child(3), table#files tr td:nth-child(4), table#files tr td:nth-child(6){
+table#files tr td:nth-child(3), table#files tr td:nth-child(5){
     width: 12%;
 }
 

{lfss-0.7.6 → lfss-0.7.7}/lfss/src/database.py

@@ -13,7 +13,7 @@ from .connection_pool import execute_sql, unique_cursor, transaction
 from .datatype import UserRecord, FileReadPermission, FileRecord, DirectoryRecord, PathContents
 from .config import LARGE_BLOB_DIR
 from .log import get_logger
-from .utils import decode_uri_compnents, hash_credential
+from .utils import decode_uri_compnents, hash_credential, concurrent_wrap
 from .error import *
 
 class DBObjectBase(ABC):
@@ -661,6 +661,7 @@ class Database:
                         continue
                 yield r, blob
 
+    @concurrent_wrap()
     async def zip_path(self, top_url: str, urls: Optional[list[str]]) -> io.BytesIO:
         if top_url.startswith('/'):
             top_url = top_url[1:]

{lfss-0.7.6 → lfss-0.7.7}/lfss/src/utils.py

@@ -3,6 +3,10 @@ import urllib.parse
 import asyncio
 import functools
 import hashlib
+from concurrent.futures import ThreadPoolExecutor
+from typing import TypeVar, Callable, Awaitable
+from functools import wraps, partial
+import os
 
 def hash_credential(username: str, password: str):
     return hashlib.sha256((username + password).encode()).hexdigest()
@@ -56,4 +60,33 @@ def now_stamp() -> float:
     return datetime.datetime.now().timestamp()
 
 def stamp_to_str(stamp: float) -> str:
-    return datetime.datetime.fromtimestamp(stamp).strftime('%Y-%m-%d %H:%M:%S')
+    return datetime.datetime.fromtimestamp(stamp).strftime('%Y-%m-%d %H:%M:%S')
+
+
+_FnReturnT = TypeVar('_FnReturnT')
+_AsyncReturnT = Awaitable[_FnReturnT]
+_g_executor = None
+def get_global_executor():
+    global _g_executor
+    if _g_executor is None:
+        _g_executor = ThreadPoolExecutor(max_workers=4 if (cpu_count:=os.cpu_count()) and cpu_count > 4 else cpu_count)
+    return _g_executor
+def async_wrap(executor=None):
+    if executor is None:
+        executor = get_global_executor()
+    def _async_wrap(func: Callable[..., _FnReturnT]) -> Callable[..., Awaitable[_FnReturnT]]:
+        @wraps(func)
+        async def run(*args, **kwargs):
+            loop = asyncio.get_event_loop()
+            pfunc = partial(func, *args, **kwargs)
+            return await loop.run_in_executor(executor, pfunc)
+        return run
+    return _async_wrap
+def concurrent_wrap(executor=None):
+    def _concurrent_wrap(func: Callable[..., _AsyncReturnT]) -> Callable[..., _AsyncReturnT]:
+        @async_wrap(executor)
+        def sync_fn(*args, **kwargs):
+            loop = asyncio.new_event_loop()
+            return loop.run_until_complete(func(*args, **kwargs))
+        return sync_fn
+    return _concurrent_wrap

{lfss-0.7.6 → lfss-0.7.7}/pyproject.toml

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