lfss 0.8.2__py3-none-any.whl → 0.8.3__py3-none-any.whl

frontend/info.js

@@ -12,8 +12,10 @@ const ensureSlashEnd = (path) => {
 /**
  * @param {FileRecord} r
  * @param {UserRecord} u
+ * @param {Connector} c
  */
-export function showInfoPanel(r, u){
+export function showInfoPanel(r, u, c){
+    const origin = c.config.endpoint;
     const innerHTML = `
 <div class="info-container">
     <div class="info-container-left">
@@ -46,7 +48,7 @@ export function showInfoPanel(r, u){
     </div>
     <div class="info-container-right">
         <div class="info-path-copy">
-            <input type="text" value="${window.location.origin}/${r.url}" readonly>
+            <input type="text" value="${origin}/${r.url}" readonly>
             <button class="copy-button" id='copy-btn-full-path'>📋</button>
         </div>
         <div class="info-path-copy">
@@ -58,7 +60,7 @@ export function showInfoPanel(r, u){
     `
     const [win, closeWin] = createFloatingWindow(innerHTML, {title: 'File Info'});
     document.getElementById('copy-btn-full-path').onclick = () => {
-        copyToClipboard(window.location.origin + '/' + r.url);
+        copyToClipboard(origin + '/' + r.url);
         showPopup('Path copied to clipboard', {timeout: 2000, level: 'success'});
     }
     document.getElementById('copy-btn-rel-path').onclick = () => {
@@ -77,6 +79,7 @@ export function showDirInfoPanel(r, u, c){
     if (fmtPath.endsWith('/')) {
         fmtPath = fmtPath.slice(0, -1);
     }
+    const origin = c.config.endpoint;
     const innerHTML = `
 <div class="info-container">
     <div class="info-container-left">
@@ -105,7 +108,7 @@ export function showDirInfoPanel(r, u, c){
     </div>
     <div class="info-container-right">
         <div class="info-path-copy">
-            <input type="text" value="${window.location.origin}/${ensureSlashEnd(r.url)}" readonly>
+            <input type="text" value="${origin}/${ensureSlashEnd(r.url)}" readonly>
             <button class="copy-button" id='copy-btn-full-path'>📋</button>
         </div>
         <div class="info-path-copy">
@@ -117,7 +120,7 @@ export function showDirInfoPanel(r, u, c){
     `
     const [win, closeWin] = createFloatingWindow(innerHTML, {title: 'File Info'});
     document.getElementById('copy-btn-full-path').onclick = () => {
-        copyToClipboard(window.location.origin + '/' + ensureSlashEnd(r.url));
+        copyToClipboard(origin + '/' + ensureSlashEnd(r.url));
         showPopup('Path copied to clipboard', {timeout: 2000, level: 'success'});
     }
     document.getElementById('copy-btn-rel-path').onclick = () => {

frontend/scripts.js

@@ -459,7 +459,7 @@ async function refreshFileList(){
                     infoButton.style.cursor = 'pointer';
                     infoButton.textContent = 'Details';
                     infoButton.addEventListener('click', () => {
-                        showInfoPanel(file, userRecord);
+                        showInfoPanel(file, userRecord, conn);
                     });
                     actContainer.appendChild(infoButton);
 

frontend/thumb.js

@@ -13,6 +13,7 @@ const ICON_ZIP = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><t
 const ICON_CODE = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>file-code-outline</title><path d="M14 2H6C4.89 2 4 2.9 4 4V20C4 21.11 4.89 22 6 22H18C19.11 22 20 21.11 20 20V8L14 2M18 20H6V4H13V9H18V20M9.54 15.65L11.63 17.74L10.35 19L7 15.65L10.35 12.3L11.63 13.56L9.54 15.65M17 15.65L13.65 19L12.38 17.74L14.47 15.65L12.38 13.56L13.65 12.3L17 15.65Z" /></svg>'
 const ICON_VIDEO = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>television-play</title><path d="M21,3H3C1.89,3 1,3.89 1,5V17A2,2 0 0,0 3,19H8V21H16V19H21A2,2 0 0,0 23,17V5C23,3.89 22.1,3 21,3M21,17H3V5H21M16,11L9,15V7" /></svg>'
 const ICON_IMAGE = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>image-outline</title><path d="M19,19H5V5H19M19,3H5A2,2 0 0,0 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5A2,2 0 0,0 19,3M13.96,12.29L11.21,15.83L9.25,13.47L6.5,17H17.5L13.96,12.29Z" /></svg>'
+const ICON_MUSIC = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>music-box-outline</title><path d="M16,9H13V14.5A2.5,2.5 0 0,1 10.5,17A2.5,2.5 0 0,1 8,14.5A2.5,2.5 0 0,1 10.5,12C11.07,12 11.58,12.19 12,12.5V7H16V9M19,3A2,2 0 0,1 21,5V19A2,2 0 0,1 19,21H5A2,2 0 0,1 3,19V5A2,2 0 0,1 5,3H19M5,5V19H19V5H5Z" /></svg>'
 
 function getIconSVGFromMimeType(mimeType){
     if (mimeType == 'directory'){
@@ -24,6 +25,9 @@ function getIconSVGFromMimeType(mimeType){
     if (mimeType.startsWith('image/')){
         return ICON_IMAGE;
     }
+    if (mimeType.startsWith('audio/')){
+        return ICON_MUSIC;
+    }
 
     if (['application/pdf', 'application/x-pdf'].includes(mimeType)){
         return ICON_PDF;

lfss/api/connector.py

@@ -54,7 +54,7 @@ class Connector:
     
     def _fetch_factory(
         self, method: Literal['GET', 'POST', 'PUT', 'DELETE'], 
-        path: str, search_params: dict = {}
+        path: str, search_params: dict = {}, extra_headers: dict = {}
     ):
         if path.startswith('/'):
             path = path[1:]
@@ -65,6 +65,7 @@ class Connector:
             headers.update({
                 'Authorization': f"Bearer {self.config['token']}",
             })
+            headers.update(extra_headers)
             if self._session is not None:
                 response = self._session.request(method, url, headers=headers, **kwargs)
                 response.raise_for_status()
@@ -168,6 +169,17 @@ class Connector:
         response = self._get(path)
         if response is None: return None
         return response.content
+
+    def get_partial(self, path: str, range_start: int = -1, range_end: int = -1) -> Optional[bytes]:
+        """
+        Downloads a partial file from the specified path.
+        start and end are the byte offsets, both inclusive.
+        """
+        response = self._fetch_factory('GET', path, extra_headers={
+            'Range': f"bytes={range_start if range_start >= 0 else ''}-{range_end if range_end >= 0 else ''}"
+        })()
+        if response is None: return None
+        return response.content
     
     def get_stream(self, path: str) -> Iterator[bytes]:
         """Downloads a file from the specified path, will raise PathNotFoundError if path not found."""

lfss/src/database.py

@@ -433,20 +433,41 @@ class FileConn(DBObjectBase):
             raise
         return size_sum
     
-    async def get_file_blob(self, file_id: str) -> Optional[bytes]:
+    async def get_file_blob(self, file_id: str, start_byte = -1, end_byte = -1) -> bytes:
         cursor = await self.cur.execute("SELECT data FROM blobs.fdata WHERE file_id = ?", (file_id, ))
         res = await cursor.fetchone()
         if res is None:
-            return None
-        return res[0]
+            raise FileNotFoundError(f"File {file_id} not found")
+        blob = res[0]
+        match (start_byte, end_byte):
+            case (-1, -1):
+                return blob
+            case (s, -1):
+                return blob[s:]
+            case (-1, e):
+                return blob[:e]
+            case (s, e):
+                return blob[s:e]
     
-    async def get_file_blob_external(self, file_id: str) -> AsyncIterable[bytes]:
+    @staticmethod
+    async def get_file_blob_external(file_id: str, start_byte = -1, end_byte = -1) -> AsyncIterable[bytes]:
         assert (LARGE_BLOB_DIR / file_id).exists(), f"File {file_id} not found"
         async with aiofiles.open(LARGE_BLOB_DIR / file_id, 'rb') as f:
-            while True:
-                chunk = await f.read(CHUNK_SIZE)
-                if not chunk: break
-                yield chunk
+            if start_byte >= 0:
+                await f.seek(start_byte)
+            if end_byte >= 0:
+                while True:
+                    head_ptr = await f.tell()
+                    if head_ptr >= end_byte:
+                        break
+                    chunk = await f.read(min(CHUNK_SIZE, end_byte - head_ptr))
+                    if not chunk: break
+                    yield chunk
+            else:
+                while True:
+                    chunk = await f.read(CHUNK_SIZE)
+                    if not chunk: break
+                    yield chunk
     
     @staticmethod
     async def delete_file_blob_external(file_id: str):
@@ -595,34 +616,21 @@ class Database:
                             permission=permission, external=True, mime_type=mime_type)
         return file_size
 
-    async def read_file_stream(self, url: str) -> AsyncIterable[bytes]:
+    async def read_file(self, url: str, start_byte = -1, end_byte = -1) -> AsyncIterable[bytes]:
+        # end byte is exclusive: [start_byte, end_byte)
         validate_url(url)
-        async with unique_cursor() as cur:
-            fconn = FileConn(cur)
-            r = await fconn.get_file_record(url)
-            if r is None:
-                raise FileNotFoundError(f"File {url} not found")
-            if not r.external:
-                raise ValueError(f"File {url} is not stored externally, should use read_file instead")
-            ret = fconn.get_file_blob_external(r.file_id)
-        return ret
-
-    async def read_file(self, url: str) -> bytes:
-        validate_url(url)
-
         async with unique_cursor() as cur:
             fconn = FileConn(cur)
             r = await fconn.get_file_record(url)
             if r is None:
                 raise FileNotFoundError(f"File {url} not found")
             if r.external:
-                raise ValueError(f"File {url} is stored externally, should use read_file_stream instead")
-
-            f_id = r.file_id
-            blob = await fconn.get_file_blob(f_id)
-            if blob is None:
-                raise FileNotFoundError(f"File {url} data not found")
-        return blob
+                ret = fconn.get_file_blob_external(r.file_id, start_byte=start_byte, end_byte=end_byte)
+            else:
+                async def blob_stream():
+                    yield await fconn.get_file_blob(r.file_id, start_byte=start_byte, end_byte=end_byte)
+                ret = blob_stream()
+        return ret
 
     async def delete_file(self, url: str, op_user: Optional[UserRecord] = None) -> Optional[FileRecord]:
         validate_url(url)
@@ -758,9 +766,6 @@ class Database:
                     blob = fconn.get_file_blob_external(f_id)
                 else:
                     blob = await fconn.get_file_blob(f_id)
-                    if blob is None:
-                        self.logger.warning(f"Blob not found for {url}")
-                        continue
                 yield r, blob
 
     @concurrent_wrap()

lfss/src/server.py

@@ -141,7 +141,8 @@ router_fs = APIRouter(prefix="")
 @skip_request_log
 async def emit_thumbnail(
     path: str, download: bool,
-    create_time: Optional[str] = None
+    create_time: Optional[str] = None, 
+    is_head = False
     ):
     if path.endswith("/"):
         fname = path.split("/")[-2]
@@ -157,44 +158,69 @@ async def emit_thumbnail(
     }
     if create_time is not None:
         headers["Last-Modified"] = format_last_modified(create_time)
+    if is_head: return Response(status_code=200, headers=headers)
     return Response(
         content=thumb_blob, media_type=mime_type, headers=headers
     )
 async def emit_file(
     file_record: FileRecord, 
     media_type: Optional[str] = None, 
-    disposition = "attachment"
+    disposition = "attachment", 
+    is_head = False, 
+    range_start = -1,
+    range_end = -1
     ):
+    if range_start < 0: assert range_start == -1
+    if range_end < 0: assert range_end == -1
+
     if media_type is None:
         media_type = file_record.mime_type
     path = file_record.url
     fname = path.split("/")[-1]
 
-    await delayed_log_access(path)
-    if not file_record.external:
-        fblob = await db.read_file(path)
-        return Response(
-            content=fblob, media_type=media_type, headers={
-                "Content-Disposition": f"{disposition}; filename={fname}", 
-                "Content-Length": str(len(fblob)), 
-                "Last-Modified": format_last_modified(file_record.create_time)
-            }
-        )
+    if range_start == -1:
+        arng_s = 0          # actual range start
     else:
-        return StreamingResponse(
-            await db.read_file_stream(path), media_type=media_type, headers={
-                "Content-Disposition": f"{disposition}; filename={fname}", 
-                "Content-Length": str(file_record.file_size),
-                "Last-Modified": format_last_modified(file_record.create_time)
-            }
-        )
+        arng_s = range_start
+    if range_end == -1:
+        arng_e = file_record.file_size - 1
+    else:
+        arng_e = range_end
+    
+    if arng_s >= file_record.file_size or arng_e >= file_record.file_size:
+        raise HTTPException(status_code=416, detail="Range not satisfiable")
+    if arng_s > arng_e:
+        raise HTTPException(status_code=416, detail="Invalid range")
 
-@router_fs.get("/{path:path}")
-@handle_exception
-async def get_file(
+    headers = {
+        "Content-Disposition": f"{disposition}; filename={fname}", 
+        "Content-Length": str(arng_e - arng_s + 1),
+        "Content-Range": f"bytes {arng_s}-{arng_e}/{file_record.file_size}",
+        "Last-Modified": format_last_modified(file_record.create_time), 
+        "Accept-Ranges": "bytes", 
+    }
+
+    if is_head: return Response(status_code=200 if (range_start == -1 and range_end == -1) else 206, headers=headers)
+
+    await delayed_log_access(path)
+    return StreamingResponse(
+        await db.read_file(
+            path, 
+            start_byte=arng_s if range_start != -1 else -1,
+            end_byte=arng_e + 1 if range_end != -1 else -1
+        ),
+        media_type=media_type, 
+        headers=headers, 
+        status_code=206 if range_start != -1 or range_end != -1 else 200
+    )
+
+async def get_file_impl(
+    request: Request,
+    user: UserRecord, 
     path: str, 
-    download: bool = False, thumb: bool = False,
-    user: UserRecord = Depends(get_current_user)
+    download: bool = False, 
+    thumb: bool = False,
+    is_head = False,
     ):
     path = ensure_uri_compnents(path)
 
@@ -236,13 +262,58 @@ async def get_file(
     if not allow_access:
         raise HTTPException(status_code=403, detail=reason)
     
+    req_range = request.headers.get("Range", None)
+    if not req_range is None:
+        # handle range request
+        if not req_range.startswith("bytes="):
+            raise HTTPException(status_code=400, detail="Invalid range request")
+        range_str = req_range[6:].strip()
+        if "," in range_str:
+            raise HTTPException(status_code=400, detail="Multiple ranges not supported")
+        if "-" not in range_str:
+            raise HTTPException(status_code=400, detail="Invalid range request")
+        range_start, range_end = map(lambda x: int(x) if x != "" else -1 , range_str.split("-"))
+    else:
+        range_start, range_end = -1, -1
+    
     if thumb:
-        return await emit_thumbnail(path, download, create_time=file_record.create_time)
+        if (range_start != -1 or range_end != -1): logger.warning("Range request for thumbnail")
+        return await emit_thumbnail(path, download, create_time=file_record.create_time, is_head=is_head)
     else:
         if download:
-            return await emit_file(file_record, 'application/octet-stream', "attachment")
+            return await emit_file(file_record, 'application/octet-stream', "attachment", is_head = is_head, range_start=range_start, range_end=range_end)
         else:
-            return await emit_file(file_record, None, "inline")
+            return await emit_file(file_record, None, "inline", is_head = is_head, range_start=range_start, range_end=range_end)
+
+@router_fs.get("/{path:path}")
+@handle_exception
+async def get_file(
+    request: Request,
+    path: str, 
+    download: bool = False, thumb: bool = False,
+    user: UserRecord = Depends(get_current_user)
+    ):
+    return await get_file_impl(
+        request = request,
+        user = user, path = path, download = download, thumb = thumb
+        )
+
+@router_fs.head("/{path:path}")
+@handle_exception
+async def head_file(
+    request: Request,
+    path: str, 
+    download: bool = False, thumb: bool = False,
+    user: UserRecord = Depends(get_current_user)
+    ):
+    if path.startswith("_api/"):
+        raise HTTPException(status_code=405, detail="HEAD not supported for API")
+    if path.endswith("/"):
+        raise HTTPException(status_code=405, detail="HEAD not supported for directory")
+    return await get_file_impl(
+        request = request,
+        user = user, path = path, download = download, thumb = thumb, is_head = True
+        )
 
 @router_fs.put("/{path:path}")
 @handle_exception

{lfss-0.8.2.dist-info → lfss-0.8.3.dist-info}/METADATA

@@ -1,13 +1,12 @@
 Metadata-Version: 2.1
 Name: lfss
-Version: 0.8.2
+Version: 0.8.3
 Summary: Lightweight file storage service
 Home-page: https://github.com/MenxLi/lfss
 Author: li, mengxun
 Author-email: limengxun45@outlook.com
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{lfss-0.8.2.dist-info → lfss-0.8.3.dist-info}/RECORD

@@ -4,19 +4,19 @@ docs/Permission.md,sha256=9r9nEmhqfz18RTS8FI0fZ9F0a31r86OoAyx3EQxxpk0,2317
 frontend/api.js,sha256=wUJNAkL8QigAiwR_jaMPUhCQEsL-lp0wZ6XeueYgunE,18049
 frontend/index.html,sha256=-k0bJ5FRqdl_H-O441D_H9E-iejgRCaL_z5UeYaS2qc,3384
 frontend/info.css,sha256=Ny0N3GywQ3a9q1_Qph_QFEKB4fEnTe_2DJ1Y5OsLLmQ,595
-frontend/info.js,sha256=WhOGaeqMoezEAfg4nIpK26hvejC7AZ-ZDLiJmRj0kDk,5758
+frontend/info.js,sha256=xGUJPCSrtDhuSu0ELLQZ77PmVWldg-prU1mwQGbdEoA,5797
 frontend/login.css,sha256=VMM0QfbDFYerxKWKSGhMI1yg5IRBXg0TTdLJEEhQZNk,355
 frontend/login.js,sha256=QoO8yKmBHDVP-ZomCMOaV7xVUVIhpl7esJrb6T5aHQE,2466
 frontend/popup.css,sha256=TJZYFW1ZcdD1IVTlNPYNtMWKPbN6XDbQ4hKBOFK8uLg,1284
 frontend/popup.js,sha256=3PgaGZmxSdV1E-D_MWgcR7aHWkcsHA1BNKSOkmP66tA,5191
-frontend/scripts.js,sha256=2YoMhrcAkI1bHihD_2EK6uCHZ1s0DiIR3FzZsh79x9A,21729
+frontend/scripts.js,sha256=nWH6NgavZTVmjK44i2DeRi6mJzGSe4qeQPUbDaEVt58,21735
 frontend/state.js,sha256=vbNL5DProRKmSEY7xu9mZH6IY0PBenF8WGxPtGgDnLI,1680
 frontend/styles.css,sha256=xcNLqI3KBsY5TLnku8UIP0Jfr7QLajr1_KNlZj9eheM,4935
 frontend/thumb.css,sha256=rNsx766amYS2DajSQNabhpQ92gdTpNoQKmV69OKvtpI,295
-frontend/thumb.js,sha256=RQ_whXNwmkdG4SEbNQGeh488YYzqwoNYDc210hPeuhQ,5703
+frontend/thumb.js,sha256=tX9LtxT6O2O6IUlpdvID6S973SUpWxgPVVqI9pwlVw8,6113
 frontend/utils.js,sha256=IYUZl77ugiXKcLxSNOWC4NSS0CdD5yRgUsDb665j0xM,2556
 lfss/api/__init__.py,sha256=c_-GokKJ_3REgve16AwgXRfFyl9mwy7__FxCIIVlk1Q,6660
-lfss/api/connector.py,sha256=tmcgKswE0sktBhanEDEc6mpuJA0de7C-DS2YqlpxHX4,10743
+lfss/api/connector.py,sha256=tCUwTlbzTwHvPnFb8nlnc6LEnrXwdCnCCThyBISt2Tg,11319
 lfss/cli/__init__.py,sha256=lPwPmqpa7EXQ4zlU7E7LOe6X2kw_xATGdwoHphUEirA,827
 lfss/cli/balance.py,sha256=R2rbO2tg9TVnnQIVeU0GJVeMS-5LDhEdk4mbOE9qGq0,4121
 lfss/cli/cli.py,sha256=LxUrviHtsqi-vs_GWZw2qRs9dBNvx9PSQHLW6SwUmhA,8167
@@ -30,15 +30,15 @@ lfss/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lfss/src/bounded_pool.py,sha256=BI1dU-MBf82TMwJBYbjhEty7w1jIUKc5Bn9SnZ_-hoY,1288
 lfss/src/config.py,sha256=7k_6L_aG7vD-lVcmgpwMIg-ggpMMDNU8IbaB4y1effE,861
 lfss/src/connection_pool.py,sha256=4YULPcmndy33FyBSo9w1fZjAlBX2q-xPP27xJOTA06I,5228
-lfss/src/database.py,sha256=psNgY3QxHh5mmhqdpRwy3pucgZCi2d9kjUtdtjnB8P4,36042
+lfss/src/database.py,sha256=zoiBm7CVHHV4TqwmK6lPnZvK9mzDNtrNvAJCRaIYMU8,36302
 lfss/src/datatype.py,sha256=yyOcxhGwz-EJi003f8hGl82EJuY4F92y6fSX6cK60Bc,2126
 lfss/src/error.py,sha256=Bh_GUtuNsMSMIKbFreU4CfZzL96TZdNAIcgmDxvGbQ0,333
 lfss/src/log.py,sha256=u6WRZZsE7iOx6_CV2NHh1ugea26p408FI4WstZh896A,5139
-lfss/src/server.py,sha256=IoqKpznDt28MIGUf79MIRFvlV_6VIaqGPmc_hkYcXuY,21150
+lfss/src/server.py,sha256=YLsp6bab7q0I2hI4uUYIiWc2S0k6d6bbMaweg6VbVV4,23743
 lfss/src/stat.py,sha256=WlRiiAl0rHX9oPi3thi6K4GKn70WHpClSDCt7iZUow4,3197
 lfss/src/thumb.py,sha256=qjCNMpnCozMuzkhm-2uAYy1eAuYTeWG6xqs-13HX-7k,3266
 lfss/src/utils.py,sha256=DxjHabdiISMkrm1WQlpsZFKL3by6YrzBNQaDt_uZlRk,5744
-lfss-0.8.2.dist-info/METADATA,sha256=gaqq7M4te2IAQk8OntQNXMaW3jbderKLu1C5pEA6ieU,2108
-lfss-0.8.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-lfss-0.8.2.dist-info/entry_points.txt,sha256=VJ8svMz7RLtMCgNk99CElx7zo7M-N-z7BWDVw2HA92E,205
-lfss-0.8.2.dist-info/RECORD,,
+lfss-0.8.3.dist-info/METADATA,sha256=2Q3LdTB3vX_i8kpXIJ9SmMv-GLC1kslzN0RUBW9ksSA,2059
+lfss-0.8.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+lfss-0.8.3.dist-info/entry_points.txt,sha256=VJ8svMz7RLtMCgNk99CElx7zo7M-N-z7BWDVw2HA92E,205
+lfss-0.8.3.dist-info/RECORD,,