lfss 0.7.7__tar.gz → 0.7.8__tar.gz

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

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

{lfss-0.7.7 → lfss-0.7.8}/frontend/info.js

@@ -19,28 +19,28 @@ export function showInfoPanel(r, u){
     <div class="info-container-left">
         <table class="info-table">
             <tr>
-                <td class="info-table-key">Filename</td>
+                <td class="info-table-key">Name</td>
                 <td class="info-table-value">${decodePathURI(r.url).split('/').pop()}</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">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>
+                <td class="info-table-key">Owner-ID</td>
+                <td class="info-table-value">${r.owner_id}</td>
             </tr>
             <tr>
-                <td class="info-table-key">Owner</td>
-                <td class="info-table-value">${r.owner_id}</td>
+                <td class="info-table-key">Access-Time</td>
+                <td class="info-table-value">${cvtGMT2Local(r.access_time)}</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>
@@ -82,7 +82,7 @@ export function showDirInfoPanel(r, u, c){
     <div class="info-container-left">
         <table class="info-table">
             <tr>
-                <td class="info-table-key">Pathname</td>
+                <td class="info-table-key">Name</td>
                 <td class="info-table-value" id="info-table-pathname">${fmtPath.split('/').pop()}</td>
             </tr>
             <tr>

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

@@ -9,6 +9,19 @@ div.floating-window.blocker{
     z-index: 100;
 }
 
+@keyframes fade-in{
+    from{
+        opacity: 0;
+        transform: translate(-50%, calc(-50% + 0.25rem));
+    }
+    to{
+        opacity: 1;
+        transform: translate(-50%, -50%);
+    }
+}
+div.floating-window.window{
+    animation: fade-in 0.1s ease-in;
+}
 div.floating-window.window{
     position: fixed;
     top: 50%;

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

@@ -277,6 +277,8 @@ function refreshFileList(){
                     infoButton.style.cursor = 'pointer';
                     infoButton.textContent = 'Details';
                     infoButton.style.width = '100%';
+                    infoButton.style.display = 'block';
+                    infoButton.style.textAlign = 'center';
                     infoButton.addEventListener('click', () => {
                         showDirInfoPanel(dir, userRecord, conn);
                     });

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

@@ -219,4 +219,14 @@ a{
 .delete-btn:hover{
     color: white !important;
     background-color: #990511c7 !important;
+}
+
+button{
+    transition: all 0.2s;
+}
+button:hover {
+    transform: scale(1.05);
+}
+button:active {
+    transform: scale(0.95);
 }

{lfss-0.7.7 → lfss-0.7.8}/lfss/cli/balance.py

@@ -3,10 +3,11 @@ Balance the storage by ensuring that large file thresholds are met.
 """
 
 from lfss.src.config import LARGE_BLOB_DIR, LARGE_FILE_BYTES
-import argparse, time
+import argparse, time, itertools
 from functools import wraps
 from asyncio import Semaphore
 import aiofiles, asyncio
+from contextlib import contextmanager
 from lfss.src.database import transaction, unique_cursor
 from lfss.src.connection_pool import global_entrance
 
@@ -30,7 +31,6 @@ async def move_to_external(f_id: str, flag: str = ''):
         if blob_row is None:
             print(f"{flag}File {f_id} not found in blobs.fdata")
             return
-        await c.execute("BEGIN")
         blob: bytes = blob_row[0]
         async with aiofiles.open(LARGE_BLOB_DIR / f_id, 'wb') as f:
             await f.write(blob)
@@ -59,8 +59,7 @@ async def _main(batch_size: int = 10000):
     start_time = time.time()
 
     e_cout = 0
-    batch_count = 0
-    while True:
+    for batch_count in itertools.count(start=0):
         async with unique_cursor() as conn:
             exceeded_rows = list(await (await conn.execute( 
                 "SELECT file_id FROM fmeta WHERE file_size > ? AND external = 0 LIMIT ? OFFSET ?",
@@ -76,8 +75,7 @@ async def _main(batch_size: int = 10000):
         await asyncio.gather(*tasks)
 
     i_count = 0
-    batch_count = 0
-    while True:
+    for batch_count in itertools.count(start=0):
         async with unique_cursor() as conn:
             under_rows = list(await (await conn.execute(
                 "SELECT file_id, file_size, external FROM fmeta WHERE file_size <= ? AND external = 1 LIMIT ? OFFSET ?",
@@ -95,15 +93,35 @@ async def _main(batch_size: int = 10000):
     end_time = time.time()
     print(f"Balancing complete, took {end_time - start_time:.2f} seconds. "
           f"{e_cout} files moved to external storage, {i_count} files moved to internal storage.")
+
+@global_entrance()
+async def vacuum(index: bool = False, blobs: bool = False):
+    @contextmanager
+    def indicator(name: str):
+        print(f"\033[1;33mRunning {name}... \033[0m")
+        s = time.time()
+        yield
+        print(f"{name} took {time.time() - s:.2f} seconds")
+
+    async with unique_cursor(is_write=True) as c:
+        if index:
+            with indicator("VACUUM-index"):
+                await c.execute("VACUUM main")
+        if blobs:
+            with indicator("VACUUM-blobs"):
+                await c.execute("VACUUM blobs")
             
 def main():
     global sem
     parser = argparse.ArgumentParser(description="Balance the storage by ensuring that large file thresholds are met.")
     parser.add_argument("-j", "--jobs", type=int, default=2, help="Number of concurrent jobs")
     parser.add_argument("-b", "--batch-size", type=int, default=10000, help="Batch size for processing files")
+    parser.add_argument("--vacuum", action="store_true", help="Run VACUUM only on index.db after balancing")
+    parser.add_argument("--vacuum-all", action="store_true", help="Run VACUUM on both index.db and blobs.db after balancing")
     args = parser.parse_args()
     sem = Semaphore(args.jobs)
     asyncio.run(_main(args.batch_size))
+    asyncio.run(vacuum(index=args.vacuum or args.vacuum_all, blobs=args.vacuum_all))
 
 if __name__ == '__main__':
     main()

{lfss-0.7.7 → lfss-0.7.8}/lfss/cli/user.py

@@ -1,20 +1,10 @@
 import argparse, asyncio
 from contextlib import asynccontextmanager
 from .cli import parse_permission, FileReadPermission
+from ..src.utils import parse_storage_size
 from ..src.database import Database, FileReadPermission, transaction, UserConn
 from ..src.connection_pool import global_entrance
 
-def parse_storage_size(s: str) -> int:
-    if s[-1] in 'Kk':
-        return int(s[:-1]) * 1024
-    if s[-1] in 'Mm':
-        return int(s[:-1]) * 1024 * 1024
-    if s[-1] in 'Gg':
-        return int(s[:-1]) * 1024 * 1024 * 1024
-    if s[-1] in 'Tt':
-        return int(s[:-1]) * 1024 * 1024 * 1024 * 1024
-    return int(s)
-
 @global_entrance(1)
 async def _main():
     parser = argparse.ArgumentParser()

{lfss-0.7.7 → lfss-0.7.8}/lfss/src/config.py

@@ -1,5 +1,6 @@
-from pathlib import Path
 import os
+from pathlib import Path
+from .utils import parse_storage_size
 
 __default_dir = '.storage_data'
 
@@ -12,6 +13,10 @@ LARGE_BLOB_DIR = DATA_HOME / 'large_blobs'
 LARGE_BLOB_DIR.mkdir(exist_ok=True)
 
 # https://sqlite.org/fasterthanfs.html
-LARGE_FILE_BYTES = 8 * 1024 * 1024   # 8MB
+__env_large_file = os.environ.get('LFSS_LARGE_FILE', None)
+if __env_large_file is not None:
+    LARGE_FILE_BYTES = parse_storage_size(__env_large_file)
+else:
+    LARGE_FILE_BYTES = 8 * 1024 * 1024  # 8MB
 MAX_FILE_BYTES = 512 * 1024 * 1024   # 512MB
 MAX_BUNDLE_BYTES = 512 * 1024 * 1024   # 512MB

{lfss-0.7.7 → lfss-0.7.8}/lfss/src/connection_pool.py

@@ -5,6 +5,7 @@ from contextlib import asynccontextmanager
 from dataclasses import dataclass
 from asyncio import Semaphore, Lock
 from functools import wraps
+from typing import Callable, Awaitable
 
 from .log import get_logger
 from .config import DATA_HOME
@@ -125,7 +126,7 @@ async def global_connection(n_read: int = 1):
         await global_connection_close()
 
 def global_entrance(n_read: int = 1):
-    def decorator(func):
+    def decorator(func: Callable[..., Awaitable]):
         @wraps(func)
         async def wrapper(*args, **kwargs):
             async with global_connection(n_read):

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

@@ -62,6 +62,18 @@ def now_stamp() -> float:
 def stamp_to_str(stamp: float) -> str:
     return datetime.datetime.fromtimestamp(stamp).strftime('%Y-%m-%d %H:%M:%S')
 
+def parse_storage_size(s: str) -> int:
+    """ Parse the file size string to bytes """
+    if s[-1].isdigit():
+        return int(s)
+    unit = s[-1].lower()
+    match unit:
+        case 'b': return int(s[:-1])
+        case 'k': return int(s[:-1]) * 1024
+        case 'm': return int(s[:-1]) * 1024**2
+        case 'g': return int(s[:-1]) * 1024**3
+        case 't': return int(s[:-1]) * 1024**4
+        case _: raise ValueError(f"Invalid file size string: {s}")
 
 _FnReturnT = TypeVar('_FnReturnT')
 _AsyncReturnT = Awaitable[_FnReturnT]

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

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