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

When running the embedded server from source compile the RapydSCript in the server thread and use atomic writes to update the output

Browse Source
This commit is contained in:
Kovid Goyal 2017-05-25 07:55:47 +05:30
parent 2240b19882
commit db4ba63005
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/srv/embedded.py
View File

@ -46,10 +46,6 @@ class Server(object):
self.opts = opts self.opts = opts
self.log, self.access_log = log, access_log self.log, self.access_log = log, access_log
self.handler.set_log(self.log) self.handler.set_log(self.log)
_df = os.environ.get('CALIBRE_DEVELOP_FROM', None)
if _df and os.path.exists(_df):
from calibre.utils.rapydscript import compile_srv
compile_srv()
@property @property
def user_manager(self): def user_manager(self):
@ -91,6 +87,10 @@ class Server(object):
pass pass
reset_caches() # we reset the cache as the server tdir has changed reset_caches() # we reset the cache as the server tdir has changed
try: try:
_df = os.environ.get('CALIBRE_DEVELOP_FROM', None)
if _df and os.path.exists(_df):
from calibre.utils.rapydscript import compile_srv
compile_srv()
self.loop.serve_forever() self.loop.serve_forever()
except BaseException as e: except BaseException as e:
self.exception = e self.exception = e

15
src/calibre/utils/rapydscript.py
View File

@ -19,6 +19,7 @@ from threading import Thread, local
from calibre import force_unicode from calibre import force_unicode
from calibre.constants import __appname__, __version__, cache_dir from calibre.constants import __appname__, __version__, cache_dir
from calibre.utils.filenames import atomic_rename
from calibre.utils.terminal import ANSIStream from calibre.utils.terminal import ANSIStream
from duktape import Context, JSError, to_python from duktape import Context, JSError, to_python
from lzma.xz import compress, decompress from lzma.xz import compress, decompress
@ -223,10 +224,16 @@ def compile_srv():
html = f.read().replace(b'RESET_STYLES', reset, 1).replace(b'ICONS', icons, 1).replace(b'MAIN_JS', js, 1) html = f.read().replace(b'RESET_STYLES', reset, 1).replace(b'ICONS', icons, 1).replace(b'MAIN_JS', js, 1)
manifest = create_manifest(html) manifest = create_manifest(html)
with lopen(os.path.join(base, 'index-generated.html'), 'wb') as f:
f.write(html) def atomic_write(name, content):
with lopen(os.path.join(base, 'calibre.appcache'), 'wb') as f: name = os.path.join(base, name)
f.write(manifest) tname = name + '.tmp'
with lopen(tname, 'wb') as f:
f.write(content)
atomic_rename(tname, name)
atomic_write('index-generated.html', html)
atomic_write('calibre.appcache', manifest)
# }}} # }}}