lfss 0.7.15__py3-none-any.whl → 0.8.1__py3-none-any.whl

frontend/scripts.js

@@ -1,9 +1,10 @@
-import { permMap } from './api.js';
+import { permMap, listPath, uploadFile } 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';
+import { maybeShowLoginPanel } from './login.js';
 
 /** @type {import('./api.js').UserRecord}*/
 let userRecord = null;
@@ -12,8 +13,6 @@ const ensureSlashEnd = (path) => {
     return path.endsWith('/') ? path : path + '/';
 }
 
-const endpointInput = document.querySelector('input#endpoint');
-const tokenInput = document.querySelector('input#token');
 const pathInput = document.querySelector('input#path');
 const pathBackButton = document.querySelector('span#back-btn');
 const pathHintDiv = document.querySelector('#position-hint');
@@ -24,42 +23,49 @@ 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 pageLimitSelect = document.querySelector('#page-limit-sel');
+const pageNumInput = document.querySelector('#page-num-input');
+const pageCountLabel = document.querySelector('#page-count-lbl');
 const sortBySelect = document.querySelector('#sort-by-sel');
 const sortOrderSelect = document.querySelector('#sort-order-sel');
 
 const conn = store.conn;
-store.init();
 
 {
-    tokenInput.value = store.token;
-    endpointInput.value = store.endpoint;
+    // initialization
+    store.init();
     pathInput.value = store.dirpath;
     uploadFilePrefixLabel.textContent = pathInput.value;
-    sortBySelect.value = store.sortby;
+    sortBySelect.value = store.orderby;
     sortOrderSelect.value = store.sortorder;
-    maybeRefreshUserRecord().then(
-        () => maybeRefreshFileList()
-    );
+    pageLimitSelect.value = store.pagelim;
+    pageNumInput.value = store.pagenum;
+
+    maybeShowLoginPanel(store,).then(
+        (user) => {
+            console.log("User record", user);
+            userRecord = user;
+            maybeRefreshFileList();
+        }
+    )
 }
 
+pathHintDiv.addEventListener('click', () => {
+    maybeShowLoginPanel(store, true).then(
+        (user) => {
+            console.log("User record", user);
+            userRecord = user;
+            maybeRefreshFileList();
+        }
+    );
+});
+
 function onPathChange(){
     uploadFilePrefixLabel.textContent = pathInput.value;
     store.dirpath = pathInput.value;
     maybeRefreshFileList();
 }
 
-endpointInput.addEventListener('blur', () => {
-    store.endpoint = endpointInput.value;
-    maybeRefreshUserRecord().then(
-        () => maybeRefreshFileList()
-    );
-});
-tokenInput.addEventListener('blur', () => {
-    store.token = tokenInput.value;
-    maybeRefreshUserRecord().then(
-        () => maybeRefreshFileList()
-    );
-});
 pathInput.addEventListener('input', () => {
     onPathChange();
 });
@@ -126,7 +132,7 @@ uploadButton.addEventListener('click', () => {
     }
     path = path + fileName;
     showPopup('Uploading...', {level: 'info', timeout: 3000});
-    conn.put(path, file, {'conflict': 'overwrite'})
+    uploadFile(conn, path, file, {'conflict': 'overwrite'})
         .then(() => {
             refreshFileList();
             uploadFileNameInput.value = '';
@@ -172,10 +178,10 @@ Are you sure you want to proceed?
                 `)){ return; }
             
             let counter = 0;
-            async function uploadFile(...args){
+            async function uploadFileFn(...args){
                 const [file, path] = args;
                 try{
-                    await conn.put(path, file, {conflict: 'overwrite'});
+                    await uploadFile(conn, path, file, {conflict: 'overwrite'});
                 }
                 catch (err){
                     showPopup('Failed to upload file [' + file.name + ']: ' + err, {level: 'error', timeout: 5000});
@@ -188,7 +194,7 @@ Are you sure you want to proceed?
             for (let i = 0; i < files.length; i++){
                 const file = files[i];
                 const path = dstPath + file.name;
-                promises.push(uploadFile(file, path));
+                promises.push(uploadFileFn(file, path));
             }
             showPopup('Uploading multiple files...', {level: 'info', timeout: 3000});
             Promise.all(promises).then(
@@ -212,54 +218,63 @@ function maybeRefreshFileList(){
     }
 }
 
-/** @param {import('./api.js').DirectoryRecord} dirs */
-function sortDirList(dirs){
-    if (store.sortby === 'name'){
-        dirs.sort((a, b) => { return a.url.localeCompare(b.url); });
-    }
-    if (store.sortorder === 'desc'){ dirs.reverse(); }
-}
-/** @param {import('./api.js').FileRecord} files */
-function sortFileList(files){
-    function timestr2num(timestr){
-        return new Date(timestr).getTime();
-    }
-    if (store.sortby === 'name'){
-        files.sort((a, b) => { return a.url.localeCompare(b.url); });
-    }
-    if (store.sortby === 'size'){
-        files.sort((a, b) => { return a.file_size - b.file_size; });
-    }
-    if (store.sortby === 'access'){
-        files.sort((a, b) => { return timestr2num(a.access_time) - timestr2num(b.access_time); });
+sortBySelect.addEventListener('change', (elem) => {store.orderby = elem.target.value; refreshFileList();});
+sortOrderSelect.addEventListener('change', (elem) => {store.sortorder = elem.target.value; refreshFileList();});
+pageLimitSelect.addEventListener('change', (elem) => {store.pagelim = elem.target.value; refreshFileList();});
+pageNumInput.addEventListener('change', (elem) => {store.pagenum = elem.target.value; refreshFileList();});
+
+window.addEventListener('keydown', (e) => {
+    if (document.activeElement !== document.body){
+        return;
     }
-    if (store.sortby === 'create'){
-        files.sort((a, b) => { return timestr2num(a.create_time) - timestr2num(b.create_time); });
+    if (e.key === 'ArrowLeft'){
+        const num = Math.max(store.pagenum - 1, 1);
+        pageNumInput.value = num;
+        store.pagenum = num;
+        refreshFileList();
     }
-    if (store.sortby === 'mime'){
-        files.sort((a, b) => { return a.mime_type.localeCompare(b.mime_type); });
+    else if (e.key === 'ArrowRight'){
+        const num = Math.min(Math.max(store.pagenum + 1, 1), parseInt(pageCountLabel.textContent));
+        pageNumInput.value = num;
+        store.pagenum = num;
+        refreshFileList();
     }
-    if (store.sortorder === 'desc'){ files.reverse(); }
-}
-sortBySelect.addEventListener('change', (elem) => {store.sortby = elem.target.value; refreshFileList();});
-sortOrderSelect.addEventListener('change', (elem) => {store.sortorder = elem.target.value; refreshFileList();});
+})
 
-function refreshFileList(){
-    conn.listPath(store.dirpath)
-        .then(data => {
+async function refreshFileList(){
+
+    listPath(conn, store.dirpath, {
+        offset: (store.pagenum - 1) * store.pagelim,
+        limit: store.pagelim,
+        orderBy: store.orderby,
+        orderDesc: store.sortorder === 'desc'
+    })
+        .then(async (res) => {
             pathHintDiv.classList.remove('disconnected');
             pathHintDiv.classList.add('connected');
-            pathHintLabel.textContent = store.dirpath;
+            pathHintLabel.textContent = `[${userRecord.username}] ${store.endpoint}/${store.dirpath.startsWith('/') ? store.dirpath.slice(1) : store.dirpath}`;
             tbody.innerHTML = '';
+            console.log("Got data", res);
 
-            console.log("Got data", data);
+            const [data, count] = res;
 
+            {
+                const total = count.dirs + count.files;
+                const pageCount = Math.max(Math.ceil(total / store.pagelim), 1);
+                pageCountLabel.textContent = pageCount;
+                if (store.pagenum > pageCount){
+                    store.pagenum = pageCount;
+                    pageNumInput.value = pageCount;
+
+                    await refreshFileList();
+                    return;
+                }
+            }
+
+            // maybe undefined
             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');
@@ -448,12 +463,6 @@ function refreshFileList(){
                     });
                     actContainer.appendChild(infoButton);
 
-                    const viewButton = document.createElement('a');
-                    viewButton.textContent = 'View';
-                    viewButton.href = conn.config.endpoint + '/' + file.url + '?token=' + conn.config.token;
-                    viewButton.target = '_blank';
-                    actContainer.appendChild(viewButton);
-
                     const moveButton = document.createElement('a');
                     moveButton.textContent = 'Move';
                     moveButton.style.cursor = 'pointer';
@@ -516,24 +525,4 @@ function refreshFileList(){
     );
 }
 
-
-async function maybeRefreshUserRecord(){
-    if (store.endpoint && store.token){
-        await refreshUserRecord();
-    }
-}
-
-async function refreshUserRecord(){
-    try{
-        userRecord = await conn.whoami();
-        console.log("User record: ", userRecord);
-    }
-    catch (err){
-        userRecord = null;
-        console.error("Failed to get user record");
-        return false;
-    }
-    return true;
-}
-
 console.log("Hello World");

frontend/state.js

@@ -41,11 +41,11 @@ export const store = {
         setPersistedState('dirpath', pth);
     },
 
-    get sortby () {
-        return loadPersistedState('sortby', 'none');
+    get orderby () {
+        return loadPersistedState('orderby', 'none');
     }, 
-    set sortby (sb) {
-        setPersistedState('sortby', sb);
+    set orderby (sb) {
+        setPersistedState('orderby', sb);
     }, 
 
     get sortorder () {
@@ -54,4 +54,19 @@ export const store = {
     set sortorder (so) {
         setPersistedState('sortorder', so);
     },
+
+    get pagenum () {
+        return parseInt(loadPersistedState('pagenum', '1'));
+    },
+    set pagenum (pn) {
+        setPersistedState('pagenum', pn.toString());
+    },
+
+    get pagelim () {
+        return parseInt(loadPersistedState('pagelim', '100'));
+    },
+    set pagelim (ps) {
+        setPersistedState('pagelim', ps.toString());
+    },
+
 };

frontend/styles.css

@@ -1,6 +1,12 @@
 @import "./popup.css";
 @import "./info.css";
 @import "./thumb.css";
+@import "./login.css"; 
+
+html {
+    overflow: -moz-scrollbars-vertical;
+    overflow-y: scroll;
+}
 
 body{
     font-family: Arial, sans-serif;
@@ -44,7 +50,9 @@ div.container.header, div.container.footer{
 
 div.container.header{
     top: 0;
-    height: 10rem;
+    height: 6.5rem;
+    justify-content: flex-end;
+    gap: 0.2rem;
 }
 div.container.footer{
     bottom: 0;
@@ -54,7 +62,7 @@ div.container.footer{
 div.container.content{
     width: 100%;
     padding-inline: 0.5rem;
-    margin-top: calc(10rem + 1rem);
+    margin-top: calc(6.5rem + 1rem);
     margin-bottom: calc(4rem + 0.5rem);
 }
 
@@ -122,13 +130,22 @@ input#path{
 }
 
 div#top-bar{
+    color: grey;
+    display: flex;
+    flex-direction: row;
+    width: calc(100% - 2rem);
+}
+div#settings-bar{
+    width: calc(100% - 2rem);
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     align-items: center;
     gap: 1rem;
+    padding-bottom: 0.2rem;
 }
 div#position-hint{
+    cursor: pointer;
     color: rgb(138, 138, 138);
     border-radius: 0.5rem;
     display: flex;
@@ -137,8 +154,15 @@ div#position-hint{
     gap: 0.25rem;
     height: 1rem;
     margin-bottom: 0.25rem;
+    font-size: x-small;
 
     padding: 0.25rem;
+    transition: all 0.2s;
+}
+div#position-hint:hover{
+    background-color: rgb(240, 244, 246);
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+    color:rgb(91, 107, 116)
 }
 div#position-hint span{
     width: 0.75rem;
@@ -152,12 +176,6 @@ div#position-hint.connected span{
     background-color: rgb(0, 166, 0);
 }
 
-div#settings {
-    display: flex;
-    flex-direction: column;
-    gap: 10px;
-}
-
 label#bucket-label{
     color: #195f8b;
 }

frontend/thumb.css

@@ -7,4 +7,10 @@ img.thumb{
     width: 32px;
     object-fit: contain;
     border-radius: 0.1rem;
+    transition: all 0.2s;
+}
+img.thumb:hover{
+    cursor: pointer;
+    height: 48px;   /* smaller than backend */
+    width: 48px;
 }

frontend/thumb.js

@@ -72,14 +72,18 @@ export function makeThumbHtml(c, r){
         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');" /> \
+            onerror="this.src='${getSafeIconUrl(getIconSVGFromMimeType(mtype))}';this.classList.add('thumb-svg');" \
+            onclick="window.open('${c.config.endpoint}/${url}?token=${token}', '_blank');" \
+            /> \
         </div>
         `;
     }
     else{
         return `
         <div class="thumb" id="${thumb_id}"> \
-            <img src="${getSafeIconUrl(getIconSVGFromMimeType(mtype))}" alt="${r.url}" class="thumb thumb-svg"/ >
+            <img src="${getSafeIconUrl(getIconSVGFromMimeType(mtype))}" alt="${r.url}" class="thumb thumb-svg" \
+            onclick="window.open('${c.config.endpoint}/${url}?token=${token}', '_blank');" \
+            / > \
         </div>
         `;
     }

lfss/{client → api}/__init__.py

@@ -1,6 +1,8 @@
 import os, time, pathlib
 from threading import Lock
-from .api import Connector
+from .connector import Connector
+from ..src.datatype import FileRecord
+from ..src.utils import decode_uri_compnents
 from ..src.bounded_pool import BoundedThreadPoolExecutor
 
 def upload_file(
@@ -11,19 +13,25 @@ def upload_file(
     interval: float = 0, 
     verbose: bool = False, 
     **put_kwargs
-    ):
+    ) -> tuple[bool, str]:
     this_try = 0
+    error_msg = ""
     while this_try <= n_retries:
         try:
-            with open(file_path, 'rb') as f:
-                blob = f.read()
-            connector.put(dst_url, blob, **put_kwargs)
+            fsize = os.path.getsize(file_path)
+            if fsize < 32 * 1024 * 1024:     # 32MB
+                with open(file_path, 'rb') as f:
+                    blob = f.read()
+                connector.put(dst_url, blob, **put_kwargs)
+            else:
+                connector.post(dst_url, file_path, **put_kwargs)
             break
         except Exception as e:
             if isinstance(e, KeyboardInterrupt):
                 raise e
             if verbose:
                 print(f"Error uploading {file_path}: {e}, retrying...")
+                error_msg = str(e)
             this_try += 1
         finally:
             time.sleep(interval)
@@ -31,8 +39,8 @@ def upload_file(
     if this_try > n_retries:
         if verbose:
             print(f"Failed to upload {file_path} after {n_retries} retries.")
-        return False
-    return True
+        return False, error_msg
+    return True, error_msg
 
 def upload_directory(
     connector: Connector, 
@@ -43,7 +51,7 @@ def upload_directory(
     interval: float = 0,
     verbose: bool = False,
     **put_kwargs
-    ) -> list[str]:
+    ) -> list[tuple[str, str]]:
     assert path.endswith('/'), "Path must end with a slash."
     if path.startswith('/'):
         path = path[1:]
@@ -52,8 +60,8 @@ def upload_directory(
     _counter = 0
     _counter_lock = Lock()
 
-    faild_files = []
-    def put_file(file_path):
+    faild_items = []
+    def put_file(c: Connector, file_path):
         with _counter_lock:
             nonlocal _counter
             _counter += 1
@@ -62,18 +70,19 @@ def upload_directory(
             if verbose:
                 print(f"[{this_count}] Uploading {file_path} to {dst_path}")
 
-        if not upload_file(
-            connector, file_path, dst_path, 
+        if not (res:=upload_file(
+            c, file_path, dst_path, 
             n_retries=n_retries, interval=interval, verbose=verbose, **put_kwargs
-            ):
-            faild_files.append(file_path)
+            ))[0]:
+            faild_items.append((file_path, res[1]))
 
-    with BoundedThreadPoolExecutor(n_concurrent) as executor:
-        for root, dirs, files in os.walk(directory):
-            for file in files:
-                executor.submit(put_file, os.path.join(root, file))
+    with connector.session(n_concurrent) as c:
+        with BoundedThreadPoolExecutor(n_concurrent) as executor:
+            for root, dirs, files in os.walk(directory):
+                for file in files:
+                    executor.submit(put_file, c, os.path.join(root, file))
 
-    return faild_files
+    return faild_items
 
 def download_file(
     connector: Connector, 
@@ -83,26 +92,39 @@ def download_file(
     interval: float = 0, 
     verbose: bool = False, 
     overwrite: bool = False
-    ):
+    ) -> tuple[bool, str]:
     this_try = 0
+    error_msg = ""
     while this_try <= n_retries:
         if not overwrite and os.path.exists(file_path):
             if verbose:
                 print(f"File {file_path} already exists, skipping download.")
-            return True
+            return True, error_msg
         try:
-            blob = connector.get(src_url)
-            if not blob:
-                return False
+            fmeta = connector.get_metadata(src_url)
+            if fmeta is None:
+                error_msg = "File not found."
+                return False, error_msg
+
             pathlib.Path(file_path).parent.mkdir(parents=True, exist_ok=True)
-            with open(file_path, 'wb') as f:
-                f.write(blob)
+            fsize = fmeta.file_size   # type: ignore
+            if fsize < 32 * 1024 * 1024:     # 32MB
+                blob = connector.get(src_url)
+                assert blob is not None
+                with open(file_path, 'wb') as f:
+                    f.write(blob)
+            else:
+                with open(file_path, 'wb') as f:
+                    for chunk in connector.get_stream(src_url):
+                        f.write(chunk)
             break
+
         except Exception as e:
             if isinstance(e, KeyboardInterrupt):
                 raise e
             if verbose:
                 print(f"Error downloading {src_url}: {e}, retrying...")
+                error_msg = str(e)
             this_try += 1
         finally:
             time.sleep(interval)
@@ -110,8 +132,8 @@ def download_file(
     if this_try > n_retries:
         if verbose:
             print(f"Failed to download {src_url} after {n_retries} retries.")
-        return False
-    return True
+        return False, error_msg
+    return True, error_msg
 
 def download_directory(
     connector: Connector,
@@ -122,7 +144,7 @@ def download_directory(
     interval: float = 0,
     verbose: bool = False,
     overwrite: bool = False
-    ) -> list[str]:
+    ) -> list[tuple[str, str]]:
 
     directory = str(directory)
 
@@ -133,23 +155,32 @@ def download_directory(
     
     _counter = 0
     _counter_lock = Lock()
-    failed_files = []
-    def get_file(src_url):
-        nonlocal _counter, failed_files
+    failed_items: list[tuple[str, str]] = []
+    def get_file(c, src_url):
+        nonlocal _counter, failed_items
         with _counter_lock:
             _counter += 1
             this_count = _counter
-            dst_path = f"{directory}{os.path.relpath(src_url, src_path)}"
+            dst_path = f"{directory}{os.path.relpath(decode_uri_compnents(src_url), decode_uri_compnents(src_path))}"
             if verbose:
                 print(f"[{this_count}] Downloading {src_url} to {dst_path}")
 
-        if not download_file(
-            connector, src_url, dst_path, 
+        if not (res:=download_file(
+            c, src_url, dst_path, 
             n_retries=n_retries, interval=interval, verbose=verbose, overwrite=overwrite
-            ):
-            failed_files.append(src_url)
+            ))[0]:
+            failed_items.append((src_url, res[1]))
         
-    with BoundedThreadPoolExecutor(n_concurrent) as executor:
-        for file in connector.list_path(src_path, flat=True).files:
-            executor.submit(get_file, file.url)
-    return failed_files
+    batch_size = 10000
+    file_list: list[FileRecord] = []
+    with connector.session(n_concurrent) as c:
+        file_count = c.count_files(src_path, flat=True)
+        for offset in range(0, file_count, batch_size):
+            file_list.extend(c.list_files(
+                src_path, offset=offset, limit=batch_size, flat=True
+            ))
+
+        with BoundedThreadPoolExecutor(n_concurrent) as executor:
+            for file in file_list:
+                executor.submit(get_file, c, file.url)
+    return failed_items