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

Various minor tweaks to catalog generation

Browse Source
This commit is contained in:
Kovid Goyal 2010-01-25 08:55:20 -07:00
commit 53f8ba24da
4 changed files with 70 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/catalog/mastheadImage.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 18 KiB

7
resources/recipes/kidney.recipe
View File

@ -58,7 +58,7 @@ class JASN(BasicNewsRecipe):
# To parse artice toc # To parse artice toc
def parse_index(self): def parse_index(self):
parse_soup = self.jasn_get_index() parse_soup = self.jasn_get_index()
div = parse_soup.find(id='tocBody') div = parse_soup.find(id='tocBody')
current_section = None current_section = None
@ -91,7 +91,7 @@ class JASN(BasicNewsRecipe):
feeds.append((current_section, current_articles)) feeds.append((current_section, current_articles))
return feeds return feeds
def preprocess_html(self, soup): def preprocess_html(self, soup):
@ -112,4 +112,5 @@ class JASN(BasicNewsRecipe):
return soup return soup

2
src/calibre/gui2/catalog/catalog_epub_mobi.py
View File

@ -14,7 +14,7 @@ from PyQt4.Qt import QWidget
class PluginWidget(QWidget,Ui_Form): class PluginWidget(QWidget,Ui_Form):
TITLE = _('E-book Options') TITLE = _('E-book options')
HELP = _('Options specific to')+' EPUB/MOBI '+_('output') HELP = _('Options specific to')+' EPUB/MOBI '+_('output')
OPTION_FIELDS = [('exclude_genre','\[[\w ]*\]'), OPTION_FIELDS = [('exclude_genre','\[[\w ]*\]'),
('exclude_tags','~,'+_('Catalog')), ('exclude_tags','~,'+_('Catalog')),

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

@ -1,12 +1,14 @@
import os, re, shutil, htmlentitydefs import os, re, shutil, htmlentitydefs
from collections import namedtuple
from xml.sax.saxutils import escape from xml.sax.saxutils import escape
from calibre.ebooks.BeautifulSoup import BeautifulSoup, BeautifulStoneSoup, Tag, NavigableString from calibre import filesystem_encoding
from calibre.customize import CatalogPlugin from calibre.customize import CatalogPlugin
from calibre.ptempfile import PersistentTemporaryDirectory
from calibre.customize.conversion import OptionRecommendation, DummyReporter from calibre.customize.conversion import OptionRecommendation, DummyReporter
from calibre import filesystem_encoding, prints from calibre.ebooks.BeautifulSoup import BeautifulSoup, BeautifulStoneSoup, Tag, NavigableString
from calibre.ptempfile import PersistentTemporaryDirectory
from calibre.utils.logging import Log
FIELDS = ['all', 'author_sort', 'authors', 'comments', FIELDS = ['all', 'author_sort', 'authors', 'comments',
'cover', 'formats', 'id', 'isbn', 'pubdate', 'publisher', 'rating', 'cover', 'formats', 'id', 'isbn', 'pubdate', 'publisher', 'rating',
@ -16,8 +18,6 @@ FIELDS = ['all', 'author_sort', 'authors', 'comments',
class CSV_XML(CatalogPlugin): class CSV_XML(CatalogPlugin):
'CSV/XML catalog generator' 'CSV/XML catalog generator'
from collections import namedtuple
Option = namedtuple('Option', 'option, default, dest, help') Option = namedtuple('Option', 'option, default, dest, help')
name = 'Catalog_CSV_XML' name = 'Catalog_CSV_XML'
@ -46,8 +46,6 @@ class CSV_XML(CatalogPlugin):
"Applies to: CSV, XML output formats"))] "Applies to: CSV, XML output formats"))]
def run(self, path_to_output, opts, db, notification=DummyReporter()): def run(self, path_to_output, opts, db, notification=DummyReporter()):
from calibre.utils.logging import Log
log = Log() log = Log()
self.fmt = path_to_output.rpartition('.')[2] self.fmt = path_to_output.rpartition('.')[2]
self.notification = notification self.notification = notification
@ -224,7 +222,6 @@ class CSV_XML(CatalogPlugin):
class EPUB_MOBI(CatalogPlugin): class EPUB_MOBI(CatalogPlugin):
'ePub catalog generator' 'ePub catalog generator'
from collections import namedtuple
Option = namedtuple('Option', 'option, default, dest, help') Option = namedtuple('Option', 'option, default, dest, help')
name = 'Catalog_EPUB_MOBI' name = 'Catalog_EPUB_MOBI'
@ -465,7 +462,8 @@ class EPUB_MOBI(CatalogPlugin):
# Used to xlate pubdate to friendly format # Used to xlate pubdate to friendly format
MONTHS = ['January', 'February','March','April','May','June', MONTHS = ['January', 'February','March','April','May','June',
'July','August','September','October','November','December'] 'July','August','September','October','November','December']
THUMB_WIDTH = 75
THUMB_HEIGHT = 100
# basename output file basename # basename output file basename
# creator dc:creator in OPF metadata # creator dc:creator in OPF metadata
@ -496,7 +494,6 @@ class EPUB_MOBI(CatalogPlugin):
self.opts.output_profile.startswith("kindle")) else False self.opts.output_profile.startswith("kindle")) else False
self.__genres = None self.__genres = None
self.__htmlFileList = [] self.__htmlFileList = []
self.__libraryPath = self.fetchLibraryPath()
self.__markerTags = self.getMarkerTags() self.__markerTags = self.getMarkerTags()
self.__ncxSoup = None self.__ncxSoup = None
self.__playOrder = 1 self.__playOrder = 1
@ -510,10 +507,10 @@ class EPUB_MOBI(CatalogPlugin):
self.__title = opts.catalog_title self.__title = opts.catalog_title
self.__verbose = opts.verbose self.__verbose = opts.verbose
if self.verbose: self.opts.log.info("CatalogBuilder(): Generating %s %s"% \
prints( "CatalogBuilder(): Generating %s for %s" % (self.opts.fmt,
(self.opts.fmt, self.opts.output_profile)) "for %s" % self.opts.output_profile if self.opts.output_profile \
else ''))
# Accessors # Accessors
''' '''
@dynamic_property @dynamic_property
@ -800,8 +797,7 @@ class EPUB_MOBI(CatalogPlugin):
def fetchBooksByTitle(self): def fetchBooksByTitle(self):
if self.verbose: self.opts.log.info(self.updateProgressFullStep("fetchBooksByTitle()"))
prints( self.updateProgressFullStep("fetchBooksByTitle()"))
# Get the database as a dictionary # Get the database as a dictionary
# Sort by title # Sort by title
@ -878,18 +874,15 @@ class EPUB_MOBI(CatalogPlugin):
# Re-sort based on title_sort # Re-sort based on title_sort
self.booksByTitle = sorted(titles, self.booksByTitle = sorted(titles,
key=lambda x:(x['title_sort'].upper(), x['title_sort'].upper())) key=lambda x:(x['title_sort'].upper(), x['title_sort'].upper()))
if self.verbose: if False and self.verbose:
prints( "fetchBooksByTitle(): %d books" % self.opts.log.info("fetchBooksByTitle(): %d books" % len(self.booksByTitle))
len(self.booksByTitle))
for title in self.booksByTitle: for title in self.booksByTitle:
prints (u" %-50s %-25s" % (title['title'][0:45], title['title_sort'][0:20])) self.opts.log.info((u" %-50s %-25s" % (title['title'][0:45], title['title_sort'][0:20])).encode('utf-8'))
print
def fetchBooksByAuthor(self): def fetchBooksByAuthor(self):
# Generate a list of titles sorted by author from the database # Generate a list of titles sorted by author from the database
if self.verbose: self.opts.log.info(self.updateProgressFullStep("fetchBooksByAuthor()"))
prints( self.updateProgressFullStep("fetchBooksByAuthor()"))
# Sort titles case-insensitive # Sort titles case-insensitive
self.booksByAuthor = sorted(self.booksByTitle, self.booksByAuthor = sorted(self.booksByTitle,
@ -911,6 +904,11 @@ class EPUB_MOBI(CatalogPlugin):
multiple_authors = True multiple_authors = True
if author != current_author and i: if author != current_author and i:
# Warn if friendly matches previous, but sort doesn't
if author[0] == current_author[0]:
self.opts.log.warn("Warning: multiple entries for Author '%s' with differing Author Sort metadata:" % author[0])
self.opts.log.warn(" '%s' != '%s'" % (author[1], current_author[1]))
# New author, save the previous author/sort/count # New author, save the previous author/sort/count
unique_authors.append((current_author[0], current_author[1].title(), unique_authors.append((current_author[0], current_author[1].title(),
books_by_current_author)) books_by_current_author))
@ -928,26 +926,20 @@ class EPUB_MOBI(CatalogPlugin):
unique_authors.append((current_author[0], current_author[1].title(), unique_authors.append((current_author[0], current_author[1].title(),
books_by_current_author)) books_by_current_author))
if self.verbose: if False and self.verbose:
prints( "\nfetchBooksByauthor(): %d unique authors" % self.opts.log.info("\nfetchBooksByauthor(): %d unique authors" % len(unique_authors))
len(unique_authors))
for author in unique_authors: for author in unique_authors:
prints (u" %-50s %-25s %2d" % (author[0][0:45], author[1][0:20], self.opts.log.info((u" %-50s %-25s %2d" % (author[0][0:45], author[1][0:20],
author[2])) author[2])).encode('utf-8'))
print
self.authors = unique_authors self.authors = unique_authors
def generateHTMLDescriptions(self): def generateHTMLDescriptions(self):
# Write each title to a separate HTML file in contentdir # Write each title to a separate HTML file in contentdir
if self.verbose: self.opts.log.info(self.updateProgressFullStep("generateHTMLDescriptions()"))
prints(
self.updateProgressFullStep("generateHTMLDescriptions()"))
for (title_num, title) in enumerate(self.booksByTitle): for (title_num, title) in enumerate(self.booksByTitle):
if False: if False:
prints( u"%3s: %s - %s" % (title['id'], title['title'], self.opts.log.info("%3s: %s - %s" % (title['id'], title['title'], title['author']))
title['author']))
self.updateProgressMicroStep("generating book descriptions ...", self.updateProgressMicroStep("generating book descriptions ...",
float(title_num*100/len(self.booksByTitle))/100) float(title_num*100/len(self.booksByTitle))/100)
@ -981,7 +973,7 @@ class EPUB_MOBI(CatalogPlugin):
authorTag.insert(1, aTag) authorTag.insert(1, aTag)
''' '''
# Insert the unlinked tags. Tags are not linked, just informative # Insert the unlinked genres.
if 'tags' in title: if 'tags' in title:
tagsTag = body.find(attrs={'class':'tags'}) tagsTag = body.find(attrs={'class':'tags'})
emTag = Tag(soup,"em") emTag = Tag(soup,"em")
@ -989,7 +981,7 @@ class EPUB_MOBI(CatalogPlugin):
tagsTag.insert(0,emTag) tagsTag.insert(0,emTag)
''' '''
# Insert tags with links to genre sections # Insert linked genres
if 'tags' in title: if 'tags' in title:
tagsTag = body.find(attrs={'class':'tags'}) tagsTag = body.find(attrs={'class':'tags'})
ttc = 0 ttc = 0
@ -1021,6 +1013,7 @@ class EPUB_MOBI(CatalogPlugin):
else: else:
imgTag['src'] = "../images/thumbnail_default.jpg" imgTag['src'] = "../images/thumbnail_default.jpg"
imgTag['alt'] = "cover" imgTag['alt'] = "cover"
imgTag['style'] = 'width: %dpx; height:%dpx;' % (self.THUMB_WIDTH, self.THUMB_HEIGHT)
thumbnailTag = body.find(attrs={'class':'thumbnail'}) thumbnailTag = body.find(attrs={'class':'thumbnail'})
thumbnailTag.insert(0,imgTag) thumbnailTag.insert(0,imgTag)
@ -1029,14 +1022,14 @@ class EPUB_MOBI(CatalogPlugin):
if 'publisher' in title: if 'publisher' in title:
publisherTag.insert(0,NavigableString(title['publisher'] + '<br/>' )) publisherTag.insert(0,NavigableString(title['publisher'] + '<br/>' ))
else: else:
publisherTag.insert(0,NavigableString('(unknown)<br/>')) publisherTag.insert(0,NavigableString('<br/>'))
# Insert the publication date # Insert the publication date
pubdateTag = body.find(attrs={'class':'date'}) pubdateTag = body.find(attrs={'class':'date'})
if title['date'] is not None: if title['date'] is not None:
pubdateTag.insert(0,NavigableString(title['date'] + '<br/>')) pubdateTag.insert(0,NavigableString(title['date'] + '<br/>'))
else: else:
pubdateTag.insert(0,NavigableString('(unknown)<br/>')) pubdateTag.insert(0,NavigableString('<br/>'))
# Insert the rating # Insert the rating
# Render different ratings chars for epub/mobi # Render different ratings chars for epub/mobi
@ -1070,8 +1063,7 @@ class EPUB_MOBI(CatalogPlugin):
def generateHTMLByTitle(self): def generateHTMLByTitle(self):
# Write books by title A-Z to HTML file # Write books by title A-Z to HTML file
if self.verbose: self.opts.log.info(self.updateProgressFullStep("generateHTMLByTitle()"))
prints( self.updateProgressFullStep("generateHTMLByTitle()"))
soup = self.generateHTMLEmptyHeader("Books By Alpha Title") soup = self.generateHTMLEmptyHeader("Books By Alpha Title")
body = soup.find('body') body = soup.find('body')
@ -1152,7 +1144,7 @@ class EPUB_MOBI(CatalogPlugin):
emTag = Tag(soup, "em") emTag = Tag(soup, "em")
aTag = Tag(soup, "a") aTag = Tag(soup, "a")
aTag['href'] = "%s.html#%s" % ("ByAlphaAuthor", self.generateAuthorAnchor(book['author'])) aTag['href'] = "%s.html#%s" % ("ByAlphaAuthor", self.generateAuthorAnchor(book['author']))
aTag.insert(0, escape(book['author'])) aTag.insert(0, NavigableString(book['author']))
emTag.insert(0,aTag) emTag.insert(0,aTag)
pBookTag.insert(ptc, emTag) pBookTag.insert(ptc, emTag)
ptc += 1 ptc += 1
@ -1173,8 +1165,8 @@ class EPUB_MOBI(CatalogPlugin):
def generateHTMLByAuthor(self): def generateHTMLByAuthor(self):
# Write books by author A-Z # Write books by author A-Z
if self.verbose: self.opts.log.info(self.updateProgressFullStep("generateHTMLByAuthor()"))
prints( self.updateProgressFullStep("generateHTMLByAuthor()"))
friendly_name = "By Author" friendly_name = "By Author"
soup = self.generateHTMLEmptyHeader(friendly_name) soup = self.generateHTMLEmptyHeader(friendly_name)
@ -1305,8 +1297,7 @@ class EPUB_MOBI(CatalogPlugin):
# Generate individual HTML files for each tag, e.g. Fiction, Nonfiction ... # Generate individual HTML files for each tag, e.g. Fiction, Nonfiction ...
# Note that special tags - ~+*[] - have already been filtered from books[] # Note that special tags - ~+*[] - have already been filtered from books[]
if self.verbose: self.opts.log.info(self.updateProgressFullStep("generateHTMLByTags()"))
prints( self.updateProgressFullStep("generateHTMLByTags()"))
# Filter out REMOVE_TAGS, sort # Filter out REMOVE_TAGS, sort
filtered_tags = self.filterDbTags(self.db.all_tags()) filtered_tags = self.filterDbTags(self.db.all_tags())
@ -1314,13 +1305,11 @@ class EPUB_MOBI(CatalogPlugin):
# Extract books matching filtered_tags # Extract books matching filtered_tags
genre_list = [] genre_list = []
for tag in filtered_tags: for tag in filtered_tags:
if False : prints( u"searching for %s" % tag)
tag_list = {} tag_list = {}
tag_list['tag'] = tag tag_list['tag'] = tag
tag_list['books'] = [] tag_list['books'] = []
for book in self.booksByAuthor: for book in self.booksByAuthor:
if 'tags' in book and tag in book['tags']: if 'tags' in book and tag in book['tags']:
if False: prints (u"\t %s" % (book['title']))
this_book = {} this_book = {}
this_book['author'] = book['author'] this_book['author'] = book['author']
this_book['title'] = book['title'] this_book['title'] = book['title']
@ -1337,12 +1326,9 @@ class EPUB_MOBI(CatalogPlugin):
# genre_list = [ [tag_list], [tag_list] ...] # genre_list = [ [tag_list], [tag_list] ...]
master_genre_list = [] master_genre_list = []
for (index, genre) in enumerate(genre_list): for (index, genre) in enumerate(genre_list):
if False : prints( u"genre: %s" % genre['tag'])
# Create sorted_authors[0] = friendly, [1] = author_sort for NCX creation # Create sorted_authors[0] = friendly, [1] = author_sort for NCX creation
authors = [] authors = []
for book in genre['books']: for book in genre['books']:
#print "\t %s - %s" % (book['title'], book['author'])
authors.append((book['author'],book['author_sort'])) authors.append((book['author'],book['author_sort']))
# authors[] contains a list of all book authors, with multiple entries for multiple books by author # authors[] contains a list of all book authors, with multiple entries for multiple books by author
@ -1385,8 +1371,6 @@ class EPUB_MOBI(CatalogPlugin):
# Generate a thumbnail per cover. If a current thumbnail exists, skip # Generate a thumbnail per cover. If a current thumbnail exists, skip
# If a cover doesn't exist, use default # If a cover doesn't exist, use default
# Return list of active thumbs # Return list of active thumbs
if self.verbose:
prints( self.updateProgressFullStep("generateThumbnails()"))
thumbs = ['thumbnail_default.jpg'] thumbs = ['thumbnail_default.jpg']
@ -1398,7 +1382,6 @@ class EPUB_MOBI(CatalogPlugin):
i/float(len(self.booksByTitle))) i/float(len(self.booksByTitle)))
# Check to see if source file exists # Check to see if source file exists
if 'cover' in title and os.path.isfile(title['cover']): if 'cover' in title and os.path.isfile(title['cover']):
# print "cover found for %s" % title['title']
# Add the thumb spec to thumbs[] # Add the thumb spec to thumbs[]
thumbs.append("thumbnail_%d.jpg" % int(title['id'])) thumbs.append("thumbnail_%d.jpg" % int(title['id']))
@ -1412,14 +1395,13 @@ class EPUB_MOBI(CatalogPlugin):
cover_timestamp = os.path.getmtime(title['cover']) cover_timestamp = os.path.getmtime(title['cover'])
thumb_timestamp = os.path.getmtime(thumb_fp) thumb_timestamp = os.path.getmtime(thumb_fp)
if thumb_timestamp < cover_timestamp: if thumb_timestamp < cover_timestamp:
# if verbose: print "updating thumbnail for %s" % title['title']
self.generateThumbnail(title, image_dir, thumb_file) self.generateThumbnail(title, image_dir, thumb_file)
else: else:
#if verbose: print "generating new thumbnail for %s" % title['title']
self.generateThumbnail(title, image_dir, thumb_file) self.generateThumbnail(title, image_dir, thumb_file)
else: else:
# Use default cover # Use default cover
if self.verbose: prints( u"no cover available for %s, will use default" % \ if self.verbose:
self.opts.log.warn(" using default cover for '%s'" % \
(title['title'])) (title['title']))
# Check to make sure default is current # Check to make sure default is current
# Check to see if thumbnail exists # Check to see if thumbnail exists
@ -1452,13 +1434,13 @@ class EPUB_MOBI(CatalogPlugin):
thumb_timestamp = os.path.getmtime(thumb_fp) thumb_timestamp = os.path.getmtime(thumb_fp)
if thumb_timestamp < cover_timestamp: if thumb_timestamp < cover_timestamp:
if self.verbose: if self.verbose:
prints( u"updating thumbnail_default for %s" % title['title']) self.opts.log.warn("updating thumbnail_default for %s" % title['title'])
#title['cover'] = "%s/DefaultCover.jpg" % self.catalogPath #title['cover'] = "%s/DefaultCover.jpg" % self.catalogPath
title['cover'] = cover title['cover'] = cover
self.generateThumbnail(title, image_dir, "thumbnail_default.jpg") self.generateThumbnail(title, image_dir, "thumbnail_default.jpg")
else: else:
if self.verbose: if self.verbose:
prints( "generating new thumbnail_default.jpg") self.opts.log.warn(" generating new thumbnail_default.jpg")
#title['cover'] = "%s/DefaultCover.jpg" % self.catalogPath #title['cover'] = "%s/DefaultCover.jpg" % self.catalogPath
title['cover'] = cover title['cover'] = cover
self.generateThumbnail(title, image_dir, "thumbnail_default.jpg") self.generateThumbnail(title, image_dir, "thumbnail_default.jpg")
@ -1467,8 +1449,7 @@ class EPUB_MOBI(CatalogPlugin):
def generateOPF(self): def generateOPF(self):
if self.verbose: self.opts.log.info(self.updateProgressFullStep("generateOPF()"))
prints( self.updateProgressFullStep("generateOPF()"))
header = ''' header = '''
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
@ -1571,7 +1552,7 @@ class EPUB_MOBI(CatalogPlugin):
# Add genre files to manifest and spine # Add genre files to manifest and spine
for genre in self.genres: for genre in self.genres:
if False: print "adding %s to manifest and spine" % genre['tag'] if False: self.opts.log.info("adding %s to manifest and spine" % genre['tag'])
itemTag = Tag(soup, "item") itemTag = Tag(soup, "item")
start = genre['file'].find('/') + 1 start = genre['file'].find('/') + 1
end = genre['file'].find('.') end = genre['file'].find('.')
@ -1600,8 +1581,7 @@ class EPUB_MOBI(CatalogPlugin):
def generateNCXHeader(self): def generateNCXHeader(self):
if self.verbose: self.opts.log.info(self.updateProgressFullStep("generateNCXHeader()"))
prints( self.updateProgressFullStep("generateNCXHeader()"))
header = ''' header = '''
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
@ -1616,7 +1596,6 @@ class EPUB_MOBI(CatalogPlugin):
navPointTag['class'] = "periodical" navPointTag['class'] = "periodical"
navPointTag['id'] = "title" navPointTag['id'] = "title"
navPointTag['playOrder'] = self.playOrder navPointTag['playOrder'] = self.playOrder
#print "generateNCXHeader(periodical): self.playOrder: %d" % self.playOrder
self.playOrder += 1 self.playOrder += 1
navLabelTag = Tag(soup, 'navLabel') navLabelTag = Tag(soup, 'navLabel')
textTag = Tag(soup, 'text') textTag = Tag(soup, 'text')
@ -1638,8 +1617,7 @@ class EPUB_MOBI(CatalogPlugin):
def generateNCXDescriptions(self, tocTitle): def generateNCXDescriptions(self, tocTitle):
if self.verbose: self.opts.log.info(self.updateProgressFullStep("generateNCXDescriptions()"))
prints( self.updateProgressFullStep("generateNCXDescription()"))
# --- Construct the 'Books by Title' section --- # --- Construct the 'Books by Title' section ---
ncx_soup = self.ncxSoup ncx_soup = self.ncxSoup
@ -1651,7 +1629,6 @@ class EPUB_MOBI(CatalogPlugin):
navPointTag['class'] = "section" navPointTag['class'] = "section"
navPointTag['id'] = "bytitle-ID" navPointTag['id'] = "bytitle-ID"
navPointTag['playOrder'] = self.playOrder navPointTag['playOrder'] = self.playOrder
#print "generateNCXDescriptions(section '%s'): self.playOrder: %d" % (tocTitle, self.playOrder)
self.playOrder += 1 self.playOrder += 1
navLabelTag = Tag(ncx_soup, 'navLabel') navLabelTag = Tag(ncx_soup, 'navLabel')
textTag = Tag(ncx_soup, 'text') textTag = Tag(ncx_soup, 'text')
@ -1671,7 +1648,6 @@ class EPUB_MOBI(CatalogPlugin):
navPointVolumeTag['class'] = "article" navPointVolumeTag['class'] = "article"
navPointVolumeTag['id'] = "book%dID" % int(book['id']) navPointVolumeTag['id'] = "book%dID" % int(book['id'])
navPointVolumeTag['playOrder'] = self.playOrder navPointVolumeTag['playOrder'] = self.playOrder
#print "generateNCXDescriptions(article): self.playOrder: %d" % self.playOrder
self.playOrder += 1 self.playOrder += 1
navLabelTag = Tag(ncx_soup, "navLabel") navLabelTag = Tag(ncx_soup, "navLabel")
textTag = Tag(ncx_soup, "text") textTag = Tag(ncx_soup, "text")
@ -1709,8 +1685,7 @@ class EPUB_MOBI(CatalogPlugin):
def generateNCXByTitle(self, tocTitle): def generateNCXByTitle(self, tocTitle):
if self.verbose: self.opts.log.info(self.updateProgressFullStep("generateNCXByTitle()"))
prints( self.updateProgressFullStep("generateNCXByTitle()"))
soup = self.ncxSoup soup = self.ncxSoup
output = "ByAlphaTitle" output = "ByAlphaTitle"
@ -1722,7 +1697,6 @@ class EPUB_MOBI(CatalogPlugin):
navPointTag['class'] = "section" navPointTag['class'] = "section"
navPointTag['id'] = "byalphatitle-ID" navPointTag['id'] = "byalphatitle-ID"
navPointTag['playOrder'] = self.playOrder navPointTag['playOrder'] = self.playOrder
#print "generateNCXByTitle(section '%s'): self.playOrder: %d" % (tocTitle, self.playOrder)
self.playOrder += 1 self.playOrder += 1
navLabelTag = Tag(soup, 'navLabel') navLabelTag = Tag(soup, 'navLabel')
textTag = Tag(soup, 'text') textTag = Tag(soup, 'text')
@ -1800,8 +1774,7 @@ class EPUB_MOBI(CatalogPlugin):
def generateNCXByAuthor(self, tocTitle): def generateNCXByAuthor(self, tocTitle):
if self.verbose: self.opts.log.info(self.updateProgressFullStep("generateNCXByAuthor()"))
prints( self.updateProgressFullStep("generateNCXByAuthor()"))
soup = self.ncxSoup soup = self.ncxSoup
HTML_file = "content/ByAlphaAuthor.html" HTML_file = "content/ByAlphaAuthor.html"
@ -1844,9 +1817,8 @@ class EPUB_MOBI(CatalogPlugin):
author_list += " &hellip;" author_list += " &hellip;"
author_list = self.formatNCXText(author_list) author_list = self.formatNCXText(author_list)
if self.verbose: if False and self.verbose:
prints( u" adding '%s' to master_author_list" % self.opts.log.info(" adding '%s' to master_author_list" % current_letter)
current_letter)
master_author_list.append((author_list, current_letter)) master_author_list.append((author_list, current_letter))
# Start the new list # Start the new list
@ -1861,8 +1833,8 @@ class EPUB_MOBI(CatalogPlugin):
if len(current_author_list) == self.descriptionClip: if len(current_author_list) == self.descriptionClip:
author_list += " &hellip;" author_list += " &hellip;"
author_list = self.formatNCXText(author_list) author_list = self.formatNCXText(author_list)
if self.verbose: if False and self.verbose:
prints( u" adding '%s' to master_author_list" % current_letter) self.opts.log.info(" adding '%s' to master_author_list" % current_letter)
master_author_list.append((author_list, current_letter)) master_author_list.append((author_list, current_letter))
# Add *article* entries for each populated author initial letter # Add *article* entries for each populated author initial letter
@ -1903,8 +1875,7 @@ class EPUB_MOBI(CatalogPlugin):
# Add each genre as an article # Add each genre as an article
# 'tag', 'file', 'authors' # 'tag', 'file', 'authors'
if self.verbose: self.opts.log.info(self.updateProgressFullStep("generateNCXByTags()"))
prints( self.updateProgressFullStep("generateNCXByTags()"))
ncx_soup = self.ncxSoup ncx_soup = self.ncxSoup
body = ncx_soup.find("navPoint") body = ncx_soup.find("navPoint")
@ -1917,11 +1888,10 @@ class EPUB_MOBI(CatalogPlugin):
file_ID = file_ID.replace(" ","") file_ID = file_ID.replace(" ","")
navPointTag['id'] = "%s-ID" % file_ID navPointTag['id'] = "%s-ID" % file_ID
navPointTag['playOrder'] = self.playOrder navPointTag['playOrder'] = self.playOrder
#print "generateNCXByTags(section '%s'): self.playOrder: %d" % (tocTitle, self.playOrder)
self.playOrder += 1 self.playOrder += 1
navLabelTag = Tag(ncx_soup, 'navLabel') navLabelTag = Tag(ncx_soup, 'navLabel')
textTag = Tag(ncx_soup, 'text') textTag = Tag(ncx_soup, 'text')
# textTag.insert(0, NavigableString('%s (%d)' % (section_title, len(genre_list)))) # textTag.insert(0, NavigableString('%s (%d)' % (section_title, len(genre_list))))
textTag.insert(0, NavigableString('%s' % tocTitle)) textTag.insert(0, NavigableString('%s' % tocTitle))
navLabelTag.insert(0, textTag) navLabelTag.insert(0, textTag)
nptc = 0 nptc = 0
@ -1939,7 +1909,6 @@ class EPUB_MOBI(CatalogPlugin):
navPointVolumeTag['class'] = "article" navPointVolumeTag['class'] = "article"
navPointVolumeTag['id'] = "genre-%s-ID" % genre['tag'] navPointVolumeTag['id'] = "genre-%s-ID" % genre['tag']
navPointVolumeTag['playOrder'] = self.playOrder navPointVolumeTag['playOrder'] = self.playOrder
#print "generateNCXByTags(article '%s'): self.playOrder: %d" % (genre['tag'], self.playOrder)
self.playOrder += 1 self.playOrder += 1
navLabelTag = Tag(ncx_soup, "navLabel") navLabelTag = Tag(ncx_soup, "navLabel")
textTag = Tag(ncx_soup, "text") textTag = Tag(ncx_soup, "text")
@ -2000,33 +1969,12 @@ class EPUB_MOBI(CatalogPlugin):
def writeNCX(self): def writeNCX(self):
if self.verbose: self.opts.log.info(self.updateProgressFullStep("writeNCX()"))
prints( self.updateProgressFullStep("writeNCX()"))
outfile = open("%s/%s.ncx" % (self.catalogPath, self.basename), 'w') outfile = open("%s/%s.ncx" % (self.catalogPath, self.basename), 'w')
outfile.write(self.ncxSoup.prettify()) outfile.write(self.ncxSoup.prettify())
# Helpers # Helpers
def contents(self, element, title, key=None):
content = None
if element is None:
return None
# Some elements seem to have \n fields
for node in element:
if node == "\n":
continue
else:
content = node
# Special handling for '&amp;' in 'cover'
if key == 'cover' and re.search('&amp;',content):
content = re.sub('&amp;','&',content)
if content:
return unicode(content)
else:
return None
def convertHTMLEntities(self, s): def convertHTMLEntities(self, s):
matches = re.findall("&#\d+;", s) matches = re.findall("&#\d+;", s)
if len(matches) > 0: if len(matches) > 0:
@ -2056,24 +2004,16 @@ class EPUB_MOBI(CatalogPlugin):
self.cleanUp() self.cleanUp()
if not os.path.isdir(catalogPath): if not os.path.isdir(catalogPath):
#if self.verbose: print " creating %s" % catalogPath
os.makedirs(catalogPath) os.makedirs(catalogPath)
# Create /content and /images # Create /content and /images
content_path = catalogPath + "/content" content_path = catalogPath + "/content"
if not os.path.isdir(content_path): if not os.path.isdir(content_path):
#if self.verbose: print " creating %s" % content_path
os.makedirs(content_path) os.makedirs(content_path)
images_path = catalogPath + "/images" images_path = catalogPath + "/images"
if not os.path.isdir(images_path): if not os.path.isdir(images_path):
#if self.verbose: print " creating %s" % images_path
os.makedirs(images_path) os.makedirs(images_path)
def fetchLibraryPath(self):
# Return a path to the current library
from calibre.utils.config import prefs
return prefs['library_path']
def getMarkerTags(self): def getMarkerTags(self):
''' Return a list of special marker tags to be excluded from genre list ''' ''' Return a list of special marker tags to be excluded from genre list '''
markerTags = [] markerTags = []
@ -2088,13 +2028,11 @@ class EPUB_MOBI(CatalogPlugin):
filtered_tags = [] filtered_tags = []
for tag in tags: for tag in tags:
# Check the leading character
if tag[0] in self.markerTags: if tag[0] in self.markerTags:
#print "skipping %s" % tag
continue continue
# Check the exclude_genre pattern
if re.search(self.opts.exclude_genre, tag): if re.search(self.opts.exclude_genre, tag):
#print "skipping %s" % tag continue
if tag == ' ':
continue continue
filtered_tags.append(tag) filtered_tags.append(tag)
@ -2339,11 +2277,7 @@ class EPUB_MOBI(CatalogPlugin):
# Convert numbers to strings, ignore leading stop words # Convert numbers to strings, ignore leading stop words
# The 21-Day Consciousness Cleanse # The 21-Day Consciousness Cleanse
if False: print "generate_sort_title(%s)" % title
title_words = title.split(' ') title_words = title.split(' ')
if title_words[0].lower() in ['the','a','an']:
stop_word = title_words.pop(0)
if False : print "removing stop word '%s'" % stop_word
# Scan for numbers in each word clump # Scan for numbers in each word clump
translated = [] translated = []
@ -2361,28 +2295,25 @@ class EPUB_MOBI(CatalogPlugin):
try: try:
img = pw.NewMagickWand() img = pw.NewMagickWand()
if img < 0: if img < 0:
raise RuntimeError('generate_thumbnail(): Cannot create wand') raise RuntimeError('generateThumbnail(): Cannot create wand')
# Read the cover # Read the cover
if not pw.MagickReadImage(img, if not pw.MagickReadImage(img,
title['cover'].encode(filesystem_encoding)): title['cover'].encode(filesystem_encoding)):
prints( u'Failed to read cover image from: %s' % self.opts.log.error('generateThumbnail(): Failed to read cover image from: %s' % title['cover'])
title['cover'])
raise IOError raise IOError
thumb = pw.CloneMagickWand(img) thumb = pw.CloneMagickWand(img)
if thumb < 0: if thumb < 0:
prints( 'generate_thumbnail(): Cannot clone cover') self.opts.log.error('generateThumbnail(): Cannot clone cover')
raise RuntimeError raise RuntimeError
# img, width, height # img, width, height
pw.MagickThumbnailImage(thumb, 75, 100) pw.MagickThumbnailImage(thumb, self.THUMB_WIDTH, self.THUMB_HEIGHT)
pw.MagickWriteImage(thumb, os.path.join(image_dir, thumb_file)) pw.MagickWriteImage(thumb, os.path.join(image_dir, thumb_file))
pw.DestroyMagickWand(thumb) pw.DestroyMagickWand(thumb)
pw.DestroyMagickWand(img) pw.DestroyMagickWand(img)
except IOError: except IOError:
prints( u"generate_thumbnail() IOError with %s" % self.opts.log.error("generateThumbnail(): IOError with %s" % title['title'])
title['title'])
except RuntimeError: except RuntimeError:
prints( u"generate_thumbnail() RuntimeError with %s" % self.opts.log.error("generateThumbnail(): RuntimeError with %s" % title['title'])
title['title'])
def processSpecialTags(self, tags, this_title, opts): def processSpecialTags(self, tags, this_title, opts):
tag_list = [] tag_list = []
@ -2403,7 +2334,7 @@ class EPUB_MOBI(CatalogPlugin):
self.error = error self.error = error
def logerror(self): def logerror(self):
prints( u'%s not implemented' % self.error) self.opts.log.info('%s not implemented' % self.error)
def updateProgressFullStep(self, description): def updateProgressFullStep(self, description):
@ -2423,9 +2354,8 @@ class EPUB_MOBI(CatalogPlugin):
return u"%.2f%% %s" % (self.progressInt, self.progressString) return u"%.2f%% %s" % (self.progressInt, self.progressString)
def run(self, path_to_output, opts, db, notification=DummyReporter()): def run(self, path_to_output, opts, db, notification=DummyReporter()):
from calibre.utils.logging import Log
log = Log() opts.log = log = Log()
opts.fmt = self.fmt = path_to_output.rpartition('.')[2] opts.fmt = self.fmt = path_to_output.rpartition('.')[2]
self.opts = opts self.opts = opts