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

Use LZMA compression for the RS compiler

Browse Source
This commit is contained in:
Kovid Goyal 2015-08-08 13:05:18 +05:30
parent 6ed8c25836
commit 05d5ea41fc
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/rapydscript/compiler.js.bz2
View File

Binary file not shown.

BIN
resources/rapydscript/compiler.js.xz Normal file
View File

Binary file not shown.

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

@ -6,17 +6,19 @@ from __future__ import (unicode_literals, division, absolute_import,
__license__ = 'GPL v3' __license__ = 'GPL v3'
__copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>' __copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
import os, sys, atexit, errno, subprocess, bz2, glob, shutil, json import os, sys, atexit, errno, subprocess, glob, shutil, json
from io import BytesIO
from threading import local from threading import local
from functools import partial from functools import partial
from threading import Thread from threading import Thread
from Queue import Queue, Empty from Queue import Queue, Empty
from duktape import Context, JSError, to_python from duktape import Context, JSError, to_python
from lzma.xz import compress, decompress
from calibre.constants import cache_dir from calibre.constants import cache_dir
from calibre.utils.terminal import ANSIStream from calibre.utils.terminal import ANSIStream
COMPILER_PATH = 'rapydscript/compiler.js.bz2' COMPILER_PATH = 'rapydscript/compiler.js.xz'
def abspath(x): def abspath(x):
return os.path.realpath(os.path.abspath(x)) return os.path.realpath(os.path.abspath(x))
@ -27,9 +29,11 @@ def update_rapydscript():
base = d(d(d(d(d(abspath(__file__)))))) base = d(d(d(d(d(abspath(__file__))))))
base = os.path.join(base, 'rapydscript') base = os.path.join(base, 'rapydscript')
raw = subprocess.check_output(['node', '--harmony', os.path.join(base, 'bin', 'export')]) raw = subprocess.check_output(['node', '--harmony', os.path.join(base, 'bin', 'export')])
if isinstance(raw, type('')):
raw = raw.encode('utf-8')
path = P(COMPILER_PATH, allow_user_override=False) path = P(COMPILER_PATH, allow_user_override=False)
with open(path, 'wb') as f: with open(path, 'wb') as f:
f.write(bz2.compress(raw, 9)) compress(raw, f, 9)
base = os.path.join(base, 'src', 'lib') base = os.path.join(base, 'src', 'lib')
dest = os.path.join(P('rapydscript', allow_user_override=False), 'lib') dest = os.path.join(P('rapydscript', allow_user_override=False), 'lib')
if not os.path.exists(dest): if not os.path.exists(dest):
@ -49,7 +53,9 @@ def compiler():
if c is None: if c is None:
c = tls.compiler = Context() c = tls.compiler = Context()
c.eval('exports = {}; sha1sum = Duktape.sha1sum;', noreturn=True) c.eval('exports = {}; sha1sum = Duktape.sha1sum;', noreturn=True)
c.eval(bz2.decompress(P(COMPILER_PATH, data=True, allow_user_override=False)), fname=COMPILER_PATH, noreturn=True) buf = BytesIO()
decompress(P(COMPILER_PATH, data=True, allow_user_override=False), buf)
c.eval(buf.getvalue(), fname=COMPILER_PATH, noreturn=True)
return c return c
class PYJError(Exception): class PYJError(Exception):

1
src/lzma/xz.py
View File

@ -402,6 +402,7 @@ def compress(raw, outfile=None, level=5, check_type='crc64'):
uncompressed_size[0] += len(ans) uncompressed_size[0] += len(ans)
checker(ans) checker(ans)
return ans return ans
lzma.compress(read, outfile.write, None, level)
unpadded_size = outfile.tell() - start unpadded_size = outfile.tell() - start
pos = outfile.tell() pos = outfile.tell()
if pos % 4: if pos % 4: