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 housekeeping, switching print to log

Browse Source
This commit is contained in:
GRiker 2010-01-24 13:42:14 -07:00
parent 073710f405
commit d4dd72d683
1 changed files with 62 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,14 @@
import pickle, os, re, shutil, htmlentitydefs import pickle, 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.customize import CatalogPlugin
from calibre.ptempfile import PersistentTemporaryDirectory
from calibre.customize.conversion import OptionRecommendation, DummyReporter
from calibre import filesystem_encoding from calibre import filesystem_encoding
from calibre.customize import CatalogPlugin
from calibre.customize.conversion import OptionRecommendation, DummyReporter
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'
@ -511,7 +508,7 @@ class EPUB_MOBI(CatalogPlugin):
self.__verbose = opts.verbose self.__verbose = opts.verbose
if self.verbose: if self.verbose:
print "CatalogBuilder(): Generating %s for %s" % (self.opts.fmt, self.opts.output_profile) self.opts.log.info("CatalogBuilder(): Generating %s for %s" % (self.opts.fmt, self.opts.output_profile))
# Accessors # Accessors
''' '''
@ -797,8 +794,9 @@ class EPUB_MOBI(CatalogPlugin):
def fetchBooksByTitle(self): def fetchBooksByTitle(self):
result = self.updateProgressFullStep("fetchBooksByTitle()")
if self.verbose: if self.verbose:
print self.updateProgressFullStep("fetchBooksByTitle()") self.opts.log.info(result)
# Get the database as a dictionary # Get the database as a dictionary
# Sort by title # Sort by title
@ -876,16 +874,16 @@ class EPUB_MOBI(CatalogPlugin):
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 self.verbose:
print "fetchBooksByTitle(): %d books" % len(self.booksByTitle) self.opts.log.info("fetchBooksByTitle(): %d books" % len(self.booksByTitle))
for title in self.booksByTitle: for title in self.booksByTitle:
print (u" %-50s %-25s" % (title['title'][0:45], title['title_sort'][0:20])).encode('utf-8') 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
result = self.updateProgressFullStep("fetchBooksByAuthor()")
if self.verbose: if self.verbose:
print self.updateProgressFullStep("fetchBooksByAuthor()") self.opts.log.info(result)
# Sort titles case-insensitive # Sort titles case-insensitive
self.booksByAuthor = sorted(self.booksByTitle, self.booksByAuthor = sorted(self.booksByTitle,
@ -907,6 +905,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))
@ -925,22 +928,22 @@ class EPUB_MOBI(CatalogPlugin):
books_by_current_author)) books_by_current_author))
if self.verbose: if self.verbose:
print "\nfetchBooksByauthor(): %d unique authors" % len(unique_authors) self.opts.log.info("\nfetchBooksByauthor(): %d unique authors" % len(unique_authors))
for author in unique_authors: for author in unique_authors:
print (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])).encode('utf-8') 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
result = self.updateProgressFullStep("generateHTMLDescriptions()")
if self.verbose: if self.verbose:
print self.updateProgressFullStep("generateHTMLDescriptions()") self.opts.log.info(result)
for (title_num, title) in enumerate(self.booksByTitle): for (title_num, title) in enumerate(self.booksByTitle):
if False: if False:
print "%3s: %s - %s" % (title['id'], title['title'], title['author']) self.opts.log.info("%3s: %s - %s" % (title['id'], title['title'], 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)
@ -1063,8 +1066,9 @@ 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
result = self.updateProgressFullStep("generateHTMLByTitle()")
if self.verbose: if self.verbose:
print self.updateProgressFullStep("generateHTMLByTitle()") self.opts.log.info(result)
soup = self.generateHTMLEmptyHeader("Books By Alpha Title") soup = self.generateHTMLEmptyHeader("Books By Alpha Title")
body = soup.find('body') body = soup.find('body')
@ -1166,8 +1170,9 @@ class EPUB_MOBI(CatalogPlugin):
def generateHTMLByAuthor(self): def generateHTMLByAuthor(self):
# Write books by author A-Z # Write books by author A-Z
result = self.updateProgressFullStep("generateHTMLByAuthor()")
if self.verbose: if self.verbose:
print self.updateProgressFullStep("generateHTMLByAuthor()") self.opts.log.info(result)
friendly_name = "By Author" friendly_name = "By Author"
soup = self.generateHTMLEmptyHeader(friendly_name) soup = self.generateHTMLEmptyHeader(friendly_name)
@ -1298,8 +1303,9 @@ 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[]
result = self.updateProgressFullStep("generateHTMLByTags()")
if self.verbose: if self.verbose:
print self.updateProgressFullStep("generateHTMLByTags()") self.opts.log.info(result)
# 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())
@ -1378,8 +1384,9 @@ 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
result = self.updateProgressFullStep("generateThumbnails()")
if self.verbose: if self.verbose:
print self.updateProgressFullStep("generateThumbnails()") self.opts.log.info(result)
thumbs = ['thumbnail_default.jpg'] thumbs = ['thumbnail_default.jpg']
@ -1405,16 +1412,15 @@ 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: print "no cover available for %s, will use default" % \ if self.verbose:
(title['title']) self.opts.log.warn(" no cover available for %s, will use default" % \
(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
thumb_fp = "%s/thumbnail_default.jpg" % (image_dir) thumb_fp = "%s/thumbnail_default.jpg" % (image_dir)
@ -1440,12 +1446,14 @@ class EPUB_MOBI(CatalogPlugin):
cover_timestamp = os.path.getmtime(cover) cover_timestamp = os.path.getmtime(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 self.verbose: print "updating thumbnail_default for %s" % title['title'] if self.verbose:
self.opts.log.info("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: print "generating new thumbnail_default.jpg" if self.verbose:
self.opts.log.info(" 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")
@ -1454,8 +1462,9 @@ class EPUB_MOBI(CatalogPlugin):
def generateOPF(self): def generateOPF(self):
result = self.updateProgressFullStep("generateOPF()")
if self.verbose: if self.verbose:
print self.updateProgressFullStep("generateOPF()") self.opts.log.info(result)
header = ''' header = '''
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
@ -1558,7 +1567,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('.')
@ -1587,8 +1596,9 @@ class EPUB_MOBI(CatalogPlugin):
def generateNCXHeader(self): def generateNCXHeader(self):
result = self.updateProgressFullStep("generateNCXHeader()")
if self.verbose: if self.verbose:
print self.updateProgressFullStep("generateNCXHeader()") self.opts.log.info(result)
header = ''' header = '''
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
@ -1625,8 +1635,9 @@ class EPUB_MOBI(CatalogPlugin):
def generateNCXDescriptions(self, tocTitle): def generateNCXDescriptions(self, tocTitle):
result = self.updateProgressFullStep("generateNCXDescriptions()")
if self.verbose: if self.verbose:
print self.updateProgressFullStep("generateNCXDescription()") self.opts.log.info(result)
# --- Construct the 'Books by Title' section --- # --- Construct the 'Books by Title' section ---
ncx_soup = self.ncxSoup ncx_soup = self.ncxSoup
@ -1696,8 +1707,9 @@ class EPUB_MOBI(CatalogPlugin):
def generateNCXByTitle(self, tocTitle): def generateNCXByTitle(self, tocTitle):
result = self.updateProgressFullStep("generateNCXByTitle()")
if self.verbose: if self.verbose:
print self.updateProgressFullStep("generateNCXByTitle()") self.opts.log.info(result)
soup = self.ncxSoup soup = self.ncxSoup
output = "ByAlphaTitle" output = "ByAlphaTitle"
@ -1787,8 +1799,9 @@ class EPUB_MOBI(CatalogPlugin):
def generateNCXByAuthor(self, tocTitle): def generateNCXByAuthor(self, tocTitle):
result = self.updateProgressFullStep("generateNCXByAuthor()")
if self.verbose: if self.verbose:
print self.updateProgressFullStep("generateNCXByAuthor()") self.opts.log.info(result)
soup = self.ncxSoup soup = self.ncxSoup
HTML_file = "content/ByAlphaAuthor.html" HTML_file = "content/ByAlphaAuthor.html"
@ -1832,7 +1845,7 @@ class EPUB_MOBI(CatalogPlugin):
author_list = self.formatNCXText(author_list) author_list = self.formatNCXText(author_list)
if self.verbose: if self.verbose:
print " 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))
# Start the new list # Start the new list
@ -1848,7 +1861,7 @@ 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 self.verbose:
print " 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
@ -1889,8 +1902,9 @@ class EPUB_MOBI(CatalogPlugin):
# Add each genre as an article # Add each genre as an article
# 'tag', 'file', 'authors' # 'tag', 'file', 'authors'
result = self.updateProgressFullStep("generateNCXByTags()")
if self.verbose: if self.verbose:
print self.updateProgressFullStep("generateNCXByTags()") self.opts.log.info(result)
ncx_soup = self.ncxSoup ncx_soup = self.ncxSoup
body = ncx_soup.find("navPoint") body = ncx_soup.find("navPoint")
@ -1986,8 +2000,9 @@ class EPUB_MOBI(CatalogPlugin):
def writeNCX(self): def writeNCX(self):
result = self.updateProgressFullStep("writeNCX()")
if self.verbose: if self.verbose:
print self.updateProgressFullStep("writeNCX()") self.opts.log.info(result)
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())
@ -2352,11 +2367,11 @@ class EPUB_MOBI(CatalogPlugin):
# 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)):
print 'Failed to read cover image from: %s' % title['cover'] self.opts.log.info('Failed to read cover image from: %s' % title['cover'])
raise IOError raise IOError
thumb = pw.CloneMagickWand(img) thumb = pw.CloneMagickWand(img)
if thumb < 0: if thumb < 0:
print 'generate_thumbnail(): Cannot clone cover' self.opts.log.info('generateThumbnail(): Cannot clone cover')
raise RuntimeError raise RuntimeError
# img, width, height # img, width, height
pw.MagickThumbnailImage(thumb, 75, 100) pw.MagickThumbnailImage(thumb, 75, 100)
@ -2364,9 +2379,9 @@ class EPUB_MOBI(CatalogPlugin):
pw.DestroyMagickWand(thumb) pw.DestroyMagickWand(thumb)
pw.DestroyMagickWand(img) pw.DestroyMagickWand(img)
except IOError: except IOError:
print "generate_thumbnail() IOError with %s" % title['title'] self.opts.log.info("generateThumbnail() IOError with %s" % title['title'])
except RuntimeError: except RuntimeError:
print "generate_thumbnail() RuntimeError with %s" % title['title'] self.opts.log.info("generateThumbnail() RuntimeError with %s" % title['title'])
def processSpecialTags(self, tags, this_title, opts): def processSpecialTags(self, tags, this_title, opts):
tag_list = [] tag_list = []
@ -2387,7 +2402,7 @@ class EPUB_MOBI(CatalogPlugin):
self.error = error self.error = error
def logerror(self): def logerror(self):
print '%s not implemented' % self.error self.opts.log.info('%s not implemented' % self.error)
def updateProgressFullStep(self, description): def updateProgressFullStep(self, description):
@ -2407,9 +2422,8 @@ class EPUB_MOBI(CatalogPlugin):
return "%.2f%% %s" % (self.progressInt, self.progressString) return "%.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