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

Correct locking on inotify watching, always use updates.

Browse Source
This commit is contained in:
Leo Vasanko 2023-11-12 21:15:35 +00:00
parent 12c954394a
commit 97c694a654
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cista/watching.py
View File

@ -1,6 +1,7 @@
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
@ -147,11 +148,12 @@ def watcher_thread(loop):
rootpath = config.config.path rootpath = config.config.path
i = inotify.adapters.InotifyTree(rootpath.as_posix()) i = inotify.adapters.InotifyTree(rootpath.as_posix())
# Initialize the tree from filesystem # Initialize the tree from filesystem
old, new = state.root, 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_root(new), loop) broadcast(format_update(old, new), loop)
# The watching is not entirely reliable, so do a full refresh every minute # The watching is not entirely reliable, so do a full refresh every minute
refreshdl = time.monotonic() + 60.0 refreshdl = time.monotonic() + 60.0
@ -330,7 +332,7 @@ 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" use_inotify = sys.platform == "linux"
app.ctx.watcher = threading.Thread( app.ctx.watcher = threading.Thread(
target=watcher_thread if use_inotify else watcher_thread_poll, target=watcher_thread if use_inotify else watcher_thread_poll,
args=[loop], args=[loop],