admin/ucvl-home-vision
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 43 Wiki Activity

Release v0.1.29: media previews, clean composer, regional profiles and cloud retention

Browse Source
This commit is contained in:
Codex
2026-10-04 20:03:44 +08:00
parent 67709832c5
commit 693dd2a10a
17 changed files with 359 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
journal.py
+28 -7
View File
@@ -44,7 +44,7 @@ class Journal:
return item
def public_media(self, item):
return {k: item.get(k) for k in ('id', 'name', 'mime', 'size', 'status', 'received', 'progress', 'error', 'at')}
return {k: item.get(k) for k in ('id', 'name', 'mime', 'size', 'status', 'received', 'progress', 'error', 'at', 'trashedAt')}
def media(self, user, key):
item = self.a.HOUSEHOLDS.owns(user, self.a.get_object('journal_media', key))
@@ -82,10 +82,13 @@ class Journal:
canEdit=entry['ownerId'] == user['id'], likes=len(voters), liked=any(v['ownerId'] == user['id'] for v in voters),
comments=[dict(c, canDelete=c['ownerId'] == user['id'] or entry['ownerId'] == user['id']) for c in related[-100:]],
commentCount=len(related)))
uploads = [self.public_media(m) for m in media.values() if m['ownerId'] == user['id'] and m['status'] != 'removed']
owned = [m for m in media.values() if m['ownerId'] == user['id']]
uploads = [self.public_media(m) for m in owned if not m.get('trashedAt') and m['status'] != 'removed']
uploads.sort(key=lambda m: m['at'], reverse=True)
trash = [self.public_media(m) for m in owned if m.get('trashedAt') or m['status'] == 'removed']
trash.sort(key=lambda m: m.get('trashedAt') or m['at'], reverse=True)
people = {e['ownerId']: e['authorName'] for e in a.objects('journal_entries') if self.visible(user, e)}
return dict(items=items, total=len(entries), page=page, uploads=uploads[:50], people=people,
return dict(items=items, total=len(entries), page=page, uploads=uploads[:50], trash=trash[:50], people=people,
connection=a.BAIDU.status(user), chunkSize=CHUNK, maxFile=MAX_FILE)
def date(self, value):
@@ -118,6 +121,8 @@ class Journal:
for mid in ids:
item = self.owned(user, 'journal_media', mid)
if item['status'] != 'ready': raise a.Problem('请等待附件上传完成后再发布')
if item.get('trashedAt') and mid not in (old or {}).get('mediaIds', []):
raise a.Problem('请先恢复已删除的附件再添加到记事', 409)
if not text and not ids: raise a.Problem('请写下内容或添加附件')
now = dt.datetime.now(dt.timezone.utc).isoformat()
entry = dict(id=old['id'] if old else secrets.token_hex(8), familyId=a.HOUSEHOLDS.scope(user),
@@ -177,13 +182,14 @@ class Journal:
if buffer['touched'] < time.time()-600: self.buffers.pop(key)
prior = self.owned(user, 'journal_media', data['id']) if data.get('id') else None
if prior:
if prior.get('trashedAt'): raise a.Problem('请先恢复已删除的附件', 409)
if prior['hashes'] != hashes or prior['size'] != size or prior['name'] != name:
raise a.Problem('请选择与原任务相同的文件')
if prior['status'] == 'ready': return self.public_media(prior)
if prior['status'] == 'removed': raise a.Problem('该附件已移除，请新建上传任务')
item = prior
else:
active = [m for m in a.objects('journal_media') if m['status'] == 'receiving' and m['ownerId'] == user['id']]
active = [m for m in a.objects('journal_media') if m['status'] == 'receiving' and not m.get('trashedAt') and m['ownerId'] == user['id']]
if len(active) >= 4: raise a.Problem('请先完成或移除现有上传任务，最多同时保留 4 个', 409)
key = secrets.token_hex(8); family = a.HOUSEHOLDS.scope(user)
instance = a.setting('cloud_instance')
@@ -228,6 +234,7 @@ class Journal:
# At most two 4 MiB buffers; this lock covers only cloud upload, never the app DB.
with self.guard:
item = self.owned(user, 'journal_media', key)
if item.get('trashedAt'): raise self.a.Problem('附件已删除，请先恢复', 409)
if item['status'] != 'receiving' or not item.get('uploadId'): raise self.a.Problem('请重新选择文件继续上传', 409)
if offset < 0 or offset+len(content) > item['size']: raise self.a.Problem('文件分片位置不正确')
if offset < item['received']: return dict(self.public_media(item), received=item['received'])
@@ -254,6 +261,7 @@ class Journal:
def finish_upload(self, user, key):
with self.guard:
item = self.owned(user, 'journal_media', key)
if item.get('trashedAt'): raise self.a.Problem('附件已删除，请先恢复', 409)
if item['status'] == 'ready': return self.public_media(item)
if item['status'] != 'receiving' or item['received'] != item['size']:
raise self.a.Problem('文件尚未完整上传，请重新选择原文件继续', 409)
@@ -265,8 +273,21 @@ class Journal:
def remove_upload(self, user, key):
with self.guard, self.a.LOCK:
item = self.owned(user, 'journal_media', key)
if any(not e.get('deleted') and key in e['mediaIds'] for e in self.a.objects('journal_entries')):
raise self.a.Problem('附件仍被记事引用，请先编辑记事移除附件', 409)
self.buffers.pop(key, None)
item.update(status='removed'); self.a.save_object('journal_media', item)
# Library deletion must not break existing published references or delete cloud files.
if not item.get('trashedAt'):
item['trashedAt'] = dt.datetime.now(dt.timezone.utc).isoformat()
self.a.save_object('journal_media', item)
return {'ok': True}
def restore_upload(self, user, key):
with self.guard, self.a.LOCK:
item = self.owned(user, 'journal_media', key)
if not item.get('trashedAt') and item['status'] != 'removed': return {'ok': True}
status = ('ready' if item.get('fsId') else 'receiving') if item['status'] == 'removed' else item['status']
if status == 'receiving':
active = sum(m['ownerId'] == user['id'] and m['status'] == 'receiving' and not m.get('trashedAt') for m in self.a.objects('journal_media'))
if active >= 4: raise self.a.Problem('请先完成或删除现有上传任务，最多同时保留 4 个', 409)
item.update(status=status, trashedAt=None)
self.a.save_object('journal_media', item)
return {'ok': True}