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

LZMA2 compression now works

Browse Source
This commit is contained in:
Kovid Goyal 2015-08-07 12:46:50 +05:30
parent 7ce47c2d91
commit de82a9c437
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lzma/lzma_binding.c
View File

@ -296,7 +296,7 @@ static size_t owrite(void *p, const void *buf, size_t size) {
PyObject *res = NULL;
if (!size) return 0;
ACQUIRE_GIL
res = PyObject_CallFunction(self->write, "s#", buf, size);
res = PyObject_CallFunction(self->write, "s#", (char*)buf, size);
if (res == NULL) return 0;
Py_DECREF(res);
RELEASE_GIL
@ -325,7 +325,7 @@ compress(PyObject *self, PyObject *args) {
OutStream out_stream;
Progress progress;
SRes res = SZ_OK;
char dictsize = 0;
Byte props_out = 0;
PyThreadState *ts = NULL;
if (!PyArg_ParseTuple(args, "OO|Oi", &read, &write, &progress_callback, &preset)) return NULL;
@ -340,8 +340,7 @@ compress(PyObject *self, PyObject *args) {
if (res != SZ_OK) { SET_ERROR(res); goto exit; }
// Write the dict size to the output stream
dictsize = Lzma2Enc_WriteProperties(lzma2);
if (!PyObject_CallFunction(write, "c", &dictsize)) { goto exit; }
props_out = Lzma2Enc_WriteProperties(lzma2);
// Create the streams and progress callback
in_stream.stream.Read = iread;
@ -362,7 +361,7 @@ compress(PyObject *self, PyObject *args) {
exit:
if (lzma2) Lzma2Enc_Destroy(lzma2);
if (PyErr_Occurred()) return NULL;
Py_RETURN_NONE;
return Py_BuildValue("s#", &props_out, 1);
}
// }}}
@ -373,7 +372,7 @@ static PyMethodDef lzma_binding_methods[] = {
},
{"compress", compress, METH_VARARGS,
"Compress data into an LZMA2 block"
"Compress data into an LZMA2 block, writing it to outfile. Returns the LZMA2 properties as a bytestring."
},
{"decompress", decompress, METH_VARARGS,

12
src/lzma/xz.py
View File

@ -144,7 +144,7 @@ class LZMA2Filter(object):
bufsize = self.BUFSIZE
self.bufsize = int(bufsize * 1024 * 1024)
def __call__(self, f, outfile, filters):
def __call__(self, f, outfile, filters=()):
w = outfile.write
c = self.crc
def write(raw):
@ -332,6 +332,16 @@ def decompress(raw, outfile=None):
raise InvalidXZ('Found trailing garbage between streams')
return outfile
def test_lzma2():
raw = P('template-functions.json', allow_user_override=False, data=True)
ibuf, obuf = BytesIO(raw), BytesIO()
props = lzma.compress(ibuf.read, obuf.write)
cc = obuf.getvalue()
ibuf, obuf = BytesIO(cc), BytesIO()
LZMA2Filter(props, 0, 1)(ibuf, obuf)
if obuf.getvalue() != raw:
raise ValueError('Roundtripping via LZMA2 failed')
if __name__ == '__main__':
import sys
decompress(open(sys.argv[-1], 'rb'))