(Skomentuj|Komentarz(e)?\([0-9]*\)) \|', lambda match: '')]
+ ]
+
+ remove_attributes = [ 'width', 'height' ]
diff --git a/resources/recipes/globe_and_mail.recipe b/resources/recipes/globe_and_mail.recipe
index b2a9915250..b6e6b5c25b 100644
--- a/resources/recipes/globe_and_mail.recipe
+++ b/resources/recipes/globe_and_mail.recipe
@@ -26,31 +26,12 @@ class GlobeAndMail(BasicNewsRecipe):
#credit {margin-top:0px;}
.tag {font-size: 22pt;}'''
description = 'Canada\'s national newspaper'
- remove_tags_before = dict(id="article-top")
- remove_tags = [
- {'id':['util', 'article-tabs', 'comments', 'article-relations',
- 'gallery-controls', 'video', 'galleryLoading','deck','header',
- 'toolsBottom'] },
- {'class':['credit','inline-img-caption','tab-pointer'] },
- dict(name='div', attrs={'id':['lead-photo', 'most-popular-story']}),
- dict(name='div', attrs={'class':'right'}),
- dict(name='div', attrs={'id':'footer'}),
- dict(name='div', attrs={'id':'beta-msg'}),
- dict(name='img', attrs={'class':'headshot'}),
- dict(name='div', attrs={'class':'brand'}),
- dict(name='div', attrs={'id':'nav-wrap'}),
- dict(name='div', attrs={'id':'featureTopics'}),
- dict(name='div', attrs={'id':'videoNav'}),
- dict(name='div', attrs={'id':'blog-header'}),
- dict(name='div', attrs={'id':'right-rail'}),
- dict(name='div', attrs={'id':'group-footer-container'}),
- dict(name=['iframe', 'style'])
- ]
- remove_attributes = ['style']
- remove_tags_after = [{'id':['article-content']},
- {'class':['pull','inline-img'] },
- dict(name='img', attrs={'class':'inline-media-embed'}),
- ]
+ keep_only_tags = [dict(name='article')]
+ remove_tags = [dict(name='aside'),
+ dict(name='footer'),
+ dict(name='div', attrs={'class':(lambda x: isinstance(x, (str,unicode)) and 'articlecommentcountholder' in x.split(' '))}),
+ dict(name='ul', attrs={'class':(lambda x: isinstance(x, (str,unicode)) and 'articletoolbar' in x.split(' '))}),
+ ]
feeds = [
(u'Latest headlines', u'http://www.theglobeandmail.com/?service=rss'),
(u'Top stories', u'http://www.theglobeandmail.com/?service=rss&feed=topstories'),
diff --git a/resources/recipes/miami_herald.recipe b/resources/recipes/miami_herald.recipe
index 4500b02097..bdff88b375 100644
--- a/resources/recipes/miami_herald.recipe
+++ b/resources/recipes/miami_herald.recipe
@@ -1,6 +1,6 @@
__license__ = 'GPL v3'
-__copyright__ = '2009, Darko Miletic
'
+__copyright__ = '2009-2010, Darko Miletic '
'''
miamiherald.com
'''
@@ -15,13 +15,11 @@ class TheMiamiHerald(BasicNewsRecipe):
max_articles_per_feed = 100
publisher = u'The Miami Herald'
category = u'miami herald, weather, dolphins, news, miami news, local news, miamiherald, miami newspaper, miamiherald.com, miami, the miami herald, broward, miami-dade'
- language = 'en'
-
+ language = 'en'
no_stylesheets = True
use_embedded_content = False
encoding = 'cp1252'
remove_javascript = True
-
extra_css = '''
h1{font-family:Arial,Helvetica,sans-serif; font-size:large; color:#1A272F; }
.subheadline{font-family:Arial,Helvetica,sans-serif; font-size:30%; color: #666666;}
@@ -33,50 +31,35 @@ class TheMiamiHerald(BasicNewsRecipe):
.imageCaption{font-family:Arial,Helvetica,sans-serif; font-size:30%; color:#666666; }
'''
- keep_only_tags = [dict(name='div', attrs={'id':['storyBody','storyPhotoContentArea']}),
- ]
+ conversion_options = {
+ 'comment' : description
+ , 'tags' : category
+ , 'publisher' : publisher
+ , 'language' : language
+ }
+
+ keep_only_tags = [dict(name='div', attrs={'id':'wide'}),]
- remove_tags = [dict(name=['object','link','embed']),
- dict(name='div', attrs={'class':["imageBuyButton","shareLinksArea","storyTools","spill_navigation pagination","circPromoArea","storyTools_footer","storyYahooContentMatch"]}) ,
- dict(name='div', attrs={'id':["pluck","mlt","storyAssets"]}) ]
+ remove_tags = [dict(name=['object','link','embed','iframe','meta'])]
feeds = [
- (u'Breaking News' , u'http://www.miamiherald.com/416/index.xml' )
- ,(u'Miami-Dade' , u'http://www.miamiherald.com/460/index.xml' )
- ,(u'Broward' , u'http://www.miamiherald.com/467/index.xml' )
- ,(u'Florida Keys' , u'http://www.miamiherald.com/505/index.xml' )
- ,(u'Florida' , u'http://www.miamiherald.com/569/index.xml' )
- ,(u'Nation' , u'http://www.miamiherald.com/509/index.xml' )
- ,(u'World' , u'http://www.miamiherald.com/578/index.xml' )
- ,(u'Americas' , u'http://www.miamiherald.com/579/index.xml' )
- ,(u'Cuba' , u'http://www.miamiherald.com/581/index.xml' )
- ,(u'Haiti' , u'http://www.miamiherald.com/582/index.xml' )
- ,(u'Politics' , u'http://www.miamiherald.com/515/index.xml' )
- ,(u'Education' , u'http://www.miamiherald.com/295/index.xml' )
- ,(u'Environment' , u'http://www.miamiherald.com/573/index.xml' )
+ (u'Breaking News' , u'http://www.miamiherald.com/news/breaking-news/index.xml' )
+ ,(u'Miami-Dade' , u'http://www.miamiherald.com/news/miami-dade/index.xml' )
+ ,(u'Broward' , u'http://www.miamiherald.com/news/broward/index.xml' )
+ ,(u'Florida Keys' , u'http://www.miamiherald.com/news/florida-keys/index.xml' )
+ ,(u'Florida' , u'http://www.miamiherald.com/news/florida/index.xml' )
+ ,(u'Nation' , u'http://www.miamiherald.com/news/nation/index.xml' )
+ ,(u'World' , u'http://www.miamiherald.com/news/world/index.xml' )
+ ,(u'Americas' , u'http://www.miamiherald.com/news/americas/index.xml' )
+ ,(u'Cuba' , u'http://www.miamiherald.com/news/americas/cuba/index.xml' )
+ ,(u'Haiti' , u'http://www.miamiherald.com/news/americas/haiti/index.xml' )
+ ,(u'Politics' , u'http://www.miamiherald.com/news/politics/index.xml' )
+ ,(u'Education' , u'http://www.miamiherald.com/news/education/index.xml' )
+ ,(u'Environment' , u'http://www.miamiherald.com/news/environment/index.xml' )
]
-
-
-
-
- def get_article_url(self, article):
- ans = article.get('guid', None)
- print ans
- try:
- self.log('Looking for full story link in', ans)
- soup = self.index_to_soup(ans)
- x = soup.find(text="Full Story")
-
- if x is not None:
- a = x.parent
- if a and a.has_key('href'):
- ans = 'http://www.miamiherald.com'+a['href']
- self.log('Found full story link', ans)
- except:
- pass
- return ans
-
-
-
+ def print_version(self, url):
+ art, sep, rest = url.rpartition('/')
+ art2, sep2, rest2 = art.rpartition('/')
+ return art2 + '/v-print/' + rest2 + '/' + rest
diff --git a/resources/recipes/novaya_gazeta.recipe b/resources/recipes/novaya_gazeta.recipe
new file mode 100644
index 0000000000..50ce83b130
--- /dev/null
+++ b/resources/recipes/novaya_gazeta.recipe
@@ -0,0 +1,18 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AdvancedUserRecipe1286819935(BasicNewsRecipe):
+ title = u'Novaya Gazeta'
+ __author__ = 'muwa'
+ oldest_article = 7
+ max_articles_per_feed = 100
+ no_stylesheets = True
+ conversion_options = {'linearize_tables' : True}
+ remove_attributes = ['style']
+ language = 'ru'
+
+ feeds = [(u'Articles', u'http://www.novayagazeta.ru/rss_number.xml')]
+
+
+ def print_version(self, url):
+ return url + '?print=true'
+
diff --git a/resources/recipes/orsai.recipe b/resources/recipes/orsai.recipe
new file mode 100644
index 0000000000..2d9659b89b
--- /dev/null
+++ b/resources/recipes/orsai.recipe
@@ -0,0 +1,37 @@
+
+__license__ = 'GPL v3'
+__copyright__ = '2010, Darko Miletic '
+'''
+orsai.bitacoras.com
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Orsai(BasicNewsRecipe):
+ title = 'Orsai'
+ __author__ = 'Darko Miletic'
+ language = 'es'
+ oldest_article = 35
+ max_articles_per_feed = 100
+ encoding = 'utf-8'
+ no_stylesheets = True
+ use_embedded_content = False
+ publication_type = 'blog'
+ masthead_url = 'http://orsai.bitacoras.com/wp-content/themes/orsai/images/logo_orsai.png'
+
+ conversion_options = {
+ 'comment' : 'Blog literario de Hernán Casciari'
+ , 'tags' : 'blog, Argentina, España, literatura, Casciari'
+ , 'publisher': 'Editorial Orsai S.L.'
+ , 'language' : 'es'
+ }
+
+ keep_only_tags=[dict(attrs={'class':['entry-title','entry-meta','entry-content','commentlist']})]
+ remove_tags=[dict(name='img',attrs={'class':'avatar avatar-40 photo'})]
+ feeds = [(u'Articulos', u'http://orsai.bitacoras.com/feed')]
+
+ def preprocess_html(self, soup):
+ for item in soup.findAll(style=True):
+ del item['style']
+ return self.adeify_images(soup)
+
diff --git a/resources/recipes/rstones.recipe b/resources/recipes/rstones.recipe
new file mode 100644
index 0000000000..fa09701e15
--- /dev/null
+++ b/resources/recipes/rstones.recipe
@@ -0,0 +1,82 @@
+#!/usr/bin/env python
+__license__ = 'GPL v3'
+__author__ = 'Tony Stegall'
+__copyright__ = '2010, Tony Stegall or Tonythebookworm on mobileread.com'
+__version__ = 'v1.01'
+__date__ = '07, October 2010'
+__description__ = 'Rolling Stones Mag'
+
+'''
+http://www.rollingstone.com
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class RollingStones(BasicNewsRecipe):
+ __author__ = 'Tony Stegall'
+ description = 'Rolling Stones Mag'
+ cover_url = 'http://gallery.celebritypro.com/data/media/648/kid-rock-rolling-stone-cover.jpg'
+ masthead_url = 'http://origin.myfonts.com/s/ec/cc-200804/Rolling_Stone-logo.gif'
+
+
+ title = 'Rolling Stones Mag'
+ category = 'Music Reviews, Movie Reviews, entertainment news'
+
+ language = 'en'
+ timefmt = '[%a, %d %b, %Y]'
+
+ oldest_article = 15
+ max_articles_per_feed = 25
+ use_embedded_content = False
+ no_stylesheets = True
+
+ remove_javascript = True
+ #####################################################################################
+ # cleanup section #
+ #####################################################################################
+ keep_only_tags = [
+ dict(name='div', attrs={'class':['c65l']}),
+ dict(name='div', attrs={'id':['col1']}),
+
+
+ ]
+ remove_tags = [
+ dict(name='div', attrs={'class': ['storyActions upper','storyActions lowerArticleNav']}),
+ dict(name='div', attrs={'id': ['comments','related']}),
+ ]
+
+
+ feeds = [
+ (u'News', u'http://www.rollingstone.com/siteServices/rss/allNews'),
+ (u'Blogs', u'http://www.rollingstone.com/siteServices/rss/allBlogs'),
+ (u'Movie Reviews', u'http://www.rollingstone.com/siteServices/rss/movieReviews'),
+ (u'Album Reviews', u'http://www.rollingstone.com/siteServices/rss/albumReviews'),
+ (u'Song Reviews', u'http://www.rollingstone.com/siteServices/rss/songReviews'),
+
+
+ ]
+
+
+
+ def get_article_url(self, article):
+ return article.get('guid', None)
+
+
+ def append_page(self, soup, appendtag, position):
+ '''
+ Some are the articles are multipage so the below function
+ will get the articles that have
+ '''
+ pager = soup.find('li',attrs={'class':'next'})
+ if pager:
+ nexturl = pager.a['href']
+ soup2 = self.index_to_soup(nexturl)
+ texttag = soup2.find('div', attrs={'id':'storyTextContainer'})
+ 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)
+
+
diff --git a/resources/recipes/volksrant.recipe b/resources/recipes/volksrant.recipe
index 0229bb0376..6f3ec4ce0d 100644
--- a/resources/recipes/volksrant.recipe
+++ b/resources/recipes/volksrant.recipe
@@ -6,7 +6,19 @@ __license__ = 'GPL v3'
__copyright__ = '2009, Kovid Goyal '
__docformat__ = 'restructuredtext en'
+'''
+ Modified by Tony Stegall
+ on 10/10/10 to include function to grab print version of articles
+'''
+
+from datetime import date
from calibre.web.feeds.news import BasicNewsRecipe
+'''
+added by Tony Stegall
+'''
+#######################################################
+from calibre.ptempfile import PersistentTemporaryFile
+#######################################################
class AdvancedUserRecipe1249039563(BasicNewsRecipe):
title = u'De Volkskrant'
@@ -16,20 +28,58 @@ class AdvancedUserRecipe1249039563(BasicNewsRecipe):
no_stylesheets = True
language = 'nl'
- keep_only_tags = [dict(name='div', attrs={'id':'leftColumnArticle'}) ]
- remove_tags = [
- dict(name='div',attrs={'class':'article_tools'}),
- dict(name='div',attrs={'id':'article_tools'}),
- dict(name='div',attrs={'class':'articletools'}),
- dict(name='div',attrs={'id':'articletools'}),
- dict(name='div',attrs={'id':'myOverlay'}),
- dict(name='div',attrs={'id':'trackback'}),
- dict(name='div',attrs={'id':'googleBanner'}),
- dict(name='div',attrs={'id':'article_headlines'}),
- ]
extra_css = '''
body{font-family:Arial,Helvetica,sans-serif; font-size:small;}
h1{font-size:large;}
'''
+ '''
+ Change Log:
+ Date: 10/10/10 - Modified code to include obfuscated to get the print version
+ Author: Tony Stegall
+ '''
+ #######################################################################################################
+ temp_files = []
+ articles_are_obfuscated = True
- feeds = [(u'Laatste Nieuws', u'http://volkskrant.nl/rss/laatstenieuws.rss'), (u'Binnenlands nieuws', u'http://volkskrant.nl/rss/nederland.rss'), (u'Buitenlands nieuws', u'http://volkskrant.nl/rss/internationaal.rss'), (u'Economisch nieuws', u'http://volkskrant.nl/rss/economie.rss'), (u'Sportnieuws', u'http://volkskrant.nl/rss/sport.rss'), (u'Kunstnieuws', u'http://volkskrant.nl/rss/kunst.rss'), (u'Wetenschapsnieuws', u'http://feeds.feedburner.com/DeVolkskrantWetenschap'), (u'Technologienieuws', u'http://feeds.feedburner.com/vkmedia')]
+ def get_obfuscated_article(self, url):
+ br = self.get_browser()
+ print 'THE CURRENT URL IS: ', url
+ br.open(url)
+ year = date.today().year
+
+ try:
+ response = br.follow_link(url_regex='.*?(%d)(\\/)(article)(\\/)(print)(\\/)'%year, nr = 0)
+ html = response.read()
+ except:
+ response = br.open(url)
+ html = response.read()
+
+ self.temp_files.append(PersistentTemporaryFile('_fa.html'))
+ self.temp_files[-1].write(html)
+ self.temp_files[-1].close()
+ return self.temp_files[-1].name
+
+ ###############################################################################################################
+
+ '''
+ Change Log:
+ Date: 10/15/2010
+ Feeds updated by Martin Tarenskeen
+ '''
+
+ feeds = [
+ (u'Laatste Nieuws', u'http://www.volkskrant.nl/rss/laatstenieuws.rss'),
+ (u'Binnenland', u'http://www.volkskrant.nl/rss/nederland.rss'),
+ (u'Buitenland', u'http://www.volkskrant.nl/rss/internationaal.rss'),
+ (u'Economie', u'http://www.volkskrant.nl/rss/economie.rss'),
+ (u'Sport', u'http://www.volkskrant.nl/rss/sport.rss'),
+ (u'Cultuur', u'http://www.volkskrant.nl/rss/kunst.rss'),
+ (u'Gezondheid & Wetenschap', u'http://www.volkskrant.nl/rss/wetenschap.rss'),
+ (u'Internet & Media', u'http://www.volkskrant.nl/rss/media.rss') ]
+
+
+'''
+example for formating
+'''
+# original url: http://www.volkskrant.nl/vk/nl/2668/Buitenland/article/detail/1031493/2010/10/10/Noord-Korea-ziet-nieuwe-leider.dhtml
+# print url : http://www.volkskrant.nl/vk/nl/2668/2010/article/print/detail/1031493/Noord-Korea-ziet-nieuwe-leider.dhtml
diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py
index 9465b789ae..9ad3cf3e08 100644
--- a/src/calibre/devices/apple/driver.py
+++ b/src/calibre/devices/apple/driver.py
@@ -13,7 +13,8 @@ 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 authors_to_string, MetaInformation
+from calibre.ebooks.metadata import authors_to_string, MetaInformation, \
+ title_sort
from calibre.ebooks.metadata.book.base import Metadata
from calibre.ebooks.metadata.epub import set_metadata
from calibre.library.server.utils import strftime
@@ -96,6 +97,9 @@ class ITUNES(DriverBase):
OPEN_FEEDBACK_MESSAGE = _(
'Apple device detected, launching iTunes, please wait ...')
+ BACKLOADING_ERROR_MESSAGE = _(
+ "Cannot copy books directly from iDevice. "
+ "Drag from iTunes Library to desktop, then add to calibre's Library window.")
# Product IDs:
# 0x1291 iPod Touch
@@ -3128,6 +3132,9 @@ class Book(Metadata):
See ebooks.metadata.book.base
'''
def __init__(self,title,author):
-
Metadata.__init__(self, title, authors=[author])
+ @property
+ def title_sorter(self):
+ return title_sort(self.title)
+
diff --git a/src/calibre/devices/interface.py b/src/calibre/devices/interface.py
index aee35649d2..75453c74b9 100644
--- a/src/calibre/devices/interface.py
+++ b/src/calibre/devices/interface.py
@@ -39,6 +39,10 @@ class DevicePlugin(Plugin):
#: Whether the metadata on books can be set via the GUI.
CAN_SET_METADATA = ['title', 'authors', 'collections']
+ # Set this to None if the books on the device are files that the GUI can
+ # access in order to add the books from the device to the library
+ BACKLOADING_ERROR_MESSAGE = _('Cannot get files from this device')
+
#: Path separator for paths to books on device
path_sep = os.sep
diff --git a/src/calibre/devices/usbms/books.py b/src/calibre/devices/usbms/books.py
index a267d18584..462d78b233 100644
--- a/src/calibre/devices/usbms/books.py
+++ b/src/calibre/devices/usbms/books.py
@@ -6,6 +6,7 @@ __docformat__ = 'restructuredtext en'
import os, re, time, sys
+from calibre.ebooks.metadata import title_sort
from calibre.ebooks.metadata.book.base import Metadata
from calibre.devices.mime import mime_type_ext
from calibre.devices.interface import BookList as _BookList
@@ -54,7 +55,7 @@ class Book(Metadata):
def title_sorter(self):
doc = '''String to sort the title. If absent, title is returned'''
def fget(self):
- return re.sub('^\s*A\s+|^\s*The\s+|^\s*An\s+', '', self.title).rstrip()
+ return title_sort(self.title)
return property(doc=doc, fget=fget)
@dynamic_property
@@ -124,7 +125,6 @@ class CollectionsBookList(BookList):
collections = {}
# This map of sets is used to avoid linear searches when testing for
# book equality
- collections_lpaths = {}
for book in self:
# Make sure we can identify this book via the lpath
lpath = getattr(book, 'lpath', None)
@@ -198,20 +198,22 @@ class CollectionsBookList(BookList):
cat_name = category
if cat_name not in collections:
- collections[cat_name] = []
- collections_lpaths[cat_name] = set()
- if lpath in collections_lpaths[cat_name]:
- continue
- collections_lpaths[cat_name].add(lpath)
+ collections[cat_name] = {}
if is_series:
- collections[cat_name].append(
- (book, book.get(attr+'_index', sys.maxint)))
+ if doing_dc:
+ collections[cat_name][lpath] = \
+ (book, book.get('series_index', sys.maxint))
+ else:
+ collections[cat_name][lpath] = \
+ (book, book.get(attr+'_index', sys.maxint))
else:
- collections[cat_name].append(
- (book, book.get('title_sort', 'zzzz')))
+ if lpath not in collections[cat_name]:
+ collections[cat_name][lpath] = \
+ (book, book.get('title_sort', 'zzzz'))
# Sort collections
result = {}
- for category, books in collections.items():
+ for category, lpaths in collections.items():
+ books = lpaths.values()
books.sort(cmp=lambda x,y:cmp(x[1], y[1]))
result[category] = [x[0] for x in books]
return result
diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py
index 78d4606e85..6fcfb9e7f0 100644
--- a/src/calibre/devices/usbms/device.py
+++ b/src/calibre/devices/usbms/device.py
@@ -94,6 +94,9 @@ class Device(DeviceConfig, DevicePlugin):
EBOOK_DIR_CARD_B = ''
DELETE_EXTS = []
+ # USB disk-based devices can see the book files on the device, so can
+ # copy these back to the library
+ BACKLOADING_ERROR_MESSAGE = None
def reset(self, key='-1', log_packets=False, report_progress=None,
detected_device=None):
diff --git a/src/calibre/ebooks/comic/input.py b/src/calibre/ebooks/comic/input.py
index 23f5906a53..04d097ac67 100755
--- a/src/calibre/ebooks/comic/input.py
+++ b/src/calibre/ebooks/comic/input.py
@@ -94,7 +94,7 @@ class PageProcessor(list):
from calibre.utils.magick import PixelWand
for i, wand in enumerate(self.pages):
pw = PixelWand()
- pw.color = 'white'
+ pw.color = '#ffffff'
wand.set_border_color(pw)
if self.rotate:
diff --git a/src/calibre/gui2/actions/add.py b/src/calibre/gui2/actions/add.py
index be1f8f4eaf..9eb197984e 100644
--- a/src/calibre/gui2/actions/add.py
+++ b/src/calibre/gui2/actions/add.py
@@ -235,6 +235,10 @@ class AddAction(InterfaceAction):
self.gui.refresh_ondevice()
def add_books_from_device(self, view, paths=None):
+ backloading_err = self.gui.device_manager.device.BACKLOADING_ERROR_MESSAGE
+ if backloading_err is not None:
+ return error_dialog(self.gui, _('Add to library'), backloading_err,
+ show=True)
if paths is None:
rows = view.selectionModel().selectedRows()
if not rows or len(rows) == 0:
diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py
index 2a81a1500d..c46d77cd06 100644
--- a/src/calibre/gui2/actions/edit_metadata.py
+++ b/src/calibre/gui2/actions/edit_metadata.py
@@ -169,7 +169,7 @@ class EditMetadataAction(InterfaceAction):
self.gui.tags_view.blockSignals(False)
if changed:
m = self.gui.library_view.model()
- m.resort(reset=False)
+ m.refresh(reset=False)
m.research()
self.gui.tags_view.recount()
if self.gui.cover_flow:
diff --git a/src/calibre/gui2/convert/metadata.py b/src/calibre/gui2/convert/metadata.py
index b206bf68a6..7a02cf4429 100644
--- a/src/calibre/gui2/convert/metadata.py
+++ b/src/calibre/gui2/convert/metadata.py
@@ -172,7 +172,7 @@ class MetadataWidget(Widget, Ui_Form):
if _file:
_file = os.path.abspath(_file)
if not os.access(_file, os.R_OK):
- d = error_dialog(self.window, _('Cannot read'),
+ d = error_dialog(self.parent(), _('Cannot read'),
_('You do not have permission to read the file: ') + _file)
d.exec_()
return
@@ -181,14 +181,14 @@ class MetadataWidget(Widget, Ui_Form):
cf = open(_file, "rb")
cover = cf.read()
except IOError, e:
- d = error_dialog(self.window, _('Error reading file'),
+ d = error_dialog(self.parent(), _('Error reading file'),
_("There was an error reading from file:
") + _file + "
"+str(e))
d.exec_()
if cover:
pix = QPixmap()
pix.loadFromData(cover)
if pix.isNull():
- d = error_dialog(self.window, _('Error reading file'),
+ d = error_dialog(self.parent(), _('Error reading file'),
_file + _(" is not a valid picture"))
d.exec_()
else:
diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index bc9f5cf671..e662c6a5cc 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -793,11 +793,17 @@ class DeviceMixin(object): # {{{
self.set_books_in_library(job.result, reset=True)
mainlist, cardalist, cardblist = job.result
self.memory_view.set_database(mainlist)
- self.memory_view.set_editable(self.device_manager.device.CAN_SET_METADATA)
+ self.memory_view.set_editable(self.device_manager.device.CAN_SET_METADATA,
+ self.device_manager.device.BACKLOADING_ERROR_MESSAGE
+ is None)
self.card_a_view.set_database(cardalist)
- self.card_a_view.set_editable(self.device_manager.device.CAN_SET_METADATA)
+ self.card_a_view.set_editable(self.device_manager.device.CAN_SET_METADATA,
+ self.device_manager.device.BACKLOADING_ERROR_MESSAGE
+ is None)
self.card_b_view.set_database(cardblist)
- self.card_b_view.set_editable(self.device_manager.device.CAN_SET_METADATA)
+ self.card_b_view.set_editable(self.device_manager.device.CAN_SET_METADATA,
+ self.device_manager.device.BACKLOADING_ERROR_MESSAGE
+ is None)
self.sync_news()
self.sync_catalogs()
self.refresh_ondevice()
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui
index 60e24dbceb..3897d6dbf9 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.ui
+++ b/src/calibre/gui2/dialogs/metadata_bulk.ui
@@ -263,7 +263,7 @@
20
- 00
+ 0
@@ -357,13 +357,13 @@ from the value in the box
-
-
- Change title to title case
-
Force the title to be in title case. If both this and swap authors are checked,
title and author are swapped before the title case is set
+
+ Change title to title case
+
-
@@ -486,15 +486,15 @@ Future conversion of these books will use the default settings.
-
-
- Enter the what you are looking for, either plain text or a regular expression, depending on the mode
-
100
0
+
+ Enter the what you are looking for, either plain text or a regular expression, depending on the mode
+
-
@@ -656,6 +656,14 @@ nothing should be put between the original text and the inserted text
true
+
+
+ 0
+ 0
+ 122
+ 34
+
+
-
@@ -733,14 +741,33 @@ nothing should be put between the original text and the inserted text
author_sort
rating
publisher
- tag_editor_button
tags
+ tag_editor_button
remove_tags
+ remove_all_tags
series
+ clear_series
autonumber_series
+ series_numbering_restarts
+ series_start_number
remove_format
+ remove_conversion_settings
swap_title_and_author
+ change_title_to_title_case
button_box
+ central_widget
+ search_field
+ search_mode
+ search_for
+ case_sensitive
+ replace_with
+ replace_func
+ destination_field
+ replace_mode
+ comma_separated
+ scrollArea11
+ test_text
+ test_result
diff --git a/src/calibre/gui2/dialogs/metadata_single.py b/src/calibre/gui2/dialogs/metadata_single.py
index 4c24365196..64ac4a3ccb 100644
--- a/src/calibre/gui2/dialogs/metadata_single.py
+++ b/src/calibre/gui2/dialogs/metadata_single.py
@@ -434,9 +434,9 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
self.pubdate.setDate(QDate(pubdate.year, pubdate.month,
pubdate.day))
timestamp = db.timestamp(self.id, index_is_id=True)
- self.orig_timestamp = timestamp.astimezone(utc_tz)
self.date.setDate(QDate(timestamp.year, timestamp.month,
timestamp.day))
+ self.orig_date = qt_to_dt(self.date.date())
exts = self.db.formats(row)
if exts:
@@ -802,7 +802,7 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
self.db.set_pubdate(self.id, d, notify=False, commit=False)
d = self.date.date()
d = qt_to_dt(d)
- if d.date() != self.orig_timestamp.date():
+ if d != self.orig_date:
self.db.set_timestamp(self.id, d, notify=False, commit=False)
self.db.commit()
diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
index 57ea04fb75..8f86bf43b8 100644
--- a/src/calibre/gui2/library/views.py
+++ b/src/calibre/gui2/library/views.py
@@ -30,6 +30,7 @@ class BooksView(QTableView): # {{{
def __init__(self, parent, modelcls=BooksModel):
QTableView.__init__(self, parent)
+ self.drag_allowed = True
self.setDragEnabled(True)
self.setDragDropOverwriteMode(False)
self.setDragDropMode(self.DragDrop)
@@ -505,6 +506,8 @@ class BooksView(QTableView): # {{{
return QTableView.mousePressEvent(self, event)
def mouseMoveEvent(self, event):
+ if not self.drag_allowed:
+ return
if self.drag_start_pos is None:
return QTableView.mouseMoveEvent(self, event)
@@ -613,7 +616,7 @@ class BooksView(QTableView): # {{{
def close(self):
self._model.close()
- def set_editable(self, editable):
+ def set_editable(self, editable, supports_backloading):
self._model.set_editable(editable)
def connect_to_search_box(self, sb, search_done):
@@ -700,5 +703,9 @@ class DeviceBooksView(BooksView): # {{{
error_dialog(self, _('Not allowed'),
_('Dropping onto a device is not supported. First add the book to the calibre library.')).exec_()
+ def set_editable(self, editable, supports_backloading):
+ self._model.set_editable(editable)
+ self.drag_allowed = supports_backloading
+
# }}}
diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py
index d8f59b8db7..6e510cbfa5 100644
--- a/src/calibre/gui2/search_box.py
+++ b/src/calibre/gui2/search_box.py
@@ -73,6 +73,8 @@ class SearchBox2(QComboBox):
self.normal_background = 'rgb(255, 255, 255, 0%)'
self.line_edit = SearchLineEdit(self)
self.setLineEdit(self.line_edit)
+ c = self.line_edit.completer()
+ c.setCompletionMode(c.PopupCompletion)
self.line_edit.key_pressed.connect(self.key_pressed,
type=Qt.DirectConnection)
self.line_edit.mouse_released.connect(self.mouse_released,
diff --git a/src/calibre/gui2/tag_view.py b/src/calibre/gui2/tag_view.py
index 88a9220024..3505cc7344 100644
--- a/src/calibre/gui2/tag_view.py
+++ b/src/calibre/gui2/tag_view.py
@@ -84,12 +84,14 @@ class TagsView(QTreeView): # {{{
self.setAcceptDrops(True)
self.setDragDropMode(self.DropOnly)
self.setDropIndicatorShown(True)
+ self.setAutoExpandDelay(500)
def set_database(self, db, tag_match, sort_by):
self.hidden_categories = config['tag_browser_hidden_categories']
self._model = TagsModel(db, parent=self,
hidden_categories=self.hidden_categories,
- search_restriction=None)
+ search_restriction=None,
+ drag_drop_finished=self.drag_drop_finished)
self.sort_by = sort_by
self.tag_match = tag_match
self.db = db
@@ -109,103 +111,6 @@ class TagsView(QTreeView): # {{{
def database_changed(self, event, ids):
self.refresh_required.emit()
- def dragEnterEvent(self, event):
- md = event.mimeData()
- if md.hasFormat("application/calibre+from_library"):
- event.setDropAction(Qt.CopyAction)
- event.accept()
- else:
- event.ignore()
-
- def dragMoveEvent(self, event):
- allowed = False
- idx = self.indexAt(event.pos())
- m = self.model()
- p = m.parent(idx)
- if idx.isValid() and p.isValid():
- item = m.data(p, Qt.UserRole)
- fm = self.db.metadata_for_field(item.category_key)
- if item.category_key in \
- ('tags', 'series', 'authors', 'rating', 'publisher') or\
- (fm['is_custom'] and \
- fm['datatype'] in ['text', 'rating', 'series']):
- allowed = True
- if allowed:
- event.acceptProposedAction()
- else:
- event.ignore()
-
- def dropEvent(self, event):
- idx = self.indexAt(event.pos())
- m = self.model()
- p = m.parent(idx)
- if idx.isValid() and p.isValid():
- item = m.data(p, Qt.UserRole)
- if item.type == TagTreeItem.CATEGORY:
- fm = self.db.metadata_for_field(item.category_key)
- if item.category_key in \
- ('tags', 'series', 'authors', 'rating', 'publisher') or\
- (fm['is_custom'] and \
- fm['datatype'] in ['text', 'rating', 'series']):
- child = m.data(idx, Qt.UserRole)
- md = event.mimeData()
- mime = 'application/calibre+from_library'
- ids = list(map(int, str(md.data(mime)).split()))
- self.handle_drop(item, child, ids)
- event.accept()
- return
- event.ignore()
-
- def handle_drop(self, parent, child, ids):
- # print 'Dropped ids:', ids, parent.category_key, child.tag.name
- key = parent.category_key
- if (key == 'authors' and len(ids) >= 5):
- if not confirm('
'+_('Changing the authors for several books can '
- 'take a while. Are you sure?')
- +'
', 'tag_browser_drop_authors', self):
- return
- elif len(ids) > 15:
- if not confirm(''+_('Changing the metadata for that many books '
- 'can take a while. Are you sure?')
- +'
', 'tag_browser_many_changes', self):
- return
-
- fm = self.db.metadata_for_field(key)
- is_multiple = fm['is_multiple']
- val = child.tag.name
- for id in ids:
- mi = self.db.get_metadata(id, index_is_id=True)
-
- # Prepare to ignore the author, unless it is changed. Title is
- # always ignored -- see the call to set_metadata
- set_authors = False
-
- # Author_sort cannot change explicitly. Changing the author might
- # change it.
- mi.author_sort = None # Never will change by itself.
-
- if key == 'authors':
- mi.authors = [val]
- set_authors=True
- elif fm['datatype'] == 'rating':
- mi.set(key, len(val) * 2)
- elif fm['is_custom'] and fm['datatype'] == 'series':
- mi.set(key, val, extra=1.0)
- elif is_multiple:
- new_val = mi.get(key, [])
- if val in new_val:
- # Fortunately, only one field can change, so the continue
- # won't break anything
- continue
- new_val.append(val)
- mi.set(key, new_val)
- else:
- mi.set(key, val)
- self.db.set_metadata(id, mi, set_title=False,
- set_authors=set_authors, commit=False)
- self.db.commit()
- self.drag_drop_finished.emit(ids)
-
@property
def match_all(self):
return self.tag_match and self.tag_match.currentIndex() > 0
@@ -374,7 +279,8 @@ class TagsView(QTreeView): # {{{
try:
self._model = TagsModel(self.db, parent=self,
hidden_categories=self.hidden_categories,
- search_restriction=self.search_restriction)
+ search_restriction=self.search_restriction,
+ drag_drop_finished=self.drag_drop_finished)
self.setModel(self._model)
except:
# The DB must be gone. Set the model to None and hope that someone
@@ -469,7 +375,8 @@ class TagTreeItem(object): # {{{
class TagsModel(QAbstractItemModel): # {{{
- def __init__(self, db, parent, hidden_categories=None, search_restriction=None):
+ def __init__(self, db, parent, hidden_categories=None,
+ search_restriction=None, drag_drop_finished=None):
QAbstractItemModel.__init__(self, parent)
# must do this here because 'QPixmap: Must construct a QApplication
@@ -487,6 +394,7 @@ class TagsModel(QAbstractItemModel): # {{{
':user' : QIcon(I('drawer.png')),
'search' : QIcon(I('search.png'))})
self.categories_with_ratings = ['authors', 'series', 'publisher', 'tags']
+ self.drag_drop_finished = drag_drop_finished
self.icon_state_map = [None, QIcon(I('plus.png')), QIcon(I('minus.png'))]
self.db = db
@@ -519,6 +427,79 @@ class TagsModel(QAbstractItemModel): # {{{
tag.avg_rating = None
TagTreeItem(parent=c, data=tag, icon_map=self.icon_state_map)
+ def mimeTypes(self):
+ return ["application/calibre+from_library"]
+
+ def dropMimeData(self, md, action, row, column, parent):
+ if not md.hasFormat("application/calibre+from_library") or \
+ action != Qt.CopyAction:
+ return False
+ idx = parent
+ if idx.isValid():
+ node = self.data(idx, Qt.UserRole)
+ if node.type == TagTreeItem.TAG:
+ fm = self.db.metadata_for_field(node.tag.category)
+ if node.tag.category in \
+ ('tags', 'series', 'authors', 'rating', 'publisher') or \
+ (fm['is_custom'] and \
+ fm['datatype'] in ['text', 'rating', 'series']):
+ mime = 'application/calibre+from_library'
+ ids = list(map(int, str(md.data(mime)).split()))
+ self.handle_drop(node, ids)
+ return True
+ return False
+
+
+ def handle_drop(self, on_node, ids):
+ #print 'Dropped ids:', ids, on_node.tag
+ key = on_node.tag.category
+ if (key == 'authors' and len(ids) >= 5):
+ if not confirm(''+_('Changing the authors for several books can '
+ 'take a while. Are you sure?')
+ +'
', 'tag_browser_drop_authors', self.parent()):
+ return
+ elif len(ids) > 15:
+ if not confirm(''+_('Changing the metadata for that many books '
+ 'can take a while. Are you sure?')
+ +'
', 'tag_browser_many_changes', self.parent()):
+ return
+
+ fm = self.db.metadata_for_field(key)
+ is_multiple = fm['is_multiple']
+ val = on_node.tag.name
+ for id in ids:
+ mi = self.db.get_metadata(id, index_is_id=True)
+
+ # Prepare to ignore the author, unless it is changed. Title is
+ # always ignored -- see the call to set_metadata
+ set_authors = False
+
+ # Author_sort cannot change explicitly. Changing the author might
+ # change it.
+ mi.author_sort = None # Never will change by itself.
+
+ if key == 'authors':
+ mi.authors = [val]
+ set_authors=True
+ elif fm['datatype'] == 'rating':
+ mi.set(key, len(val) * 2)
+ elif fm['is_custom'] and fm['datatype'] == 'series':
+ mi.set(key, val, extra=1.0)
+ elif is_multiple:
+ new_val = mi.get(key, [])
+ if val in new_val:
+ # Fortunately, only one field can change, so the continue
+ # won't break anything
+ continue
+ new_val.append(val)
+ mi.set(key, new_val)
+ else:
+ mi.set(key, val)
+ self.db.set_metadata(id, mi, set_title=False,
+ set_authors=set_authors, commit=False)
+ self.db.commit()
+ self.drag_drop_finished.emit(ids)
+
def set_search_restriction(self, s):
self.search_restriction = s
@@ -650,12 +631,19 @@ class TagsModel(QAbstractItemModel): # {{{
def flags(self, index, *args):
ans = Qt.ItemIsEnabled|Qt.ItemIsSelectable|Qt.ItemIsEditable
- if index.isValid() and self.parent(index).isValid():
- ans |= Qt.ItemIsDropEnabled
+ if index.isValid():
+ node = self.data(index, Qt.UserRole)
+ if node.type == TagTreeItem.TAG:
+ fm = self.db.metadata_for_field(node.tag.category)
+ if node.tag.category in \
+ ('tags', 'series', 'authors', 'rating', 'publisher') or \
+ (fm['is_custom'] and \
+ fm['datatype'] in ['text', 'rating', 'series']):
+ ans |= Qt.ItemIsDropEnabled
return ans
def supportedDropActions(self):
- return Qt.CopyAction|Qt.MoveAction
+ return Qt.CopyAction
def path_for_index(self, index):
ans = []
diff --git a/src/calibre/gui2/viewer/main.py b/src/calibre/gui2/viewer/main.py
index 26fd2cadc9..f0f29a67e6 100644
--- a/src/calibre/gui2/viewer/main.py
+++ b/src/calibre/gui2/viewer/main.py
@@ -695,6 +695,9 @@ def config(defaults=None):
c.add_opt('raise_window', ['--raise-window'], default=False,
help=_('If specified, viewer window will try to come to the '
'front when started.'))
+ c.add_opt('full_screen', ['--full-screen', '--fullscreen', '-f'], default=False,
+ help=_('If specified, viewer window will try to open '
+ 'full screen when started.'))
c.add_opt('remember_window_size', default=False,
help=_('Remember last used window size'))
c.add_opt('debug_javascript', ['--debug-javascript'], default=False,
@@ -726,8 +729,10 @@ def main(args=sys.argv):
main.show()
if opts.raise_window:
main.raise_()
- with main:
- return app.exec_()
+ if opts.full_screen:
+ main.action_full_screen.trigger()
+ with main:
+ return app.exec_()
return 0
if __name__ == '__main__':
diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index 5bec43ab28..bbfef47977 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -10,6 +10,7 @@ import os, sys, shutil, cStringIO, glob, time, functools, traceback, re
from itertools import repeat
from math import floor
from Queue import Queue
+from operator import itemgetter
from PyQt4.QtGui import QImage
@@ -68,7 +69,7 @@ copyfile = os.link if hasattr(os, 'link') else shutil.copyfile
class Tag(object):
def __init__(self, name, id=None, count=0, state=0, avg=0, sort=None,
- tooltip=None, icon=None):
+ tooltip=None, icon=None, category=None):
self.name = name
self.id = id
self.count = count
@@ -81,9 +82,11 @@ class Tag(object):
tooltip = _('%sAverage rating is %3.1f')%(tooltip, self.avg_rating)
self.tooltip = tooltip
self.icon = icon
+ self.category = category
def __unicode__(self):
- return u'%s:%s:%s:%s:%s'%(self.name, self.count, self.id, self.state, self.tooltip)
+ return u'%s:%s:%s:%s:%s:%s'%(self.name, self.count, self.id, self.state,
+ self.category, self.tooltip)
def __str__(self):
return unicode(self).encode('utf-8')
@@ -1102,21 +1105,22 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
tooltip = self.custom_column_label_map[label]['name']
datatype = cat['datatype']
+ avgr = itemgetter(3)
+ item_not_zero_func = lambda x: x[2] > 0
if datatype == 'rating':
# eliminate the zero ratings line as well as count == 0
item_not_zero_func = (lambda x: x[1] > 0 and x[2] > 0)
formatter = (lambda x:u'\u2605'*int(x/2))
+ avgr = itemgetter(1)
elif category == 'authors':
- item_not_zero_func = (lambda x: x[2] > 0)
# Clean up the authors strings to human-readable form
formatter = (lambda x: x.replace('|', ','))
else:
- item_not_zero_func = (lambda x: x[2] > 0)
formatter = (lambda x:unicode(x))
categories[category] = [Tag(formatter(r[1]), count=r[2], id=r[0],
- avg=r[3], sort=r[4],
- icon=icon, tooltip=tooltip)
+ avg=avgr(r), sort=r[4], icon=icon,
+ tooltip=tooltip, category=category)
for r in data if item_not_zero_func(r)]
# Needed for legacy databases that have multiple ratings that
@@ -1148,7 +1152,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
WHERE format="%s"'''%fmt,
all=False)
if count > 0:
- categories['formats'].append(Tag(fmt, count=count, icon=icon))
+ categories['formats'].append(Tag(fmt, count=count, icon=icon,
+ category='formats'))
if sort == 'popularity':
categories['formats'].sort(key=lambda x: x.count, reverse=True)
@@ -1194,7 +1199,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
if icon_map and 'search' in icon_map:
icon = icon_map['search']
for srch in saved_searches().names():
- items.append(Tag(srch, tooltip=saved_searches().lookup(srch), icon=icon))
+ items.append(Tag(srch, tooltip=saved_searches().lookup(srch),
+ icon=icon, category='search'))
if len(items):
if icon_map is not None:
icon_map['search'] = icon_map['search']
diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index 42d3d76dfb..ffbd958688 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -5,12 +5,130 @@ __license__ = 'GPL v3'
__copyright__ = '2010, Kovid Goyal '
__docformat__ = 'restructuredtext en'
-import operator, os
+import operator, os, json
+from urllib import quote
+from binascii import hexlify, unhexlify
import cherrypy
from calibre.constants import filesystem_encoding
from calibre import isbytestring, force_unicode, prepare_string_for_xml as xml
+from calibre.utils.ordered_dict import OrderedDict
+
+def render_book_list(ids):
+ pages = []
+ while ids:
+ page = list(ids[:25])
+ pages.append(page)
+ ids = ids[25:]
+ page_template = u'''\
+
+
+
{2}
+
+
{0}
+
+ {pages}
+
+ '''
+ return templ.format(_('Browsing %d books')%len(ids), pages=rpages)
+
+def utf8(x): # {{{
+ if isinstance(x, unicode):
+ x = x.encode('utf-8')
+ return x
+# }}}
+
+def render_rating(rating, container='span'): # {{{
+ if rating < 0.1:
+ return '', ''
+ added = 0
+ rstring = xml(_('Average rating: %.1f stars')% (rating if rating else 0.0),
+ True)
+ ans = ['<%s class="rating">' % (container)]
+ for i in range(5):
+ n = rating - added
+ x = 'half'
+ if n <= 0.1:
+ x = 'off'
+ elif n >= 0.9:
+ x = 'on'
+ ans.append(
+ u'
'.format(
+ rstring, x))
+ added += 1
+ ans.append(''%container)
+ return u''.join(ans), rstring
+
+# }}}
+
+def get_category_items(category, items, db, datatype): # {{{
+
+ def item(i):
+ templ = (u''
+ '
{0}
{1}
'
+ '
{2}'
+ '{3}
'] + items + ['
'])
+
+# }}}
+
+class Endpoint(object): # {{{
+ 'Manage encoding, mime-type, last modified, cookies, etc.'
+
+ def __init__(self, mimetype='text/html; charset=utf-8', sort_type='category'):
+ self.mimetype = mimetype
+ self.sort_type = sort_type
+ self.sort_kwarg = sort_type + '_sort'
+ self.sort_cookie_name = 'calibre_browse_server_sort_'+self.sort_type
+
+ def __call__(eself, func):
+
+ def do(self, *args, **kwargs):
+ sort_val = None
+ cookie = cherrypy.request.cookie
+ if cookie.has_key(eself.sort_cookie_name):
+ sort_val = cookie[eself.sort_cookie_name].value
+ kwargs[eself.sort_kwarg] = sort_val
+
+ ans = func(self, *args, **kwargs)
+ cherrypy.response.headers['Content-Type'] = eself.mimetype
+ updated = self.db.last_modified()
+ cherrypy.response.headers['Last-Modified'] = \
+ self.last_modified(max(updated, self.build_time))
+ ans = utf8(ans)
+ return ans
+
+ do.__name__ = func.__name__
+
+ return do
+# }}}
class BrowseServer(object):
@@ -19,30 +137,47 @@ class BrowseServer(object):
connect('browse', base_href, self.browse_catalog)
connect('browse_catalog', base_href+'/category/{category}',
self.browse_catalog)
- connect('browse_list', base_href+'/list/{query}', self.browse_list)
+ connect('browse_category_group',
+ base_href+'/category_group/{category}/{group}',
+ self.browse_category_group)
+ connect('browse_matches',
+ base_href+'/matches/{category}/{cid}',
+ self.browse_matches)
+ connect('browse_booklist_page',
+ base_href+'/booklist_page',
+ self.browse_booklist_page)
+
connect('browse_search', base_href+'/search/{query}',
self.browse_search)
- connect('browse_book', base_href+'/book/{uuid}', self.browse_book)
- connect('browse_json', base_href+'/json/{query}', self.browse_json)
- def browse_template(self, category=True):
+ def browse_template(self, sort, category=True):
+
def generate():
+ scn = 'calibre_browse_server_sort_'
+
if category:
sort_opts = [('rating', _('Average rating')), ('name',
_('Name')), ('popularity', _('Popularity'))]
+ scn += 'category'
else:
+ scn += 'list'
fm = self.db.field_metadata
- sort_opts = [(x, fm[x]['name']) for x in fm.sortable_field_keys()
- if fm[x]['name']]
- prefix = 'category' if category else 'book'
- ans = P('content_server/browse.html', data=True)
+ sort_opts, added = [], set([])
+ for x in fm.sortable_field_keys():
+ n = fm[x]['name']
+ if n not in added:
+ added.add(n)
+ sort_opts.append((x, n))
+
+ ans = P('content_server/browse/browse.html',
+ data=True).decode('utf-8')
ans = ans.replace('{sort_select_label}', xml(_('Sort by')+':'))
- opts = ['' % (prefix, xml(k),
- xml(n)) for k, n in
+ ans = ans.replace('{sort_cookie_name}', scn)
+ opts = ['' % (
+ 'selected="selected" ' if k==sort else '',
+ xml(k), xml(n), ) for k, n in
sorted(sort_opts, key=operator.itemgetter(1))]
- opts = [''] + opts
- ans = ans.replace('{sort_select_options}', '\n\t\t\t'.join(opts))
+ ans = ans.replace('{sort_select_options}', ('\n'+' '*20).join(opts))
lp = self.db.library_path
if isbytestring(lp):
lp = force_unicode(lp, filesystem_encoding)
@@ -60,25 +195,217 @@ class BrowseServer(object):
# Catalogs {{{
- def browse_catalog(self, category=None):
- if category == None:
- ans = self.browse_template().format(title='',
- script='toplevel();')
+ def browse_toplevel(self):
+ categories = self.categories_cache()
+ category_meta = self.db.field_metadata
+ cats = [
+ (_('Newest'), 'newest'),
+ ]
+
+ def getter(x):
+ return category_meta[x]['name'].lower()
+
+ for category in sorted(categories,
+ cmp=lambda x,y: cmp(getter(x), getter(y))):
+ if len(categories[category]) == 0:
+ continue
+ if category == 'formats':
+ continue
+ meta = category_meta.get(category, None)
+ if meta is None:
+ continue
+ cats.append((meta['name'], category))
+ cats = ['{0}/browse/category/{1}'\
+ .format(xml(x, True), xml(quote(y)), xml(_('Browse books by')))
+ for x, y in cats]
+
+ main = ''\
+ .format(_('Choose a category to browse by:'), '\n\n'.join(cats))
+ return self.browse_template('name').format(title='',
+ script='toplevel();', main=main)
+
+ def browse_sort_categories(self, items, sort):
+ if sort not in ('rating', 'name', 'popularity'):
+ sort = 'name'
+ def sorter(x):
+ ans = getattr(x, 'sort', x.name)
+ if hasattr(ans, 'upper'):
+ ans = ans.upper()
+ return ans
+ items.sort(key=sorter)
+ if sort == 'popularity':
+ items.sort(key=operator.attrgetter('count'), reverse=True)
+ elif sort == 'rating':
+ items.sort(key=operator.attrgetter('avg_rating'), reverse=True)
+ return sort
+
+ def browse_category(self, category, sort):
+ categories = self.categories_cache()
+ if category not in categories:
+ raise cherrypy.HTTPError(404, 'category not found')
+ category_meta = self.db.field_metadata
+ category_name = category_meta[category]['name']
+ datatype = category_meta[category]['datatype']
+
+
+ items = categories[category]
+ sort = self.browse_sort_categories(items, sort)
+
+ script = 'true'
+
+ if len(items) <= self.opts.max_opds_ungrouped_items:
+ script = 'false'
+ items = get_category_items(category, items, self.db, datatype)
else:
- raise cherrypy.HTTPError(404, 'Not found')
- cherrypy.response.headers['Content-Type'] = 'text/html'
- cherrypy.response.headers['Last-Modified'] = self.last_modified(self.build_time)
+ getter = lambda x: unicode(getattr(x, 'sort', x.name))
+ starts = set([])
+ for x in items:
+ val = getter(x)
+ if not val:
+ val = u'A'
+ starts.add(val[0].upper())
+ category_groups = OrderedDict()
+ for x in sorted(starts):
+ category_groups[x] = len([y for y in items if
+ getter(y).upper().startswith(x)])
+ items = [(u'{0} [{2}]
'
+ u'
'
+ u'
{1} '
+ u'
{3}\n{0}
'.format(items)
+
+
+
+ script = 'category(%s);'%script
+
+ main = u'''
+
+ '''.format(
+ xml(_('Browsing by')+': ' + category_name), items,
+ xml(_('Up'), True))
+
+ return self.browse_template(sort).format(title=category_name,
+ script=script, main=main)
+
+ @Endpoint(mimetype='application/json; charset=utf-8')
+ def browse_category_group(self, category=None, group=None,
+ category_sort=None):
+ sort = category_sort
+ if sort not in ('rating', 'name', 'popularity'):
+ sort = 'name'
+ categories = self.categories_cache()
+ if category not in categories:
+ raise cherrypy.HTTPError(404, 'category not found')
+
+ category_meta = self.db.field_metadata
+ datatype = category_meta[category]['datatype']
+
+ if not group:
+ raise cherrypy.HTTPError(404, 'invalid group')
+
+ items = categories[category]
+ entries = []
+ getter = lambda x: unicode(getattr(x, 'sort', x.name))
+ for x in items:
+ val = getter(x)
+ if not val:
+ val = u'A'
+ if val.upper().startswith(group):
+ entries.append(x)
+
+ sort = self.browse_sort_categories(entries, sort)
+ entries = get_category_items(category, entries, self.db, datatype)
+ return json.dumps(entries, ensure_ascii=False)
+
+
+
+ @Endpoint()
+ def browse_catalog(self, category=None, category_sort=None):
+ 'Entry point for top-level, categories and sub-categories'
+ if category == None:
+ ans = self.browse_toplevel()
+ elif category == 'newest':
+ raise cherrypy.InternalRedirect('/browse/matches/newest/dummy')
+ else:
+ ans = self.browse_category(category, category_sort)
+
return ans
# }}}
# Book Lists {{{
- def browse_list(self, query=None):
- raise NotImplementedError()
+
+ def browse_sort_book_list(self, items, sort):
+ fm = self.db.field_metadata
+ keys = frozenset(fm.sortable_field_keys())
+ if sort not in keys:
+ sort = 'title'
+ self.sort(items, 'title', True)
+ if sort != 'title':
+ ascending = fm[sort]['datatype'] not in ('rating', 'datetime')
+ self.sort(items, sort, ascending)
+ return sort
+
+ @Endpoint(sort_type='list')
+ def browse_matches(self, category=None, cid=None, list_sort=None):
+ if not cid:
+ raise cherrypy.HTTPError(404, 'invalid category id: %r'%cid)
+ categories = self.categories_cache()
+
+ if category not in categories and category != 'newest':
+ raise cherrypy.HTTPError(404, 'category not found')
+ try:
+ category_name = self.db.field_metadata[category]['name']
+ except:
+ if category != 'newest':
+ raise
+ category_name = _('Newest')
+
+ if category == 'search':
+ which = unhexlify(cid)
+ try:
+ ids = self.search_cache('search:"%s"'%which)
+ except:
+ raise cherrypy.HTTPError(404, 'Search: %r not understood'%which)
+ elif category == 'newest':
+ ids = list(self.db.data.iterallids())
+ else:
+ ids = self.db.get_books_for_category(category, cid)
+
+ items = [self.db.data._data[x] for x in ids]
+ if category == 'newest':
+ list_sort = 'timestamp'
+ sort = self.browse_sort_book_list(items, list_sort)
+ ids = [x[0] for x in items]
+ html = render_book_list(ids)
+ return self.browse_template(sort).format(
+ title=_('Books in') + " " +category_name,
+ script='booklist();', main=html)
+
+ @Endpoint(mimetype='application/json; charset=utf-8', sort_type='list')
+ def browse_booklist_page(self, ids=None, list_sort=None):
+ if ids is None:
+ ids = json.dumps('[]')
+ try:
+ ids = json.loads(ids)
+ except:
+ raise cherrypy.HTTPError(404, 'invalid ids')
+
# }}}
# Search {{{
- def browse_search(self, query=None):
+ def browse_search(self, query=None, offset=0, sort=None):
raise NotImplementedError()
# }}}
@@ -87,8 +414,4 @@ class BrowseServer(object):
raise NotImplementedError()
# }}}
- # JSON {{{
- def browse_json(self, query=None):
- raise NotImplementedError()
- # }}}
diff --git a/src/calibre/library/server/cache.py b/src/calibre/library/server/cache.py
index 94e4a1c041..29602a114c 100644
--- a/src/calibre/library/server/cache.py
+++ b/src/calibre/library/server/cache.py
@@ -29,6 +29,11 @@ class Cache(object):
def categories_cache(self, restrict_to=frozenset([])):
+ base_restriction = self.search_cache('')
+ if restrict_to:
+ restrict_to = frozenset(restrict_to).intersection(base_restriction)
+ else:
+ restrict_to = base_restriction
old = self._category_cache.pop(frozenset(restrict_to), None)
if old is None or old[0] <= self.db.last_modified():
categories = self.db.get_categories(ids=restrict_to)
diff --git a/src/calibre/library/server/content.py b/src/calibre/library/server/content.py
index 7139b12d08..8c5fef4ee1 100644
--- a/src/calibre/library/server/content.py
+++ b/src/calibre/library/server/content.py
@@ -5,18 +5,15 @@ __license__ = 'GPL v3'
__copyright__ = '2010, Kovid Goyal '
__docformat__ = 'restructuredtext en'
-import re, os, cStringIO
+import re, os
import cherrypy
-try:
- from PIL import Image as PILImage
- PILImage
-except ImportError:
- import Image as PILImage
from calibre import fit_image, guess_type
from calibre.utils.date import fromtimestamp
from calibre.library.caches import SortKeyGenerator
+from calibre.utils.magick.draw import save_cover_data_to, Image, \
+ thumbnail as generate_thumbnail
class CSSortKeyGenerator(SortKeyGenerator):
@@ -35,6 +32,7 @@ class ContentServer(object):
def add_routes(self, connect):
connect('root', '/', self.index)
+ connect('old', '/old', self.old)
connect('get', '/get/{what}/{id}', self.get,
conditions=dict(method=["GET", "HEAD"]))
connect('static', '/static/{name:.*?}', self.static,
@@ -76,8 +74,13 @@ class ContentServer(object):
id = int(match.group())
if not self.db.has_id(id):
raise cherrypy.HTTPError(400, 'id:%d does not exist in database'%id)
- if what == 'thumb':
- return self.get_cover(id, thumbnail=True)
+ if what == 'thumb' or what.startswith('thumb_'):
+ try:
+ width, height = map(int, what.split('_')[1:])
+ except:
+ width, height = 60, 80
+ return self.get_cover(id, thumbnail=True, thumb_width=width,
+ thumb_height=height)
if what == 'cover':
return self.get_cover(id)
return self.get_format(id, what)
@@ -123,38 +126,43 @@ class ContentServer(object):
return self.static('index.html')
+ def old(self, **kwargs):
+ return self.static('index.html')
+
# Actually get content from the database {{{
- def get_cover(self, id, thumbnail=False):
- cover = self.db.cover(id, index_is_id=True, as_file=False)
- if cover is None:
- cover = self.default_cover
- cherrypy.response.headers['Content-Type'] = 'image/jpeg'
- cherrypy.response.timeout = 3600
- path = getattr(cover, 'name', False)
- updated = fromtimestamp(os.stat(path).st_mtime) if path and \
- os.access(path, os.R_OK) else self.build_time
- cherrypy.response.headers['Last-Modified'] = self.last_modified(updated)
+ def get_cover(self, id, thumbnail=False, thumb_width=60, thumb_height=80):
try:
- f = cStringIO.StringIO(cover)
- try:
- im = PILImage.open(f)
- except IOError:
- raise cherrypy.HTTPError(404, 'No valid cover found')
- width, height = im.size
+ cherrypy.response.headers['Content-Type'] = 'image/jpeg'
+ cherrypy.response.timeout = 3600
+ cover = self.db.cover(id, index_is_id=True, as_file=True)
+ if cover is None:
+ cover = self.default_cover
+ updated = self.build_time
+ else:
+ with cover as f:
+ updated = fromtimestamp(os.stat(f.name).st_mtime)
+ cover = f.read()
+ cherrypy.response.headers['Last-Modified'] = self.last_modified(updated)
+
+ if thumbnail:
+ return generate_thumbnail(cover,
+ width=thumb_width, height=thumb_height)[-1]
+
+ img = Image()
+ img.load(cover)
+ width, height = img.size
scaled, width, height = fit_image(width, height,
- 60 if thumbnail else self.max_cover_width,
- 80 if thumbnail else self.max_cover_height)
+ thumb_width if thumbnail else self.max_cover_width,
+ thumb_height if thumbnail else self.max_cover_height)
if not scaled:
return cover
- im = im.resize((int(width), int(height)), PILImage.ANTIALIAS)
- of = cStringIO.StringIO()
- im.convert('RGB').save(of, 'JPEG')
- return of.getvalue()
+ return save_cover_data_to(img, 'img.jpg', return_data=True,
+ resize_to=(width, height))
except Exception, err:
import traceback
cherrypy.log.error('Failed to generate cover:')
cherrypy.log.error(traceback.print_exc())
- raise cherrypy.HTTPError(404, 'Failed to generate cover: %s'%err)
+ raise cherrypy.HTTPError(404, 'Failed to generate cover: %r'%err)
def get_format(self, id, format):
format = format.upper()
diff --git a/src/calibre/library/server/opds.py b/src/calibre/library/server/opds.py
index f1aeb583db..16e7d34cbf 100644
--- a/src/calibre/library/server/opds.py
+++ b/src/calibre/library/server/opds.py
@@ -18,7 +18,7 @@ from calibre.constants import __appname__
from calibre.ebooks.metadata import fmt_sidx
from calibre.library.comments import comments_to_html
from calibre.library.server import custom_fields_to_display
-from calibre.library.server.utils import format_tag_string
+from calibre.library.server.utils import format_tag_string, Offsets
from calibre import guess_type
from calibre.utils.ordered_dict import OrderedDict
@@ -321,26 +321,6 @@ class CategoryGroupFeed(NavFeed):
self.root.append(CATALOG_GROUP_ENTRY(item, which, base_href, version, updated))
-class OPDSOffsets(object):
-
- def __init__(self, offset, delta, total):
- if offset < 0:
- offset = 0
- if offset >= total:
- raise cherrypy.HTTPError(404, 'Invalid offset: %r'%offset)
- last_allowed_index = total - 1
- last_current_index = offset + delta - 1
- self.offset = offset
- self.next_offset = last_current_index + 1
- if self.next_offset > last_allowed_index:
- self.next_offset = -1
- self.previous_offset = self.offset - delta
- if self.previous_offset < 0:
- self.previous_offset = 0
- self.last_offset = last_allowed_index - delta
- if self.last_offset < 0:
- self.last_offset = 0
-
class OPDSServer(object):
@@ -374,7 +354,7 @@ class OPDSServer(object):
items = [x for x in self.db.data.iterall() if x[idx] in ids]
self.sort(items, sort_by, ascending)
max_items = self.opts.max_opds_items
- offsets = OPDSOffsets(offset, max_items, len(items))
+ offsets = Offsets(offset, max_items, len(items))
items = items[offsets.offset:offsets.offset+max_items]
updated = self.db.last_modified()
cherrypy.response.headers['Last-Modified'] = self.last_modified(updated)
@@ -448,7 +428,7 @@ class OPDSServer(object):
id_ = 'calibre-category-group-feed:'+category+':'+which
max_items = self.opts.max_opds_items
- offsets = OPDSOffsets(offset, max_items, len(items))
+ offsets = Offsets(offset, max_items, len(items))
items = list(items)[offsets.offset:offsets.offset+max_items]
cherrypy.response.headers['Last-Modified'] = self.last_modified(updated)
@@ -495,7 +475,7 @@ class OPDSServer(object):
if len(items) <= MAX_ITEMS:
max_items = self.opts.max_opds_items
- offsets = OPDSOffsets(offset, max_items, len(items))
+ offsets = Offsets(offset, max_items, len(items))
items = list(items)[offsets.offset:offsets.offset+max_items]
ans = CategoryFeed(items, which, id_, updated, version, offsets,
page_url, up_url, self.db)
@@ -516,7 +496,7 @@ class OPDSServer(object):
getattr(y, 'sort', y.name).startswith(x)])
items = [Group(x, y) for x, y in category_groups.items()]
max_items = self.opts.max_opds_items
- offsets = OPDSOffsets(offset, max_items, len(items))
+ offsets = Offsets(offset, max_items, len(items))
items = items[offsets.offset:offsets.offset+max_items]
ans = CategoryGroupFeed(items, which, id_, updated, version, offsets,
page_url, up_url)
diff --git a/src/calibre/library/server/utils.py b/src/calibre/library/server/utils.py
index 9a64948a3d..35c92f7ae2 100644
--- a/src/calibre/library/server/utils.py
+++ b/src/calibre/library/server/utils.py
@@ -13,6 +13,28 @@ from calibre import strftime as _strftime, prints
from calibre.utils.date import now as nowf
from calibre.utils.config import tweaks
+class Offsets(object):
+ 'Calculate offsets for a paginated view'
+
+ def __init__(self, offset, delta, total):
+ if offset < 0:
+ offset = 0
+ if offset >= total:
+ raise cherrypy.HTTPError(404, 'Invalid offset: %r'%offset)
+ last_allowed_index = total - 1
+ last_current_index = offset + delta - 1
+ self.slice_upper_bound = offset+delta
+ self.offset = offset
+ self.next_offset = last_current_index + 1
+ if self.next_offset > last_allowed_index:
+ self.next_offset = -1
+ self.previous_offset = self.offset - delta
+ if self.previous_offset < 0:
+ self.previous_offset = 0
+ self.last_offset = last_allowed_index - delta
+ if self.last_offset < 0:
+ self.last_offset = 0
+
def expose(func):
diff --git a/src/calibre/manual/faq.rst b/src/calibre/manual/faq.rst
index 3cf171bc1b..359cc4755f 100644
--- a/src/calibre/manual/faq.rst
+++ b/src/calibre/manual/faq.rst
@@ -387,6 +387,12 @@ solve it, look for a corrupted font file on your system, in ~/Library/Fonts or t
check for corrupted fonts in OS X is to start the "Font Book" application, select all fonts and then in the File
menu, choose "Validate fonts".
+
+I downloaded the installer, but it is not working?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Downloading from the internet can sometimes result in a corrupted download. If the |app| installer you downloaded is not opening, try downloading it again. If re-downloading it does not work, download it from `an alternate location `_. If the installer still doesn't work, then something on your computer is preventing it from running. Best place to ask for more help is in the `forums `_.
+
My antivirus program claims |app| is a virus/trojan?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -418,3 +424,14 @@ How do I run calibre from my USB stick?
A portable version of calibre is available at: `portableapps.com `_. However, this is usually out of date. You can also setup your own portable calibre install by following :ref:`these instructions `.
+Why are there so many calibre-parallel processes on my system?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+|app| maintains two separate worker process pools. One is used for adding books/saving to disk and the other for conversions. You can control the number of worker processes via :guilabel:`Preferences->Advanced->Miscellaneous`. So if you set it to 6 that means a maximum of 3 conversions will run simultaneously. And that is why you will see the number of worker processes changes by two when you use the up and down arrows. On windows, you can set the priority that these processes run with. This can be useful on older, single CPU machines, if you find them slowing down to a crawl when conversions are running.
+
+In addition to this some conversion plugins run tasks in their own pool of processes, so for example if you bulk convert comics, each comic conversion will use three separate processes to render the images. The job manager knows this so it will run only a single comic conversion simultaneously.
+
+And since I'm sure someone will ask: The reason adding/saving books are in separate processes is because of PDF. PDF processing libraries can crash on reading PDFs and I dont want the crash to take down all of calibre. Also when adding EPUB books, in order to extract the cover you have to sometimes render the HTML of the first page, which means that it either has to run the GUI thread of the main process or in a separate process.
+
+Finally, the reason calibre keep workers alive and idle instead of launching on demand is to workaround the slow startup time of python processes.
+
diff --git a/src/calibre/utils/ipc/launch.py b/src/calibre/utils/ipc/launch.py
index 8d3628d69a..a179f356be 100644
--- a/src/calibre/utils/ipc/launch.py
+++ b/src/calibre/utils/ipc/launch.py
@@ -14,7 +14,10 @@ from calibre.ptempfile import PersistentTemporaryFile, base_dir
if iswindows:
import win32process
- _windows_null_file = open(os.devnull, 'wb')
+ try:
+ _windows_null_file = open(os.devnull, 'wb')
+ except:
+ raise RuntimeError('NUL %r file missing in windows'%os.devnull)
class Worker(object):
'''
diff --git a/src/calibre/utils/magick/draw.py b/src/calibre/utils/magick/draw.py
index 6808215554..5c978a27e0 100644
--- a/src/calibre/utils/magick/draw.py
+++ b/src/calibre/utils/magick/draw.py
@@ -25,6 +25,7 @@ def save_cover_data_to(data, path, bgcolor='#ffffff', resize_to=None,
resize and the input and output image formats are the same, no changes are
made.
+ :param data: Image data as bytestring or Image object
:param compression_quality: The quality of the image after compression.
Number between 1 and 100. 1 means highest compression, 100 means no
compression (lossless).
@@ -33,8 +34,11 @@ def save_cover_data_to(data, path, bgcolor='#ffffff', resize_to=None,
'''
changed = False
- img = Image()
- img.load(data)
+ if isinstance(data, Image):
+ img = data
+ else:
+ img = Image()
+ img.load(data)
orig_fmt = normalize_format_name(img.format)
fmt = os.path.splitext(path)[1]
fmt = normalize_format_name(fmt[1:])
diff --git a/src/calibre/utils/smtp.py b/src/calibre/utils/smtp.py
index 230a983b74..b8b46a96cb 100644
--- a/src/calibre/utils/smtp.py
+++ b/src/calibre/utils/smtp.py
@@ -11,6 +11,7 @@ This module implements a simple commandline SMTP client that supports:
import sys, traceback, os
from email import encoders
+from calibre import isbytestring
def create_mail(from_, to, subject, text=None, attachment_data=None,
attachment_type=None, attachment_name=None):
@@ -26,7 +27,10 @@ def create_mail(from_, to, subject, text=None, attachment_data=None,
if text is not None:
from email.mime.text import MIMEText
- msg = MIMEText(text)
+ if isbytestring(text):
+ msg = MIMEText(text)
+ else:
+ msg = MIMEText(text, 'plain', 'utf-8')
outer.attach(msg)
if attachment_data is not None: