Skip to content

Use lzma instead of bz2 for data compression #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wendingyuan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use lzma instead of bz2 for data compression #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions bsdiff4/format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import absolute_import

import bz2
import lzma
import sys


Expand All @@ -25,9 +25,9 @@ def write_patch(fo, len_dst, tcontrol, bdiff, bextra):
for x in c:
faux.write(core.encode_int64(x))
# compress each block
bcontrol = bz2.compress(faux.getvalue())
bdiff = bz2.compress(bdiff)
bextra = bz2.compress(bextra)
bcontrol = lzma.compress(faux.getvalue(), preset=9)
bdiff = lzma.compress(bdiff, preset=9)
bextra = lzma.compress(bextra, preset=9)
for n in len(bcontrol), len(bdiff), len_dst:
fo.write(core.encode_int64(n))
fo.write(bcontrol)
Expand All @@ -46,16 +46,16 @@ def read_patch(fi, header_only=False):
len_diff = core.decode_int64(fi.read(8))
len_dst = core.decode_int64(fi.read(8))
# read the control header
bcontrol = bz2.decompress(fi.read(len_control))
bcontrol = lzma.decompress(fi.read(len_control))
tcontrol = [(core.decode_int64(bcontrol[i:i + 8]),
core.decode_int64(bcontrol[i + 8:i + 16]),
core.decode_int64(bcontrol[i + 16:i + 24]))
for i in range(0, len(bcontrol), 24)]
if header_only:
return len_control, len_diff, len_dst, tcontrol
# read the diff and extra blocks
bdiff = bz2.decompress(fi.read(len_diff))
bextra = bz2.decompress(fi.read())
bdiff = lzma.decompress(fi.read(len_diff))
bextra = lzma.decompress(fi.read())
return len_dst, tcontrol, bdiff, bextra


Expand Down