Vasanko/cista-storage
Vasanko/cista-storage
2
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Correct locking in thread poll watcher

Browse Source
This commit is contained in:
Leo Vasanko 2023-11-12 20:30:35 +00:00
parent 2978e0c968
commit c31fb24752
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cista/watching.py
View File

@ -1,7 +1,6 @@
import asyncio import asyncio
import shutil import shutil
import stat import stat
import sys
import threading import threading
import time import time
from os import stat_result from os import stat_result
@ -190,10 +189,10 @@ def watcher_thread_poll(loop):
while not quit: while not quit:
rootpath = config.config.path rootpath = config.config.path
old = state.root
new = walk() new = walk()
if old != new: with state.lock:
with state.lock: old = state.root
if old != new:
state.root = new state.root = new
broadcast(format_update(old, new), loop) broadcast(format_update(old, new), loop)
@ -333,8 +332,9 @@ async def abroadcast(msg):
async def start(app, loop): async def start(app, loop):
config.load_config() config.load_config()
use_inotify = False # sys.platform == "linux"
app.ctx.watcher = threading.Thread( app.ctx.watcher = threading.Thread(
target=watcher_thread if sys.platform == "linux" else watcher_thread_poll, target=watcher_thread if use_inotify else watcher_thread_poll,
args=[loop], args=[loop],
) )
app.ctx.watcher.start() app.ctx.watcher.start()

16
frontend/src/repositories/WS.ts
View File

@ -126,16 +126,16 @@ function handleUpdateMessage(updateData: { update: UpdateEntry[] }) {
let oidx = 0 let oidx = 0
for (const [action, arg] of update) { for (const [action, arg] of update) {
if (action === 'k') { if (action === 'k') {
newtree.push(...tree.slice(oidx, oidx + arg)) newtree.push(...tree.slice(oidx, oidx + arg))
oidx += arg oidx += arg
} }
else if (action === 'd') oidx += arg else if (action === 'd') oidx += arg
else if (action === 'i') newtree.push(...arg) else if (action === 'i') newtree.push(...arg)
else console.log("Unknown update action", action, arg) else console.log("Unknown update action", action, arg)
} }
if (oidx != tree.length) if (oidx != tree.length)
throw Error(`Tree update out of sync, number of entries mismatch: got ${oidx}, expected ${tree.length}`) throw Error(`Tree update out of sync, number of entries mismatch: got ${oidx}, expected ${tree.length}, new tree ${newtree.length}`)
store.updateRoot(newtree) store.updateRoot(newtree)
tree = newtree tree = newtree
saveSession() saveSession()

1
frontend/src/stores/documents.ts
View File

@ -4,7 +4,6 @@ import { defineStore } from 'pinia'
import { collator } from '@/utils' import { collator } from '@/utils'
import { logoutUser } from '@/repositories/User' import { logoutUser } from '@/repositories/User'
import { watchConnect } from '@/repositories/WS' import { watchConnect } from '@/repositories/WS'
import { format } from 'path'
type FileData = { id: string; mtime: number; size: number; dir: DirectoryData } type FileData = { id: string; mtime: number; size: number; dir: DirectoryData }
type DirectoryData = { type DirectoryData = {