Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make the file watching classes re-useable

Browse Source
This commit is contained in:
Kovid Goyal 2015-06-09 08:32:25 +05:30
parent 532fd2a7e9
commit bd8ca5a020
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/calibre/srv/auto_reload.py
View File

@ -14,14 +14,12 @@ from calibre.constants import islinux, iswindows, isosx
class NoAutoReload(EnvironmentError):
pass
EXTENSIONS_TO_WATCH = frozenset('py pyj'.split())
BOUNCE_INTERVAL = 2 # seconds
def file_is_watched(fname):
return fname and fname.rpartition('.')[-1] in EXTENSIONS_TO_WATCH
class WatcherBase(object):
EXTENSIONS_TO_WATCH = frozenset('py pyj'.split())
BOUNCE_INTERVAL = 2 # seconds
def __init__(self, server, log):
self.server, self.log = server, log
fpath = os.path.abspath(__file__)
@ -31,7 +29,7 @@ class WatcherBase(object):
def handle_modified(self, modified):
if modified:
if time.time() - self.last_restart_time > BOUNCE_INTERVAL:
if time.time() - self.last_restart_time > self.BOUNCE_INTERVAL:
modified = {os.path.relpath(x, self.base) if x.startswith(self.base) else x for x in modified if x}
changed = os.pathsep.join(sorted(modified))
self.log('')
@ -40,20 +38,20 @@ class WatcherBase(object):
self.server.restart()
self.last_restart_time = time.time()
def file_is_watched(self, fname):
return fname and fname.rpartition('.')[-1] in self.EXTENSIONS_TO_WATCH
if islinux:
import select
from calibre.utils.inotify import INotifyTreeWatcher
def ignore_event(path, name):
return not file_is_watched(name)
class Watcher(WatcherBase):
def __init__(self, root_dirs, server, log):
WatcherBase.__init__(self, server, log)
self.fd_map = {}
for d in frozenset(root_dirs):
w = INotifyTreeWatcher(d, ignore_event)
w = INotifyTreeWatcher(d, self.ignore_event)
self.fd_map[w._inotify_fd] = w
def loop(self):
@ -65,6 +63,9 @@ if islinux:
modified |= w()
self.handle_modified()
def ignore_event(self, path, name):
return not self.file_is_watched(name)
elif iswindows:
import win32file, win32con
from Queue import Queue
@ -104,7 +105,7 @@ elif iswindows:
None, None
)
for action, filename in results:
if file_is_watched(filename):
if self.file_is_watched(filename):
self.modified_queue.put(os.path.join(self.path_to_watch, filename))
except Exception:
import traceback
@ -156,7 +157,7 @@ elif isosx:
name = ev.name
if isinstance(name, bytes):
name = name.decode('utf-8')
if file_is_watched(name):
if self.file_is_watched(name):
self.handle_modified({name})
else: