'+ans%('', '')
-class Amazon(MetadataSource):
+ # }}}
+
+class Amazon(MetadataSource): # {{{
name = 'Amazon'
metadata_type = 'social'
@@ -198,37 +204,27 @@ class Amazon(MetadataSource):
self.exception = e
self.tb = traceback.format_exc()
-class LibraryThing(MetadataSource):
+ # }}}
+
+class LibraryThing(MetadataSource): # {{{
name = 'LibraryThing'
metadata_type = 'social'
- description = _('Downloads series information from librarything.com')
+ description = _('Downloads series/tags/rating information from librarything.com')
def fetch(self):
if not self.isbn:
return
- from calibre import browser
- from calibre.ebooks.metadata import MetaInformation
- import json
- br = browser()
+ from calibre.ebooks.metadata.library_thing import get_social_metadata
try:
- raw = br.open(
- 'http://status.calibre-ebook.com/library_thing/metadata/'+self.isbn
- ).read()
- data = json.loads(raw)
- if not data:
- return
- if 'error' in data:
- raise Exception(data['error'])
- if 'series' in data and 'series_index' in data:
- mi = MetaInformation(self.title, [])
- mi.series = data['series']
- mi.series_index = data['series_index']
- self.results = mi
+ self.results = get_social_metadata(self.title, self.book_author,
+ self.publisher, self.isbn)
except Exception, e:
self.exception = e
self.tb = traceback.format_exc()
+ # }}}
+
def result_index(source, result):
if not result.isbn:
@@ -268,6 +264,31 @@ class MetadataSources(object):
for s in self.sources:
s.join()
+def filter_metadata_results(item):
+ keywords = ["audio", "tape", "cassette", "abridged", "playaway"]
+ for keyword in keywords:
+ if item.publisher and keyword in item.publisher.lower():
+ return False
+ return True
+
+class HeadRequest(urllib2.Request):
+ def get_method(self):
+ return "HEAD"
+
+def do_cover_check(item):
+ opener = browser()
+ item.has_cover = False
+ try:
+ opener.open(HeadRequest(OPENLIBRARY%item.isbn), timeout=5)
+ item.has_cover = True
+ except:
+ pass # Cover not found
+
+def check_for_covers(items):
+ threads = [Thread(target=do_cover_check, args=(item,)) for item in items]
+ for t in threads: t.start()
+ for t in threads: t.join()
+
def search(title=None, author=None, publisher=None, isbn=None, isbndb_key=None,
verbose=0):
assert not(title is None and author is None and publisher is None and \
@@ -285,10 +306,60 @@ def search(title=None, author=None, publisher=None, isbn=None, isbndb_key=None,
for fetcher in fetchers[1:]:
merge_results(results, fetcher.results)
- results = sorted(results, cmp=lambda x, y : cmp(
- (x.comments.strip() if x.comments else ''),
- (y.comments.strip() if y.comments else '')
- ), reverse=True)
+ results = list(filter(filter_metadata_results, results))
+
+ check_for_covers(results)
+
+ words = ("the", "a", "an", "of", "and")
+ prefix_pat = re.compile(r'^(%s)\s+'%("|".join(words)))
+ trailing_paren_pat = re.compile(r'\(.*\)$')
+ whitespace_pat = re.compile(r'\s+')
+
+ def sort_func(x, y):
+
+ def cleanup_title(s):
+ s = s.strip().lower()
+ s = prefix_pat.sub(' ', s)
+ s = trailing_paren_pat.sub('', s)
+ s = whitespace_pat.sub(' ', s)
+ return s.strip()
+
+ t = cleanup_title(title)
+ x_title = cleanup_title(x.title)
+ y_title = cleanup_title(y.title)
+
+ # prefer titles that start with the search title
+ tx = cmp(t, x_title)
+ ty = cmp(t, y_title)
+ result = 0 if abs(tx) == abs(ty) else abs(tx) - abs(ty)
+
+ # then prefer titles that have a cover image
+ if result == 0:
+ result = -cmp(x.has_cover, y.has_cover)
+
+ # then prefer titles with the longest comment, with in 10%
+ if result == 0:
+ cx = len(x.comments.strip() if x.comments else '')
+ cy = len(y.comments.strip() if y.comments else '')
+ t = (cx + cy) / 20
+ result = cy - cx
+ if abs(result) < t:
+ result = 0
+
+ return result
+
+ results = sorted(results, cmp=sort_func)
+
+ # if for some reason there is no comment in the top selection, go looking for one
+ if len(results) > 1:
+ if not results[0].comments or len(results[0].comments) == 0:
+ for r in results[1:]:
+ if title.lower() == r.title[:len(title)].lower() and r.comments and len(r.comments):
+ results[0].comments = r.comments
+ break
+
+ # for r in results:
+ # print "{0:14.14} {1:30.30} {2:20.20} {3:6} {4}".format(r.isbn, r.title, r.publisher, len(r.comments if r.comments else ''), r.has_cover)
return results, [(x.name, x.exception, x.tb) for x in fetchers]
diff --git a/src/calibre/ebooks/metadata/library_thing.py b/src/calibre/ebooks/metadata/library_thing.py
index d10d80bc61..3a78204e8e 100644
--- a/src/calibre/ebooks/metadata/library_thing.py
+++ b/src/calibre/ebooks/metadata/library_thing.py
@@ -6,10 +6,11 @@ Fetch cover from LibraryThing.com based on ISBN number.
import sys, socket, os, re
-from calibre import browser as _browser
+from lxml import html
+
+from calibre import browser, prints
from calibre.utils.config import OptionParser
from calibre.ebooks.BeautifulSoup import BeautifulSoup
-browser = None
OPENLIBRARY = 'http://covers.openlibrary.org/b/isbn/%s-L.jpg?default=false'
@@ -22,31 +23,28 @@ class ISBNNotFound(LibraryThingError):
class ServerBusy(LibraryThingError):
pass
-def login(username, password, force=True):
- global browser
- if browser is not None and not force:
- return
- browser = _browser()
- browser.open('http://www.librarything.com')
- browser.select_form('signup')
- browser['formusername'] = username
- browser['formpassword'] = password
- browser.submit()
+def login(br, username, password, force=True):
+ br.open('http://www.librarything.com')
+ br.select_form('signup')
+ br['formusername'] = username
+ br['formpassword'] = password
+ br.submit()
def cover_from_isbn(isbn, timeout=5., username=None, password=None):
- global browser
- if browser is None:
- browser = _browser()
src = None
+ br = browser()
try:
- return browser.open(OPENLIBRARY%isbn, timeout=timeout).read(), 'jpg'
+ return br.open(OPENLIBRARY%isbn, timeout=timeout).read(), 'jpg'
except:
pass # Cover not found
if username and password:
- login(username, password, force=False)
+ try:
+ login(br, username, password, force=False)
+ except:
+ pass
try:
- src = browser.open('http://www.librarything.com/isbn/'+isbn,
+ src = br.open_novisit('http://www.librarything.com/isbn/'+isbn,
timeout=timeout).read().decode('utf-8', 'replace')
except Exception, err:
if isinstance(getattr(err, 'args', [None])[0], socket.timeout):
@@ -63,7 +61,7 @@ def cover_from_isbn(isbn, timeout=5., username=None, password=None):
if url is None:
raise LibraryThingError(_('LibraryThing.com server error. Try again later.'))
url = re.sub(r'_S[XY]\d+', '', url['src'])
- cover_data = browser.open(url).read()
+ cover_data = br.open_novisit(url).read()
return cover_data, url.rpartition('.')[-1]
def option_parser():
@@ -71,7 +69,7 @@ def option_parser():
_('''
%prog [options] ISBN
-Fetch a cover image for the book identified by ISBN from LibraryThing.com
+Fetch a cover image/social metadata for the book identified by ISBN from LibraryThing.com
'''))
parser.add_option('-u', '--username', default=None,
help='Username for LibraryThing.com')
@@ -79,6 +77,61 @@ Fetch a cover image for the book identified by ISBN from LibraryThing.com
help='Password for LibraryThing.com')
return parser
+def get_social_metadata(title, authors, publisher, isbn, username=None,
+ password=None):
+ from calibre.ebooks.metadata import MetaInformation
+ mi = MetaInformation(title, authors)
+ if isbn:
+ br = browser()
+ if username and password:
+ try:
+ login(br, username, password, force=False)
+ except:
+ pass
+
+ raw = br.open_novisit('http://www.librarything.com/isbn/'
+ +isbn).read()
+ if not raw:
+ return mi
+ root = html.fromstring(raw)
+ h1 = root.xpath('//div[@class="headsummary"]/h1')
+ if h1 and not mi.title:
+ mi.title = html.tostring(h1[0], method='text', encoding=unicode)
+ h2 = root.xpath('//div[@class="headsummary"]/h2/a')
+ if h2 and not mi.authors:
+ mi.authors = [html.tostring(x, method='text', encoding=unicode) for
+ x in h2]
+ h3 = root.xpath('//div[@class="headsummary"]/h3/a')
+ if h3:
+ match = None
+ for h in h3:
+ series = html.tostring(h, method='text', encoding=unicode)
+ match = re.search(r'(.+) \((.+)\)', series)
+ if match is not None:
+ break
+ if match is not None:
+ mi.series = match.group(1).strip()
+ match = re.search(r'[0-9.]+', match.group(2))
+ si = 1.0
+ if match is not None:
+ si = float(match.group())
+ mi.series_index = si
+ tags = root.xpath('//div[@class="tags"]/span[@class="tag"]/a')
+ if tags:
+ mi.tags = [html.tostring(x, method='text', encoding=unicode) for x
+ in tags]
+ span = root.xpath(
+ '//table[@class="wsltable"]/tr[@class="wslcontent"]/td[4]//span')
+ if span:
+ raw = html.tostring(span[0], method='text', encoding=unicode)
+ match = re.search(r'([0-9.]+)', raw)
+ if match is not None:
+ rating = float(match.group())
+ if rating > 0 and rating <= 5:
+ mi.rating = rating
+ return mi
+
+
def main(args=sys.argv):
parser = option_parser()
opts, args = parser.parse_args(args)
@@ -86,6 +139,8 @@ def main(args=sys.argv):
parser.print_help()
return 1
isbn = args[1]
+ mi = get_social_metadata('', [], '', isbn)
+ prints(mi)
cover_data, ext = cover_from_isbn(isbn, username=opts.username,
password=opts.password)
if not ext:
diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py
index 46924cad1f..579398d3b0 100644
--- a/src/calibre/ebooks/metadata/opf2.py
+++ b/src/calibre/ebooks/metadata/opf2.py
@@ -18,7 +18,7 @@ from calibre.constants import __appname__, __version__, filesystem_encoding
from calibre.ebooks.metadata.toc import TOC
from calibre.ebooks.metadata import MetaInformation, string_to_authors
from calibre.utils.date import parse_date, isoformat
-
+from calibre.utils.localization import get_lang
class Resource(object):
'''
@@ -1069,7 +1069,7 @@ class OPFCreator(MetaInformation):
dc_attrs={'id':__appname__+'_id'}))
if getattr(self, 'pubdate', None) is not None:
a(DC_ELEM('date', self.pubdate.isoformat()))
- a(DC_ELEM('language', self.language if self.language else 'UND'))
+ a(DC_ELEM('language', self.language if self.language else get_lang()))
if self.comments:
a(DC_ELEM('description', self.comments))
if self.publisher:
@@ -1184,7 +1184,6 @@ def metadata_to_opf(mi, as_string=True):
factory(DC('contributor'), mi.book_producer, __appname__, 'bkp')
if hasattr(mi.pubdate, 'isoformat'):
factory(DC('date'), isoformat(mi.pubdate))
- factory(DC('language'), mi.language)
if mi.category:
factory(DC('type'), mi.category)
if mi.comments:
@@ -1195,6 +1194,7 @@ def metadata_to_opf(mi, as_string=True):
factory(DC('identifier'), mi.isbn, scheme='ISBN')
if mi.rights:
factory(DC('rights'), mi.rights)
+ factory(DC('language'), mi.language if mi.language and mi.language.lower() != 'und' else get_lang())
if mi.tags:
for tag in mi.tags:
factory(DC('subject'), tag)
diff --git a/src/calibre/ebooks/oeb/base.py b/src/calibre/ebooks/oeb/base.py
index 76e2cef3bb..54549ac415 100644
--- a/src/calibre/ebooks/oeb/base.py
+++ b/src/calibre/ebooks/oeb/base.py
@@ -17,6 +17,7 @@ from urlparse import urljoin
from lxml import etree, html
from cssutils import CSSParser
+from cssutils.css import CSSRule
import calibre
from calibre.constants import filesystem_encoding
@@ -762,6 +763,7 @@ class Manifest(object):
self.href = self.path = urlnormalize(href)
self.media_type = media_type
self.fallback = fallback
+ self.override_css_fetch = None
self.spine_position = None
self.linear = True
if loader is None and data is None:
@@ -982,15 +984,40 @@ class Manifest(object):
def _parse_css(self, data):
+
+ def get_style_rules_from_import(import_rule):
+ ans = []
+ if not import_rule.styleSheet:
+ return ans
+ rules = import_rule.styleSheet.cssRules
+ for rule in rules:
+ if rule.type == CSSRule.IMPORT_RULE:
+ ans.extend(get_style_rules_from_import(rule))
+ elif rule.type in (CSSRule.FONT_FACE_RULE,
+ CSSRule.STYLE_RULE):
+ ans.append(rule)
+ return ans
+
self.oeb.log.debug('Parsing', self.href, '...')
data = self.oeb.decode(data)
- data = self.oeb.css_preprocessor(data)
- data = XHTML_CSS_NAMESPACE + data
+ data = self.oeb.css_preprocessor(data, add_namespace=True)
parser = CSSParser(loglevel=logging.WARNING,
- fetcher=self._fetch_css,
+ fetcher=self.override_css_fetch or self._fetch_css,
log=_css_logger)
data = parser.parseString(data, href=self.href)
data.namespaces['h'] = XHTML_NS
+ import_rules = list(data.cssRules.rulesOfType(CSSRule.IMPORT_RULE))
+ rules_to_append = []
+ insert_index = None
+ for r in data.cssRules.rulesOfType(CSSRule.STYLE_RULE):
+ insert_index = data.cssRules.index(r)
+ break
+ for rule in import_rules:
+ rules_to_append.extend(get_style_rules_from_import(rule))
+ for r in reversed(rules_to_append):
+ data.insertRule(r, index=insert_index)
+ for rule in import_rules:
+ data.deleteRule(rule)
return data
def _fetch_css(self, path):
diff --git a/src/calibre/ebooks/oeb/iterator.py b/src/calibre/ebooks/oeb/iterator.py
index 3fdd6aaf99..7f56cb4d2d 100644
--- a/src/calibre/ebooks/oeb/iterator.py
+++ b/src/calibre/ebooks/oeb/iterator.py
@@ -139,11 +139,18 @@ class EbookIterator(object):
if id != -1:
families = [unicode(f) for f in QFontDatabase.applicationFontFamilies(id)]
if family:
- family = family.group(1).strip().replace('"', '')
- bad_map[family] = families[0]
- if family not in families:
+ family = family.group(1)
+ specified_families = [x.strip().replace('"',
+ '').replace("'", '') for x in family.split(',')]
+ aliasing_ok = False
+ for f in specified_families:
+ bad_map[f] = families[0]
+ if not aliasing_ok and f in families:
+ aliasing_ok = True
+
+ if not aliasing_ok:
prints('WARNING: Family aliasing not fully supported.')
- prints('\tDeclared family: %s not in actual families: %s'
+ prints('\tDeclared family: %r not in actual families: %r'
% (family, families))
else:
prints('Loaded embedded font:', repr(family))
diff --git a/src/calibre/ebooks/oeb/stylizer.py b/src/calibre/ebooks/oeb/stylizer.py
index 0637dddfb6..3c84252ff4 100644
--- a/src/calibre/ebooks/oeb/stylizer.py
+++ b/src/calibre/ebooks/oeb/stylizer.py
@@ -126,6 +126,13 @@ class Stylizer(object):
head = head[0]
else:
head = []
+
+ # Add cssutils parsing profiles from output_profile
+ for profile in self.opts.output_profile.extra_css_modules:
+ cssutils.profile.addProfile(profile['name'],
+ profile['props'],
+ profile['macros'])
+
parser = cssutils.CSSParser(fetcher=self._fetch_css_file,
log=logging.getLogger('calibre.css'))
self.font_face_rules = []
diff --git a/src/calibre/gui2/actions.py b/src/calibre/gui2/actions.py
index f838e9c1fe..43a657ae67 100644
--- a/src/calibre/gui2/actions.py
+++ b/src/calibre/gui2/actions.py
@@ -21,6 +21,7 @@ from calibre.utils.filenames import ascii_filename
from calibre.gui2.widgets import IMAGE_EXTENSIONS
from calibre.gui2.dialogs.metadata_single import MetadataSingleDialog
from calibre.gui2.dialogs.metadata_bulk import MetadataBulkDialog
+from calibre.gui2.dialogs.tag_list_editor import TagListEditor
from calibre.gui2.tools import convert_single_ebook, convert_bulk_ebook, \
fetch_scheduled_recipe, generate_catalog
from calibre.constants import preferred_encoding, filesystem_encoding, \
@@ -176,7 +177,8 @@ class AnnotationsAction(object): # {{{
def mark_book_as_read(self,id):
read_tag = gprefs.get('catalog_epub_mobi_read_tag')
- self.db.set_tags(id, [read_tag], append=True)
+ if read_tag:
+ self.db.set_tags(id, [read_tag], append=True)
def canceled(self):
self.pd.hide()
@@ -830,6 +832,23 @@ class EditMetadataAction(object): # {{{
db.set_metadata(dest_id, dest_mi, ignore_errors=False)
# }}}
+ def edit_device_collections(self, view, oncard=None):
+ model = view.model()
+ result = model.get_collections_with_ids()
+ compare = (lambda x,y:cmp(x.lower(), y.lower()))
+ d = TagListEditor(self, tag_to_match=None, data=result, compare=compare)
+ d.exec_()
+ if d.result() == d.Accepted:
+ to_rename = d.to_rename # dict of new text to old ids
+ to_delete = d.to_delete # list of ids
+ for text in to_rename:
+ for old_id in to_rename[text]:
+ model.rename_collection(old_id, new_name=unicode(text))
+ for item in to_delete:
+ model.delete_collection_using_id(item)
+ self.upload_collections(model.db, view=view, oncard=oncard)
+ view.reset()
+
# }}}
class SaveToDiskAction(object): # {{{
diff --git a/src/calibre/gui2/convert/txt_input.ui b/src/calibre/gui2/convert/txt_input.ui
index 5a9527ebc5..186783c277 100644
--- a/src/calibre/gui2/convert/txt_input.ui
+++ b/src/calibre/gui2/convert/txt_input.ui
@@ -43,6 +43,9 @@
:'
print soup.prettify()
return None
- paras = articleBody.findAll('p')
+ paras = articlebody.findAll('p')
for p in paras:
if p.renderContents() > '' :
return self.massageNCXText(self.tag_to_string(p,use_alt=False))
return None
- # Method entry point here
- # Single section toc looks different than multi-section tocs
- if oeb.toc.depth() == 2 :
- for article in oeb.toc :
- if article.author is None :
- article.author = extract_byline(article.href)
- if article.description is None :
- article.description = extract_description(article.href).decode('utf-8')
- elif oeb.toc.depth() == 3 :
- for section in oeb.toc :
- for article in section :
- if article.author is None :
- article.author = extract_byline(article.href)
- if article.description is None :
- article.description = extract_description(article.href)
+ article.author = extract_author(soup)
+ article.summary = article.text_summary = extract_description(soup)
def strip_anchors(self,soup):
paras = soup.findAll(True)
diff --git a/resources/recipes/people_daily.recipe b/resources/recipes/people_daily.recipe
new file mode 100644
index 0000000000..4dec2452e2
--- /dev/null
+++ b/resources/recipes/people_daily.recipe
@@ -0,0 +1,57 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AdvancedUserRecipe1277129332(BasicNewsRecipe):
+ title = u'People Daily - China'
+ oldest_article = 2
+ max_articles_per_feed = 100
+ __author__ = 'rty'
+
+ pubisher = 'people.com.cn'
+ description = 'People Daily Newspaper'
+ language = 'zh'
+ category = 'News, China'
+ remove_javascript = True
+ use_embedded_content = False
+ no_stylesheets = True
+ encoding = 'GB2312'
+ conversion_options = {'linearize_tables':True}
+
+ feeds = [(u'\u56fd\u5185\u65b0\u95fb', u'http://www.people.com.cn/rss/politics.xml'),
+ (u'\u56fd\u9645\u65b0\u95fb', u'http://www.people.com.cn/rss/world.xml'),
+ (u'\u7ecf\u6d4e\u65b0\u95fb', u'http://www.people.com.cn/rss/finance.xml'),
+ (u'\u4f53\u80b2\u65b0\u95fb', u'http://www.people.com.cn/rss/sports.xml'),
+ (u'\u53f0\u6e7e\u65b0\u95fb', u'http://www.people.com.cn/rss/haixia.xml')]
+ keep_only_tags = [
+ dict(name='div', attrs={'class':'left_content'}),
+ ]
+ remove_tags = [
+ dict(name='table', attrs={'class':'title'}),
+ ]
+ remove_tags_after = [
+ dict(name='table', attrs={'class':'bianji'}),
+ ]
+
+ def append_page(self, soup, appendtag, position):
+ pager = soup.find('img',attrs={'src':'/img/next_b.gif'})
+ if pager:
+ nexturl = self.INDEX + pager.a['href']
+ soup2 = self.index_to_soup(nexturl)
+ texttag = soup2.find('div', attrs={'class':'left_content'})
+ #for it in texttag.findAll(style=True):
+ # del it['style']
+ newpos = len(texttag.contents)
+ self.append_page(soup2,texttag,newpos)
+ texttag.extract()
+ appendtag.insert(position,texttag)
+
+
+ def preprocess_html(self, soup):
+ mtag = '\n'
+ soup.head.insert(0,mtag)
+ for item in soup.findAll(style=True):
+ del item['form']
+ self.append_page(soup, soup.body, 3)
+ #pager = soup.find('a',attrs={'class':'ab12'})
+ #if pager:
+ # pager.extract()
+ return soup
diff --git a/src/calibre/customize/profiles.py b/src/calibre/customize/profiles.py
index c872c9df38..d352ce5de7 100644
--- a/src/calibre/customize/profiles.py
+++ b/src/calibre/customize/profiles.py
@@ -36,7 +36,7 @@ class Plugin(_Plugin):
self.fnames = dict((name, sz) for name, _, sz in self.fsizes if name)
self.fnums = dict((num, sz) for _, num, sz in self.fsizes if num)
-
+# Input profiles {{{
class InputProfile(Plugin):
author = 'Kovid Goyal'
@@ -218,6 +218,8 @@ input_profiles = [InputProfile, SonyReaderInput, SonyReader300Input,
input_profiles.sort(cmp=lambda x,y:cmp(x.name.lower(), y.name.lower()))
+# }}}
+
class OutputProfile(Plugin):
author = 'Kovid Goyal'
@@ -237,11 +239,12 @@ class OutputProfile(Plugin):
# If True the MOBI renderer on the device supports MOBI indexing
supports_mobi_indexing = False
- # Device supports displaying a nested TOC
- supports_nested_toc = True
-
# If True output should be optimized for a touchscreen interface
touchscreen = False
+ touchscreen_news_css = ''
+ # A list of extra (beyond CSS 2.1) modules supported by the device
+ # Format is a cssutils profile dictionary (see iPad for example)
+ extra_css_modules = []
@classmethod
def tags_to_string(cls, tags):
@@ -256,8 +259,94 @@ class iPadOutput(OutputProfile):
screen_size = (768, 1024)
comic_screen_size = (768, 1024)
dpi = 132.0
- supports_nested_toc = False
+ extra_css_modules = [
+ {
+ 'name':'webkit',
+ 'props': { '-webkit-border-bottom-left-radius':'{length}',
+ '-webkit-border-bottom-right-radius':'{length}',
+ '-webkit-border-top-left-radius':'{length}',
+ '-webkit-border-top-right-radius':'{length}',
+ '-webkit-border-radius': r'{border-width}(\s+{border-width}){0,3}|inherit',
+ },
+ 'macros': {'border-width': '{length}|medium|thick|thin'}
+ }
+ ]
touchscreen = True
+ # touchscreen_news_css {{{
+ touchscreen_news_css = u'''
+ /* hr used in articles */
+ .caption_divider {
+ border:#ccc 1px solid;
+ }
+
+ .touchscreen_navbar {
+ background:#ccc;
+ border:#ccc 1px solid;
+ border-collapse:separate;
+ border-spacing:1px;
+ margin-left: 5%;
+ margin-right: 5%;
+ width: 90%;
+ -webkit-border-radius:4px;
+ }
+ .touchscreen_navbar td {
+ background:#fff;
+ font-family:Helvetica;
+ font-size:90%;
+ padding: 5px;
+ text-align:center;
+ }
+ .touchscreen_navbar td:first-child {
+ -webkit-border-top-left-radius:4px;
+ -webkit-border-bottom-left-radius:4px;
+ }
+ .touchscreen_navbar td:last-child {
+ -webkit-border-top-right-radius:4px;
+ -webkit-border-bottom-right-radius:4px;
+ }
+
+ .feed_link {
+ font-style: italic;
+ }
+
+ /* Index formatting */
+ .publish_date {
+ text-align:center;
+ }
+ .divider {
+ border-bottom:1em solid white;
+ border-top:1px solid gray;
+ }
+
+ /* Feed summary formatting */
+ .feed_title {
+ text-align: center;
+ font-size: 160%;
+ }
+
+ .summary_headline {
+ font-weight:bold;
+ text-align:left;
+ }
+
+ .summary_byline {
+ text-align:left;
+ font-family:monospace;
+ }
+
+ .summary_text {
+ text-align:left;
+ }
+
+ .feed {
+ font-family:sans-serif;
+ font-weight:bold;
+ font-size:larger;
+ }
+
+ '''
+ # }}}
+
class SonyReaderOutput(OutputProfile):
diff --git a/src/calibre/customize/ui.py b/src/calibre/customize/ui.py
index 8397827fbb..14d22d5017 100644
--- a/src/calibre/customize/ui.py
+++ b/src/calibre/customize/ui.py
@@ -151,13 +151,13 @@ def reread_filetype_plugins():
def _run_filetype_plugins(path_to_file, ft=None, occasion='preprocess'):
- occasion = {'import':_on_import, 'preprocess':_on_preprocess,
+ occasion_plugins = {'import':_on_import, 'preprocess':_on_preprocess,
'postprocess':_on_postprocess}[occasion]
customization = config['plugin_customization']
if ft is None:
ft = os.path.splitext(path_to_file)[-1].lower().replace('.', '')
nfp = path_to_file
- for plugin in occasion.get(ft, []):
+ for plugin in occasion_plugins.get(ft, []):
if is_disabled(plugin):
continue
plugin.site_customization = customization.get(plugin.name, '')
diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py
index 0bbdf0f22c..49c41b4e57 100644
--- a/src/calibre/devices/android/driver.py
+++ b/src/calibre/devices/android/driver.py
@@ -45,8 +45,8 @@ class ANDROID(USBMS):
'GT-I5700', 'SAMSUNG']
WINDOWS_MAIN_MEM = ['ANDROID_PHONE', 'A855', 'A853', 'INC.NEXUS_ONE',
'__UMS_COMPOSITE', '_MB200', 'MASS_STORAGE', '_-_CARD',
- 'PROD_GT-I9000']
- WINDOWS_CARD_A_MEM = ['ANDROID_PHONE', 'PROD_GT-I9000_CARD']
+ 'PR OD_GT-I9000']
+ WINDOWS_CARD_A_MEM = ['ANDROID_PHONE', 'PR OD_GT-I9000_CARD']
OSX_MAIN_MEM = 'HTC Android Phone Media'
diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py
index a994efb0f6..f58e4ec27a 100644
--- a/src/calibre/devices/apple/driver.py
+++ b/src/calibre/devices/apple/driver.py
@@ -10,13 +10,15 @@ from calibre.constants import __appname__, __version__, DEBUG
from calibre import fit_image
from calibre.constants import isosx, iswindows
from calibre.devices.errors import UserFeedback
+from calibre.devices.usbms.deviceconfig import DeviceConfig
from calibre.devices.interface import DevicePlugin
from calibre.ebooks.BeautifulSoup import BeautifulSoup
from calibre.ebooks.metadata import MetaInformation
from calibre.ebooks.metadata.epub import set_metadata
from calibre.library.server.utils import strftime
-from calibre.utils.config import Config, config_dir
+from calibre.utils.config import config_dir
from calibre.utils.date import isoformat, now, parse_date
+from calibre.utils.localization import get_lang
from calibre.utils.logging import Log
from calibre.utils.zipfile import ZipFile
@@ -33,8 +35,15 @@ if isosx:
if iswindows:
import pythoncom, win32com.client
+class DriverBase(DeviceConfig, DevicePlugin):
+ # Needed for config_widget to work
+ FORMATS = ['epub', 'pdf']
-class ITUNES(DevicePlugin):
+ @classmethod
+ def _config_base_name(cls):
+ return 'iTunes'
+
+class ITUNES(DriverBase):
'''
Calling sequences:
Initialization:
@@ -78,18 +87,22 @@ class ITUNES(DevicePlugin):
supported_platforms = ['osx','windows']
author = 'GRiker'
#: The version of this plugin as a 3-tuple (major, minor, revision)
- version = (0,7,0)
+ version = (0,8,0)
OPEN_FEEDBACK_MESSAGE = _(
'Apple device detected, launching iTunes, please wait ...')
- FORMATS = ['epub']
# Product IDs:
- # 0x1292:iPhone 3G
- # 0x129a:iPad
+ # 0x1291 iPod Touch
+ # 0x1292 iPhone 3G
+ # 0x1293 iPod Touch 2G
+ # 0x1294 iPhone 3GS
+ # 0x1297 iPhone 4
+ # 0x1299 iPod Touch 3G
+ # 0x129a iPad
VENDOR_ID = [0x05ac]
- PRODUCT_ID = [0x129a]
+ PRODUCT_ID = [0x1292,0x1293,0x1294,0x1297,0x1299,0x129a]
BCD = [0x01]
# iTunes enumerations
@@ -141,6 +154,10 @@ class ITUNES(DevicePlugin):
'SongNames',
]
+ # Cover art size limits
+ MAX_COVER_WIDTH = 510
+ MAX_COVER_HEIGHT = 680
+
# Properties
cached_books = {}
cache_dir = os.path.join(config_dir, 'caches', 'itunes')
@@ -159,7 +176,6 @@ class ITUNES(DevicePlugin):
sources = None
update_msg = None
update_needed = False
- use_series_data = True
# Public methods
def add_books_to_metadata(self, locations, metadata, booklists):
@@ -173,16 +189,17 @@ class ITUNES(DevicePlugin):
(L{books}(oncard=None), L{books}(oncard='carda'),
L{books}(oncard='cardb')).
'''
+ if DEBUG:
+ self.log.info("ITUNES.add_books_to_metadata()")
task_count = float(len(self.update_list))
# Delete any obsolete copies of the book from the booklist
if self.update_list:
- if True:
- self.log.info("ITUNES.add_books_to_metadata()")
- #self._dump_booklist(booklists[0], header='before',indent=2)
- #self._dump_update_list(header='before',indent=2)
- #self._dump_cached_books(header='before',indent=2)
+ if False:
+ self._dump_booklist(booklists[0], header='before',indent=2)
+ self._dump_update_list(header='before',indent=2)
+ self._dump_cached_books(header='before',indent=2)
for (j,p_book) in enumerate(self.update_list):
if False:
@@ -230,12 +247,12 @@ class ITUNES(DevicePlugin):
# Add new books to booklists[0]
for new_book in locations[0]:
- if False:
+ if DEBUG:
self.log.info(" adding '%s' by '%s' to booklists[0]" %
(new_book.title, new_book.author))
booklists[0].append(new_book)
- if False:
+ if DEBUG:
self._dump_booklist(booklists[0],header='after',indent=2)
self._dump_cached_books(header='after',indent=2)
@@ -329,7 +346,8 @@ class ITUNES(DevicePlugin):
'title':book.Name,
'author':book.Artist,
'lib_book':library_books[this_book.path] if this_book.path in library_books else None,
- 'uuid': book.Composer
+ 'uuid': book.Composer,
+ 'format': 'pdf' if book.KindAsString.startswith('PDF') else 'epub'
}
if self.report_progress is not None:
@@ -343,9 +361,9 @@ class ITUNES(DevicePlugin):
if self.report_progress is not None:
self.report_progress(1.0, _('finished'))
self.cached_books = cached_books
-# if DEBUG:
-# self._dump_booklist(booklist, 'returning from books():')
-# self._dump_cached_books('returning from books():')
+ if DEBUG:
+ self._dump_booklist(booklist, 'returning from books()', indent=2)
+ self._dump_cached_books('returning from books()',indent=2)
return booklist
else:
return []
@@ -506,6 +524,19 @@ class ITUNES(DevicePlugin):
'''
return (None,None)
+ @classmethod
+ def config_widget(cls):
+ '''
+ Return a QWidget with settings for the device interface
+ '''
+ cw = DriverBase.config_widget()
+ # Turn off the Save template
+ cw.opt_save_template.setVisible(False)
+ cw.label.setVisible(False)
+ # Repurpose the checkbox
+ cw.opt_read_metadata.setText(_("Use Series as Category in iTunes/iBooks"))
+ return cw
+
def delete_books(self, paths, end_session=True):
'''
Delete books at paths on device.
@@ -685,6 +716,9 @@ class ITUNES(DevicePlugin):
@param booklists: A tuple containing the result of calls to
(L{books}(oncard=None), L{books}(oncard='carda'),
L{books}(oncard='cardb')).
+
+ NB: This will not find books that were added by a different installation of calibre
+ as uuids are different
'''
if DEBUG:
self.log.info("ITUNES.remove_books_from_metadata()")
@@ -732,17 +766,6 @@ class ITUNES(DevicePlugin):
'''
self.report_progress = report_progress
- def settings(self):
- '''
- Should return an opts object. The opts object should have one attribute
- `format_map` which is an ordered list of formats for the device.
- '''
- klass = self if isinstance(self, type) else self.__class__
- c = Config('device_drivers_%s' % klass.__name__, _('settings for device drivers'))
- c.add_opt('format_map', default=self.FORMATS,
- help=_('Ordered list of formats the device will accept'))
- return c.parse()
-
def sync_booklists(self, booklists, end_session=True):
'''
Update metadata on device.
@@ -750,6 +773,10 @@ class ITUNES(DevicePlugin):
(L{books}(oncard=None), L{books}(oncard='carda'),
L{books}(oncard='cardb')).
'''
+
+ if DEBUG:
+ self.log.info("ITUNES.sync_booklists()")
+
if self.update_needed:
if DEBUG:
self.log.info(' calling _update_device')
@@ -812,29 +839,33 @@ class ITUNES(DevicePlugin):
self.problem_msg = _("Some cover art could not be converted.\n"
"Click 'Show Details' for a list.")
- if False:
+ if DEBUG:
self.log.info("ITUNES.upload_books()")
self._dump_files(files, header='upload_books()',indent=2)
self._dump_update_list(header='upload_books()',indent=2)
+ #self.log.info(" self.settings().format_map: %s" % self.settings().format_map)
if isosx:
for (i,file) in enumerate(files):
+ format = file.rpartition('.')[2].lower()
path = self.path_template % (metadata[i].title, metadata[i].author[0])
self._remove_existing_copy(path, metadata[i])
- fpath = self._get_fpath(file, metadata[i], update_md=True)
+ fpath = self._get_fpath(file, metadata[i], format, update_md=True)
db_added, lb_added = self._add_new_copy(fpath, metadata[i])
- thumb = self._cover_to_thumb(path, metadata[i], db_added, lb_added)
- this_book = self._create_new_book(fpath, metadata[i], path, db_added, lb_added, thumb)
+ thumb = self._cover_to_thumb(path, metadata[i], db_added, lb_added, format)
+ this_book = self._create_new_book(fpath, metadata[i], path, db_added, lb_added, thumb, format)
new_booklist.append(this_book)
self._update_iTunes_metadata(metadata[i], db_added, lb_added, this_book)
# Add new_book to self.cached_paths
self.cached_books[this_book.path] = {
- 'title': metadata[i].title,
'author': metadata[i].author,
- 'lib_book': lb_added,
'dev_book': db_added,
- 'uuid': metadata[i].uuid}
+ 'format': format,
+ 'lib_book': lb_added,
+ 'title': metadata[i].title,
+ 'uuid': metadata[i].uuid }
+
# Report progress
if self.report_progress is not None:
@@ -846,9 +877,10 @@ class ITUNES(DevicePlugin):
self.iTunes = win32com.client.Dispatch("iTunes.Application")
for (i,file) in enumerate(files):
+ format = file.rpartition('.')[2].lower()
path = self.path_template % (metadata[i].title, metadata[i].author[0])
self._remove_existing_copy(path, metadata[i])
- fpath = self._get_fpath(file, metadata[i], update_md=True)
+ fpath = self._get_fpath(file, metadata[i],format, update_md=True)
db_added, lb_added = self._add_new_copy(fpath, metadata[i])
if self.manual_sync_mode and not db_added:
@@ -857,17 +889,18 @@ class ITUNES(DevicePlugin):
"Click 'Show Details...' for affected books.")
self.problem_titles.append("'%s' by %s" % (metadata[i].title, metadata[i].author[0]))
- thumb = self._cover_to_thumb(path, metadata[i], lb_added, db_added)
- this_book = self._create_new_book(fpath, metadata[i], path, db_added, lb_added, thumb)
+ thumb = self._cover_to_thumb(path, metadata[i], db_added, lb_added, format)
+ this_book = self._create_new_book(fpath, metadata[i], path, db_added, lb_added, thumb, format)
new_booklist.append(this_book)
self._update_iTunes_metadata(metadata[i], db_added, lb_added, this_book)
# Add new_book to self.cached_paths
self.cached_books[this_book.path] = {
- 'title': metadata[i].title,
'author': metadata[i].author[0],
- 'lib_book': lb_added,
'dev_book': db_added,
+ 'format': format,
+ 'lib_book': lb_added,
+ 'title': metadata[i].title,
'uuid': metadata[i].uuid}
# Report progress
@@ -968,7 +1001,8 @@ class ITUNES(DevicePlugin):
db_added = self._find_device_book(
{'title': metadata.title,
'author': metadata.authors[0],
- 'uuid': metadata.uuid})
+ 'uuid': metadata.uuid,
+ 'format': fpath.rpartition('.')[2].lower()})
return db_added
@@ -1021,7 +1055,8 @@ class ITUNES(DevicePlugin):
added = self._find_library_book(
{ 'title': metadata.title,
'author': metadata.author[0],
- 'uuid': metadata.uuid})
+ 'uuid': metadata.uuid,
+ 'format': file.rpartition('.')[2].lower()})
return added
def _add_new_copy(self, fpath, metadata):
@@ -1047,46 +1082,82 @@ class ITUNES(DevicePlugin):
return db_added, lb_added
- def _cover_to_thumb(self, path, metadata, db_added, lb_added):
+ def _cover_to_thumb(self, path, metadata, db_added, lb_added, format):
'''
assumes pythoncom wrapper for db_added
+ as of iTunes 9.2, iBooks 1.1, can't set artwork for PDF files via automation
'''
self.log.info(" ITUNES._cover_to_thumb()")
+
thumb = None
if metadata.cover:
- if isosx:
- cover_data = open(metadata.cover,'rb')
- if lb_added:
- lb_added.artworks[1].data_.set(cover_data.read())
- if db_added:
- # The following command generates an error, but the artwork does in fact
- # get sent to the device. Seems like a bug in Apple's automation interface
- try:
- db_added.artworks[1].data_.set(cover_data.read())
- except:
+ if (format == 'epub'):
+ # Pre-shrink cover
+ # self.MAX_COVER_WIDTH, self.MAX_COVER_HEIGHT
+ try:
+ img = PILImage.open(metadata.cover)
+ width = img.size[0]
+ height = img.size[1]
+ scaled, nwidth, nheight = fit_image(width, height, self.MAX_COVER_WIDTH, self.MAX_COVER_HEIGHT)
+ if scaled:
if DEBUG:
- self.log.warning(" iTunes automation interface reported an error"
- " when adding artwork to '%s' on the iDevice" % metadata.title)
- #import traceback
- #traceback.print_exc()
- #from calibre import ipython
- #ipython(user_ns=locals())
- pass
-
-
- elif iswindows:
- if lb_added:
- if lb_added.Artwork.Count:
- lb_added.Artwork.Item(1).SetArtworkFromFile(metadata.cover)
+ self.log.info(" '%s' scaled from %sx%s to %sx%s" %
+ (metadata.cover,width,height,nwidth,nheight))
+ img = img.resize((nwidth, nheight), PILImage.ANTIALIAS)
+ cd = cStringIO.StringIO()
+ img.convert('RGB').save(cd, 'JPEG')
+ cover_data = cd.getvalue()
+ cd.close()
else:
- lb_added.AddArtworkFromFile(metadata.cover)
+ with open(metadata.cover,'r+b') as cd:
+ cover_data = cd.read()
+ except:
+ self.problem_titles.append("'%s' by %s" % (metadata.title, metadata.author[0]))
+ self.log.error(" error scaling '%s' for '%s'" % (metadata.cover,metadata.title))
+ return thumb
- if db_added:
- if db_added.Artwork.Count:
- db_added.Artwork.Item(1).SetArtworkFromFile(metadata.cover)
- else:
- db_added.AddArtworkFromFile(metadata.cover)
+ if isosx:
+ if lb_added:
+ lb_added.artworks[1].data_.set(cover_data)
+
+ if db_added:
+ # The following command generates an error, but the artwork does in fact
+ # get sent to the device. Seems like a bug in Apple's automation interface
+ try:
+ db_added.artworks[1].data_.set(cover_data)
+ except:
+ if DEBUG:
+ self.log.warning(" iTunes automation interface reported an error"
+ " when adding artwork to '%s' on the iDevice" % metadata.title)
+ #import traceback
+ #traceback.print_exc()
+ #from calibre import ipython
+ #ipython(user_ns=locals())
+ pass
+
+
+ elif iswindows:
+ # Write the data to a real file for Windows iTunes
+ tc = os.path.join(tempfile.gettempdir(), "cover.jpg")
+ with open(tc,'wb') as tmp_cover:
+ tmp_cover.write(cover_data)
+
+ if lb_added:
+ if lb_added.Artwork.Count:
+ lb_added.Artwork.Item(1).SetArtworkFromFile(tc)
+ else:
+ lb_added.AddArtworkFromFile(tc)
+
+ if db_added:
+ if db_added.Artwork.Count:
+ db_added.Artwork.Item(1).SetArtworkFromFile(tc)
+ else:
+ db_added.AddArtworkFromFile(tc)
+
+ elif format == 'pdf':
+ if DEBUG:
+ self.log.info(" unable to set PDF cover via automation interface")
try:
# Resize for thumb
@@ -1097,6 +1168,7 @@ class ITUNES(DevicePlugin):
of = cStringIO.StringIO()
im.convert('RGB').save(of, 'JPEG')
thumb = of.getvalue()
+ of.close()
# Refresh the thumbnail cache
if DEBUG:
@@ -1105,14 +1177,15 @@ class ITUNES(DevicePlugin):
zfw = ZipFile(archive_path, mode='a')
thumb_path = path.rpartition('.')[0] + '.jpg'
zfw.writestr(thumb_path, thumb)
- zfw.close()
except:
self.problem_titles.append("'%s' by %s" % (metadata.title, metadata.author[0]))
self.log.error(" error converting '%s' to thumb for '%s'" % (metadata.cover,metadata.title))
+ finally:
+ zfw.close()
- return thumb
+ return thumb
- def _create_new_book(self,fpath, metadata, path, db_added, lb_added, thumb):
+ def _create_new_book(self,fpath, metadata, path, db_added, lb_added, thumb, format):
'''
'''
if DEBUG:
@@ -1122,6 +1195,7 @@ class ITUNES(DevicePlugin):
this_book.db_id = None
this_book.device_collections = []
+ this_book.format = format
this_book.library_id = lb_added
this_book.path = path
this_book.thumbnail = thumb
@@ -1134,13 +1208,13 @@ class ITUNES(DevicePlugin):
try:
this_book.datetime = parse_date(str(lb_added.date_added())).timetuple()
except:
- pass
+ this_book.datetime = time.gmtime()
elif db_added:
this_book.size = self._get_device_book_size(fpath, db_added.size())
try:
this_book.datetime = parse_date(str(db_added.date_added())).timetuple()
except:
- pass
+ this_book.datetime = time.gmtime()
elif iswindows:
if lb_added:
@@ -1148,13 +1222,13 @@ class ITUNES(DevicePlugin):
try:
this_book.datetime = parse_date(str(lb_added.DateAdded)).timetuple()
except:
- pass
+ this_book.datetime = time.gmtime()
elif db_added:
this_book.size = self._get_device_book_size(fpath, db_added.Size)
try:
this_book.datetime = parse_date(str(db_added.DateAdded)).timetuple()
except:
- pass
+ this_book.datetime = time.gmtime()
return this_book
@@ -1319,10 +1393,11 @@ class ITUNES(DevicePlugin):
self.cached_books[cb]['uuid']))
elif iswindows:
for cb in self.cached_books.keys():
- self.log.info("%s%-40.40s %-30.30s %s" %
+ self.log.info("%s%-40.40s %-30.30s %-4.4s %s" %
(' '*indent,
self.cached_books[cb]['title'],
self.cached_books[cb]['author'],
+ self.cached_books[cb]['format'],
self.cached_books[cb]['uuid']))
self.log.info()
@@ -1338,8 +1413,9 @@ class ITUNES(DevicePlugin):
fnames = zf.namelist()
opf = [x for x in fnames if '.opf' in x][0]
if opf:
- opf_raw = cStringIO.StringIO(zf.read(opf)).getvalue()
- soup = BeautifulSoup(opf_raw)
+ opf_raw = cStringIO.StringIO(zf.read(opf))
+ soup = BeautifulSoup(opf_raw.getvalue())
+ opf_raw.close()
title = soup.find('dc:title').renderContents()
author = soup.find('dc:creator').renderContents()
ts = soup.find('meta',attrs={'name':'calibre:timestamp'})
@@ -1428,7 +1504,7 @@ class ITUNES(DevicePlugin):
hits = dev_books.Search(search['uuid'],self.SearchField.index('All'))
if hits:
hit = hits[0]
- self.log.info(" found '%s' by %s (%s)" % (hit.Name, hit.Artist, hit.Composer))
+ self.log.info(" found '%s' by %s (%s)" % (hit.Name, hit.Artist, hit.Composer))
return hit
# Try by author - there could be multiple hits
@@ -1437,9 +1513,25 @@ class ITUNES(DevicePlugin):
for hit in hits:
if hit.Name == search['title']:
if DEBUG:
- self.log.info(" found '%s' by %s (%s)" % (hit.Name, hit.Artist, hit.Composer))
+ self.log.info(" found '%s' by %s (%s)" % (hit.Name, hit.Artist, hit.Composer))
return hit
+ # PDF metadata was rewritten at export as 'safe(title) - safe(author)'
+ if search['format'] == 'pdf':
+ title = re.sub(r'[^0-9a-zA-Z ]', '_', search['title'])
+ author = re.sub(r'[^0-9a-zA-Z ]', '_', search['author'])
+ if DEBUG:
+ self.log.info(" searching by name: '%s - %s'" % (title,author))
+ hits = dev_books.Search('%s - %s' % (title,author),
+ self.SearchField.index('All'))
+ if hits:
+ hit = hits[0]
+ self.log.info(" found '%s' by %s (%s)" % (hit.Name, hit.Artist, hit.Composer))
+ return hit
+ else:
+ if DEBUG:
+ self.log.info(" no PDF hits")
+
attempts -= 1
time.sleep(0.5)
if DEBUG:
@@ -1496,7 +1588,7 @@ class ITUNES(DevicePlugin):
if hits:
hit = hits[0]
if DEBUG:
- self.log.info(" found '%s' by %s (%s)" % (hit.Name, hit.Artist, hit.Composer))
+ self.log.info(" found '%s' by %s (%s)" % (hit.Name, hit.Artist, hit.Composer))
return hit
if DEBUG:
@@ -1506,9 +1598,25 @@ class ITUNES(DevicePlugin):
for hit in hits:
if hit.Name == search['title']:
if DEBUG:
- self.log.info(" found '%s' by %s (%s)" % (hit.Name, hit.Artist, hit.Composer))
+ self.log.info(" found '%s' by %s (%s)" % (hit.Name, hit.Artist, hit.Composer))
return hit
+ # PDF metadata was rewritten at export as 'safe(title) - safe(author)'
+ if search['format'] == 'pdf':
+ title = re.sub(r'[^0-9a-zA-Z ]', '_', search['title'])
+ author = re.sub(r'[^0-9a-zA-Z ]', '_', search['author'])
+ if DEBUG:
+ self.log.info(" searching by name: %s - %s" % (title,author))
+ hits = lib_books.Search('%s - %s' % (title,author),
+ self.SearchField.index('All'))
+ if hits:
+ hit = hits[0]
+ self.log.info(" found '%s' by %s (%s)" % (hit.Name, hit.Artist, hit.Composer))
+ return hit
+ else:
+ if DEBUG:
+ self.log.info(" no PDF hits")
+
attempts -= 1
time.sleep(0.5)
if DEBUG:
@@ -1523,10 +1631,12 @@ class ITUNES(DevicePlugin):
Convert iTunes artwork to thumbnail
Cache generated thumbnails
cache_dir = os.path.join(config_dir, 'caches', 'itunes')
+ as of iTunes 9.2, iBooks 1.1, can't set artwork for PDF files via automation
'''
archive_path = os.path.join(self.cache_dir, "thumbs.zip")
thumb_path = book_path.rpartition('.')[0] + '.jpg'
+ format = book_path.rpartition('.')[2].lower()
try:
zfr = ZipFile(archive_path)
@@ -1539,77 +1649,99 @@ class ITUNES(DevicePlugin):
self.log.info(" ITUNES._generate_thumbnail()")
if isosx:
- try:
- # Resize the cover
- data = book.artworks[1].raw_data().data
- #self._dump_hex(data[:256])
- im = PILImage.open(cStringIO.StringIO(data))
- scaled, width, height = fit_image(im.size[0],im.size[1], 60, 80)
- im = im.resize((int(width),int(height)), PILImage.ANTIALIAS)
- thumb = cStringIO.StringIO()
- im.convert('RGB').save(thumb,'JPEG')
-
- # Cache the tagged thumb
- if DEBUG:
- self.log.info(" generated thumb for '%s', caching" % book.name())
- zfw.writestr(thumb_path, thumb.getvalue())
- zfw.close()
- return thumb.getvalue()
- except:
- self.log.error(" error generating thumb for '%s'" % book.name())
+ if format == 'epub':
try:
+ if False:
+ self.log.info(" fetching artwork from %s\n %s" % (book_path,book))
+ # Resize the cover
+ data = book.artworks[1].raw_data().data
+ #self._dump_hex(data[:256])
+ img_data = cStringIO.StringIO(data)
+ im = PILImage.open(img_data)
+ scaled, width, height = fit_image(im.size[0],im.size[1], 60, 80)
+ im = im.resize((int(width),int(height)), PILImage.ANTIALIAS)
+ img_data.close()
+
+ thumb = cStringIO.StringIO()
+ im.convert('RGB').save(thumb,'JPEG')
+ thumb_data = thumb.getvalue()
+ thumb.close()
+
+ # Cache the tagged thumb
+ if DEBUG:
+ self.log.info(" generated thumb for '%s', caching" % book.name())
+ zfw.writestr(thumb_path, thumb_data)
zfw.close()
+ return thumb_data
except:
- pass
+ self.log.error(" error generating thumb for '%s'" % book.name())
+ try:
+ zfw.close()
+ except:
+ pass
+ return None
+ else:
+ if DEBUG:
+ self.log.info(" unable to generate PDF thumbs")
return None
elif iswindows:
if not book.Artwork.Count:
if DEBUG:
- self.log.info(" no artwork available")
+ self.log.info(" no artwork available for '%s'" % book.Name)
return None
- # Save the cover from iTunes
- try:
- tmp_thumb = os.path.join(tempfile.gettempdir(), "thumb.%s" % self.ArtworkFormat[book.Artwork.Item(1).Format])
- book.Artwork.Item(1).SaveArtworkToFile(tmp_thumb)
- # Resize the cover
- im = PILImage.open(tmp_thumb)
- scaled, width, height = fit_image(im.size[0],im.size[1], 60, 80)
- im = im.resize((int(width),int(height)), PILImage.ANTIALIAS)
- thumb = cStringIO.StringIO()
- im.convert('RGB').save(thumb,'JPEG')
- os.remove(tmp_thumb)
-
- # Cache the tagged thumb
- if DEBUG:
- self.log.info(" generated thumb for '%s', caching" % book.Name)
- zfw.writestr(thumb_path, thumb.getvalue())
- zfw.close()
- return thumb.getvalue()
- except:
- self.log.error(" error generating thumb for '%s'" % book.Name)
+ if format == 'epub':
+ # Save the cover from iTunes
try:
+ tmp_thumb = os.path.join(tempfile.gettempdir(), "thumb.%s" % self.ArtworkFormat[book.Artwork.Item(1).Format])
+ book.Artwork.Item(1).SaveArtworkToFile(tmp_thumb)
+ # Resize the cover
+ im = PILImage.open(tmp_thumb)
+ scaled, width, height = fit_image(im.size[0],im.size[1], 60, 80)
+ im = im.resize((int(width),int(height)), PILImage.ANTIALIAS)
+ thumb = cStringIO.StringIO()
+ im.convert('RGB').save(thumb,'JPEG')
+ thumb_data = thumb.getvalue()
+ os.remove(tmp_thumb)
+ thumb.close()
+
+ # Cache the tagged thumb
+ if DEBUG:
+ self.log.info(" generated thumb for '%s', caching" % book.Name)
+ zfw.writestr(thumb_path, thumb_data)
zfw.close()
+ return thumb_data
except:
- pass
+ self.log.error(" error generating thumb for '%s'" % book.Name)
+ try:
+ zfw.close()
+ except:
+ pass
+ return None
+ else:
+ if DEBUG:
+ self.log.info(" unable to generate PDF thumbs")
return None
def _get_device_book_size(self, file, compressed_size):
'''
Calculate the exploded size of file
'''
- myZip = ZipFile(file,'r')
- myZipList = myZip.infolist()
- exploded_file_size = 0
- for file in myZipList:
- exploded_file_size += file.file_size
- if False:
- self.log.info(" ITUNES._get_device_book_size()")
- self.log.info(" %d items in archive" % len(myZipList))
- self.log.info(" compressed: %d exploded: %d" % (compressed_size, exploded_file_size))
- myZip.close()
+ exploded_file_size = compressed_size
+ format = file.rpartition('.')[2].lower()
+ if format == 'epub':
+ myZip = ZipFile(file,'r')
+ myZipList = myZip.infolist()
+ exploded_file_size = 0
+ for file in myZipList:
+ exploded_file_size += file.file_size
+ if False:
+ self.log.info(" ITUNES._get_device_book_size()")
+ self.log.info(" %d items in archive" % len(myZipList))
+ self.log.info(" compressed: %d exploded: %d" % (compressed_size, exploded_file_size))
+ myZip.close()
return exploded_file_size
def _get_device_books(self):
@@ -1701,7 +1833,7 @@ class ITUNES(DevicePlugin):
self.log.error(" no iPad|Books playlist found")
return pl
- def _get_fpath(self,file, metadata, update_md=False):
+ def _get_fpath(self,file, metadata, format, update_md=False):
'''
If the database copy will be deleted after upload, we have to
use file (the PersistentTemporaryFile), which will be around until
@@ -1723,9 +1855,9 @@ class ITUNES(DevicePlugin):
else:
# Recipe - PTF
if DEBUG:
- self.log.info(" file will be deleted after upload")
+ self.log.info(" file will be deleted after upload")
- if update_md:
+ if format == 'epub' and update_md:
self._update_epub_metadata(fpath, metadata)
return fpath
@@ -1775,10 +1907,14 @@ class ITUNES(DevicePlugin):
# Collect calibre orphans - remnants of recipe uploads
path = self.path_template % (book.name(), book.artist())
if str(book.description()).startswith(self.description_prefix):
- if book.location() == appscript.k.missing_value:
- library_orphans[path] = book
- if False:
- self.log.info(" found iTunes PTF '%s' in Library|Books" % book.name())
+ try:
+ if book.location() == appscript.k.missing_value:
+ library_orphans[path] = book
+ if False:
+ self.log.info(" found iTunes PTF '%s' in Library|Books" % book.name())
+ except:
+ if DEBUG:
+ self.log.error(" iTunes returned an error returning .location() with %s" % book.name())
library_books[path] = book
if DEBUG:
@@ -1937,10 +2073,22 @@ class ITUNES(DevicePlugin):
(self.iTunes.name(), self.iTunes.version(), self.initial_status,
self.version[0],self.version[1],self.version[2]))
self.log.info(" iTunes_media: %s" % self.iTunes_media)
+
if iswindows:
'''
Launch iTunes if not already running
Assumes pythoncom wrapper
+
+ *** Current implementation doesn't handle UNC paths correctly,
+ and python has two incompatible methods to parse UNCs:
+ os.path.splitdrive() and os.path.splitunc()
+ need to use os.path.normpath on result of splitunc()
+
+ Once you have the //server/share, convert with os.path.normpath('//server/share')
+ os.path.splitdrive doesn't work as advertised, so use os.path.splitunc
+ os.path.splitunc("//server/share") returns ('//server/share','')
+ os.path.splitunc("C:/Documents") returns ('c:','/documents')
+ os.path.normpath("//server/share") returns "\\\\server\\share"
'''
# Instantiate iTunes
self.iTunes = win32com.client.Dispatch("iTunes.Application")
@@ -1949,17 +2097,23 @@ class ITUNES(DevicePlugin):
self.initial_status = 'launched'
# Read the current storage path for iTunes media from the XML file
+ media_dir = ''
+ string = None
with open(self.iTunes.LibraryXMLPath, 'r') as xml:
- soup = BeautifulSoup(xml.read().decode('utf-8'))
- mf = soup.find('key',text="Music Folder").parent
- string = mf.findNext('string').renderContents()
- media_dir = os.path.abspath(string[len('file://localhost/'):].replace('%20',' '))
+ for line in xml:
+ if line.strip().startswith('Music Folder'):
+ soup = BeautifulSoup(line)
+ string = soup.find('string').renderContents()
+ media_dir = os.path.abspath(string[len('file://localhost/'):].replace('%20',' '))
+ break
if os.path.exists(media_dir):
self.iTunes_media = media_dir
- else:
+ elif hasattr(string,'parent'):
self.log.error(" could not extract valid iTunes.media_dir from %s" % self.iTunes.LibraryXMLPath)
self.log.error(" %s" % string.parent.prettify())
self.log.error(" '%s' not found" % media_dir)
+ else:
+ self.log.error(" no media dir found: string: %s" % string)
if DEBUG:
self.log.info(" %s %s" % (__appname__, __version__))
@@ -2028,7 +2182,9 @@ class ITUNES(DevicePlugin):
# Delete existing from Library|Books, add to self.update_list
# for deletion from booklist[0] during add_books_to_metadata
for book in self.cached_books:
- if self.cached_books[book]['uuid'] == metadata.uuid:
+ if (self.cached_books[book]['uuid'] == metadata.uuid) or \
+ (self.cached_books[book]['title'] == metadata.title and \
+ self.cached_books[book]['author'] == metadata.authors[0]):
self.update_list.append(self.cached_books[book])
self._remove_from_iTunes(self.cached_books[book])
if DEBUG:
@@ -2036,7 +2192,7 @@ class ITUNES(DevicePlugin):
break
else:
if DEBUG:
- self.log.info(" '%s' not in cached_books" % metadata.title)
+ self.log.info(" '%s' not found in cached_books" % metadata.title)
def _remove_from_device(self, cached_book):
'''
@@ -2119,8 +2275,8 @@ class ITUNES(DevicePlugin):
path = book.Location
if book:
- storage_path = os.path.split(path)
- if path.startswith(self.iTunes_media):
+ if self.iTunes_media and path.startswith(self.iTunes_media):
+ storage_path = os.path.split(path)
if DEBUG:
self.log.info(" removing '%s' at %s" %
(cached_book['title'], path))
@@ -2158,20 +2314,34 @@ class ITUNES(DevicePlugin):
fnames = zf_opf.namelist()
opf = [x for x in fnames if '.opf' in x][0]
if opf:
- opf_raw = cStringIO.StringIO(zf_opf.read(opf)).getvalue()
- soup = BeautifulSoup(opf_raw)
+ opf_raw = cStringIO.StringIO(zf_opf.read(opf))
+ soup = BeautifulSoup(opf_raw.getvalue())
+ opf_raw.close()
+
+ # Touch existing calibre timestamp
md = soup.find('metadata')
- ts = md.find('meta',attrs={'name':'calibre:timestamp'})
- if ts:
- # Touch existing calibre timestamp
- timestamp = ts['content']
- old_ts = parse_date(timestamp)
- metadata.timestamp = datetime.datetime(old_ts.year, old_ts.month, old_ts.day, old_ts.hour,
- old_ts.minute, old_ts.second, old_ts.microsecond+1, old_ts.tzinfo)
+ if md:
+ ts = md.find('meta',attrs={'name':'calibre:timestamp'})
+ if ts:
+ timestamp = ts['content']
+ old_ts = parse_date(timestamp)
+ metadata.timestamp = datetime.datetime(old_ts.year, old_ts.month, old_ts.day, old_ts.hour,
+ old_ts.minute, old_ts.second, old_ts.microsecond+1, old_ts.tzinfo)
+ else:
+ metadata.timestamp = isoformat(now())
+ if DEBUG:
+ self.log.info(" add timestamp: %s" % metadata.timestamp)
else:
metadata.timestamp = isoformat(now())
if DEBUG:
+ self.log.warning(" missing block in OPF file")
self.log.info(" add timestamp: %s" % metadata.timestamp)
+
+ # Force the language declaration for iBooks 1.1
+ metadata.language = get_lang()
+ if DEBUG:
+ self.log.info(" rewriting language: %s " % metadata.language)
+
zf_opf.close()
# If 'News' in tags, tweak the title/author for friendlier display in iBooks
@@ -2257,6 +2427,9 @@ class ITUNES(DevicePlugin):
lb_added.enabled.set(True)
lb_added.sort_artist.set(metadata.author_sort.title())
lb_added.sort_name.set(this_book.title_sorter)
+ if this_book.format == 'pdf':
+ lb_added.artist.set(metadata.authors[0])
+ lb_added.name.set(metadata.title)
if db_added:
db_added.album.set(metadata.title)
@@ -2265,6 +2438,9 @@ class ITUNES(DevicePlugin):
db_added.enabled.set(True)
db_added.sort_artist.set(metadata.author_sort.title())
db_added.sort_name.set(this_book.title_sorter)
+ if this_book.format == 'pdf':
+ db_added.artist.set(metadata.authors[0])
+ db_added.name.set(metadata.title)
if metadata.comments:
if lb_added:
@@ -2284,7 +2460,9 @@ class ITUNES(DevicePlugin):
# Set genre from series if available, else first alpha tag
# Otherwise iTunes grabs the first dc:subject from the opf metadata
- if self.use_series_data and metadata.series:
+ if metadata.series and self.settings().read_metadata:
+ if DEBUG:
+ self.log.info(" using Series name as Genre")
if lb_added:
lb_added.sort_name.set("%s %03d" % (metadata.series, metadata.series_index))
lb_added.genre.set(metadata.series)
@@ -2298,6 +2476,9 @@ class ITUNES(DevicePlugin):
db_added.episode_number.set(metadata.series_index)
elif metadata.tags:
+ if DEBUG:
+ self.log.info(" %susing Tag as Genre" %
+ "no Series name available, " if self.settings().read_metadata else '')
for tag in metadata.tags:
if self._is_alpha(tag[0]):
if lb_added:
@@ -2314,6 +2495,9 @@ class ITUNES(DevicePlugin):
lb_added.Enabled = True
lb_added.SortArtist = (metadata.author_sort.title())
lb_added.SortName = (this_book.title_sorter)
+ if this_book.format == 'pdf':
+ lb_added.Artist = metadata.authors[0]
+ lb_added.Name = metadata.title
if db_added:
db_added.Album = metadata.title
@@ -2322,6 +2506,9 @@ class ITUNES(DevicePlugin):
db_added.Enabled = True
db_added.SortArtist = (metadata.author_sort.title())
db_added.SortName = (this_book.title_sorter)
+ if this_book.format == 'pdf':
+ db_added.Artist = metadata.authors[0]
+ db_added.Name = metadata.title
if metadata.comments:
if lb_added:
@@ -2345,7 +2532,9 @@ class ITUNES(DevicePlugin):
# Otherwise iBooks uses first from opf
# iTunes balks on setting EpisodeNumber, but it sticks (9.1.1.12)
- if self.use_series_data and metadata.series:
+ if metadata.series and self.settings().read_metadata:
+ if DEBUG:
+ self.log.info(" using Series name as Genre")
if lb_added:
lb_added.SortName = "%s %03d" % (metadata.series, metadata.series_index)
lb_added.Genre = metadata.series
@@ -2365,6 +2554,8 @@ class ITUNES(DevicePlugin):
self.log.warning(" iTunes automation interface reported an error"
" setting EpisodeNumber on iDevice")
elif metadata.tags:
+ if DEBUG:
+ self.log.info(" using Tag as Genre")
for tag in metadata.tags:
if self._is_alpha(tag[0]):
if lb_added:
@@ -2429,8 +2620,6 @@ class BookList(list):
class Book(MetaInformation):
'''
A simple class describing a book in the iTunes Books Library.
- Q's:
- - Should thumbnail come from calibre if available?
- See ebooks.metadata.__init__ for all fields
'''
def __init__(self,title,author):
diff --git a/src/calibre/devices/interface.py b/src/calibre/devices/interface.py
index da8a2cb978..c417c501f4 100644
--- a/src/calibre/devices/interface.py
+++ b/src/calibre/devices/interface.py
@@ -59,7 +59,7 @@ class DevicePlugin(Plugin):
return cls.__name__
return cls.name
-
+ # Device detection {{{
def test_bcd_windows(self, device_id, bcd):
if bcd is None or len(bcd) == 0:
return True
@@ -152,6 +152,7 @@ class DevicePlugin(Plugin):
return True, dev
return False, None
+ # }}}
def reset(self, key='-1', log_packets=False, report_progress=None,
detected_device=None) :
@@ -372,14 +373,12 @@ class DevicePlugin(Plugin):
@classmethod
def settings(cls):
'''
- Should return an opts object. The opts object should have one attribute
+ Should return an opts object. The opts object should have at least one attribute
`format_map` which is an ordered list of formats for the device.
'''
raise NotImplementedError()
-
-
class BookList(list):
'''
A list of books. Each Book object must have the fields:
diff --git a/src/calibre/devices/kindle/driver.py b/src/calibre/devices/kindle/driver.py
index cd56d210e1..c3e7bb190d 100644
--- a/src/calibre/devices/kindle/driver.py
+++ b/src/calibre/devices/kindle/driver.py
@@ -429,6 +429,7 @@ class Bookmark():
entries, = unpack('>I', data[9:13])
current_entry = 0
e_base = 0x0d
+ self.pdf_page_offset = 0
while current_entry < entries:
'''
location, = unpack('>I', data[e_base+2:e_base+6])
diff --git a/src/calibre/devices/prs505/driver.py b/src/calibre/devices/prs505/driver.py
index 5860826778..c55936be2d 100644
--- a/src/calibre/devices/prs505/driver.py
+++ b/src/calibre/devices/prs505/driver.py
@@ -99,7 +99,7 @@ class PRS505(USBMS):
if self._card_b_prefix is not None:
if not write_cache(self._card_b_prefix):
self._card_b_prefix = None
-
+ self.booklist_class.rebuild_collections = self.rebuild_collections
def get_device_information(self, end_session=True):
return (self.gui_name, '', '', '')
@@ -145,7 +145,7 @@ class PRS505(USBMS):
blists[i] = booklists[i]
opts = self.settings()
if opts.extra_customization:
- collections = [x.strip() for x in
+ collections = [x.lower().strip() for x in
opts.extra_customization.split(',')]
else:
collections = []
@@ -156,4 +156,10 @@ class PRS505(USBMS):
USBMS.sync_booklists(self, booklists, end_session=end_session)
debug_print('PRS505: finished sync_booklists')
+ def rebuild_collections(self, booklist, oncard):
+ debug_print('PRS505: started rebuild_collections on card', oncard)
+ c = self.initialize_XML_cache()
+ c.rebuild_collections(booklist, {'carda':1, 'cardb':2}.get(oncard, 0))
+ c.write()
+ debug_print('PRS505: finished rebuild_collections')
diff --git a/src/calibre/devices/prs505/sony_cache.py b/src/calibre/devices/prs505/sony_cache.py
index e7d0e4686c..9bd005d71c 100644
--- a/src/calibre/devices/prs505/sony_cache.py
+++ b/src/calibre/devices/prs505/sony_cache.py
@@ -6,10 +6,8 @@ __copyright__ = '2010, Kovid Goyal '
__docformat__ = 'restructuredtext en'
import os, time
-from pprint import pprint
from base64 import b64decode
from uuid import uuid4
-
from lxml import etree
from calibre import prints, guess_type
@@ -62,8 +60,7 @@ class XMLCache(object):
def __init__(self, paths, prefixes, use_author_sort):
if DEBUG:
- debug_print('Building XMLCache...')
- pprint(paths)
+ debug_print('Building XMLCache...', paths)
self.paths = paths
self.prefixes = prefixes
self.use_author_sort = use_author_sort
@@ -151,15 +148,14 @@ class XMLCache(object):
else:
seen.add(title)
- def get_playlist_map(self):
- debug_print('Start get_playlist_map')
+ def build_playlist_id_map(self):
+ debug_print('Start build_playlist_id_map')
ans = {}
self.ensure_unique_playlist_titles()
debug_print('after ensure_unique_playlist_titles')
self.prune_empty_playlists()
- debug_print('get_playlist_map loop')
for i, root in self.record_roots.items():
- debug_print('get_playlist_map loop', i)
+ debug_print('build_playlist_id_map loop', i)
id_map = self.build_id_map(root)
ans[i] = []
for playlist in root.xpath('//*[local-name()="playlist"]'):
@@ -170,9 +166,23 @@ class XMLCache(object):
if record is not None:
items.append(record)
ans[i].append((playlist.get('title'), items))
- debug_print('end get_playlist_map')
+ debug_print('end build_playlist_id_map')
return ans
+ def build_id_playlist_map(self, bl_index):
+ debug_print('Start build_id_playlist_map')
+ pmap = self.build_playlist_id_map()[bl_index]
+ playlist_map = {}
+ for title, records in pmap:
+ for record in records:
+ path = record.get('path', None)
+ if path:
+ if path not in playlist_map:
+ playlist_map[path] = []
+ playlist_map[path].append(title)
+ debug_print('Finish build_id_playlist_map. Found', len(playlist_map))
+ return playlist_map
+
def get_or_create_playlist(self, bl_idx, title):
root = self.record_roots[bl_idx]
for playlist in root.xpath('//*[local-name()="playlist"]'):
@@ -192,8 +202,7 @@ class XMLCache(object):
# }}}
def fix_ids(self): # {{{
- if DEBUG:
- debug_print('Running fix_ids()')
+ debug_print('Running fix_ids()')
def ensure_numeric_ids(root):
idmap = {}
@@ -276,38 +285,19 @@ class XMLCache(object):
def update_booklist(self, bl, bl_index):
if bl_index not in self.record_roots:
return
- if DEBUG:
- debug_print('Updating JSON cache:', bl_index)
+ debug_print('Updating JSON cache:', bl_index)
+ playlist_map = self.build_id_playlist_map(bl_index)
root = self.record_roots[bl_index]
- pmap = self.get_playlist_map()[bl_index]
- playlist_map = {}
- for title, records in pmap:
- for record in records:
- path = record.get('path', None)
- if path:
- if path not in playlist_map:
- playlist_map[path] = []
- playlist_map[path].append(title)
-
lpath_map = self.build_lpath_map(root)
for book in bl:
record = lpath_map.get(book.lpath, None)
if record is not None:
title = record.get('title', None)
if title is not None and title != book.title:
- if DEBUG:
- debug_print('Renaming title', book.title, 'to', title)
+ debug_print('Renaming title', book.title, 'to', title)
book.title = title
-# We shouldn't do this for Sonys, because the reader strips
-# all but the first author.
-# authors = record.get('author', None)
-# if authors is not None:
-# authors = string_to_authors(authors)
-# if authors != book.authors:
-# if DEBUG:
-# prints('Renaming authors', book.authors, 'to',
-# authors)
-# book.authors = authors
+ # Don't set the author, because the reader strips all but
+ # the first author.
for thumbnail in record.xpath(
'descendant::*[local-name()="thumbnail"]'):
for img in thumbnail.xpath(
@@ -318,45 +308,50 @@ class XMLCache(object):
book.thumbnail = raw
break
break
- if book.lpath in playlist_map:
- tags = playlist_map[book.lpath]
- book.device_collections = tags
+ book.device_collections = playlist_map.get(book.lpath, [])
debug_print('Finished updating JSON cache:', bl_index)
# }}}
# Update XML from JSON {{{
def update(self, booklists, collections_attributes):
- debug_print('Starting update XML from JSON')
- playlist_map = self.get_playlist_map()
-
+ debug_print('Starting update', collections_attributes)
for i, booklist in booklists.items():
- if DEBUG:
- debug_print('Updating XML Cache:', i)
+ playlist_map = self.build_id_playlist_map(i)
+ debug_print('Updating XML Cache:', i)
root = self.record_roots[i]
lpath_map = self.build_lpath_map(root)
for book in booklist:
path = os.path.join(self.prefixes[i], *(book.lpath.split('/')))
-# record = self.book_by_lpath(book.lpath, root)
record = lpath_map.get(book.lpath, None)
if record is None:
record = self.create_text_record(root, i, book.lpath)
self.update_text_record(record, book, path, i)
+ # Ensure the collections in the XML database are recorded for
+ # this book
+ if book.device_collections is None:
+ book.device_collections = []
+ book.device_collections = playlist_map.get(book.lpath, [])
+ self.update_playlists(i, root, booklist, collections_attributes)
+ # Update the device collections because update playlist could have added
+ # some new ones.
+ debug_print('In update/ Starting refresh of device_collections')
+ for i, booklist in booklists.items():
+ playlist_map = self.build_id_playlist_map(i)
+ for book in booklist:
+ book.device_collections = playlist_map.get(book.lpath, [])
+ self.fix_ids()
+ debug_print('Finished update')
- bl_pmap = playlist_map[i]
- self.update_playlists(i, root, booklist, bl_pmap,
- collections_attributes)
-
+ def rebuild_collections(self, booklist, bl_index):
+ if bl_index not in self.record_roots:
+ return
+ root = self.record_roots[bl_index]
+ self.update_playlists(bl_index, root, booklist, [])
self.fix_ids()
- # This is needed to update device_collections
- for i, booklist in booklists.items():
- self.update_booklist(booklist, i)
- debug_print('Finished update XML from JSON')
-
- def update_playlists(self, bl_index, root, booklist, playlist_map,
- collections_attributes):
- debug_print('Starting update_playlists')
+ def update_playlists(self, bl_index, root, booklist, collections_attributes):
+ debug_print('Starting update_playlists', collections_attributes, bl_index)
collections = booklist.get_collections(collections_attributes)
lpath_map = self.build_lpath_map(root)
for category, books in collections.items():
@@ -372,10 +367,8 @@ class XMLCache(object):
rec.set('id', str(self.max_id(root)+1))
ids = [x.get('id', None) for x in records]
if None in ids:
- if DEBUG:
- debug_print('WARNING: Some elements do not have ids')
- ids = [x for x in ids if x is not None]
-
+ debug_print('WARNING: Some elements do not have ids')
+ ids = [x for x in ids if x is not None]
playlist = self.get_or_create_playlist(bl_index, category)
playlist_ids = []
for item in playlist:
@@ -544,10 +537,5 @@ class XMLCache(object):
break
self.namespaces[i] = ns
-# if DEBUG:
-# debug_print('Found nsmaps:')
-# pprint(self.nsmaps)
-# debug_print('Found namespaces:')
-# pprint(self.namespaces)
# }}}
diff --git a/src/calibre/devices/usbms/books.py b/src/calibre/devices/usbms/books.py
index be154f35c1..7108fa3f00 100644
--- a/src/calibre/devices/usbms/books.py
+++ b/src/calibre/devices/usbms/books.py
@@ -11,6 +11,7 @@ from calibre.devices.mime import mime_type_ext
from calibre.devices.interface import BookList as _BookList
from calibre.constants import filesystem_encoding, preferred_encoding
from calibre import isbytestring
+from calibre.utils.config import prefs
class Book(MetaInformation):
@@ -76,7 +77,7 @@ class Book(MetaInformation):
in C{other} takes precedence, unless the information in C{other} is NULL.
'''
- MetaInformation.smart_update(self, other)
+ MetaInformation.smart_update(self, other, replace_tags=True)
for attr in self.BOOK_ATTRS:
if hasattr(other, attr):
@@ -132,7 +133,9 @@ class CollectionsBookList(BookList):
def get_collections(self, collection_attributes):
collections = {}
series_categories = set([])
- collection_attributes = list(collection_attributes)+['device_collections']
+ collection_attributes = list(collection_attributes)
+ if prefs['preserve_user_collections']:
+ collection_attributes += ['device_collections']
for attr in collection_attributes:
attr = attr.strip()
for book in self:
@@ -167,3 +170,15 @@ class CollectionsBookList(BookList):
books.sort(cmp=lambda x,y:cmp(getter(x), getter(y)))
return collections
+ def rebuild_collections(self, booklist, oncard):
+ '''
+ For each book in the booklist for the card oncard, remove it from all
+ its current collections, then add it to the collections specified in
+ device_collections.
+
+ oncard is None for the main memory, carda for card A, cardb for card B,
+ etc.
+
+ booklist is the object created by the :method:`books` call above.
+ '''
+ pass
diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py
index d899c8e995..55790420f2 100644
--- a/src/calibre/devices/usbms/device.py
+++ b/src/calibre/devices/usbms/device.py
@@ -78,9 +78,6 @@ class Device(DeviceConfig, DevicePlugin):
STORAGE_CARD_VOLUME_LABEL = ''
STORAGE_CARD2_VOLUME_LABEL = None
- SUPPORTS_SUB_DIRS = False
- MUST_READ_METADATA = False
- SUPPORTS_USE_AUTHOR_SORT = False
EBOOK_DIR_MAIN = ''
EBOOK_DIR_CARD_A = ''
diff --git a/src/calibre/devices/usbms/deviceconfig.py b/src/calibre/devices/usbms/deviceconfig.py
index 5edefff743..e074387175 100644
--- a/src/calibre/devices/usbms/deviceconfig.py
+++ b/src/calibre/devices/usbms/deviceconfig.py
@@ -13,6 +13,10 @@ class DeviceConfig(object):
EXTRA_CUSTOMIZATION_MESSAGE = None
EXTRA_CUSTOMIZATION_DEFAULT = None
+ SUPPORTS_SUB_DIRS = False
+ MUST_READ_METADATA = False
+ SUPPORTS_USE_AUTHOR_SORT = False
+
#: If None the default is used
SAVE_TEMPLATE = None
@@ -23,9 +27,14 @@ class DeviceConfig(object):
config().parse().send_template
@classmethod
- def _config(cls):
+ def _config_base_name(cls):
klass = cls if isinstance(cls, type) else cls.__class__
- c = Config('device_drivers_%s' % klass.__name__, _('settings for device drivers'))
+ return klass.__name__
+
+ @classmethod
+ def _config(cls):
+ name = cls._config_base_name()
+ c = Config('device_drivers_%s' % name, _('settings for device drivers'))
c.add_opt('format_map', default=cls.FORMATS,
help=_('Ordered list of formats the device will accept'))
c.add_opt('use_subdirs', default=True,
diff --git a/src/calibre/ebooks/conversion/preprocess.py b/src/calibre/ebooks/conversion/preprocess.py
index 7a7f362169..4734f4f5c1 100644
--- a/src/calibre/ebooks/conversion/preprocess.py
+++ b/src/calibre/ebooks/conversion/preprocess.py
@@ -107,9 +107,21 @@ class CSSPreProcessor(object):
PAGE_PAT = re.compile(r'@page[^{]*?{[^}]*?}')
- def __call__(self, data):
+ def __call__(self, data, add_namespace=False):
+ from calibre.ebooks.oeb.base import XHTML_CSS_NAMESPACE
data = self.PAGE_PAT.sub('', data)
- return data
+ if not add_namespace:
+ return data
+ ans, namespaced = [], False
+ for line in data.splitlines():
+ ll = line.lstrip()
+ if not (namespaced or ll.startswith('@import') or
+ ll.startswith('@charset')):
+ ans.append(XHTML_CSS_NAMESPACE.strip())
+ namespaced = True
+ ans.append(line)
+
+ return u'\n'.join(ans)
class HTMLPreProcessor(object):
diff --git a/src/calibre/ebooks/html/input.py b/src/calibre/ebooks/html/input.py
index 6108aa329d..73fd020d7b 100644
--- a/src/calibre/ebooks/html/input.py
+++ b/src/calibre/ebooks/html/input.py
@@ -20,7 +20,7 @@ from itertools import izip
from calibre.customize.conversion import InputFormatPlugin
from calibre.ebooks.chardet import xml_to_unicode
from calibre.customize.conversion import OptionRecommendation
-from calibre.constants import islinux, isfreebsd
+from calibre.constants import islinux, isfreebsd, iswindows
from calibre import unicode_path
from calibre.utils.localization import get_lang
from calibre.utils.filenames import ascii_filename
@@ -32,9 +32,14 @@ class Link(object):
@classmethod
def url_to_local_path(cls, url, base):
- path = urlunparse(('', '', url.path, url.params, url.query, ''))
+ path = url.path
+ isabs = False
+ if iswindows and path.startswith('/'):
+ path = path[1:]
+ isabs = True
+ path = urlunparse(('', '', path, url.params, url.query, ''))
path = unquote(path)
- if os.path.isabs(path):
+ if isabs or os.path.isabs(path):
return path
return os.path.abspath(os.path.join(base, path))
@@ -307,6 +312,7 @@ class HTMLInput(InputFormatPlugin):
xpath
from calibre import guess_type
import cssutils
+ self.OEB_STYLES = OEB_STYLES
oeb = create_oebbook(log, None, opts, self,
encoding=opts.input_encoding, populate=False)
self.oeb = oeb
@@ -371,7 +377,7 @@ class HTMLInput(InputFormatPlugin):
rewrite_links(item.data, partial(self.resource_adder, base=dpath))
for item in oeb.manifest.values():
- if item.media_type in OEB_STYLES:
+ if item.media_type in self.OEB_STYLES:
dpath = None
for path, href in self.added_resources.items():
if href == item.href:
@@ -409,12 +415,30 @@ class HTMLInput(InputFormatPlugin):
oeb.container = DirContainer(os.getcwdu(), oeb.log)
return oeb
+ def link_to_local_path(self, link_, base=None):
+ if not isinstance(link_, unicode):
+ try:
+ link_ = link_.decode('utf-8', 'error')
+ except:
+ self.log.warn('Failed to decode link %r. Ignoring'%link_)
+ return None, None
+ try:
+ l = Link(link_, base if base else os.getcwdu())
+ except:
+ self.log.exception('Failed to process link: %r'%link_)
+ return None, None
+ if l.path is None:
+ # Not a local resource
+ return None, None
+ link = l.path.replace('/', os.sep).strip()
+ frag = l.fragment
+ if not link:
+ return None, None
+ return link, frag
def resource_adder(self, link_, base=None):
- link = self.urlnormalize(link_)
- link, frag = self.urldefrag(link)
- link = unquote(link).replace('/', os.sep)
- if not link.strip():
+ link, frag = self.link_to_local_path(link_, base=base)
+ if link is None:
return link_
try:
if base and not os.path.isabs(link):
@@ -442,6 +466,9 @@ class HTMLInput(InputFormatPlugin):
item = self.oeb.manifest.add(id, href, media_type)
item.html_input_href = bhref
+ if guessed in self.OEB_STYLES:
+ item.override_css_fetch = partial(
+ self.css_import_handler, os.path.dirname(link))
item.data
self.added_resources[link] = href
@@ -450,7 +477,17 @@ class HTMLInput(InputFormatPlugin):
nlink = '#'.join((nlink, frag))
return nlink
-
+ def css_import_handler(self, base, href):
+ link, frag = self.link_to_local_path(href, base=base)
+ if link is None or not os.access(link, os.R_OK) or os.path.isdir(link):
+ return (None, None)
+ try:
+ raw = open(link, 'rb').read().decode('utf-8', 'replace')
+ raw = self.oeb.css_preprocessor(raw, add_namespace=True)
+ except:
+ self.log.exception('Failed to read CSS file: %r'%link)
+ return (None, None)
+ return (None, raw)
diff --git a/src/calibre/ebooks/metadata/__init__.py b/src/calibre/ebooks/metadata/__init__.py
index 690cca511a..0dbffd5f7f 100644
--- a/src/calibre/ebooks/metadata/__init__.py
+++ b/src/calibre/ebooks/metadata/__init__.py
@@ -268,7 +268,7 @@ class MetaInformation(object):
):
prints(x, getattr(self, x, 'None'))
- def smart_update(self, mi):
+ def smart_update(self, mi, replace_tags=False):
'''
Merge the information in C{mi} into self. In case of conflicts, the information
in C{mi} takes precedence, unless the information in mi is NULL.
@@ -282,7 +282,7 @@ class MetaInformation(object):
for attr in ('author_sort', 'title_sort', 'category',
'publisher', 'series', 'series_index', 'rating',
'isbn', 'application_id', 'manifest', 'spine', 'toc',
- 'cover', 'language', 'guide', 'book_producer',
+ 'cover', 'guide', 'book_producer',
'timestamp', 'lccn', 'lcc', 'ddc', 'pubdate', 'rights',
'publication_type', 'uuid'):
if hasattr(mi, attr):
@@ -291,7 +291,10 @@ class MetaInformation(object):
setattr(self, attr, val)
if mi.tags:
- self.tags += mi.tags
+ if replace_tags:
+ self.tags = mi.tags
+ else:
+ self.tags += mi.tags
self.tags = list(set(self.tags))
if mi.author_sort_map:
@@ -314,6 +317,11 @@ class MetaInformation(object):
if len(other_comments.strip()) > len(my_comments.strip()):
self.comments = other_comments
+ other_lang = getattr(mi, 'language', None)
+ if other_lang and other_lang.lower() != 'und':
+ self.language = other_lang
+
+
def format_series_index(self):
try:
x = float(self.series_index)
diff --git a/src/calibre/ebooks/metadata/fetch.py b/src/calibre/ebooks/metadata/fetch.py
index d12c668e0d..66e994f24f 100644
--- a/src/calibre/ebooks/metadata/fetch.py
+++ b/src/calibre/ebooks/metadata/fetch.py
@@ -3,17 +3,18 @@ __license__ = 'GPL 3'
__copyright__ = '2009, Kovid Goyal '
__docformat__ = 'restructuredtext en'
-import traceback, sys, textwrap, re
+import traceback, sys, textwrap, re, urllib2
from threading import Thread
-from calibre import prints
+from calibre import prints, browser
from calibre.utils.config import OptionParser
from calibre.utils.logging import default_log
from calibre.customize import Plugin
+from calibre.ebooks.metadata.library_thing import OPENLIBRARY
metadata_config = None
-class MetadataSource(Plugin):
+class MetadataSource(Plugin): # {{{
author = 'Kovid Goyal'
@@ -130,7 +131,9 @@ class MetadataSource(Plugin):
def customization_help(self):
return 'This plugin can only be customized using the GUI'
-class GoogleBooks(MetadataSource):
+ # }}}
+
+class GoogleBooks(MetadataSource): # {{{
name = 'Google Books'
description = _('Downloads metadata from Google Books')
@@ -145,8 +148,9 @@ class GoogleBooks(MetadataSource):
self.exception = e
self.tb = traceback.format_exc()
+ # }}}
-class ISBNDB(MetadataSource):
+class ISBNDB(MetadataSource): # {{{
name = 'IsbnDB'
description = _('Downloads metadata from isbndb.com')
@@ -181,7 +185,9 @@ class ISBNDB(MetadataSource):
'and enter your access key below.')
return '
{manifest}
@@ -71,6 +72,29 @@ CONTAINER='''\
'''
+
+SVG_TEMPLATE = '''\
+
+
+
+
+ Cover
+
+
+
+
+
+
+'''
+
class TOC(list):
def __init__(self, title=None, href=None):
@@ -151,8 +175,6 @@ class EPUBHelpBuilder(StandaloneHTMLBuilder):
spine = [' '*8+'`_
+ You can get help on any individual feature of the converters by mousing over it in the GUI or running ``ebook-convert dummy.html .epub -h`` at a terminal. A good place to start is to look at the following demo files that demonstrate some of the advanced features:
+ * `html-demo.zip `_
Device Integration
@@ -95,12 +95,39 @@ We just need some information from you:
device supports SD cards, insert them. Then connect your device. In calibre go to Preferences->Advanced
and click the "Debug device detection" button. This will create some debug output. Copy it to a file
and repeat the process, this time with your device disconnected.
- * Send both the above outputs to us with the other information and we will write a device driver for your
+ * Send both the above outputs to us with the other information and we will write a device driver for your
device.
Once you send us the output for a particular operating system, support for the device in that operating system
will appear in the next release of |app|.
+How does |app| manage collections on my SONY reader?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When |app| connects with the device, it retrieves all collections for the books on the device. The collections
+of which books are members are shown on the device view.
+
+When you send a book to the device, |app| will add the book to collections based on the metadata for that book. By
+default, collections are created from tags and series. You can control what metadata is used by going to
+Preferences->Plugins->Device Interface plugins and customizing the SONY device interface plugin. If you remove all
+values, |app| will not add the book to any collection.
+
+Collection management is largely controlled by 'Preserve device collections' found at Preferences->Add/Save->Sending
+to device. If checked (the default), managing collections is left to the user; |app| will not delete already
+existing collections for a book on your device when you resend the book to the device, but |app| will add the book to
+collections if necessary. To ensure that the collections for a book are based only on current |app| metadata, first
+delete the books from the device, then resend the books. You can edit collections directly on the device view by
+double-clicking or right-clicking in the collections column.
+
+If 'Preserve device collections' is not checked, then |app| will manage collections. Collections will be built using
+|app| metadata exclusively. Sending a book to the device will correct the collections for that book so its
+collections exactly match the book's metadata. Collections are added and deleted as necessary. Editing collections on
+the device pane is not permitted, because collections not in the metadata will be removed automatically.
+
+In summary, check 'Preserve device collections' if you want to manage collections yourself. Collections for a book
+will never be removed by |app|, but can be removed by you by editing on the device view. Uncheck 'Preserve device
+collections' if you want |app| to manage the collections, adding books to and removing books from collections as
+needed.
Can I use both |app| and the SONY software to manage my reader?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -130,7 +157,7 @@ simplest is to simply re-name the executable file that launches the library prog
Can I use the collections feature of the SONY reader?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|app| has full support for collections. When you add tags to a book's metadata, those tags are turned into collections when you upload the book to the SONY reader. Also, the series information is automatically
-turned into a collection on the reader. Note that the PRS-500 does not support collections for books stored on the SD card. The PRS-505 does.
+turned into a collection on the reader. Note that the PRS-500 does not support collections for books stored on the SD card. The PRS-505 does.
How do I use |app| with my iPad/iPhone/iTouch?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -139,7 +166,7 @@ The easiest way to browse your |app| collection on your Apple device (iPad/iPhon
First perform the following steps in |app|
- * Set the Preferred Output Format in |app| to EPUB (The output format can be set under Preferences->General)
+ * Set the Preferred Output Format in |app| to EPUB (The output format can be set under Preferences->General)
* Set the output profile to iPad (this will work for iPhone/iPods as well), under Preferences->Conversion->Page Setup
* Convert the books you want to read on your iPhone to EPUB format by selecting them and clicking the Convert button.
* Turn on the Content Server in |app|'s preferences and leave |app| running.
@@ -160,7 +187,7 @@ Alternative for the iPad
As of |app| version 0.7.0, you can plugin your iPad into the computer using its charging cable, and |app| will detect it and show you a list of books on the iPad. You can then use the Send to device button to send books directly to iBooks on the iPad.
This method only works on Windows XP and higher and OS X 10.5 and higher. Linux is not supported (iTunes is not available in linux) and OS X 10.4 is not supported. For more details, see
-`this forum post http://www.mobileread.com/forums/showpost.php?p=944079&postcount=1`_.
+`this forum post `_.
How do I use |app| with my Android phone?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -171,7 +198,7 @@ Can I access my |app| books using the web browser in my Kindle or other reading
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|app| has a *Content Server* that exports the books in |app| as a web page. You can turn it on under
-Preferences->Content Server. Then just point the web browser on your device to the computer running
+Preferences->Content Server. Then just point the web browser on your device to the computer running
the Content Server and you will be able to browse your book collection. For example, if the computer running
the server has IP address 63.45.128.5, in the browser, you would type::
@@ -190,11 +217,16 @@ The most likely cause of this is your antivirus program. Try temporarily disabli
Why is my device not detected in linux?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-|app| uses something called SYSFS to detect devices in linux. The linux kernel can export two version of SYSFS, one of which is deprecated. Some linux distributions still ship with kernels that support the deprecated version of SYSFS, even though it was deprecated a long time ago. In this case, device detection in |app| will not work. You can check what version of SYSFS is exported by your kernel with the following command::
-
+|app| needs your linux kernel to have been setup correctly to detect devices. If your devices are not detected, perform the following tests::
+
grep SYSFS_DEPRECATED /boot/config-`uname -r`
-You should see something like ``CONFIG_SYSFS_DEPRECATED_V2 is not set``. If you don't you have to either recompile your kernel with the correct setting, or upgrade your linux distro to a more modern version, where this will not be set.
+You should see something like ``CONFIG_SYSFS_DEPRECATED_V2 is not set``.
+Also, ::
+
+ grep CONFIG_SCSI_MULTI_LUN /boot/config-`uname -r`
+
+must return ``CONFIG_SCSI_MULTI_LUN=y``. If you don't see either, you have to recompile your kernel with the correct settings.
Library Management
------------------
@@ -222,7 +254,7 @@ Now this makes it very easy to find for example all science fiction books by Isa
ReadStatus -> Genre -> Author -> Series
-In |app|, you would instead use tags to mark genre and read status and then just use a simple search query like ``tag:scifi and not tag:read``. |app| even has a nice graphical interface, so you don't need to learn its search language instead you can just click on tags to include or exclude them from the search.
+In |app|, you would instead use tags to mark genre and read status and then just use a simple search query like ``tag:scifi and not tag:read``. |app| even has a nice graphical interface, so you don't need to learn its search language instead you can just click on tags to include or exclude them from the search.
Why doesn't |app| have a column for foo?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -230,7 +262,7 @@ Why doesn't |app| have a column for foo?
How do I move my |app| library from one computer to another?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Simply copy the |app| library folder from the old to the new computer. You can find out what the library folder is by clicking Preferences. The very first item is the path to the library folder. Now on the new computer, start |app| for the first time. It will run the Welcome Wizard asking you for the location of the |app| library. Point it to the previously copied folder.
+Simply copy the |app| library folder from the old to the new computer. You can find out what the library folder is by clicking Preferences. The very first item is the path to the library folder. Now on the new computer, start |app| for the first time. It will run the Welcome Wizard asking you for the location of the |app| library. Point it to the previously copied folder.
Note that if you are transferring between different types of computers (for example Windows to OS X) then after doing the above you should also go to Preferences->Advanced and click the Check database integrity button. It will warn you about missing files, if any, which you should then transfer by hand.
@@ -241,11 +273,11 @@ Content From The Web
:depth: 1
:local:
-My downloaded news content causes the reader to reset.
+My downloaded news content causes the reader to reset.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This is a bug in the SONY firmware. The problem can be mitigated by switching the output format to EPUB
-in the configuration dialog. Alternatively, you can use the LRF output format and use the SONY software
-to transfer the files to the reader. The SONY software pre-paginates the LRF file,
+in the configuration dialog. Alternatively, you can use the LRF output format and use the SONY software
+to transfer the files to the reader. The SONY software pre-paginates the LRF file,
thereby reducing the number of resets.
I obtained a recipe for a news site as a .py file from somewhere, how do I use it?
@@ -280,7 +312,7 @@ Take your pick:
Why does |app| show only some of my fonts on OS X?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-|app| embeds fonts in ebook files it creates. E-book files support embedding only TrueType (.ttf) fonts. Most fonts on OS X systems are in .dfont format, thus they cannot be embedded. |app| shows only TrueType fonts founf on your system. You can obtain many TrueType fonts on the web. Simply download the .ttf files and add them to the Library/Fonts directory in your home directory.
+|app| embeds fonts in ebook files it creates. E-book files support embedding only TrueType (.ttf) fonts. Most fonts on OS X systems are in .dfont format, thus they cannot be embedded. |app| shows only TrueType fonts found on your system. You can obtain many TrueType fonts on the web. Simply download the .ttf files and add them to the Library/Fonts directory in your home directory.
|app| is not starting on Windows?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -303,6 +335,10 @@ Post any output you see in a help message on the `Forum System->Universal Access and turn off the setting for enabling
+access for assistive devices in all the tabs.
+
You can obtain debug output about why |app| is not starting by running `Console.app`. Debug output will
be printed to it. If the debug output contains a line that looks like::
@@ -312,9 +348,9 @@ then the problem is probably a corrupted font cache. You can clear the cache by
`instructions `_. If that doesn't
solve it, look for a corrupted font file on your system, in ~/Library/Fonts or the like.
-
My antivirus program claims |app| is a virus/trojan?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
Your antivirus program is wrong. |app| is a completely open source product. You can actually browse the source code yourself (or hire someone to do it for you) to verify that it is not a virus. Please report the false identification to whatever company you buy your antivirus software from. If the antivirus program is preventing you from downloading/installing |app|, disable it temporarily, install |app| and then re-enable it.
How do I use purchased EPUB books with |app|?
@@ -324,8 +360,8 @@ Most purchased EPUB books have `DRM `_. Thi
I want some feature added to |app|. What can I do?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-You have two choices:
- 1. Create a patch by hacking on |app| and send it to me for review and inclusion. See `Development `_.
+You have two choices:
+ 1. Create a patch by hacking on |app| and send it to me for review and inclusion. See `Development `_.
2. `Open a ticket `_ (you have to register and login first) and hopefully I will find the time to implement your feature.
Can I include |app| on a CD to be distributed with my product/magazine?
diff --git a/src/calibre/manual/resources/epub_cover.jpg b/src/calibre/manual/resources/epub_cover.jpg
new file mode 100644
index 0000000000..d5aa42e775
Binary files /dev/null and b/src/calibre/manual/resources/epub_cover.jpg differ
diff --git a/src/calibre/manual/resources/titlepage.html b/src/calibre/manual/resources/titlepage.html
deleted file mode 100644
index 08f7ddf1cc..0000000000
--- a/src/calibre/manual/resources/titlepage.html
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
- %(title)s
-
-
-
- '
+
+import copy
+
from lxml import html, etree
from lxml.html.builder import HTML, HEAD, TITLE, STYLE, DIV, BODY, \
- STRONG, BR, SPAN, A, HR, UL, LI, H2, IMG, P as PT, \
+ STRONG, EM, BR, SPAN, A, HR, UL, LI, H2, H3, IMG, P as PT, \
TABLE, TD, TR
from calibre import preferred_encoding, strftime, isbytestring
@@ -14,6 +17,7 @@ def CLASS(*args, **kwargs): # class is a reserved word in Python
kwargs['class'] = ' '.join(args)
return kwargs
+# Regular templates
class Template(object):
IS_HTML = True
@@ -44,105 +48,35 @@ class Template(object):
return etree.tostring(self.root, encoding='utf-8', xml_declaration=True,
pretty_print=True)
-class NavBarTemplate(Template):
+class EmbeddedContent(Template):
- def _generate(self, bottom, feed, art, number_of_articles_in_feed,
- two_levels, url, __appname__, prefix='', center=True,
- extra_css=None, style=None):
- head = HEAD(TITLE('navbar'))
+ def _generate(self, article, style=None, extra_css=None):
+ content = article.content if article.content else ''
+ summary = article.summary if article.summary else ''
+ text = content if len(content) > len(summary) else summary
+ head = HEAD(TITLE(article.title))
if style:
head.append(STYLE(style, type='text/css'))
if extra_css:
head.append(STYLE(extra_css, type='text/css'))
- if prefix and not prefix.endswith('/'):
- prefix += '/'
- align = 'center' if center else 'left'
- navbar = DIV(CLASS('calibre_navbar', 'calibre_rescale_70',
- style='text-align:'+align))
- if bottom:
- navbar.append(HR())
- text = 'This article was downloaded by '
- p = PT(text, STRONG(__appname__), A(url, href=url), style='text-align:left')
- p[0].tail = ' from '
- navbar.append(p)
- navbar.append(BR())
- navbar.append(BR())
- else:
- next = 'feed_%d'%(feed+1) if art == number_of_articles_in_feed - 1 \
- else 'article_%d'%(art+1)
- up = '../..' if art == number_of_articles_in_feed - 1 else '..'
- href = '%s%s/%s/index.html'%(prefix, up, next)
- navbar.text = '| '
- navbar.append(A('Next', href=href))
- href = '%s../index.html#article_%d'%(prefix, art)
- navbar.iterchildren(reversed=True).next().tail = ' | '
- navbar.append(A('Section Menu', href=href))
- href = '%s../../index.html#feed_%d'%(prefix, feed)
- navbar.iterchildren(reversed=True).next().tail = ' | '
- navbar.append(A('Main Menu', href=href))
- if art > 0 and not bottom:
- href = '%s../article_%d/index.html'%(prefix, art-1)
- navbar.iterchildren(reversed=True).next().tail = ' | '
- navbar.append(A('Previous', href=href))
- navbar.iterchildren(reversed=True).next().tail = ' | '
- if not bottom:
- navbar.append(HR())
-
- self.root = HTML(head, BODY(navbar))
-
-class TouchscreenNavBarTemplate(Template):
-
- def _generate(self, bottom, feed, art, number_of_articles_in_feed,
- two_levels, url, __appname__, prefix='', center=True,
- extra_css=None, style=None):
- head = HEAD(TITLE('navbar'))
- if style:
- head.append(STYLE(style, type='text/css'))
- if extra_css:
- head.append(STYLE(extra_css, type='text/css'))
-
- if prefix and not prefix.endswith('/'):
- prefix += '/'
- align = 'center' if center else 'left'
- navbar = DIV(CLASS('calibre_navbar', 'calibre_rescale_100',
- style='text-align:'+align))
- if bottom:
- navbar.append(DIV(style="border-top:1px solid gray;border-bottom:1em solid white"))
- text = 'This article was downloaded by '
- p = PT(text, STRONG(__appname__), A(url, href=url), style='text-align:left')
- p[0].tail = ' from '
- navbar.append(p)
- navbar.append(BR())
- navbar.append(BR())
- else:
- next = 'feed_%d'%(feed+1) if art == number_of_articles_in_feed - 1 \
- else 'article_%d'%(art+1)
- up = '../..' if art == number_of_articles_in_feed - 1 else '..'
- href = '%s%s/%s/index.html'%(prefix, up, next)
- navbar.text = '| '
- navbar.append(A('Next', href=href))
-
- href = '%s../index.html#article_%d'%(prefix, art)
- navbar.iterchildren(reversed=True).next().tail = ' | '
- navbar.append(A('Section Menu', href=href))
- href = '%s../../index.html#feed_%d'%(prefix, feed)
- navbar.iterchildren(reversed=True).next().tail = ' | '
- navbar.append(A('Main Menu', href=href))
- if art > 0 and not bottom:
- href = '%s../article_%d/index.html'%(prefix, art-1)
- navbar.iterchildren(reversed=True).next().tail = ' | '
- navbar.append(A('Previous', href=href))
-
- navbar.iterchildren(reversed=True).next().tail = ' | '
- if not bottom:
- navbar.append(DIV(style="border-top:1px solid gray;border-bottom:1em solid white"))
-
- self.root = HTML(head, BODY(navbar))
+ if isbytestring(text):
+ text = text.decode('utf-8', 'replace')
+ elements = html.fragments_fromstring(text)
+ self.root = HTML(head,
+ BODY(H2(article.title), DIV()))
+ div = self.root.find('body').find('div')
+ if elements and isinstance(elements[0], unicode):
+ div.text = elements[0]
+ elements = list(elements)[1:]
+ for elem in elements:
+ elem.getparent().remove(elem)
+ div.append(elem)
class IndexTemplate(Template):
def _generate(self, title, masthead, datefmt, feeds, extra_css=None, style=None):
+ self.IS_HTML = False
if isinstance(datefmt, unicode):
datefmt = datefmt.encode(preferred_encoding)
date = strftime(datefmt)
@@ -164,43 +98,10 @@ class IndexTemplate(Template):
CLASS('calibre_rescale_100'))
self.root = HTML(head, BODY(div))
-class TouchscreenIndexTemplate(Template):
-
- def _generate(self, title, masthead, datefmt, feeds, extra_css=None, style=None):
- if isinstance(datefmt, unicode):
- datefmt = datefmt.encode(preferred_encoding)
- date = '%s, %s %s, %s' % (strftime('%A'), strftime('%B'), strftime('%d').lstrip('0'), strftime('%Y'))
- masthead_p = etree.Element("p")
- masthead_p.set("style","text-align:center")
- masthead_img = etree.Element("img")
- masthead_img.set("src",masthead)
- masthead_img.set("alt","masthead")
- masthead_p.append(masthead_img)
-
- head = HEAD(TITLE(title))
- if style:
- head.append(STYLE(style, type='text/css'))
- if extra_css:
- head.append(STYLE(extra_css, type='text/css'))
-
- toc = TABLE(CLASS('toc'),width="100%",border="0",cellpadding="3px")
- for i, feed in enumerate(feeds):
- if feed:
- tr = TR()
- tr.append(TD( CLASS('calibre_rescale_120'), A(feed.title, href='feed_%d/index.html'%i)))
- tr.append(TD( '%s' % len(feed.articles), style="text-align:right"))
- toc.append(tr)
- div = DIV(
- masthead_p,
- PT(date, style='text-align:center'),
- #DIV(style="border-color:gray;border-top-style:solid;border-width:thin"),
- DIV(style="border-top:1px solid gray;border-bottom:1em solid white"),
- toc)
- self.root = HTML(head, BODY(div))
-
class FeedTemplate(Template):
- def _generate(self, feed, cutoff, extra_css=None, style=None):
+ def _generate(self, f, feeds, cutoff, extra_css=None, style=None):
+ feed = feeds[f]
head = HEAD(TITLE(feed.title))
if style:
head.append(STYLE(style, type='text/css'))
@@ -248,9 +149,146 @@ class FeedTemplate(Template):
self.root = HTML(head, body)
+class NavBarTemplate(Template):
+
+ def _generate(self, bottom, feed, art, number_of_articles_in_feed,
+ two_levels, url, __appname__, prefix='', center=True,
+ extra_css=None, style=None):
+ head = HEAD(TITLE('navbar'))
+ if style:
+ head.append(STYLE(style, type='text/css'))
+ if extra_css:
+ head.append(STYLE(extra_css, type='text/css'))
+
+ if prefix and not prefix.endswith('/'):
+ prefix += '/'
+ align = 'center' if center else 'left'
+
+ navbar = DIV(CLASS('calibre_navbar', 'calibre_rescale_70',
+ style='text-align:'+align))
+ if bottom:
+ navbar.append(HR())
+ text = 'This article was downloaded by '
+ p = PT(text, STRONG(__appname__), A(url, href=url), style='text-align:left')
+ p[0].tail = ' from '
+ navbar.append(p)
+ navbar.append(BR())
+ navbar.append(BR())
+ else:
+ next = 'feed_%d'%(feed+1) if art == number_of_articles_in_feed - 1 \
+ else 'article_%d'%(art+1)
+ up = '../..' if art == number_of_articles_in_feed - 1 else '..'
+ href = '%s%s/%s/index.html'%(prefix, up, next)
+ navbar.text = '| '
+ navbar.append(A('Next', href=href))
+ href = '%s../index.html#article_%d'%(prefix, art)
+ navbar.iterchildren(reversed=True).next().tail = ' | '
+ navbar.append(A('Section Menu', href=href))
+ href = '%s../../index.html#feed_%d'%(prefix, feed)
+ navbar.iterchildren(reversed=True).next().tail = ' | '
+ navbar.append(A('Main Menu', href=href))
+ if art > 0 and not bottom:
+ href = '%s../article_%d/index.html'%(prefix, art-1)
+ navbar.iterchildren(reversed=True).next().tail = ' | '
+ navbar.append(A('Previous', href=href))
+ navbar.iterchildren(reversed=True).next().tail = ' | '
+ if not bottom:
+ navbar.append(HR())
+
+ self.root = HTML(head, BODY(navbar))
+
+
+# Touchscreen templates
+class TouchscreenIndexTemplate(Template):
+
+ def _generate(self, title, masthead, datefmt, feeds, extra_css=None, style=None):
+
+ self.IS_HTML = False
+
+ if isinstance(datefmt, unicode):
+ datefmt = datefmt.encode(preferred_encoding)
+ date = '%s, %s %s, %s' % (strftime('%A'), strftime('%B'), strftime('%d').lstrip('0'), strftime('%Y'))
+ masthead_p = etree.Element("p")
+ masthead_p.set("style","text-align:center")
+ masthead_img = etree.Element("img")
+ masthead_img.set("src",masthead)
+ masthead_img.set("alt","masthead")
+ masthead_p.append(masthead_img)
+
+ head = HEAD(TITLE(title))
+ if style:
+ head.append(STYLE(style, type='text/css'))
+ if extra_css:
+ head.append(STYLE(extra_css, type='text/css'))
+
+ toc = TABLE(CLASS('toc'),width="100%",border="0",cellpadding="3px")
+ for i, feed in enumerate(feeds):
+ if feed:
+ tr = TR()
+ tr.append(TD( CLASS('calibre_rescale_120'), A(feed.title, href='feed_%d/index.html'%i)))
+ tr.append(TD( '%s' % len(feed.articles), style="text-align:right"))
+ toc.append(tr)
+ div = DIV(
+ masthead_p,
+ H3(CLASS('publish_date'),date),
+ DIV(CLASS('divider')),
+ toc)
+ self.root = HTML(head, BODY(div))
+
class TouchscreenFeedTemplate(Template):
- def _generate(self, feed, cutoff, extra_css=None, style=None):
+ def _generate(self, f, feeds, cutoff, extra_css=None, style=None):
+
+ def trim_title(title,clip=18):
+ if len(title)>clip:
+ tokens = title.split(' ')
+ new_title_tokens = []
+ new_title_len = 0
+ if len(tokens[0]) > clip:
+ return tokens[0][:clip] + '...'
+ for token in tokens:
+ if len(token) + new_title_len < clip:
+ new_title_tokens.append(token)
+ new_title_len += len(token)
+ else:
+ new_title_tokens.append('...')
+ title = ' '.join(new_title_tokens)
+ break
+ return title
+
+ self.IS_HTML = False
+ feed = feeds[f]
+
+ # Construct the navbar
+ navbar_t = TABLE(CLASS('touchscreen_navbar'))
+ navbar_tr = TR()
+
+ # Previous Section
+ link = ''
+ if f > 0:
+ link = A(CLASS('feed_link'),
+ trim_title(feeds[f-1].title),
+ href = '../feed_%d/index.html' % int(f-1))
+ navbar_tr.append(TD(link, width="40%", align="center"))
+
+ # Up to Sections
+ link = A(STRONG('Sections'), href="../index.html")
+ navbar_tr.append(TD(link,width="20%",align="center"))
+
+ # Next Section
+ link = ''
+ if f < len(feeds)-1:
+ link = A(CLASS('feed_link'),
+ trim_title(feeds[f+1].title),
+ href = '../feed_%d/index.html' % int(f+1))
+ navbar_tr.append(TD(link, width="40%", align="center", ))
+ navbar_t.append(navbar_tr)
+ top_navbar = navbar_t
+ bottom_navbar = copy.copy(navbar_t)
+ #print "\n%s\n" % etree.tostring(navbar_t, pretty_print=True)
+
+
+ # Build the page
head = HEAD(TITLE(feed.title))
if style:
head.append(STYLE(style, type='text/css'))
@@ -258,10 +296,11 @@ class TouchscreenFeedTemplate(Template):
head.append(STYLE(extra_css, type='text/css'))
body = BODY(style='page-break-before:always')
div = DIV(
- H2(feed.title, CLASS('calibre_feed_title', 'calibre_rescale_160')),
- DIV(style="border-top:1px solid gray;border-bottom:1em solid white")
+ top_navbar,
+ H2(feed.title, CLASS('feed_title'))
)
body.append(div)
+
if getattr(feed, 'image', None):
div.append(DIV(IMG(
alt = feed.image_alt if feed.image_alt else '',
@@ -280,65 +319,64 @@ class TouchscreenFeedTemplate(Template):
continue
tr = TR()
- if True:
- div_td = DIV(
- A(article.title, CLASS('summary_headline','calibre_rescale_120',
- href=article.url)),
- style="display:inline-block")
- if article.author:
- div_td.append(DIV(article.author,
- CLASS('summary_byline', 'calibre_rescale_100')))
- if article.summary:
- div_td.append(DIV(cutoff(article.text_summary),
- CLASS('summary_text', 'calibre_rescale_100')))
- tr.append(TD(div_td))
- else:
- td = TD(
- A(article.title, CLASS('summary_headline','calibre_rescale_120',
- href=article.url))
- )
- if article.author:
- td.append(DIV(article.author,
- CLASS('summary_byline', 'calibre_rescale_100')))
- if article.summary:
- td.append(DIV(cutoff(article.text_summary),
- CLASS('summary_text', 'calibre_rescale_100')))
-
- tr.append(td)
-
+ div_td = DIV(
+ A(article.title, CLASS('summary_headline','calibre_rescale_120',
+ href=article.url)),
+ style="display:inline-block")
+ if article.author:
+ div_td.append(DIV(article.author,
+ CLASS('summary_byline', 'calibre_rescale_100')))
+ if article.summary:
+ div_td.append(DIV(cutoff(article.text_summary),
+ CLASS('summary_text', 'calibre_rescale_100')))
+ tr.append(TD(div_td))
toc.append(tr)
+
div.append(toc)
-
- navbar = DIV('| ', CLASS('calibre_navbar', 'calibre_rescale_100'),style='text-align:center')
- link = A('Up one level', href="../index.html")
- link.tail = ' |'
- navbar.append(link)
- div.append(navbar)
-
+ div.append(BR())
+ div.append(bottom_navbar)
self.root = HTML(head, body)
-class EmbeddedContent(Template):
+class TouchscreenNavBarTemplate(Template):
- def _generate(self, article, style=None, extra_css=None):
- content = article.content if article.content else ''
- summary = article.summary if article.summary else ''
- text = content if len(content) > len(summary) else summary
- head = HEAD(TITLE(article.title))
+ def _generate(self, bottom, feed, art, number_of_articles_in_feed,
+ two_levels, url, __appname__, prefix='', center=True,
+ extra_css=None, style=None):
+ head = HEAD(TITLE('navbar'))
if style:
head.append(STYLE(style, type='text/css'))
if extra_css:
head.append(STYLE(extra_css, type='text/css'))
- if isbytestring(text):
- text = text.decode('utf-8', 'replace')
- elements = html.fragments_fromstring(text)
- self.root = HTML(head,
- BODY(H2(article.title), DIV()))
- div = self.root.find('body').find('div')
- if elements and isinstance(elements[0], unicode):
- div.text = elements[0]
- elements = list(elements)[1:]
- for elem in elements:
- elem.getparent().remove(elem)
- div.append(elem)
+ navbar = DIV()
+ navbar_t = TABLE(CLASS('touchscreen_navbar'))
+ navbar_tr = TR()
+ # | Previous
+ if art > 0:
+ href = '%s../article_%d/index.html'%(prefix, art-1)
+ navbar_tr.append(TD(A(EM('Previous'),href=href),
+ width="32%"))
+ else:
+ navbar_tr.append(TD('', width="32%"))
+
+ # | Articles | Sections |
+ href = '%s../index.html#article_%d'%(prefix, art)
+ navbar_tr.append(TD(A(STRONG('Articles'), href=href),width="18%"))
+
+ href = '%s../../index.html#feed_%d'%(prefix, feed)
+ navbar_tr.append(TD(A(STRONG('Sections'), href=href),width="18%"))
+
+ # | Next
+ next = 'feed_%d'%(feed+1) if art == number_of_articles_in_feed - 1 \
+ else 'article_%d'%(art+1)
+ up = '../..' if art == number_of_articles_in_feed - 1 else '..'
+ href = '%s%s/%s/index.html'%(prefix, up, next)
+
+ navbar_tr.append(TD(A(EM('Next'),href=href),
+ width="32%"))
+ navbar_t.append(navbar_tr)
+ navbar.append(navbar_t)
+ #print "\n%s\n" % etree.tostring(navbar, pretty_print=True)
+
+ self.root = HTML(head, BODY(navbar))
- s)
-
-