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

GwR fix for mbp annotation parsing

Browse Source
This commit is contained in:
GRiker 2010-03-05 12:09:24 -08:00
parent b4481eaf76
commit 978940d2cb
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/devices/kindle/driver.py
View File

@ -185,7 +185,7 @@ class Bookmark():
from calibre.ebooks.metadata.mobi import StreamSlicer from calibre.ebooks.metadata.mobi import StreamSlicer
user_notes = {} user_notes = {}
if self.bookmark_extension == 'mbp': if self.bookmark_extension == 'mbp':
MAGIC_MOBI_CONSTANT MAGIC_MOBI_CONSTANT = 150
with open(path,'rb') as f: with open(path,'rb') as f:
stream = StringIO(f.read()) stream = StringIO(f.read())
data = StreamSlicer(stream) data = StreamSlicer(stream)
@ -234,9 +234,6 @@ class Bookmark():
displayed_location=displayed_location, displayed_location=displayed_location,
type=entry_type, type=entry_type,
text=text) text=text)
#print " %2d: %s %s" % (current_entry, entry_type,'at %d' % location if location else '')
#if current_block == 'text_block':
#self.textdump(text)
eo += rec_len + 8 eo += rec_len + 8
current_entry += 1 current_entry += 1
@ -246,11 +243,13 @@ class Bookmark():
while sig == 'BKMK': while sig == 'BKMK':
# Fix start location for Highlights using BKMK data # Fix start location for Highlights using BKMK data
end_loc, = unpack('>I', data[eo+0x10:eo+0x14]) end_loc, = unpack('>I', data[eo+0x10:eo+0x14])
if end_loc in user_notes and user_notes[end_loc]['type'] != 'Note': if end_loc in user_notes and user_notes[end_loc]['type'] == 'Highlight':
start, = unpack('>I', data[eo+8:eo+12]) start, = unpack('>I', data[eo+8:eo+12])
user_notes[start] = user_notes[end_loc] user_notes[start] = user_notes[end_loc]
user_notes.pop(end_loc) user_notes.pop(end_loc)
#print "changing start location of %d to %d" % (end_loc,start) elif end_loc in user_notes and user_notes[end_loc]['type'] == 'Note':
# Skip duplicate bookmarks for notes
pass
else: else:
# If a bookmark coincides with a user annotation, the locs could # If a bookmark coincides with a user annotation, the locs could
# be the same - cheat by nudging -1 # be the same - cheat by nudging -1

4
src/calibre/library/catalog.py
View File

@ -13,7 +13,6 @@ from calibre.customize import CatalogPlugin
from calibre.customize.conversion import OptionRecommendation, DummyReporter from calibre.customize.conversion import OptionRecommendation, DummyReporter
from calibre.ebooks.BeautifulSoup import BeautifulSoup, BeautifulStoneSoup, Tag, NavigableString from calibre.ebooks.BeautifulSoup import BeautifulSoup, BeautifulStoneSoup, Tag, NavigableString
from calibre.ptempfile import PersistentTemporaryDirectory from calibre.ptempfile import PersistentTemporaryDirectory
from calibre.utils.logging import Log
from calibre.utils.date import isoformat, now as nowf from calibre.utils.date import isoformat, now as nowf
FIELDS = ['all', 'author_sort', 'authors', 'comments', FIELDS = ['all', 'author_sort', 'authors', 'comments',
@ -3929,9 +3928,6 @@ class EPUB_MOBI(CatalogPlugin):
return result.renderContents(encoding=None) return result.renderContents(encoding=None)
def magicKindleLocationCalculator(self,offset):
return offset/150 + 1
def processSpecialTags(self, tags, this_title, opts): def processSpecialTags(self, tags, this_title, opts):
tag_list = [] tag_list = []
for tag in tags: for tag in tags: