lfss 0.5.0__tar.gz → 0.5.2__tar.gz

{lfss-0.5.0 → lfss-0.5.2}/PKG-INFO

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

{lfss-0.5.0 → lfss-0.5.2}/frontend/api.js

@@ -57,13 +57,13 @@ export default class Connector {
     * @returns {Promise<string>} - the promise of the request, the url of the file
     */
     async put(path, file, {
-        overwrite = false,
+        conflict = 'abort',
         permission = 0
     } = {}){
         if (path.startsWith('/')){ path = path.slice(1); }
         const fileBytes = await file.arrayBuffer();
         const dst = new URL(this.config.endpoint + '/' + path);
-        dst.searchParams.append('overwrite', overwrite);
+        dst.searchParams.append('conflict', conflict);
         dst.searchParams.append('permission', permission);
         const res = await fetch(dst.toString(), {
             method: 'PUT',
@@ -191,7 +191,7 @@ export default class Connector {
      * @param {string} path - file path(url)
      * @param {string} newPath - new file path(url)
      */
-    async moveFile(path, newPath){
+    async move(path, newPath){
         if (path.startsWith('/')){ path = path.slice(1); }
         if (newPath.startsWith('/')){ newPath = newPath.slice(1); }
         const dst = new URL(this.config.endpoint + '/_api/meta');

{lfss-0.5.0 → lfss-0.5.2}/frontend/popup.js

@@ -40,7 +40,7 @@ export function createFloatingWindow(innerHTML = '',  {
     return [floatingWindow, closeWindow];
 }
 
-/* select can be "last-filename" */
+/* select can be "last-filename" or "last-pathname" */
 export function showFloatingWindowLineInput(onSubmit = (v) => {}, {
     text = "",
     placeholder = "Enter text",
@@ -72,6 +72,7 @@ export function showFloatingWindowLineInput(onSubmit = (v) => {}, {
     };
 
     if (select === "last-filename") {
+        // select the last filename, e.g. "file" in "/path/to/file.txt"
         const inputVal = input.value;
         let lastSlash = inputVal.lastIndexOf("/");
         if (lastSlash === -1) {
@@ -84,6 +85,17 @@ export function showFloatingWindowLineInput(onSubmit = (v) => {}, {
         }
         input.setSelectionRange(lastSlash + 1, lastSlash + lastDot + 1);
     }
+    else if (select === "last-pathname") {
+        // select the last pathname, e.g. "to" in "/path/to/<filename>"
+        const lastSlash = input.value.lastIndexOf("/");
+        const secondLastSlash = input.value.lastIndexOf("/", input.value.lastIndexOf("/") - 1);
+        if (secondLastSlash !== -1) {
+            input.setSelectionRange(secondLastSlash + 1, lastSlash);
+        }
+        else {
+            input.setSelectionRange(0, lastSlash);
+        }
+    }
 
     return [floatingWindow, closeWindow];
 }

{lfss-0.5.0 → lfss-0.5.2}/frontend/scripts.js

@@ -5,6 +5,9 @@ import { formatSize, decodePathURI, ensurePathURI, copyToClipboard, getRandomStr
 
 const conn = new Connector();
 let userRecord = null;
+const ensureSlashEnd = (path) => {
+    return path.endsWith('/') ? path : path + '/';
+}
 
 const endpointInput = document.querySelector('input#endpoint');
 const tokenInput = document.querySelector('input#token');
@@ -128,11 +131,13 @@ uploadButton.addEventListener('click', () => {
         throw new Error('File name cannot end with /');
     }
     path = path + fileName;
+    showPopup('Uploading...', {level: 'info', timeout: 3000});
     conn.put(path, file)
         .then(() => {
             refreshFileList();
             uploadFileNameInput.value = '';
             onFileNameInpuChange();
+            showPopup('Upload success.', {level: 'success', timeout: 3000});
         }, 
         (err) => {
             showPopup('Failed to upload file: ' + err, {level: 'error', timeout: 5000});
@@ -176,7 +181,7 @@ Are you sure you want to proceed?
             async function uploadFile(...args){
                 const [file, path] = args;
                 try{
-                    await conn.put(path, file, {overwrite: true});
+                    await conn.put(path, file, {conflict: 'overwrite'});
                 }
                 catch (err){
                     showPopup('Failed to upload file [' + file.name + ']: ' + err, {level: 'error', timeout: 5000});
@@ -191,9 +196,14 @@ Are you sure you want to proceed?
                 const path = dstPath + file.name;
                 promises.push(uploadFile(file, path));
             }
+            showPopup('Uploading multiple files...', {level: 'info', timeout: 3000});
             Promise.all(promises).then(
                 () => {
+                    showPopup('Upload success.', {level: 'success', timeout: 3000});
                     refreshFileList();
+                }, 
+                (err) => {
+                    showPopup('Failed to upload some files: ' + err, {level: 'error', timeout: 5000});
                 }
             );
         }
@@ -260,15 +270,16 @@ function refreshFileList(){
                     tr.appendChild(accessTd);
                 }
                 {
+                    const dirurl = ensureSlashEnd(dir.url);
                     const actTd = document.createElement('td');
                     const actContainer = document.createElement('div');
                     actContainer.classList.add('action-container');
 
                     const showMetaButton = document.createElement('a');
-                    showMetaButton.textContent = 'Details';
+                    showMetaButton.textContent = 'Reveal';
                     showMetaButton.style.cursor = 'pointer';
                     showMetaButton.addEventListener('click', () => {
-                        const dirUrlEncap = dir.url + (dir.url.endsWith('/') ? '' : '/');
+                        const dirUrlEncap = dirurl;
                         conn.getMetadata(dirUrlEncap).then(
                             (meta) => {
                                 sizeTd.textContent = formatSize(meta.size);
@@ -280,6 +291,30 @@ function refreshFileList(){
                     });
                     actContainer.appendChild(showMetaButton);
 
+                    const moveButton = document.createElement('a');
+                    moveButton.textContent = 'Move';
+                    moveButton.style.cursor = 'pointer';
+                    moveButton.addEventListener('click', () => {
+                        showFloatingWindowLineInput((dstPath) => {
+                            dstPath = encodePathURI(dstPath);
+                            console.log("Moving", dirurl, "to", dstPath);
+                            conn.move(dirurl, dstPath)
+                                .then(() => {
+                                    refreshFileList();
+                                }, 
+                                (err) => {
+                                    showPopup('Failed to move path: ' + err, {level: 'error'});
+                                }
+                            );
+                        }, {
+                            text: 'Enter the destination path: ',
+                            placeholder: 'Destination path',
+                            value: decodePathURI(dirurl), 
+                            select: "last-pathname"
+                        });
+                    });
+                    actContainer.appendChild(moveButton);
+
                     const downloadButton = document.createElement('a');
                     downloadButton.textContent = 'Download';
                     downloadButton.href = conn.config.endpoint + '/_api/bundle?' + 
@@ -402,10 +437,7 @@ function refreshFileList(){
                     moveButton.addEventListener('click', () => {
                         showFloatingWindowLineInput((dstPath) => {
                             dstPath = encodePathURI(dstPath);
-                            if (dstPath.endsWith('/')){
-                                dstPath = dstPath.slice(0, -1);
-                            }
-                            conn.moveFile(file.url, dstPath)
+                            conn.move(file.url, dstPath)
                                 .then(() => {
                                     refreshFileList();
                                 }, 

{lfss-0.5.0 → lfss-0.5.2}/frontend/styles.css

@@ -192,7 +192,7 @@ input#file-name.duplicate{
     display: flex;
     flex-direction: row;
     gap: 10px;
-    /* justify-content: flex-end; */
+    justify-content: flex-end;
 }
 a{
     color: #195f8b;

lfss-0.5.2/lfss/cli/balance.py

@@ -0,0 +1,124 @@
+"""
+Balance the storage by ensuring that large file thresholds are met.
+"""
+
+from lfss.src.config import DATA_HOME, LARGE_BLOB_DIR, LARGE_FILE_BYTES
+import argparse, time
+from functools import wraps
+from asyncio import Semaphore
+import aiosqlite, aiofiles, asyncio
+
+sem = Semaphore(1)
+db_file = DATA_HOME / 'lfss.db'
+
+def _get_sem():
+    return sem
+
+def barriered(func):
+    @wraps(func)
+    async def wrapper(*args, **kwargs):
+        async with _get_sem():
+            return await func(*args, **kwargs)
+    return wrapper
+
+@barriered
+async def move_to_external(f_id: str, flag: str = ''):
+    async with aiosqlite.connect(db_file, timeout = 60) as c:
+        async with c.execute( "SELECT data FROM fdata WHERE file_id = ?", (f_id,)) as cursor:
+            blob_row = await cursor.fetchone()
+            if blob_row is None:
+                print(f"{flag}File {f_id} not found in fdata")
+                return
+        await c.execute("BEGIN")
+        blob: bytes = blob_row[0]
+        try:
+            async with aiofiles.open(LARGE_BLOB_DIR / f_id, 'wb') as f:
+                await f.write(blob)
+            await c.execute( "UPDATE fmeta SET external = 1 WHERE file_id = ?", (f_id,))
+            await c.execute( "DELETE FROM fdata WHERE file_id = ?", (f_id,))
+            await c.commit()
+            print(f"{flag}Moved {f_id} to external storage")
+        except Exception as e:
+            await c.rollback()
+            print(f"{flag}Error moving {f_id}: {e}")
+
+            if isinstance(e, KeyboardInterrupt):
+                raise e
+
+@barriered
+async def move_to_internal(f_id: str, flag: str = ''):
+    async with aiosqlite.connect(db_file, timeout = 60) as c:
+        if not (LARGE_BLOB_DIR / f_id).exists():
+            print(f"{flag}File {f_id} not found in external storage")
+            return
+        async with aiofiles.open(LARGE_BLOB_DIR / f_id, 'rb') as f:
+            blob = await f.read()
+
+        await c.execute("BEGIN")
+        try:
+            await c.execute("INSERT INTO fdata (file_id, data) VALUES (?, ?)", (f_id, blob))
+            await c.execute("UPDATE fmeta SET external = 0 WHERE file_id = ?", (f_id,))
+            await c.commit()
+            (LARGE_BLOB_DIR / f_id).unlink(missing_ok=True)
+            print(f"{flag}Moved {f_id} to internal storage")
+        except Exception as e:
+            await c.rollback()
+            print(f"{flag}Error moving {f_id}: {e}")
+            if isinstance(e, KeyboardInterrupt):
+                raise e
+
+
+async def _main(batch_size: int = 10000):
+
+    tasks = []
+    start_time = time.time()
+
+    e_cout = 0
+    batch_count = 0
+    while True:
+        async with aiosqlite.connect(db_file) as conn:
+            exceeded_rows = list(await (await conn.execute( 
+                "SELECT file_id FROM fmeta WHERE file_size > ? AND external = 0 LIMIT ? OFFSET ?",
+                (LARGE_FILE_BYTES, batch_size, batch_size * batch_count)
+            )).fetchall())
+            if not exceeded_rows:
+                break
+        e_cout += len(exceeded_rows)
+        for i in range(0, len(exceeded_rows)):
+            row = exceeded_rows[i]
+            f_id = row[0]
+            tasks.append(move_to_external(f_id, flag=f"[b{batch_count+1}-e{i+1}/{len(exceeded_rows)}] "))
+        await asyncio.gather(*tasks)
+
+    i_count = 0
+    batch_count = 0
+    while True:
+        async with aiosqlite.connect(db_file) 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 ?",
+                (LARGE_FILE_BYTES, batch_size, batch_size * batch_count)
+            )).fetchall())
+            if not under_rows:
+                break
+        i_count += len(under_rows)
+        for i in range(0, len(under_rows)):
+            row = under_rows[i]
+            f_id = row[0]
+            tasks.append(move_to_internal(f_id, flag=f"[b{batch_count+1}-i{i+1}/{len(under_rows)}] "))
+        await asyncio.gather(*tasks)
+
+    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.")
+            
+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")
+    args = parser.parse_args()
+    sem = Semaphore(args.jobs)
+    asyncio.run(_main(args.batch_size))
+
+if __name__ == '__main__':
+    main()

{lfss-0.5.0 → lfss-0.5.2}/lfss/cli/cli.py

@@ -13,8 +13,8 @@ def parse_arguments():
     sp_upload.add_argument("src", help="Source file or directory", type=str)
     sp_upload.add_argument("dst", help="Destination path", type=str)
     sp_upload.add_argument("-j", "--jobs", type=int, default=1, help="Number of concurrent uploads")
-    sp_upload.add_argument("--interval", type=float, default=0, help="Interval between retries, only works with directory upload")
-    sp_upload.add_argument("--overwrite", action="store_true", help="Overwrite existing files")
+    sp_upload.add_argument("--interval", type=float, default=0, help="Interval between files, only works with directory upload")
+    sp_upload.add_argument("--conflict", choices=["overwrite", "abort", "skip"], default="abort", help="Conflict resolution")
     sp_upload.add_argument("--permission", type=FileReadPermission, default=FileReadPermission.UNSET, help="File permission")
     sp_upload.add_argument("--retries", type=int, default=0, help="Number of retries, only works with directory upload")
 
@@ -32,7 +32,7 @@ def main():
                 n_concurrent=args.jobs, 
                 n_reties=args.retries, 
                 interval=args.interval,
-                overwrite=args.overwrite, 
+                conflict=args.conflict,
                 permission=args.permission
             )
             if failed_upload:
@@ -44,7 +44,7 @@ def main():
                 connector.put(
                     args.dst, 
                     f.read(), 
-                    overwrite=args.overwrite, 
+                    conflict=args.conflict,
                     permission=args.permission
                     )
     else:

{lfss-0.5.0 → lfss-0.5.2}/lfss/client/api.py

@@ -34,33 +34,52 @@ class Connector:
             return response
         return f
 
-    def put(self, path: str, file_data: bytes, permission: int | FileReadPermission = 0, overwrite: bool = False):
+    def put(self, path: str, file_data: bytes, permission: int | FileReadPermission = 0, conflict: Literal['overwrite', 'abort', 'skip'] = 'abort'):
         """Uploads a file to the specified path."""
-        if path.startswith('/'):
-            path = path[1:]
         response = self._fetch('PUT', path, search_params={
             'permission': int(permission),
-            'overwrite': overwrite
+            'conflict': conflict
             })(
             data=file_data, 
             headers={'Content-Type': 'application/octet-stream'}
         )
         return response.json()
     
-    def get(self, path: str) -> Optional[bytes]:
-        """Downloads a file from the specified path."""
+    def put_json(self, path: str, data: dict, permission: int | FileReadPermission = 0, conflict: Literal['overwrite', 'abort', 'skip'] = 'abort'):
+        """Uploads a JSON file to the specified path."""
+        assert path.endswith('.json'), "Path must end with .json"
+        response = self._fetch('PUT', path, search_params={
+            'permission': int(permission),
+            'conflict': conflict
+            })(
+            json=data, 
+            headers={'Content-Type': 'application/json'}
+        )
+        return response.json()
+    
+    def _get(self, path: str) -> Optional[requests.Response]:
         try:
             response = self._fetch('GET', path)()
         except requests.exceptions.HTTPError as e:
             if e.response.status_code == 404:
                 return None
             raise e
+        return response
+
+    def get(self, path: str) -> Optional[bytes]:
+        """Downloads a file from the specified path."""
+        response = self._get(path)
+        if response is None: return None
         return response.content
+
+    def get_json(self, path: str) -> Optional[dict]:
+        response = self._get(path)
+        if response is None: return None
+        assert response.headers['Content-Type'] == 'application/json'
+        return response.json()
     
     def delete(self, path: str):
         """Deletes the file at the specified path."""
-        if path.startswith('/'):
-            path = path[1:]
         self._fetch('DELETE', path)()
     
     def get_metadata(self, path: str) -> Optional[FileRecord | DirectoryRecord]:
@@ -87,8 +106,8 @@ class Connector:
             headers={'Content-Type': 'application/www-form-urlencoded'}
         )
         
-    def move_file(self, path: str, new_path: str):
-        """Moves a file to a new location."""
+    def move(self, path: str, new_path: str):
+        """Move file or directory to a new path."""
         self._fetch('POST', '_api/meta', {'path': path, 'new_path': new_path})(
             headers = {'Content-Type': 'application/www-form-urlencoded'}
         )

lfss-0.5.2/lfss/sql/init.sql

@@ -0,0 +1,38 @@
+CREATE TABLE IF NOT EXISTS user (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    username VARCHAR(255) UNIQUE NOT NULL,
+    credential VARCHAR(255) NOT NULL,
+    is_admin BOOLEAN DEFAULT FALSE,
+    create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, 
+    last_active TIMESTAMP DEFAULT CURRENT_TIMESTAMP, 
+    max_storage INTEGER DEFAULT 1073741824,
+    permission INTEGER DEFAULT 0
+);
+
+CREATE TABLE IF NOT EXISTS fmeta (
+    url VARCHAR(512) PRIMARY KEY,
+    owner_id INTEGER NOT NULL,
+    file_id VARCHAR(256) NOT NULL,
+    file_size INTEGER,
+    create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, 
+    access_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    permission INTEGER DEFAULT 0, 
+    external BOOLEAN DEFAULT FALSE,
+    FOREIGN KEY(owner_id) REFERENCES user(id)
+);
+
+CREATE TABLE IF NOT EXISTS fdata (
+    file_id VARCHAR(256) PRIMARY KEY,
+    data BLOB
+);
+
+CREATE TABLE IF NOT EXISTS usize (
+    user_id INTEGER PRIMARY KEY,
+    size INTEGER DEFAULT 0
+);
+
+CREATE INDEX IF NOT EXISTS idx_fmeta_url ON fmeta(url);
+
+CREATE INDEX IF NOT EXISTS idx_user_username ON user(username);
+
+CREATE INDEX IF NOT EXISTS idx_user_credential ON user(credential);

lfss-0.5.2/lfss/sql/pragma.sql

@@ -0,0 +1,5 @@
+PRAGMA journal_mode=MEMROY;
+PRAGMA temp_store=MEMORY;
+PRAGMA page_size=8192;
+PRAGMA synchronous=NORMAL;
+PRAGMA case_sensitive_like=ON;

{lfss-0.5.0 → lfss-0.5.2}/lfss/src/config.py

@@ -10,6 +10,7 @@ if not DATA_HOME.exists():
 LARGE_BLOB_DIR = DATA_HOME / 'large_blobs'
 LARGE_BLOB_DIR.mkdir(exist_ok=True)
 
-LARGE_FILE_BYTES = 64 * 1024 * 1024   # 64MB
+# https://sqlite.org/fasterthanfs.html
+LARGE_FILE_BYTES = 8 * 1024 * 1024   # 8MB
 MAX_FILE_BYTES = 1024 * 1024 * 1024   # 1GB
 MAX_BUNDLE_BYTES = 1024 * 1024 * 1024   # 1GB

{lfss-0.5.0 → lfss-0.5.2}/lfss/src/database.py

@@ -3,6 +3,7 @@ from typing import Optional, overload, Literal, AsyncIterable
 from abc import ABC, abstractmethod
 
 import urllib.parse
+from pathlib import Path
 import dataclasses, hashlib, uuid
 from contextlib import asynccontextmanager
 from functools import wraps
@@ -23,6 +24,15 @@ _g_conn: Optional[aiosqlite.Connection] = None
 def hash_credential(username, password):
     return hashlib.sha256((username + password).encode()).hexdigest()
 
+async def execute_sql(conn: aiosqlite.Connection, name: str):
+    this_dir = Path(__file__).parent
+    sql_dir = this_dir.parent / 'sql'
+    async with aiofiles.open(sql_dir / name, 'r') as f:
+        sql = await f.read()
+    sql = sql.split(';')
+    for s in sql:
+        await conn.execute(s)
+
 _atomic_lock = Lock()
 def atomic(func):
     """ Ensure non-reentrancy """
@@ -48,7 +58,8 @@ class DBConnBase(ABC):
         global _g_conn
         if _g_conn is None:
             _g_conn = await aiosqlite.connect(DATA_HOME / 'lfss.db')
-            await _g_conn.execute('PRAGMA journal_mode=memory')
+            await execute_sql(_g_conn, 'pragma.sql')
+            await execute_sql(_g_conn, 'init.sql')
 
     async def commit(self):
         await self.conn.commit()
@@ -82,26 +93,6 @@ class UserConn(DBConnBase):
 
     async def init(self):
         await super().init()
-        # default to 1GB (1024x1024x1024 bytes)
-        await self.conn.execute('''
-        CREATE TABLE IF NOT EXISTS user (
-            id INTEGER PRIMARY KEY AUTOINCREMENT,
-            username VARCHAR(255) UNIQUE NOT NULL,
-            credential VARCHAR(255) NOT NULL,
-            is_admin BOOLEAN DEFAULT FALSE,
-            create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, 
-            last_active TIMESTAMP DEFAULT CURRENT_TIMESTAMP, 
-            max_storage INTEGER DEFAULT 1073741824,
-            permission INTEGER DEFAULT 0
-        )
-        ''')
-        await self.conn.execute('''
-        CREATE INDEX IF NOT EXISTS idx_user_username ON user(username)
-        ''')
-        await self.conn.execute('''
-        CREATE INDEX IF NOT EXISTS idx_user_credential ON user(credential)
-        ''')
-
         return self
     
     async def get_user(self, username: str) -> Optional[UserRecord]:
@@ -222,37 +213,6 @@ class FileConn(DBConnBase):
     
     async def init(self):
         await super().init()
-        await self.conn.execute('''
-        CREATE TABLE IF NOT EXISTS fmeta (
-            url VARCHAR(512) PRIMARY KEY,
-            owner_id INTEGER NOT NULL,
-            file_id VARCHAR(256) NOT NULL,
-            file_size INTEGER,
-            create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, 
-            access_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-            permission INTEGER DEFAULT 0, 
-            external BOOLEAN DEFAULT FALSE,
-            FOREIGN KEY(owner_id) REFERENCES user(id)
-        )
-        ''')
-        await self.conn.execute('''
-        CREATE INDEX IF NOT EXISTS idx_fmeta_url ON fmeta(url)
-        ''')
-
-        await self.conn.execute('''
-        CREATE TABLE IF NOT EXISTS fdata (
-            file_id VARCHAR(256) PRIMARY KEY,
-            data BLOB
-        )
-        ''')
-
-        # user file size table
-        await self.conn.execute('''
-        CREATE TABLE IF NOT EXISTS usize (
-            user_id INTEGER PRIMARY KEY,
-            size INTEGER DEFAULT 0
-        )
-        ''')
         # backward compatibility, since 0.2.1
         async with self.conn.execute("SELECT * FROM user") as cursor:
             res = await cursor.fetchall()
@@ -371,7 +331,7 @@ class FileConn(DBConnBase):
         dirs = await asyncio.gather(*[get_dir(url + d) for d in dirs_str])
         return PathContents(dirs, files)
     
-    async def get_path_record(self, url: str) -> Optional[DirectoryRecord]:
+    async def get_path_record(self, url: str) -> DirectoryRecord:
         assert url.endswith('/'), "Path must end with /"
         async with self.conn.execute("""
             SELECT MIN(create_time) as create_time, 
@@ -461,6 +421,25 @@ class FileConn(DBConnBase):
         async with self.conn.execute("UPDATE fmeta SET url = ?, create_time = CURRENT_TIMESTAMP WHERE url = ?", (new_url, old_url)):
             self.logger.info(f"Moved file {old_url} to {new_url}")
     
+    @atomic
+    async def move_path(self, old_url: str, new_url: str, conflict_handler: Literal['skip', 'overwrite'] = 'overwrite', user_id: Optional[int] = None):
+        assert old_url.endswith('/'), "Old path must end with /"
+        assert new_url.endswith('/'), "New path must end with /"
+        if user_id is None:
+            async with self.conn.execute("SELECT * FROM fmeta WHERE url LIKE ?", (old_url + '%', )) as cursor:
+                res = await cursor.fetchall()
+        else:
+            async with self.conn.execute("SELECT * FROM fmeta WHERE url LIKE ? AND owner_id = ?", (old_url + '%', user_id)) as cursor:
+                res = await cursor.fetchall()
+        for r in res:
+            new_r = new_url + r[0][len(old_url):]
+            if conflict_handler == 'overwrite':
+                await self.conn.execute("DELETE FROM fmeta WHERE url = ?", (new_r, ))
+            elif conflict_handler == 'skip':
+                if (await self.conn.execute("SELECT url FROM fmeta WHERE url = ?", (new_r, ))) is not None:
+                    continue
+            await self.conn.execute("UPDATE fmeta SET url = ?, create_time = CURRENT_TIMESTAMP WHERE url = ?", (new_r, r[0]))
+    
     async def log_access(self, url: str):
         await self.conn.execute("UPDATE fmeta SET access_time = CURRENT_TIMESTAMP WHERE url = ?", (url, ))
     
@@ -704,6 +683,13 @@ class Database:
 
         async with transaction(self):
             await self.file.move_file(old_url, new_url)
+    
+    async def move_path(self, old_url: str, new_url: str, user_id: Optional[int] = None):
+        validate_url(old_url, is_file=False)
+        validate_url(new_url, is_file=False)
+
+        async with transaction(self):
+            await self.file.move_path(old_url, new_url, 'overwrite', user_id)
 
     async def __batch_delete_file_blobs(self, file_records: list[FileRecord], batch_size: int = 512):
         # https://github.com/langchain-ai/langchain/issues/10321

{lfss-0.5.0 → lfss-0.5.2}/lfss/src/server.py

@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Optional, Literal
 from functools import wraps
 
 from fastapi import FastAPI, APIRouter, Depends, Request, Response
@@ -179,7 +179,7 @@ async def get_file(path: str, download = False, user: UserRecord = Depends(get_c
 async def put_file(
     request: Request, 
     path: str, 
-    overwrite: Optional[bool] = False,
+    conflict: Literal["overwrite", "skip", "abort"] = "abort",
     permission: int = 0,
     user: UserRecord = Depends(get_current_user)):
     path = ensure_uri_compnents(path)
@@ -201,8 +201,12 @@ async def put_file(
     exists_flag = False
     file_record = await conn.file.get_file_record(path)
     if file_record:
-        if not overwrite:
+        if conflict == "abort":
             raise HTTPException(status_code=409, detail="File exists")
+        if conflict == "skip":
+            return Response(status_code=200, headers={
+                "Content-Type": "application/json",
+            }, content=json.dumps({"url": path}))
         # remove the old file
         exists_flag = True
         await conn.delete_file(path)
@@ -226,8 +230,9 @@ async def put_file(
         blobs = await request.body()
     if len(blobs) > LARGE_FILE_BYTES:
         async def blob_reader():
-            for b in range(0, len(blobs), 4096):
-                yield blobs[b:b+4096]
+            chunk_size = 16 * 1024 * 1024    # 16MB
+            for b in range(0, len(blobs), chunk_size):
+                yield blobs[b:b+chunk_size]
         await conn.save_file(user.id, path, blob_reader(), permission = FileReadPermission(permission))
     else:
         await conn.save_file(user.id, path, blobs, permission = FileReadPermission(permission))
@@ -258,6 +263,7 @@ async def delete_file(path: str, user: UserRecord = Depends(get_current_user)):
     else:
         res = await conn.delete_file(path)
 
+    await conn.user.set_active(user.username)
     if res:
         return Response(status_code=200, content="Deleted")
     else:
@@ -330,26 +336,57 @@ async def update_file_meta(
     if user.id == 0:
         raise HTTPException(status_code=401, detail="Permission denied")
     path = ensure_uri_compnents(path)
-    file_record = await conn.file.get_file_record(path)
-    if not file_record:
-        logger.debug(f"Reject update meta request from {user.username} to {path}")
-        raise HTTPException(status_code=404, detail="File not found")
-    
-    if not (user.is_admin or user.id == file_record.owner_id):
-        logger.debug(f"Reject update meta request from {user.username} to {path}")
-        raise HTTPException(status_code=403, detail="Permission denied")
+    if path.startswith("/"):
+        path = path[1:]
+    await conn.user.set_active(user.username)
+
+    # file
+    if not path.endswith("/"):
+        file_record = await conn.file.get_file_record(path)
+        if not file_record:
+            logger.debug(f"Reject update meta request from {user.username} to {path}")
+            raise HTTPException(status_code=404, detail="File not found")
+        
+        if not (user.is_admin or user.id == file_record.owner_id):
+            logger.debug(f"Reject update meta request from {user.username} to {path}")
+            raise HTTPException(status_code=403, detail="Permission denied")
+        
+        if perm is not None:
+            logger.info(f"Update permission of {path} to {perm}")
+            await conn.file.set_file_record(
+                url = file_record.url, 
+                permission = FileReadPermission(perm)
+            )
     
-    if perm is not None:
-        logger.info(f"Update permission of {path} to {perm}")
-        await conn.file.set_file_record(
-            url = file_record.url, 
-            permission = FileReadPermission(perm)
-        )
+        if new_path is not None:
+            new_path = ensure_uri_compnents(new_path)
+            logger.info(f"Update path of {path} to {new_path}")
+            await conn.move_file(path, new_path)
     
-    if new_path is not None:
-        new_path = ensure_uri_compnents(new_path)
-        logger.info(f"Update path of {path} to {new_path}")
-        await conn.move_file(path, new_path)
+    # directory
+    else:
+        assert perm is None, "Permission is not supported for directory"
+        if new_path is not None:
+            new_path = ensure_uri_compnents(new_path)
+            logger.info(f"Update path of {path} to {new_path}")
+            assert new_path.endswith("/"), "New path must end with /"
+            if new_path.startswith("/"):
+                new_path = new_path[1:]
+
+            # check if new path is under the user's directory
+            first_component = new_path.split("/")[0]
+            if not (first_component == user.username or user.is_admin):
+                raise HTTPException(status_code=403, detail="Permission denied, path must start with username")
+            elif user.is_admin:
+                _is_user = await conn.user.get_user(first_component)
+                if not _is_user:
+                    raise HTTPException(status_code=404, detail="User not found, path must start with username")
+
+            # check if old path is under the user's directory (non-admin)
+            if not path.startswith(f"{user.username}/") and not user.is_admin:
+                raise HTTPException(status_code=403, detail="Permission denied, path must start with username")
+            # currently only move own file, with overwrite
+            await conn.move_path(path, new_path, user_id = user.id)
 
     return Response(status_code=200, content="OK")
     

{lfss-0.5.0 → lfss-0.5.2}/pyproject.toml

@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "lfss"
-version = "0.5.0"
+version = "0.5.2"
 description = "Lightweight file storage service"
 authors = ["li, mengxun <limengxun45@outlook.com>"]
 readme = "Readme.md"
 homepage = "https://github.com/MenxLi/lfss"
 repository = "https://github.com/MenxLi/lfss"
-include = ["Readme.md", "docs/*", "frontend/*"]
+include = ["Readme.md", "docs/*", "frontend/*", "lfss/sql/*"]
 
 [tool.poetry.dependencies]
 python = ">=3.9"
@@ -20,6 +20,7 @@ lfss-serve = "lfss.cli.serve:main"
 lfss-user = "lfss.cli.user:main"
 lfss-panel = "lfss.cli.panel:main"
 lfss-cli = "lfss.cli.cli:main"
+lfss-balance = "lfss.cli.balance:main"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]