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

wip - trying to resolve problems with AZW3 generation

Browse Source
This commit is contained in:
GRiker 2012-09-16 07:33:45 -06:00
parent b4e2dc54d1
commit 03d2b0f606
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/calibre/library/catalogs/epub_mobi_builder.py
View File

@ -33,6 +33,12 @@ class CatalogBuilder(object):
catalog = Catalog(notification=Reporter()) catalog = Catalog(notification=Reporter())
catalog.build_sources() catalog.build_sources()
Options managed in gui2.catalog.catalog_epub_mobi.py Options managed in gui2.catalog.catalog_epub_mobi.py
Turned off fetch_bookmarks as of 0.8.70
self.generate_recently_read = True if (_opts.generate_recently_added and
_opts.connected_kindle and
self.generate_for_kindle_mobi) else False
Does not work with AZW3, interferes with new prefix handling
''' '''
DEBUG = False DEBUG = False
@ -85,9 +91,9 @@ class CatalogBuilder(object):
@property @property
def SYMBOL_READING(self): def SYMBOL_READING(self):
if self.generate_for_kindle_mobi: if self.generate_for_kindle_mobi:
return self.format_prefix('▷') return '▷'
else: else:
return self.format_prefix(' ') return ' '
def __init__(self, db, _opts, plugin, def __init__(self, db, _opts, plugin,
@ -123,9 +129,7 @@ class CatalogBuilder(object):
self.content_dir = os.path.join(self.catalog_path, "content") self.content_dir = os.path.join(self.catalog_path, "content")
self.current_step = 0.0 self.current_step = 0.0
self.error = [] self.error = []
self.generate_recently_read = True if (_opts.generate_recently_added and self.generate_recently_read = False
_opts.connected_kindle and
self.generate_for_kindle_mobi) else False
self.genres = [] self.genres = []
self.genre_tags_dict = None self.genre_tags_dict = None
self.html_filelist_1 = [] self.html_filelist_1 = []
@ -959,7 +963,7 @@ class CatalogBuilder(object):
""" """
from calibre.devices.usbms.device import Device from calibre.devices.usbms.device import Device
from calibre.devices.kindle.driver import Bookmark from calibre.devices.kindle.bookmark import Bookmark
from calibre.ebooks.metadata import MetaInformation from calibre.ebooks.metadata import MetaInformation
MBP_FORMATS = [u'azw', u'mobi', u'prc', u'txt'] MBP_FORMATS = [u'azw', u'mobi', u'prc', u'txt']
@ -985,7 +989,10 @@ class CatalogBuilder(object):
file_fmts.add(fmt) file_fmts.add(fmt)
bookmark_extension = None bookmark_extension = None
if file_fmts.intersection(mbp_formats): if file_fmts.intersection(han_formats):
book_extension = list(file_fmts.intersection(han_formats))[0]
bookmark_extension = 'han'
elif file_fmts.intersection(mbp_formats):
book_extension = list(file_fmts.intersection(mbp_formats))[0] book_extension = list(file_fmts.intersection(mbp_formats))[0]
bookmark_extension = 'mbp' bookmark_extension = 'mbp'
elif file_fmts.intersection(tan_formats): elif file_fmts.intersection(tan_formats):
@ -1012,6 +1019,7 @@ class CatalogBuilder(object):
path_map.pop(id) path_map.pop(id)
return path_map, book_ext return path_map, book_ext
self.bookmarked_books = {}
if self.generate_recently_read: if self.generate_recently_read:
self.opts.log.info(" Collecting Kindle bookmarks matching catalog entries") self.opts.log.info(" Collecting Kindle bookmarks matching catalog entries")
@ -1046,8 +1054,6 @@ class CatalogBuilder(object):
bookmarks[id] = ((myBookmark,book)) bookmarks[id] = ((myBookmark,book))
self.bookmarked_books = bookmarks self.bookmarked_books = bookmarks
else:
self.bookmarked_books = {}
def filter_db_tags(self): def filter_db_tags(self):
""" Remove excluded tags from data set, return normalized genre list. """ Remove excluded tags from data set, return normalized genre list.
@ -2849,7 +2855,10 @@ class CatalogBuilder(object):
self.update_progress_full_step(_("NCX for Descriptions")) self.update_progress_full_step(_("NCX for Descriptions"))
# --- Construct the 'Books by Title' section --- sort_descriptions_by = self.books_by_author if self.opts.sort_descriptions_by_author \
else self.books_by_title
# --- Construct the 'Descriptions' section ---
ncx_soup = self.ncx_soup ncx_soup = self.ncx_soup
body = ncx_soup.find("navPoint") body = ncx_soup.find("navPoint")
btc = len(body.contents) btc = len(body.contents)
@ -2858,7 +2867,7 @@ class CatalogBuilder(object):
navPointTag = Tag(ncx_soup, 'navPoint') navPointTag = Tag(ncx_soup, 'navPoint')
if self.generate_for_kindle_mobi: if self.generate_for_kindle_mobi:
navPointTag['class'] = "section" navPointTag['class'] = "section"
navPointTag['id'] = "bytitle-ID" navPointTag['id'] = "bydescription-ID"
navPointTag['playOrder'] = self.play_order navPointTag['playOrder'] = self.play_order
self.play_order += 1 self.play_order += 1
navLabelTag = Tag(ncx_soup, 'navLabel') navLabelTag = Tag(ncx_soup, 'navLabel')
@ -2869,13 +2878,11 @@ class CatalogBuilder(object):
navPointTag.insert(nptc, navLabelTag) navPointTag.insert(nptc, navLabelTag)
nptc += 1 nptc += 1
contentTag = Tag(ncx_soup,"content") contentTag = Tag(ncx_soup,"content")
contentTag['src'] = "content/book_%d.html" % int(self.books_by_author[0]['id']) contentTag['src'] = "content/book_%d.html" % int(sort_descriptions_by[0]['id'])
navPointTag.insert(nptc, contentTag) navPointTag.insert(nptc, contentTag)
nptc += 1 nptc += 1
# Loop over the titles # Loop over the titles
sort_descriptions_by = self.books_by_author if self.opts.sort_descriptions_by_author \
else self.books_by_title
for book in sort_descriptions_by: for book in sort_descriptions_by:
navPointVolumeTag = Tag(ncx_soup, 'navPoint') navPointVolumeTag = Tag(ncx_soup, 'navPoint')