LeoVasanko
9ac571463a
Increases block size to 16 MiB and adjusts progress display to work smoothly with that. Also removes download WS that was already unused. Provides faster upload speed than over WS.
93 lines
2.6 KiB
Python
93 lines
2.6 KiB
Python
import os
|
|
import threading
|
|
|
|
from cista import config
|
|
from cista.util import filename
|
|
from cista.util.lrucache import LRUCache
|
|
|
|
|
|
def fuid(stat) -> str:
|
|
"""Unique file ID. Stays the same on renames and modification."""
|
|
return config.derived_secret("filekey-inode", stat.st_dev, stat.st_ino).hex()
|
|
|
|
|
|
class File:
|
|
def __init__(self, filename):
|
|
self.path = config.config.path / filename
|
|
self.fd = None
|
|
self.writable = False
|
|
|
|
def open_ro(self):
|
|
self.close()
|
|
self.fd = os.open(self.path, os.O_RDONLY)
|
|
|
|
def open_rw(self):
|
|
self.close()
|
|
self.path.parent.mkdir(parents=True, exist_ok=True)
|
|
self.fd = os.open(self.path, os.O_RDWR | os.O_CREAT)
|
|
self.writable = True
|
|
|
|
def write(self, pos, buffer, *, file_size=None):
|
|
if not self.writable:
|
|
# Create/open file
|
|
self.open_rw()
|
|
assert self.fd is not None
|
|
if file_size is not None:
|
|
assert pos + len(buffer) <= file_size
|
|
os.ftruncate(self.fd, file_size)
|
|
if buffer:
|
|
os.lseek(self.fd, pos, os.SEEK_SET)
|
|
os.write(self.fd, buffer)
|
|
|
|
def __getitem__(self, slice):
|
|
if self.fd is None:
|
|
self.open_ro()
|
|
assert self.fd is not None
|
|
os.lseek(self.fd, slice.start, os.SEEK_SET)
|
|
size = slice.stop - slice.start
|
|
data = os.read(self.fd, size)
|
|
if len(data) < size:
|
|
raise EOFError("Error reading requested range")
|
|
return data
|
|
|
|
def close(self):
|
|
if self.fd is not None:
|
|
os.close(self.fd)
|
|
self.fd = self.writable = None
|
|
|
|
def __del__(self):
|
|
self.close()
|
|
|
|
|
|
class FileServer:
|
|
async def start(self):
|
|
self.cache = LRUCache(File, capacity=10, maxage=5.0)
|
|
self.cache_lock = threading.Lock()
|
|
self.file_locks: dict[str, threading.Lock] = {}
|
|
|
|
async def stop(self):
|
|
self.cache.close()
|
|
|
|
@staticmethod
|
|
def _stat_size(path):
|
|
try:
|
|
return os.stat(path).st_size
|
|
except FileNotFoundError:
|
|
return None
|
|
|
|
def upload_info(self, name, pos, data, file_size):
|
|
name = filename.sanitize(name)
|
|
with self.cache_lock:
|
|
f = self.cache[name]
|
|
lock = self.file_locks.setdefault(name, threading.Lock())
|
|
with lock:
|
|
size_before = self._stat_size(f.path)
|
|
f.write(pos, data, file_size=file_size)
|
|
size_after = self._stat_size(f.path)
|
|
return {
|
|
"written": len(data),
|
|
"created": size_before is None,
|
|
"size_before": size_before,
|
|
"size_after": size_after,
|
|
}
|