mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-07 18:24:30 -04:00
0.8.24
This commit is contained in:
GRiker
commit
2bc51460c9
@ -19,6 +19,55 @@
|
||||
# new recipes:
|
||||
# - title:
|
||||
|
||||
- version: 0.8.24
|
||||
date: 2011-10-27
|
||||
|
||||
new features:
|
||||
- title: "Kobo: Add support for fetching annotations from the kobo reader."
|
||||
description: "Right click the send to device button in calibre with your kobo connected and choose fetch annotations. The annotations are placed into the comments of the corresponding books in the calibre library. This feature is still experimental."
|
||||
type: major
|
||||
|
||||
- title: "Preserve the set of selected books in the library view when a device is connected, fixing a long standing annoyance"
|
||||
|
||||
bug fixes:
|
||||
- title: "Prevent changing of device metadata management option while a device is connected."
|
||||
tickets: [874118]
|
||||
|
||||
- title: "Book details panel: Show tooltip only when hovering over cover, not the rest of the book information, as it makes it hard to read."
|
||||
tickets: [876454]
|
||||
|
||||
- title: "MOBI Output: Fix use of list elements as link anchors caused links to always point to start of list."
|
||||
tickets: [879391]
|
||||
|
||||
- title: "RB Output: Fix calibre generated rb files not being opened by the RocketBook."
|
||||
tickets: [880930]
|
||||
|
||||
- title: "FB2 Input: Dont choke on FB2 files that have empty embedded content tags."
|
||||
tickets: [880904]
|
||||
|
||||
- title: "ODT Input: CSS rationalization should not fail with non ascii class names"
|
||||
|
||||
- title: "Fix creating new library using the copy structure option incorrectly setting all text type columns to be like the tags column"
|
||||
|
||||
- title: "E-book viewer: Don't choke on windows installs with a non UTF-8 filesystem encoding."
|
||||
tickets: [879740]
|
||||
|
||||
|
||||
improved recipes:
|
||||
- Novaya Gazeta
|
||||
- El Universal (Venezuela)
|
||||
- The Australian (subscription enabled)
|
||||
- Metro NL
|
||||
- The Scotsman
|
||||
- Japan Times
|
||||
|
||||
new recipes:
|
||||
- title: Silicon Republic
|
||||
author: Neil Grogan
|
||||
|
||||
- title: Calibre Blog
|
||||
author: Krittika Goyal
|
||||
|
||||
- version: 0.8.23
|
||||
date: 2011-10-21
|
||||
|
||||
|
||||
18
recipes/calibre_blog.recipe
Normal file
18
recipes/calibre_blog.recipe
Normal file
@ -0,0 +1,18 @@
|
||||
from calibre.web.feeds.news import BasicNewsRecipe
|
||||
|
||||
class CalibreBlog(BasicNewsRecipe):
|
||||
title = u'Calibre Blog'
|
||||
language = 'en'
|
||||
__author__ = 'Krittika Goyal'
|
||||
oldest_article = 1000 #days
|
||||
max_articles_per_feed = 5
|
||||
use_embedded_content = False
|
||||
|
||||
no_stylesheets = True
|
||||
auto_cleanup = True
|
||||
|
||||
|
||||
feeds = [
|
||||
('Article',
|
||||
'http://blog.calibre-ebook.com/feeds/posts/default'),
|
||||
]
|
||||
@ -56,6 +56,7 @@ class ElUniversal(BasicNewsRecipe):
|
||||
]
|
||||
|
||||
def print_version(self, url):
|
||||
rp,sep,rest = url.rpartition('/')
|
||||
return rp + sep + 'imp_' + rest
|
||||
return url + '-imp'
|
||||
|
||||
def get_article_url(self, article):
|
||||
return article.get('guid', None)
|
||||
|
||||
BIN
recipes/icons/metro_news_nl.png (PNG Image, 16x16 pixels).png
Normal file
BIN
recipes/icons/metro_news_nl.png (PNG Image, 16x16 pixels).png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 712 B |
@ -1,9 +1,21 @@
|
||||
from calibre.web.feeds.news import BasicNewsRecipe
|
||||
import re
|
||||
from calibre.utils.magick import Image
|
||||
|
||||
|
||||
''' Version 1.2, updated cover image to match the changed website.
|
||||
added info date on title
|
||||
version 1.4 Updated tags, delay and added autoclean 22-09-2011
|
||||
version 1.5 Changes due to changes in site
|
||||
version 1.6 Added css, removed auto cleanup, added buitenland section, added use_embedded_content, added remove_attributes
|
||||
Added som processing on pictures
|
||||
Removed links in html
|
||||
Removed extre white characters
|
||||
changed handling of self closing span
|
||||
'''
|
||||
|
||||
class AdvancedUserRecipe1306097511(BasicNewsRecipe):
|
||||
title = u'Metro Nieuws NL'
|
||||
# Version 1.2, updated cover image to match the changed website.
|
||||
# added info date on title
|
||||
oldest_article = 2
|
||||
max_articles_per_feed = 100
|
||||
__author__ = u'DrMerry'
|
||||
@ -11,8 +23,8 @@ class AdvancedUserRecipe1306097511(BasicNewsRecipe):
|
||||
language = u'nl'
|
||||
simultaneous_downloads = 5
|
||||
#delay = 1
|
||||
auto_cleanup = True
|
||||
auto_cleanup_keep = '//div[@class="article-image-caption-2column"]|//div[@id="date"]'
|
||||
#auto_cleanup = True
|
||||
#auto_cleanup_keep = '//div[@class="article-image-caption-2column"]/*|//div[@id="date"]/*|//div[@class="article-image-caption-3column"]/*'
|
||||
timefmt = ' [%A, %d %b %Y]'
|
||||
no_stylesheets = True
|
||||
remove_javascript = True
|
||||
@ -20,22 +32,73 @@ class AdvancedUserRecipe1306097511(BasicNewsRecipe):
|
||||
cover_url = 'http://www.oldreadmetro.com/img/en/metroholland/last/1/small.jpg'
|
||||
publication_type = 'newspaper'
|
||||
remove_tags_before = dict(name='div', attrs={'id':'date'})
|
||||
remove_tags_after = dict(name='div', attrs={'id':'column-1-3'})
|
||||
remove_tags_after = dict(name='div', attrs={'class':'article-body'})
|
||||
encoding = 'utf-8'
|
||||
extra_css = 'body{font-size:12px} #date, .article-image-caption {font-size: 0.583em} h2 {font-size: 0.917em} p.small, span, li, li span span, p, b, i, u, p.small.article-paragraph, p.small.article-paragraph p, p.small.article-paragraph span, p span, span {font-size: 0.833em} h1 {font-size: 1em}'
|
||||
remove_attributes = ['style', 'font', 'width', 'height']
|
||||
use_embedded_content = False
|
||||
extra_css = 'body {padding:5px 0px; background:#fff;font-size: 13px;}\
|
||||
#date {clear: both;margin-left: 19px;font-size: 11px;font-weight: 300;color: #616262;height: 15px;}\
|
||||
.article-box-fact.module-title {clear:both;border-top:1px solid black;border-bottom:4px solid black;padding: 8px 0;color: #24763b;font-family: arial, sans-serif;font-size: 14px;font-weight: bold;}\
|
||||
h1.title {color: #000000;font-size: 44px;padding-bottom: 10px;line-height: 1.15;font-weight: 300;} h2.subtitle {font-size: 13px;font-weight: 700;padding-bottom: 10px;}\
|
||||
.article-body p{padding-bottom:10px;}div.column-1-3{float: left;display: inline;width: 567px;margin-left: 19px;border-right: 1px solid #CACACA;padding-right: 9px;}\
|
||||
div.column-1-2 {float: left;display: inline;width: 373px;padding-right: 7px;border-right: 1px solid #CACACA;}\
|
||||
p.article-image-caption {font-size: 12px;font-weight: 300;line-height: 1.4;color: #616262;margin-top: 5px;} \
|
||||
p.article-image-caption .credits {font-style: italic;font-size: 10px;}\
|
||||
div.article-image-caption {width: 246px;margin-bottom: 5px;margin-left: 10px;}\
|
||||
div.article-image-caption-2column {margin-bottom: 10px;width: 373px;} div.article-image-caption-3column {}\
|
||||
img {border:0px;} .img-mask {position:absolute;top:0px;left:0px;}'
|
||||
|
||||
keep_only_tags = [dict(name='div', attrs={'class':[ 'article-image-caption-2column', 'article-image-caption-3column', 'article-body', 'article-box-fact']}),
|
||||
dict(name='div', attrs={'id':['date']}),
|
||||
dict(name='h1', attrs={'class':['title']}),
|
||||
dict(name='h2', attrs={'class':['subtitle']})]
|
||||
|
||||
remove_tags = [dict(name='div', attrs={'class':[ 'metroCommentFormWrap',
|
||||
'commentForm', 'metroCommentInnerWrap', 'article-slideshow-counter-container', 'article-slideshow-control', 'ad', 'header-links',
|
||||
'art-rgt','pluck-app pluck-comm', 'share-and-byline', 'article-tools-below-title', 'col-179 ', 'related-links', 'clear padding-top-15', 'share-tools', 'article-page-auto-pushes', 'footer-edit']}),
|
||||
dict(name='div', attrs={'id':['article-2', 'article-4', 'article-1', 'navigation', 'footer', 'header', 'comments', 'sidebar']}),
|
||||
dict(name='div', attrs={'id':['article-2', 'article-4', 'article-1', 'navigation', 'footer', 'header', 'comments', 'sidebar', 'share-and-byline']}),
|
||||
dict(name='iframe')]
|
||||
|
||||
preprocess_regexps = [(re.compile(r'(<p>( |\s)*</p>|<a[^>]*>Tweet</a>|<a[^>]*>|</a>|<!--.*?-->)', re.DOTALL|re.IGNORECASE),lambda match: ''),
|
||||
(re.compile(r'( |\s\s)+\s*', re.DOTALL|re.IGNORECASE),lambda match: ' '),
|
||||
(re.compile(r'([\s>])([^\s>]+)(<span[^>]+) />', re.DOTALL|re.IGNORECASE),
|
||||
lambda match: match.group(1) + match.group(3) + '>' + match.group(2) + '</span>'),
|
||||
]
|
||||
|
||||
def postprocess_html(self, soup, first):
|
||||
for tag in soup.findAll(lambda tag: tag.name.lower()=='img' and tag.has_key('src')):
|
||||
iurl = tag['src']
|
||||
img = Image()
|
||||
img.open(iurl)
|
||||
#width, height = img.size
|
||||
#print '***img is: ', iurl, '\n****width is: ', width, 'height is: ', height
|
||||
img.trim(0)
|
||||
img.save(iurl)
|
||||
'''
|
||||
#width, height = img.size
|
||||
#print '***TRIMMED img width is: ', width, 'height is: ', height
|
||||
left=0
|
||||
top=0
|
||||
border_color='#ffffff'
|
||||
width, height = img.size
|
||||
#print '***retrieved img width is: ', width, 'height is: ', height
|
||||
height_correction = 1.17
|
||||
canvas = create_canvas(width, height*height_correction,border_color)
|
||||
canvas.compose(img, left, top)
|
||||
#img = canvas
|
||||
canvas.save(iurl)
|
||||
#width, height = canvas.size
|
||||
#print '***NEW img width is: ', width, 'height is: ', height
|
||||
'''
|
||||
return soup
|
||||
|
||||
feeds = [
|
||||
(u'Binnenland', u'http://www.metronieuws.nl/rss.xml?c=1277377288-3'),
|
||||
(u'Economie', u'http://www.metronieuws.nl/rss.xml?c=1278070988-0'),
|
||||
(u'Den Haag', u'http://www.metronieuws.nl/rss.xml?c=1289013337-3'),
|
||||
(u'Rotterdam', u'http://www.metronieuws.nl/rss.xml?c=1289013337-2'),
|
||||
(u'Amsterdam', u'http://www.metronieuws.nl/rss.xml?c=1289013337-1'),
|
||||
(u'Buitenland', u'http://www.metronieuws.nl/rss.xml?c=1277377288-4'),
|
||||
(u'Columns', u'http://www.metronieuws.nl/rss.xml?c=1277377288-17'),
|
||||
(u'Entertainment', u'http://www.metronieuws.nl/rss.xml?c=1277377288-2'),
|
||||
(u'Dot', u'http://www.metronieuws.nl/rss.xml?c=1283166782-12'),
|
||||
|
||||
@ -8,7 +8,7 @@ class AdvancedUserRecipe1294342201(BasicNewsRecipe):
|
||||
title = u'New London Day'
|
||||
__author__ = 'Being'
|
||||
description = 'State, local and business news from New London, CT'
|
||||
language = 'en_GB'
|
||||
language = 'en'
|
||||
oldest_article = 1
|
||||
max_articles_per_feed = 200
|
||||
|
||||
|
||||
@ -10,9 +10,8 @@ class AdvancedUserRecipe1286819935(BasicNewsRecipe):
|
||||
remove_attributes = ['style']
|
||||
language = 'ru'
|
||||
|
||||
feeds = [(u'Articles', u'http://www.novayagazeta.ru/rss_number.xml')]
|
||||
feeds = [(u'Articles', u'http://www.novayagazeta.ru/rss/all.xml')]
|
||||
|
||||
|
||||
def print_version(self, url):
|
||||
return url + '?print=true'
|
||||
|
||||
return '%s%s' % (url, '?print=1')
|
||||
|
||||
22
recipes/silicon_republic.recipe
Normal file
22
recipes/silicon_republic.recipe
Normal file
@ -0,0 +1,22 @@
|
||||
__license__ = 'GPL v3'
|
||||
__copyright__ = '2011 Neil Grogan'
|
||||
#
|
||||
# Silicon Republic Recipe
|
||||
#
|
||||
|
||||
from calibre.web.feeds.news import BasicNewsRecipe
|
||||
|
||||
class SiliconRepublic(BasicNewsRecipe):
|
||||
title = u'Silicon Republic'
|
||||
oldest_article = 7
|
||||
max_articles_per_feed = 100
|
||||
__author__ = u'Neil Grogan'
|
||||
language = 'en_IE'
|
||||
|
||||
remove_tags = [dict(attrs={'class':['thumb','txt','compactbox','icons','catlist','catlistinner','taglist','taglistinner','social','also-in','also-in-inner','also-in-footer','zonek-dfp','paneladvert','rcadvert','panel','h2b']}),
|
||||
dict(id=['header','logo','header-right','sitesearch','rsslinks','topnav','topvideos','topvideos-list','topnews','topnews-list','slideshow','slides','compactheader','compactnews','compactfeatures','article-type','contactlinks-header','banner-zone-k-dfp','footer-related','directory-services','also-in-section','featuredrelated1','featuredrelated2','featuredrelated3','featuredrelated4','advert2-dfp']),
|
||||
dict(name=['script', 'style'])]
|
||||
|
||||
|
||||
feeds = [(u'News', u'http://www.siliconrepublic.com/feeds/')]
|
||||
|
||||
@ -12,21 +12,18 @@ from calibre.web.feeds.news import BasicNewsRecipe
|
||||
class DailyTelegraph(BasicNewsRecipe):
|
||||
title = u'The Australian'
|
||||
__author__ = u'Matthew Briggs and Sujata Raman'
|
||||
description = u'National broadsheet newspaper from down under - colloquially known as The Oz'
|
||||
description = (u'National broadsheet newspaper from down under - colloquially known as The Oz'
|
||||
'. You will need to have a subscription to '
|
||||
'http://www.theaustralian.com.au to get full articles.')
|
||||
language = 'en_AU'
|
||||
|
||||
oldest_article = 2
|
||||
needs_subscription = 'optional'
|
||||
max_articles_per_feed = 30
|
||||
remove_javascript = True
|
||||
no_stylesheets = True
|
||||
encoding = 'utf8'
|
||||
|
||||
html2lrf_options = [
|
||||
'--comment' , description
|
||||
, '--category' , 'news, Australia'
|
||||
, '--publisher' , title
|
||||
]
|
||||
|
||||
keep_only_tags = [dict(name='div', attrs={'id': 'story'})]
|
||||
|
||||
#remove_tags = [dict(name=['object','link'])]
|
||||
@ -67,6 +64,19 @@ class DailyTelegraph(BasicNewsRecipe):
|
||||
(u'Commercial Property', u'http://feeds.news.com.au/public/rss/2.0/aus_business_commercial_property_708.xml'),
|
||||
(u'Mining', u'http://feeds.news.com.au/public/rss/2.0/aus_business_mining_704.xml')]
|
||||
|
||||
def get_browser(self):
|
||||
br = BasicNewsRecipe.get_browser(self)
|
||||
if self.username and self.password:
|
||||
br.open('http://www.theaustralian.com.au')
|
||||
br.select_form(nr=0)
|
||||
br['username'] = self.username
|
||||
br['password'] = self.password
|
||||
raw = br.submit().read()
|
||||
if '>log out' not in raw.lower():
|
||||
raise ValueError('Failed to log in to www.theaustralian.com.au'
|
||||
' are your username and password correct?')
|
||||
return br
|
||||
|
||||
def get_article_url(self, article):
|
||||
return article.id
|
||||
|
||||
@ -76,14 +86,4 @@ class DailyTelegraph(BasicNewsRecipe):
|
||||
|
||||
#return br.geturl()
|
||||
|
||||
def get_cover_url(self):
|
||||
|
||||
href = 'http://www.theaustralian.news.com.au/'
|
||||
|
||||
soup = self.index_to_soup(href)
|
||||
img = soup.find('img',alt ="AUS HP promo digital2")
|
||||
print img
|
||||
if img :
|
||||
cover_url = img['src']
|
||||
|
||||
return cover_url
|
||||
|
||||
@ -7,15 +7,15 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: calibre\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2011-09-02 16:21+0000\n"
|
||||
"PO-Revision-Date: 2011-09-21 13:48+0000\n"
|
||||
"Last-Translator: Jellby <Unknown>\n"
|
||||
"POT-Creation-Date: 2011-09-27 14:31+0000\n"
|
||||
"PO-Revision-Date: 2011-10-22 22:04+0000\n"
|
||||
"Last-Translator: Fitoschido <fitoschido@gmail.com>\n"
|
||||
"Language-Team: Spanish <es@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2011-09-22 04:47+0000\n"
|
||||
"X-Generator: Launchpad (build 13996)\n"
|
||||
"X-Launchpad-Export-Date: 2011-10-23 05:13+0000\n"
|
||||
"X-Generator: Launchpad (build 14170)\n"
|
||||
|
||||
#. name for aaa
|
||||
msgid "Ghotuo"
|
||||
@ -5911,7 +5911,7 @@ msgstr "Gwahatike"
|
||||
|
||||
#. name for dai
|
||||
msgid "Day"
|
||||
msgstr "Day"
|
||||
msgstr "Día"
|
||||
|
||||
#. name for daj
|
||||
msgid "Daju; Dar Fur"
|
||||
@ -18231,7 +18231,7 @@ msgstr ""
|
||||
|
||||
#. name for nhi
|
||||
msgid "Nahuatl; Zacatlán-Ahuacatlán-Tepetzintla"
|
||||
msgstr "Náhuatl de Zacatlán; Ahuacatlán y Tepetzintla"
|
||||
msgstr "Náhuatl de Zacatlán-Ahuacatlán-Tepetzintla"
|
||||
|
||||
#. name for nhk
|
||||
msgid "Nahuatl; Isthmus-Cosoleacaque"
|
||||
|
||||
@ -10,14 +10,14 @@ msgstr ""
|
||||
"Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
|
||||
"devel@lists.alioth.debian.org>\n"
|
||||
"POT-Creation-Date: 2011-09-27 14:31+0000\n"
|
||||
"PO-Revision-Date: 2011-09-27 18:36+0000\n"
|
||||
"Last-Translator: Kovid Goyal <Unknown>\n"
|
||||
"PO-Revision-Date: 2011-10-25 19:06+0000\n"
|
||||
"Last-Translator: zeugma <Unknown>\n"
|
||||
"Language-Team: Turkish <gnome-turk@gnome.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2011-09-28 05:12+0000\n"
|
||||
"X-Generator: Launchpad (build 14049)\n"
|
||||
"X-Launchpad-Export-Date: 2011-10-26 05:13+0000\n"
|
||||
"X-Generator: Launchpad (build 14189)\n"
|
||||
"Language: tr\n"
|
||||
|
||||
#. name for aaa
|
||||
@ -54,7 +54,7 @@ msgstr ""
|
||||
|
||||
#. name for aai
|
||||
msgid "Arifama-Miniafia"
|
||||
msgstr ""
|
||||
msgstr "Arifama-Miniafia"
|
||||
|
||||
#. name for aak
|
||||
msgid "Ankave"
|
||||
@ -122,7 +122,7 @@ msgstr "Bankon"
|
||||
|
||||
#. name for abc
|
||||
msgid "Ayta; Ambala"
|
||||
msgstr ""
|
||||
msgstr "Ayta; Ambala"
|
||||
|
||||
#. name for abd
|
||||
msgid "Manide"
|
||||
@ -130,11 +130,11 @@ msgstr "Manide"
|
||||
|
||||
#. name for abe
|
||||
msgid "Abnaki; Western"
|
||||
msgstr ""
|
||||
msgstr "Abnaki; Western"
|
||||
|
||||
#. name for abf
|
||||
msgid "Abai Sungai"
|
||||
msgstr ""
|
||||
msgstr "Abai Sungai"
|
||||
|
||||
#. name for abg
|
||||
msgid "Abaga"
|
||||
@ -146,7 +146,7 @@ msgstr "Arapça; Tacikçe"
|
||||
|
||||
#. name for abi
|
||||
msgid "Abidji"
|
||||
msgstr ""
|
||||
msgstr "Abidji"
|
||||
|
||||
#. name for abj
|
||||
msgid "Aka-Bea"
|
||||
@ -158,7 +158,7 @@ msgstr "Abhazca"
|
||||
|
||||
#. name for abl
|
||||
msgid "Lampung Nyo"
|
||||
msgstr ""
|
||||
msgstr "Lampung Nyo"
|
||||
|
||||
#. name for abm
|
||||
msgid "Abanyom"
|
||||
@ -282,7 +282,7 @@ msgstr "Achterhoeks"
|
||||
|
||||
#. name for acu
|
||||
msgid "Achuar-Shiwiar"
|
||||
msgstr ""
|
||||
msgstr "Achuar-Shiwiar"
|
||||
|
||||
#. name for acv
|
||||
msgid "Achumawi"
|
||||
|
||||
@ -4,7 +4,7 @@ __license__ = 'GPL v3'
|
||||
__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
|
||||
__docformat__ = 'restructuredtext en'
|
||||
__appname__ = u'calibre'
|
||||
numeric_version = (0, 8, 23)
|
||||
numeric_version = (0, 8, 24)
|
||||
__version__ = u'.'.join(map(unicode, numeric_version))
|
||||
__author__ = u"Kovid Goyal <kovid@kovidgoyal.net>"
|
||||
|
||||
|
||||
112
src/calibre/devices/kobo/bookmark.py
Normal file
112
src/calibre/devices/kobo/bookmark.py
Normal file
@ -0,0 +1,112 @@
|
||||
# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
|
||||
|
||||
__license__ = 'GPL v3'
|
||||
__copyright__ = '2011, Timothy Legge <timlegge@gmail.com> and Kovid Goyal <kovid@kovidgoyal.net>'
|
||||
__docformat__ = 'restructuredtext en'
|
||||
|
||||
import os
|
||||
from contextlib import closing
|
||||
|
||||
import sqlite3 as sqlite
|
||||
|
||||
class Bookmark(): # {{{
|
||||
'''
|
||||
A simple class fetching bookmark data
|
||||
kobo-specific
|
||||
'''
|
||||
def __init__(self, db_path, contentid, path, id, book_format, bookmark_extension):
|
||||
self.book_format = book_format
|
||||
self.bookmark_extension = bookmark_extension
|
||||
self.book_length = 0 # Not Used
|
||||
self.id = id
|
||||
self.last_read = 0
|
||||
self.last_read_location = 0 # Not Used
|
||||
self.path = path
|
||||
self.timestamp = 0
|
||||
self.user_notes = None
|
||||
self.db_path = db_path
|
||||
self.contentid = contentid
|
||||
self.percent_read = 0
|
||||
self.get_bookmark_data()
|
||||
self.get_book_length() # Not Used
|
||||
|
||||
def get_bookmark_data(self):
|
||||
''' Return the timestamp and last_read_location '''
|
||||
|
||||
user_notes = {}
|
||||
self.timestamp = os.path.getmtime(self.path)
|
||||
with closing(sqlite.connect(self.db_path)) as connection:
|
||||
# return bytestrings if the content cannot the decoded as unicode
|
||||
connection.text_factory = lambda x: unicode(x, "utf-8", "ignore")
|
||||
|
||||
cursor = connection.cursor()
|
||||
t = (self.contentid,)
|
||||
|
||||
cursor.execute('select bm.bookmarkid, bm.contentid, bm.volumeid, '
|
||||
'bm.text, bm.annotation, bm.ChapterProgress, '
|
||||
'bm.StartContainerChildIndex, bm.StartOffset, c.BookTitle, '
|
||||
'c.TITLE, c.volumeIndex, c.___NumPages '
|
||||
'from Bookmark bm inner join Content c on '
|
||||
'bm.contentid = c.contentid and '
|
||||
'bm.volumeid = ? order by bm.volumeid, bm.chapterprogress', t)
|
||||
|
||||
previous_chapter = 0
|
||||
bm_count = 0
|
||||
for row in cursor:
|
||||
current_chapter = row[10]
|
||||
if previous_chapter == current_chapter:
|
||||
bm_count = bm_count + 1
|
||||
else:
|
||||
bm_count = 0
|
||||
|
||||
text = row[3]
|
||||
annotation = row[4]
|
||||
|
||||
# A dog ear (bent upper right corner) is a bookmark
|
||||
if row[6] == row[7] == 0: # StartContainerChildIndex = StartOffset = 0
|
||||
e_type = 'Bookmark'
|
||||
text = row[9]
|
||||
# highlight is text with no annotation
|
||||
elif text is not None and (annotation is None or annotation == ""):
|
||||
e_type = 'Highlight'
|
||||
elif text and annotation:
|
||||
e_type = 'Annotation'
|
||||
else:
|
||||
e_type = 'Unknown annotation type'
|
||||
|
||||
note_id = row[10] + bm_count
|
||||
chapter_title = row[9]
|
||||
# book_title = row[8]
|
||||
chapter_progress = min(round(float(100*row[5]),2),100)
|
||||
user_notes[note_id] = dict(id=self.id,
|
||||
displayed_location=note_id,
|
||||
type=e_type,
|
||||
text=text,
|
||||
annotation=annotation,
|
||||
chapter=row[10],
|
||||
chapter_title=chapter_title,
|
||||
chapter_progress=chapter_progress)
|
||||
previous_chapter = row[10]
|
||||
# debug_print("e_type:" , e_type, '\t', 'loc: ', note_id, 'text: ', text,
|
||||
# 'annotation: ', annotation, 'chapter_title: ', chapter_title,
|
||||
# 'chapter_progress: ', chapter_progress, 'date: ')
|
||||
|
||||
cursor.execute('select datelastread, ___PercentRead from content '
|
||||
'where bookid is Null and '
|
||||
'contentid = ?', t)
|
||||
for row in cursor:
|
||||
self.last_read = row[0]
|
||||
self.percent_read = row[1]
|
||||
# print row[1]
|
||||
cursor.close()
|
||||
|
||||
# self.last_read_location = self.last_read - self.pdf_page_offset
|
||||
self.user_notes = user_notes
|
||||
|
||||
|
||||
def get_book_length(self):
|
||||
#TL self.book_length = 0
|
||||
#TL self.book_length = int(unpack('>I', record0[0x04:0x08])[0])
|
||||
pass
|
||||
|
||||
# }}}
|
||||
@ -2,15 +2,16 @@
|
||||
# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
|
||||
|
||||
__license__ = 'GPL v3'
|
||||
__copyright__ = '2010, Timothy Legge <timlegge at gmail.com> and Kovid Goyal <kovid@kovidgoyal.net>'
|
||||
__copyright__ = '2010, Timothy Legge <timlegge@gmail.com> and Kovid Goyal <kovid@kovidgoyal.net>'
|
||||
__docformat__ = 'restructuredtext en'
|
||||
|
||||
import os
|
||||
import os, time, calendar
|
||||
import sqlite3 as sqlite
|
||||
from contextlib import closing
|
||||
from calibre.devices.usbms.books import BookList
|
||||
from calibre.devices.kobo.books import Book
|
||||
from calibre.devices.kobo.books import ImageWrapper
|
||||
from calibre.devices.kobo.bookmark import Bookmark
|
||||
from calibre.devices.mime import mime_type_ext
|
||||
from calibre.devices.usbms.driver import USBMS, debug_print
|
||||
from calibre import prints
|
||||
@ -24,7 +25,7 @@ class KOBO(USBMS):
|
||||
gui_name = 'Kobo Reader'
|
||||
description = _('Communicate with the Kobo Reader')
|
||||
author = 'Timothy Legge'
|
||||
version = (1, 0, 10)
|
||||
version = (1, 0, 11)
|
||||
|
||||
dbversion = 0
|
||||
fwversion = 0
|
||||
@ -47,6 +48,7 @@ class KOBO(USBMS):
|
||||
|
||||
EBOOK_DIR_MAIN = ''
|
||||
SUPPORTS_SUB_DIRS = True
|
||||
SUPPORTS_ANNOTATIONS = True
|
||||
|
||||
VIRTUAL_BOOK_EXTENSIONS = frozenset(['kobo'])
|
||||
|
||||
@ -77,11 +79,6 @@ class KOBO(USBMS):
|
||||
self.book_class = Book
|
||||
self.dbversion = 7
|
||||
|
||||
def create_annotations_path(self, mdata, device_path=None):
|
||||
if device_path:
|
||||
return device_path
|
||||
return USBMS.create_annotations_path(self, mdata)
|
||||
|
||||
def books(self, oncard=None, end_session=True):
|
||||
from calibre.ebooks.metadata.meta import path_to_ext
|
||||
|
||||
@ -111,6 +108,7 @@ class KOBO(USBMS):
|
||||
|
||||
if self.fwversion != '1.0' and self.fwversion != '1.4':
|
||||
self.has_kepubs = True
|
||||
debug_print('Version of driver: ', self.version, 'Has kepubs:', self.has_kepubs)
|
||||
debug_print('Version of firmware: ', self.fwversion, 'Has kepubs:', self.has_kepubs)
|
||||
|
||||
self.booklist_class.rebuild_collections = self.rebuild_collections
|
||||
@ -893,3 +891,198 @@ class KOBO(USBMS):
|
||||
tf.write(r.read())
|
||||
paths[idx] = tf.name
|
||||
return paths
|
||||
|
||||
def create_annotations_path(self, mdata, device_path=None):
|
||||
if device_path:
|
||||
return device_path
|
||||
return USBMS.create_annotations_path(self, mdata)
|
||||
|
||||
def get_annotations(self, path_map):
|
||||
EPUB_FORMATS = [u'epub']
|
||||
epub_formats = set(EPUB_FORMATS)
|
||||
|
||||
def get_storage():
|
||||
storage = []
|
||||
if self._main_prefix:
|
||||
storage.append(os.path.join(self._main_prefix, self.EBOOK_DIR_MAIN))
|
||||
if self._card_a_prefix:
|
||||
storage.append(os.path.join(self._card_a_prefix, self.EBOOK_DIR_CARD_A))
|
||||
if self._card_b_prefix:
|
||||
storage.append(os.path.join(self._card_b_prefix, self.EBOOK_DIR_CARD_B))
|
||||
return storage
|
||||
|
||||
def resolve_bookmark_paths(storage, path_map):
|
||||
pop_list = []
|
||||
book_ext = {}
|
||||
for id in path_map:
|
||||
file_fmts = set()
|
||||
for fmt in path_map[id]['fmts']:
|
||||
file_fmts.add(fmt)
|
||||
bookmark_extension = None
|
||||
if file_fmts.intersection(epub_formats):
|
||||
book_extension = list(file_fmts.intersection(epub_formats))[0]
|
||||
bookmark_extension = 'epub'
|
||||
|
||||
if bookmark_extension:
|
||||
for vol in storage:
|
||||
bkmk_path = path_map[id]['path']
|
||||
bkmk_path = bkmk_path
|
||||
if os.path.exists(bkmk_path):
|
||||
path_map[id] = bkmk_path
|
||||
book_ext[id] = book_extension
|
||||
break
|
||||
else:
|
||||
pop_list.append(id)
|
||||
else:
|
||||
pop_list.append(id)
|
||||
|
||||
# Remove non-existent bookmark templates
|
||||
for id in pop_list:
|
||||
path_map.pop(id)
|
||||
return path_map, book_ext
|
||||
|
||||
storage = get_storage()
|
||||
path_map, book_ext = resolve_bookmark_paths(storage, path_map)
|
||||
|
||||
bookmarked_books = {}
|
||||
for id in path_map:
|
||||
extension = os.path.splitext(path_map[id])[1]
|
||||
ContentType = self.get_content_type_from_extension(extension) if extension != '' else self.get_content_type_from_path(path_map[id])
|
||||
ContentID = self.contentid_from_path(path_map[id], ContentType)
|
||||
|
||||
bookmark_ext = extension
|
||||
|
||||
db_path = self.normalize_path(self._main_prefix + '.kobo/KoboReader.sqlite')
|
||||
myBookmark = Bookmark(db_path, ContentID, path_map[id], id, book_ext[id], bookmark_ext)
|
||||
bookmarked_books[id] = self.UserAnnotation(type='kobo_bookmark', value=myBookmark)
|
||||
|
||||
# This returns as job.result in gui2.ui.annotations_fetched(self,job)
|
||||
return bookmarked_books
|
||||
|
||||
def generate_annotation_html(self, bookmark):
|
||||
from calibre.ebooks.BeautifulSoup import BeautifulSoup, Tag, NavigableString
|
||||
# Returns <div class="user_annotations"> ... </div>
|
||||
#last_read_location = bookmark.last_read_location
|
||||
#timestamp = bookmark.timestamp
|
||||
percent_read = bookmark.percent_read
|
||||
debug_print("Date: ", bookmark.last_read)
|
||||
if bookmark.last_read is not None:
|
||||
try:
|
||||
last_read = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(calendar.timegm(time.strptime(bookmark.last_read, "%Y-%m-%dT%H:%M:%S"))))
|
||||
except:
|
||||
last_read = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(calendar.timegm(time.strptime(bookmark.last_read, "%Y-%m-%dT%H:%M:%S.%f"))))
|
||||
else:
|
||||
#self.datetime = time.gmtime()
|
||||
last_read = time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime())
|
||||
|
||||
# debug_print("Percent read: ", percent_read)
|
||||
ka_soup = BeautifulSoup()
|
||||
dtc = 0
|
||||
divTag = Tag(ka_soup,'div')
|
||||
divTag['class'] = 'user_annotations'
|
||||
|
||||
# Add the last-read location
|
||||
spanTag = Tag(ka_soup, 'span')
|
||||
spanTag['style'] = 'font-weight:normal'
|
||||
if bookmark.book_format == 'epub':
|
||||
spanTag.insert(0,NavigableString(
|
||||
_("<hr /><b>Book Last Read:</b> %(time)s<br /><b>Percentage Read:</b> %(pr)d%%<hr />") % \
|
||||
dict(time=last_read,
|
||||
#loc=last_read_location,
|
||||
pr=percent_read)))
|
||||
else:
|
||||
spanTag.insert(0,NavigableString(
|
||||
_("<hr /><b>Book Last Read:</b> %(time)s<br /><b>Percentage Read:</b> %(pr)d%%<hr />") % \
|
||||
dict(time=last_read,
|
||||
#loc=last_read_location,
|
||||
pr=percent_read)))
|
||||
|
||||
divTag.insert(dtc, spanTag)
|
||||
dtc += 1
|
||||
divTag.insert(dtc, Tag(ka_soup,'br'))
|
||||
dtc += 1
|
||||
|
||||
if bookmark.user_notes:
|
||||
user_notes = bookmark.user_notes
|
||||
annotations = []
|
||||
|
||||
# Add the annotations sorted by location
|
||||
for location in sorted(user_notes):
|
||||
if user_notes[location]['type'] == 'Bookmark':
|
||||
annotations.append(
|
||||
_('<b>Chapter %(chapter)d:</b> %(chapter_title)s<br /><b>%(typ)s</b><br /><b>Chapter Progress:</b> %(chapter_progress)s%%<br />%(annotation)s<br /><hr />') % \
|
||||
dict(chapter=user_notes[location]['chapter'],
|
||||
dl=user_notes[location]['displayed_location'],
|
||||
typ=user_notes[location]['type'],
|
||||
chapter_title=user_notes[location]['chapter_title'],
|
||||
chapter_progress=user_notes[location]['chapter_progress'],
|
||||
annotation=user_notes[location]['annotation'] if user_notes[location]['annotation'] is not None else ""))
|
||||
elif user_notes[location]['type'] == 'Highlight':
|
||||
annotations.append(
|
||||
_('<b>Chapter %(chapter)d:</b> %(chapter_title)s<br /><b>%(typ)s</b><br /><b>Chapter Progress:</b> %(chapter_progress)s%%<br /><b>Highlight:</b> %(text)s<br /><hr />') % \
|
||||
dict(chapter=user_notes[location]['chapter'],
|
||||
dl=user_notes[location]['displayed_location'],
|
||||
typ=user_notes[location]['type'],
|
||||
chapter_title=user_notes[location]['chapter_title'],
|
||||
chapter_progress=user_notes[location]['chapter_progress'],
|
||||
text=user_notes[location]['text']))
|
||||
elif user_notes[location]['type'] == 'Annotation':
|
||||
annotations.append(
|
||||
_('<b>Chapter %(chapter)d:</b> %(chapter_title)s<br /><b>%(typ)s</b><br /><b>Chapter Progress:</b> %(chapter_progress)s%%<br /><b>Highlight:</b> %(text)s<br /><b>Notes:</b> %(annotation)s<br /><hr />') % \
|
||||
dict(chapter=user_notes[location]['chapter'],
|
||||
dl=user_notes[location]['displayed_location'],
|
||||
typ=user_notes[location]['type'],
|
||||
chapter_title=user_notes[location]['chapter_title'],
|
||||
chapter_progress=user_notes[location]['chapter_progress'],
|
||||
text=user_notes[location]['text'],
|
||||
annotation=user_notes[location]['annotation']))
|
||||
else:
|
||||
annotations.append(
|
||||
_('<b>Chapter %(chapter)d:</b> %(chapter_title)s<br /><b>%(typ)s</b><br /><b>Chapter Progress:</b> %(chapter_progress)s%%<br /><b>Highlight:</b> %(text)s<br /><b>Notes:</b> %(annotation)s<br /><hr />') % \
|
||||
dict(chapter=user_notes[location]['chapter'],
|
||||
dl=user_notes[location]['displayed_location'],
|
||||
typ=user_notes[location]['type'],
|
||||
chapter_title=user_notes[location]['chapter_title'],
|
||||
chapter_progress=user_notes[location]['chapter_progress'],
|
||||
text=user_notes[location]['text'], \
|
||||
annotation=user_notes[location]['annotation']))
|
||||
|
||||
for annotation in annotations:
|
||||
divTag.insert(dtc, annotation)
|
||||
dtc += 1
|
||||
|
||||
ka_soup.insert(0,divTag)
|
||||
return ka_soup
|
||||
|
||||
def add_annotation_to_library(self, db, db_id, annotation):
|
||||
from calibre.ebooks.BeautifulSoup import Tag
|
||||
bm = annotation
|
||||
ignore_tags = set(['Catalog', 'Clippings'])
|
||||
|
||||
if bm.type == 'kobo_bookmark':
|
||||
mi = db.get_metadata(db_id, index_is_id=True)
|
||||
user_notes_soup = self.generate_annotation_html(bm.value)
|
||||
if mi.comments:
|
||||
a_offset = mi.comments.find('<div class="user_annotations">')
|
||||
ad_offset = mi.comments.find('<hr class="annotations_divider" />')
|
||||
|
||||
if a_offset >= 0:
|
||||
mi.comments = mi.comments[:a_offset]
|
||||
if ad_offset >= 0:
|
||||
mi.comments = mi.comments[:ad_offset]
|
||||
if set(mi.tags).intersection(ignore_tags):
|
||||
return
|
||||
if mi.comments:
|
||||
hrTag = Tag(user_notes_soup,'hr')
|
||||
hrTag['class'] = 'annotations_divider'
|
||||
user_notes_soup.insert(0, hrTag)
|
||||
|
||||
mi.comments += unicode(user_notes_soup.prettify())
|
||||
else:
|
||||
mi.comments = unicode(user_notes_soup.prettify())
|
||||
# Update library comments
|
||||
db.set_comment(db_id, mi.comments)
|
||||
|
||||
# Add bookmark file to db_id
|
||||
db.add_format_with_hooks(db_id, bm.value.bookmark_extension,
|
||||
bm.value.path, index_is_id=True)
|
||||
|
||||
@ -127,7 +127,7 @@ class FB2Input(InputFormatPlugin):
|
||||
def extract_embedded_content(self, doc):
|
||||
self.binary_map = {}
|
||||
for elem in doc.xpath('./*'):
|
||||
if 'binary' in elem.tag and elem.attrib.has_key('id'):
|
||||
if elem.text and 'binary' in elem.tag and elem.attrib.has_key('id'):
|
||||
ct = elem.get('content-type', '')
|
||||
fname = elem.attrib['id']
|
||||
ext = ct.rpartition('/')[-1].lower()
|
||||
|
||||
@ -138,6 +138,7 @@ class MobiMLizer(object):
|
||||
self.mobimlize_elem(body, stylizer, BlockState(nbody),
|
||||
[FormatState()])
|
||||
item.data = nroot
|
||||
#print etree.tostring(nroot)
|
||||
|
||||
def mobimlize_font(self, ptsize):
|
||||
return self.fnums[self.fmap[ptsize]]
|
||||
@ -233,9 +234,19 @@ class MobiMLizer(object):
|
||||
elif tag in TABLE_TAGS:
|
||||
para.attrib['valign'] = 'top'
|
||||
if istate.ids:
|
||||
last = bstate.body[-1]
|
||||
for id in istate.ids:
|
||||
last.addprevious(etree.Element(XHTML('a'), attrib={'id': id}))
|
||||
for id_ in istate.ids:
|
||||
anchor = etree.Element(XHTML('a'), attrib={'id': id_})
|
||||
if tag == 'li':
|
||||
try:
|
||||
last = bstate.body[-1][-1]
|
||||
except:
|
||||
break
|
||||
last.insert(0, anchor)
|
||||
anchor.tail = last.text
|
||||
last.text = None
|
||||
else:
|
||||
last = bstate.body[-1]
|
||||
last.addprevious(anchor)
|
||||
istate.ids.clear()
|
||||
if not text:
|
||||
return
|
||||
|
||||
@ -601,7 +601,7 @@ class MobiWriter(object):
|
||||
Write the PalmDB header
|
||||
'''
|
||||
title = ascii_filename(unicode(self.oeb.metadata.title[0])).replace(
|
||||
' ', '_')[:32]
|
||||
' ', '_')[:31]
|
||||
title = title + (b'\0' * (32 - len(title)))
|
||||
now = int(time.time())
|
||||
nrecords = len(self.records)
|
||||
|
||||
@ -74,7 +74,10 @@ class Extract(ODF2XHTML):
|
||||
style = style[0]
|
||||
css = style.text
|
||||
if css:
|
||||
style.text, sel_map = self.do_filter_css(css)
|
||||
css, sel_map = self.do_filter_css(css)
|
||||
if not isinstance(css, unicode):
|
||||
css = css.decode('utf-8', 'ignore')
|
||||
style.text = css
|
||||
for x in root.xpath('//*[@class]'):
|
||||
extra = []
|
||||
orig = x.get('class')
|
||||
|
||||
@ -104,8 +104,9 @@ class RBWriter(object):
|
||||
size = len(text)
|
||||
|
||||
pages = []
|
||||
for i in range(0, (len(text) / TEXT_RECORD_SIZE) + 1):
|
||||
pages.append(zlib.compress(text[i * TEXT_RECORD_SIZE : (i * TEXT_RECORD_SIZE) + TEXT_RECORD_SIZE], 9))
|
||||
for i in range(0, (len(text) + TEXT_RECORD_SIZE-1) / TEXT_RECORD_SIZE):
|
||||
zobj = zlib.compressobj(9, zlib.DEFLATED, 13, 8, 0)
|
||||
pages.append(zobj.compress(text[i * TEXT_RECORD_SIZE : (i * TEXT_RECORD_SIZE) + TEXT_RECORD_SIZE]) + zobj.flush())
|
||||
|
||||
return (size, pages)
|
||||
|
||||
|
||||
@ -19,6 +19,8 @@ from calibre.ebooks.textile.unsmarten import unsmarten
|
||||
|
||||
class TextileMLizer(OEB2HTML):
|
||||
|
||||
MAX_EM = 10
|
||||
|
||||
def extract_content(self, oeb_book, opts):
|
||||
self.log.info('Converting XHTML to Textile formatted TXT...')
|
||||
self.opts = opts
|
||||
@ -176,7 +178,7 @@ class TextileMLizer(OEB2HTML):
|
||||
if 'margin-left' in style.cssdict() and style['margin-left'] != 'auto':
|
||||
left_margin_pts = unit_convert(style['margin-left'], style.width, style.fontSize, stylizer.profile.dpi)
|
||||
left = left_margin_pts + left_padding_pts
|
||||
emleft = int(round(left / stylizer.profile.fbase))
|
||||
emleft = min(int(round(left / stylizer.profile.fbase)), self.MAX_EM)
|
||||
if emleft >= 1:
|
||||
txt += '(' * emleft
|
||||
right_padding_pts = 0
|
||||
@ -186,7 +188,7 @@ class TextileMLizer(OEB2HTML):
|
||||
if 'margin-right' in style.cssdict() and style['margin-right'] != 'auto':
|
||||
right_margin_pts = unit_convert(style['margin-right'], style.width, style.fontSize, stylizer.profile.dpi)
|
||||
right = right_margin_pts + right_padding_pts
|
||||
emright = int(round(right / stylizer.profile.fbase))
|
||||
emright = min(int(round(right / stylizer.profile.fbase)), self.MAX_EM)
|
||||
if emright >= 1:
|
||||
txt += ')' * emright
|
||||
|
||||
@ -243,7 +245,7 @@ class TextileMLizer(OEB2HTML):
|
||||
|
||||
# Soft scene breaks.
|
||||
if 'margin-top' in style.cssdict() and style['margin-top'] != 'auto':
|
||||
ems = int(round(float(style.marginTop) / style.fontSize) - 1)
|
||||
ems = min(int(round(float(style.marginTop) / style.fontSize) - 1), self.MAX_EM)
|
||||
if ems >= 1:
|
||||
text.append(u'\n\n\xa0' * ems)
|
||||
|
||||
@ -476,7 +478,7 @@ class TextileMLizer(OEB2HTML):
|
||||
|
||||
# Soft scene breaks.
|
||||
if 'margin-bottom' in style.cssdict() and style['margin-bottom'] != 'auto':
|
||||
ems = int(round((float(style.marginBottom) / style.fontSize) - 1))
|
||||
ems = min(int(round((float(style.marginBottom) / style.fontSize) - 1)), self.MAX_EM)
|
||||
if ems >= 1:
|
||||
text.append(u'\n\n\xa0' * ems)
|
||||
|
||||
|
||||
@ -326,6 +326,18 @@ class CoverView(QWidget): # {{{
|
||||
if id_ is not None:
|
||||
self.cover_removed.emit(id_)
|
||||
|
||||
def update_tooltip(self, current_path):
|
||||
try:
|
||||
sz = self.pixmap.size()
|
||||
except:
|
||||
sz = QSize(0, 0)
|
||||
self.setToolTip(
|
||||
'<p>'+_('Double-click to open Book Details window') +
|
||||
'<br><br>' + _('Path') + ': ' + current_path +
|
||||
'<br><br>' + _('Cover size: %(width)d x %(height)d')%dict(
|
||||
width=sz.width(), height=sz.height())
|
||||
)
|
||||
|
||||
# }}}
|
||||
|
||||
# Book Info {{{
|
||||
@ -561,16 +573,7 @@ class BookDetails(QWidget): # {{{
|
||||
|
||||
def update_layout(self):
|
||||
self._layout.do_layout(self.rect())
|
||||
try:
|
||||
sz = self.cover_view.pixmap.size()
|
||||
except:
|
||||
sz = QSize(0, 0)
|
||||
self.setToolTip(
|
||||
'<p>'+_('Double-click to open Book Details window') +
|
||||
'<br><br>' + _('Path') + ': ' + self.current_path +
|
||||
'<br><br>' + _('Cover size: %(width)d x %(height)d')%dict(
|
||||
width=sz.width(), height=sz.height())
|
||||
)
|
||||
self.cover_view.update_tooltip(self.current_path)
|
||||
|
||||
def reset_info(self):
|
||||
self.show_data(Metadata(_('Unknown')))
|
||||
|
||||
@ -850,15 +850,16 @@ class DeviceMixin(object): # {{{
|
||||
self.refresh_ondevice()
|
||||
device_signals.device_metadata_available.emit()
|
||||
|
||||
def refresh_ondevice(self, reset_only = False):
|
||||
def refresh_ondevice(self, reset_only=False):
|
||||
'''
|
||||
Force the library view to refresh, taking into consideration new
|
||||
device books information
|
||||
'''
|
||||
self.book_on_device(None, reset=True)
|
||||
if reset_only:
|
||||
return
|
||||
self.library_view.model().refresh_ondevice()
|
||||
with self.library_view.preserve_state():
|
||||
self.book_on_device(None, reset=True)
|
||||
if reset_only:
|
||||
return
|
||||
self.library_view.model().refresh_ondevice()
|
||||
|
||||
# }}}
|
||||
|
||||
@ -888,7 +889,6 @@ class DeviceMixin(object): # {{{
|
||||
# if set_books_in_library did not.
|
||||
if not self.set_books_in_library(self.booklists(), reset=True, add_as_step_to_job=job):
|
||||
self.upload_booklists(job)
|
||||
self.book_on_device(None, reset=True)
|
||||
# We need to reset the ondevice flags in the library. Use a big hammer,
|
||||
# so we don't need to worry about whether some succeeded or not.
|
||||
self.refresh_ondevice(reset_only=False)
|
||||
@ -1319,9 +1319,7 @@ class DeviceMixin(object): # {{{
|
||||
# If it does not, then do it here.
|
||||
if not self.set_books_in_library(self.booklists(), reset=True, add_as_step_to_job=job):
|
||||
self.upload_booklists(job)
|
||||
with self.library_view.preserve_selected_books:
|
||||
self.book_on_device(None, reset=True)
|
||||
self.refresh_ondevice()
|
||||
self.refresh_ondevice()
|
||||
|
||||
view = self.card_a_view if on_card == 'carda' else \
|
||||
self.card_b_view if on_card == 'cardb' else self.memory_view
|
||||
|
||||
@ -23,24 +23,43 @@ from calibre.gui2.library import DEFAULT_SORT
|
||||
from calibre.constants import filesystem_encoding
|
||||
from calibre import force_unicode
|
||||
|
||||
class PreserveSelection(object): # {{{
|
||||
class PreserveViewState(object): # {{{
|
||||
|
||||
'''
|
||||
Save the set of selected books at enter time. If at exit time there are no
|
||||
selected books, restore the previous selection.
|
||||
selected books, restore the previous selection, the previous current index
|
||||
and dont affect the scroll position.
|
||||
'''
|
||||
|
||||
def __init__(self, view):
|
||||
def __init__(self, view, preserve_hpos=True, preserve_vpos=True):
|
||||
self.view = view
|
||||
self.selected_ids = []
|
||||
self.selected_ids = set()
|
||||
self.current_id = None
|
||||
self.preserve_hpos = preserve_hpos
|
||||
self.preserve_vpos = preserve_vpos
|
||||
self.vscroll = self.hscroll = 0
|
||||
|
||||
def __enter__(self):
|
||||
self.selected_ids = self.view.get_selected_ids()
|
||||
try:
|
||||
self.selected_ids = self.view.get_selected_ids()
|
||||
self.current_id = self.view.current_id
|
||||
self.vscroll = self.view.verticalScrollBar().value()
|
||||
self.hscroll = self.view.horizontalScrollBar().value()
|
||||
except:
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
|
||||
def __exit__(self, *args):
|
||||
current = self.view.get_selected_ids()
|
||||
if not current:
|
||||
self.view.select_rows(self.selected_ids, using_ids=True)
|
||||
if not current and self.selected_ids:
|
||||
if self.current_id is not None:
|
||||
self.view.current_id = self.current_id
|
||||
self.view.select_rows(self.selected_ids, using_ids=True,
|
||||
scroll=False, change_current=self.current_id is None)
|
||||
if self.preserve_vpos:
|
||||
self.view.verticalScrollBar().setValue(self.vscroll)
|
||||
if self.preserve_hpos:
|
||||
self.view.horizontalScrollBar().setValue(self.hscroll)
|
||||
# }}}
|
||||
|
||||
class BooksView(QTableView): # {{{
|
||||
@ -104,7 +123,7 @@ class BooksView(QTableView): # {{{
|
||||
self.setSelectionBehavior(QAbstractItemView.SelectRows)
|
||||
self.setSortingEnabled(True)
|
||||
self.selectionModel().currentRowChanged.connect(self._model.current_changed)
|
||||
self.preserve_selected_books = PreserveSelection(self)
|
||||
self.preserve_state = partial(PreserveViewState, self)
|
||||
|
||||
# {{{ Column Header setup
|
||||
self.can_add_columns = True
|
||||
@ -788,6 +807,23 @@ class BooksView(QTableView): # {{{
|
||||
ans.append(i)
|
||||
return ans
|
||||
|
||||
@dynamic_property
|
||||
def current_id(self):
|
||||
def fget(self):
|
||||
try:
|
||||
return self.model().id(self.currentIndex())
|
||||
except:
|
||||
pass
|
||||
return None
|
||||
def fset(self, val):
|
||||
if val is None: return
|
||||
m = self.model()
|
||||
for row in xrange(m.rowCount(QModelIndex())):
|
||||
if m.id(row) == val:
|
||||
self.set_current_row(row, select=False)
|
||||
break
|
||||
return property(fget=fget, fset=fset)
|
||||
|
||||
def close(self):
|
||||
self._model.close()
|
||||
|
||||
|
||||
@ -30,6 +30,13 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
|
||||
(_('Automatic management'), 'on_connect')]
|
||||
r('manage_device_metadata', prefs, choices=choices)
|
||||
|
||||
if gui.device_manager.is_device_connected:
|
||||
self.opt_manage_device_metadata.setEnabled(False)
|
||||
self.opt_manage_device_metadata.setToolTip(
|
||||
_('Cannot change metadata management while a device is connected'))
|
||||
self.mm_label.setText('Metadata management (disabled while '
|
||||
'device connected)')
|
||||
|
||||
self.send_template.changed_signal.connect(self.changed_signal.emit)
|
||||
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_4">
|
||||
<widget class="QLabel" name="mm_label">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
|
||||
@ -243,7 +243,7 @@ Replace ``192.168.1.2`` with the local IP address of the computer running |app|.
|
||||
If you get timeout errors while browsing the calibre catalog in Stanza, try increasing the connection timeout value in the stanza settings. Go to Info->Settings and increase the value of Download Timeout.
|
||||
|
||||
.. note::
|
||||
As of iOS version 5 Stanza no longer works on Apple devices. Alternatives to Stanza are discussed `here <http://www.mobileread.com/forums/showthread.php?t=152789>`_.
|
||||
As of iOS version 5 Stanza no longer works on Apple devices. Alternatives to Stanza are discussed `in this forum <http://www.mobileread.com/forums/showthread.php?t=152789>`_.
|
||||
|
||||
|
||||
Using iBooks
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -4,9 +4,9 @@
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: calibre 0.8.23\n"
|
||||
"POT-Creation-Date: 2011-10-20 22:00+IST\n"
|
||||
"PO-Revision-Date: 2011-10-20 22:00+IST\n"
|
||||
"Project-Id-Version: calibre 0.8.24\n"
|
||||
"POT-Creation-Date: 2011-10-27 14:45+IST\n"
|
||||
"PO-Revision-Date: 2011-10-27 14:45+IST\n"
|
||||
"Last-Translator: Automatically generated\n"
|
||||
"Language-Team: LANGUAGE\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@ -31,13 +31,13 @@ msgstr ""
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:79
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/books.py:24
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:581
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:579
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:660
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:308
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:309
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:310
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:485
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:106
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:109
|
||||
@ -80,7 +80,7 @@ msgstr ""
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:49
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:301
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:302
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/covers.py:79
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/covers.py:81
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/douban.py:80
|
||||
@ -101,8 +101,8 @@ msgstr ""
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:1006
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/utils.py:299
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer2/indexer.py:496
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:138
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:140
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:141
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:143
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1002
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1007
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1079
|
||||
@ -142,7 +142,7 @@ msgstr ""
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:380
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/add.py:161
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/add.py:168
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:576
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:579
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151
|
||||
@ -175,14 +175,14 @@ msgstr ""
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:200
|
||||
#: /home/kovid/work/calibre/src/calibre/library/cli.py:220
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database.py:914
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:543
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:551
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:562
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:2039
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:2191
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:3246
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:3248
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:3381
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:544
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:552
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:563
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:2040
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:2192
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:3247
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:3249
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:3382
|
||||
#: /home/kovid/work/calibre/src/calibre/library/server/content.py:227
|
||||
#: /home/kovid/work/calibre/src/calibre/library/server/content.py:228
|
||||
#: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:243
|
||||
@ -449,7 +449,7 @@ msgid "Change the way calibre behaves"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:919
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:233
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:252
|
||||
msgid "Add your own columns"
|
||||
msgstr ""
|
||||
|
||||
@ -852,26 +852,26 @@ msgstr ""
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:647
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:66
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:563
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:989
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:990
|
||||
#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:820
|
||||
#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:832
|
||||
msgid "Yes"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/db/fields.py:163
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:1103
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:1104
|
||||
msgid "Main"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/db/fields.py:165
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:72
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:1105
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:1106
|
||||
msgid "Card A"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/db/fields.py:167
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:74
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:1107
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:1108
|
||||
msgid "Card B"
|
||||
msgstr ""
|
||||
|
||||
@ -987,8 +987,8 @@ msgstr ""
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:102
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:526
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:545
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:527
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:546
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:1084
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:1090
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:1125
|
||||
@ -996,9 +996,9 @@ msgstr ""
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:453
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/tag_browser/model.py:1148
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/tag_browser/model.py:1150
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:336
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:349
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:3107
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:337
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:350
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:3108
|
||||
#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:187
|
||||
msgid "News"
|
||||
msgstr ""
|
||||
@ -1006,8 +1006,8 @@ msgstr ""
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2685
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65
|
||||
#: /home/kovid/work/calibre/src/calibre/library/catalog.py:662
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:3066
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:3084
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:3067
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:3085
|
||||
msgid "Catalog"
|
||||
msgstr ""
|
||||
|
||||
@ -1047,11 +1047,11 @@ msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:218
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:234
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:88
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:91
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:94
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:97
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:305
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:150
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:303
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:151
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:140
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:143
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:146
|
||||
@ -1071,8 +1071,8 @@ msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:330
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:344
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:439
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:474
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:437
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:472
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:297
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328
|
||||
msgid "Adding books to device metadata listing..."
|
||||
@ -1082,8 +1082,8 @@ msgstr ""
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:354
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:114
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:125
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:391
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:423
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:389
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:421
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:352
|
||||
msgid "Removing books from device..."
|
||||
@ -1091,8 +1091,8 @@ msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:369
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:374
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:427
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:434
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:425
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:432
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:359
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:364
|
||||
msgid "Removing books from device metadata listing..."
|
||||
@ -1328,39 +1328,61 @@ msgstr ""
|
||||
msgid "Communicate with the Kindle DX eBook reader."
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:25
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:26
|
||||
msgid "Communicate with the Kobo Reader"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:54
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:56
|
||||
msgid "The Kobo supports several collections including "
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:56
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:58
|
||||
msgid "Create tags for automatic management"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:57
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:59
|
||||
msgid "Upload covers for books (newer readers)"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:58
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:60
|
||||
msgid "Normally, the KOBO readers get the cover image from the ebook file itself. With this option, calibre will send a separate cover image to the reader, useful if you have modified the cover."
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:62
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:64
|
||||
msgid "Upload Black and White Covers"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:561
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:559
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:390
|
||||
msgid "Not Implemented"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:562
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:560
|
||||
msgid "\".kobo\" files do not exist on the device as books instead, they are rows in the sqlite database. Currently they cannot be exported or viewed."
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:989
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:995
|
||||
#, python-format
|
||||
msgid "<hr /><b>Book Last Read:</b> %(time)s<br /><b>Percentage Read:</b> %(pr)d%%<hr />"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:1013
|
||||
#, python-format
|
||||
msgid "<b>Chapter %(chapter)d:</b> %(chapter_title)s<br /><b>%(typ)s</b><br /><b>Chapter Progress:</b> %(chapter_progress)s%%<br />%(annotation)s<br /><hr />"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:1022
|
||||
#, python-format
|
||||
msgid "<b>Chapter %(chapter)d:</b> %(chapter_title)s<br /><b>%(typ)s</b><br /><b>Chapter Progress:</b> %(chapter_progress)s%%<br /><b>Highlight:</b> %(text)s<br /><hr />"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:1031
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:1041
|
||||
#, python-format
|
||||
msgid "<b>Chapter %(chapter)d:</b> %(chapter_title)s<br /><b>%(typ)s</b><br /><b>Chapter Progress:</b> %(chapter_progress)s%%<br /><b>Highlight:</b> %(text)s<br /><b>Notes:</b> %(annotation)s<br /><hr />"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/misc.py:19
|
||||
msgid "Communicate with the Palm Pre"
|
||||
msgstr ""
|
||||
@ -1471,7 +1493,7 @@ msgid "All by author"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:70
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:67
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:68
|
||||
msgid "Comma separated list of metadata fields to turn into collections on the device. Possibilities include: "
|
||||
msgstr ""
|
||||
|
||||
@ -1493,17 +1515,17 @@ msgid "Refresh separate covers when using automatic management (newer readers)"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:77
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:78
|
||||
msgid "Set this option to have separate book covers uploaded every time you connect your device. Unset this option if you have so many books on the reader that performance is unacceptable."
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:90
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:81
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:82
|
||||
msgid "Preserve cover aspect ratio when building thumbnails"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:83
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:84
|
||||
msgid "Set this option if you want the cover thumbnails to have the same aspect ratio (width to height) as the cover. Unset it if you want the thumbnail to be the maximum size, ignoring aspect ratio."
|
||||
msgstr ""
|
||||
|
||||
@ -1524,23 +1546,23 @@ msgstr ""
|
||||
msgid "Communicate with the PRST1 and newer SONY eBook readers"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:70
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:71
|
||||
msgid "Upload separate cover thumbnails for books"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:71
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:72
|
||||
msgid "Normally, the SONY readers get the cover image from the ebook file itself. With this option, calibre will send a separate cover image to the reader, useful if you are sending DRMed books in which you cannot change the cover."
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:75
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:76
|
||||
msgid "Refresh separate covers when using automatic management"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:87
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:88
|
||||
msgid "Use SONY Author Format (First Author Only)"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:89
|
||||
#: /home/kovid/work/calibre/src/calibre/devices/prst1/driver.py:90
|
||||
msgid "Set this option if you want the author on the Sony to appear the same way the T1 sets it. This means it will only show the first author for books with multiple authors. Leave this disabled if you use Metadata Plugboards."
|
||||
msgstr ""
|
||||
|
||||
@ -3100,7 +3122,7 @@ msgstr ""
|
||||
msgid "Main Text"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:41
|
||||
#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:42
|
||||
#, python-format
|
||||
msgid "%s format books are not supported"
|
||||
msgstr ""
|
||||
@ -4097,7 +4119,7 @@ msgstr ""
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:471
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:212
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:100
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:898
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:934
|
||||
msgid "Not allowed"
|
||||
msgstr ""
|
||||
|
||||
@ -5166,17 +5188,17 @@ msgstr ""
|
||||
msgid "Remove Cover"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:569
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:335
|
||||
msgid "Double-click to open Book Details window"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:570
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:336
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76
|
||||
#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:295
|
||||
msgid "Path"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:571
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:337
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:109
|
||||
#, python-format
|
||||
msgid "Cover size: %(width)d x %(height)d"
|
||||
@ -5275,7 +5297,7 @@ msgstr ""
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template_ui.py:56
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:21
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:109
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:68
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:21
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:21
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:95
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:21
|
||||
@ -10064,54 +10086,54 @@ msgstr ""
|
||||
msgid "Double click to <b>edit</b> me<br><br>"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:168
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:187
|
||||
#, python-format
|
||||
msgid "Hide column %s"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:173
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:192
|
||||
#, python-format
|
||||
msgid "Sort on %s"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:174
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:193
|
||||
msgid "Ascending"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:177
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:196
|
||||
msgid "Descending"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:189
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:208
|
||||
#, python-format
|
||||
msgid "Change text alignment for %s"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:191
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:210
|
||||
msgid "Left"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:191
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:210
|
||||
msgid "Right"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:192
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:211
|
||||
msgid "Center"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:211
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:230
|
||||
msgid "Show column"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:223
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:242
|
||||
msgid "Shrink column if it is too wide to fit"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:226
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:245
|
||||
msgid "Restore default layout"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:899
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:935
|
||||
msgid "Dropping onto a device is not supported. First add the book to the calibre library."
|
||||
msgstr ""
|
||||
|
||||
@ -12292,7 +12314,7 @@ msgid "Change paths to &lowercase"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:46
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:76
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:57
|
||||
msgid "Format &dates as:"
|
||||
msgstr ""
|
||||
|
||||
@ -12421,32 +12443,36 @@ msgid ""
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending.py:28
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:70
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:41
|
||||
msgid "Manual management"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending.py:29
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:71
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:43
|
||||
msgid "Only on send"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending.py:30
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:72
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:45
|
||||
msgid "Automatic management"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:69
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending.py:36
|
||||
msgid "Cannot change metadata management while a device is connected"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:30
|
||||
msgid "Metadata &management:"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:73
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:50
|
||||
msgid ""
|
||||
"<li><b>Manual management</b>: Calibre updates the metadata and adds collections only when a book is sent. With this option, calibre will never remove a collection.</li>\n"
|
||||
"<li><b>Only on send</b>: Calibre updates metadata and adds/removes collections for a book only when it is sent to the device. </li>\n"
|
||||
"<li><b>Automatic management</b>: Calibre automatically keeps metadata on the device in sync with the calibre library, on every connect</li></ul>"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:77
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:64
|
||||
msgid "Here you can control how calibre will save your books when you click the Send to Device button. This setting can be overriden for individual devices by customizing the device interface plugins in Preferences->Advanced->Plugins"
|
||||
msgstr ""
|
||||
|
||||
@ -13283,7 +13309,7 @@ msgid "Changing the metadata for that many books can take a while. Are you sure?
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/gui2/tag_browser/model.py:823
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:457
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:458
|
||||
msgid "Searches"
|
||||
msgstr ""
|
||||
|
||||
@ -15365,17 +15391,17 @@ msgstr ""
|
||||
msgid "%(tt)sAverage rating is %(rating)3.1f"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:3407
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:3408
|
||||
#, python-format
|
||||
msgid "<p>Migrating old database to ebook library in %s<br><center>"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:3436
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:3437
|
||||
#, python-format
|
||||
msgid "Copying <b>%s</b>"
|
||||
msgstr ""
|
||||
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:3453
|
||||
#: /home/kovid/work/calibre/src/calibre/library/database2.py:3454
|
||||
msgid "Compacting database"
|
||||
msgstr ""
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user