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

Fix KF8 internal links

Browse Source
This commit is contained in:
Kovid Goyal 2012-04-22 22:45:32 +05:30
parent 03a6e4ad62
commit 2e30c49e3f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/mobi/utils.py
View File

@ -369,7 +369,7 @@ def count_set_bits(num):
def to_base(num, base=32, min_num_digits=None): def to_base(num, base=32, min_num_digits=None):
digits = string.digits + string.ascii_uppercase digits = string.digits + string.ascii_uppercase
sign = 1 if num >= 0 else -1 sign = 1 if num >= 0 else -1
if num == 0: return '0' if num == 0: return ('0' if min_num_digits is None else '0'*min_num_digits)
num *= sign num *= sign
ans = [] ans = []
while num: while num:

6
src/calibre/ebooks/mobi/writer8/skeleton.py
View File

@ -366,7 +366,7 @@ class Chunker(object):
def to_placeholder(aid): def to_placeholder(aid):
pos, fid = aid_map[aid] pos, fid = aid_map[aid]
pos, fid = to_base(pos, min_num_digits=4), to_href(fid) pos, fid = to_base(pos, min_num_digits=4), to_href(fid)
return bytes(':'.join((pos, fid))) return bytes(':off:'.join((pos, fid)))
placeholder_map = {bytes(k):to_placeholder(v) for k, v in placeholder_map = {bytes(k):to_placeholder(v) for k, v in
self.placeholder_map.iteritems()} self.placeholder_map.iteritems()}
@ -376,12 +376,12 @@ class Chunker(object):
raw = match.group() raw = match.group()
pl = match.group(1) pl = match.group(1)
try: try:
return raw[:-15] + placeholder_map[pl] return raw[:-19] + placeholder_map[pl]
except KeyError: except KeyError:
pass pass
return raw return raw
return re.sub(br'<[^>]+(kindle:pos:fid:0000:\d{10})', sub, text) return re.sub(br'<[^>]+(kindle:pos:fid:0000:off:[0-9A-Za-z]{10})', sub, text)
def dump(self, orig_dumps): def dump(self, orig_dumps):
import tempfile, shutil, os import tempfile, shutil, os