mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-06-23 15:30:45 -04:00
Sync to trunk.
This commit is contained in:
John Schember
commit
c54901bb95
@ -19,6 +19,57 @@
|
||||
# new recipes:
|
||||
# - title:
|
||||
|
||||
- version: 0.8.59
|
||||
date: 2012-07-06
|
||||
|
||||
new features:
|
||||
- title: "Drivers for Samsung SGH-T989 and Sony Ericsson Sola"
|
||||
tickets: [1021365]
|
||||
|
||||
- title: "Conversion pipeline: When removing the first image, also remove the html file the image is found in, if that file has no other content. Allows this option to be used to remove covers from EPUB files without leaving behind a blank page."
|
||||
|
||||
- title: "Content server: Add a navigation panel at the bottom of each page."
|
||||
tickets: [1020225]
|
||||
|
||||
- title: "calibredb: Add a backup_metadata command to manually run the backup to opf from the command line"
|
||||
|
||||
- title: "User defined driver: Add option to swap main memory and card a."
|
||||
tickets: [1020056]
|
||||
|
||||
- title: "Add new option to the series_index_auto_increment tweak, no_change, that causes calibre not to change the series_index when the series is changed"
|
||||
|
||||
bug fixes:
|
||||
- title: "PDF Output: Resize large images so that they do not get off at the right edge of the page."
|
||||
|
||||
- title: "On linux ensure that WM_CLASS for the main calibre GUI is set to 'calibre-gui' to match the name of the calibre-gui.desktop file. This is apparently required by the GNOME 3 shell."
|
||||
tickets: [1020297]
|
||||
|
||||
- title: "Update ICU in all builds to version 49.1"
|
||||
|
||||
- title: "Tag browser: Fix regression that broke drag and drop between user categories in the tag browser"
|
||||
|
||||
- title: "When copying to library and deleting after copy, do not place deleted files in recycle bin, as this is redundant and slow (they have already been copied into another library)"
|
||||
|
||||
- title: "Fix yes/no fields with value of No not showing up in the book details panel"
|
||||
|
||||
- title: "Catalogs: Better sorting for non English languages"
|
||||
tickets: [930882]
|
||||
|
||||
- title: "Get Books: Fix Foyles UK, Weightless books, ebooks.com and ozon.ru"
|
||||
|
||||
- title: "CHM Input: Fix handling of chm files that split their html into multiple sub-directories."
|
||||
tickets: [1018792]
|
||||
|
||||
improved recipes:
|
||||
- FHM UK
|
||||
- The Age
|
||||
- weblogs_ssl
|
||||
- Heraldo.es
|
||||
|
||||
new recipes:
|
||||
- title: CATO Institute and Heritage Foundation
|
||||
author: _reader
|
||||
|
||||
- version: 0.8.58
|
||||
date: 2012-06-29
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ Here, we will teach you how to create your own plugins to add new features to |a
|
||||
:depth: 2
|
||||
:local:
|
||||
|
||||
.. note:: This only applies to calibre releases >= 0.7.53
|
||||
.. note:: This only applies to calibre releases >= 0.8.60
|
||||
|
||||
Anatomy of a |app| plugin
|
||||
---------------------------
|
||||
@ -32,11 +32,15 @@ and enter the following Python code into it:
|
||||
.. literalinclude:: plugin_examples/helloworld/__init__.py
|
||||
:lines: 10-
|
||||
|
||||
That's all. To add this code to |app| as a plugin, simply create a zip file with::
|
||||
That's all. To add this code to |app| as a plugin, simply run the following in
|
||||
the directory in which you created :file:`__init__.py`::
|
||||
|
||||
zip plugin.zip __init__.py
|
||||
calibre-customize -b .
|
||||
|
||||
Add this plugin to |app| via :guilabel:`Preferences->Plugins`.
|
||||
.. note::
|
||||
On OS X you have to first install the |app| command line tools, by
|
||||
going to :guilabel:`Preferences->Miscellaneous` and clicking the
|
||||
:guilabel:`Install command line tools` button.
|
||||
|
||||
You can download the Hello World plugin from
|
||||
`helloworld_plugin.zip <http://calibre-ebook.com/downloads/helloworld_plugin.zip>`_.
|
||||
@ -191,14 +195,12 @@ When running from the command line, debug output will be printed to the console,
|
||||
|
||||
You can insert print statements anywhere in your plugin code, they will be output in debug mode. Remember, this is python, you really shouldn't need anything more than print statements to debug ;) I developed all of |app| using just this debugging technique.
|
||||
|
||||
It can get tiresome to keep re-adding a plugin to calibre to test small changes. The plugin zip files are stored in the calibre config directory in plugins/ (goto Preferences->Misc and click open config directory to see the config directory).
|
||||
You can quickly test changes to your plugin by using the following command
|
||||
line::
|
||||
|
||||
Once you've located the zip file of your plugin you can then directly update it with your changes instead of re-adding it each time. To do so from the command line, in the directory that contains your plugin source code, use::
|
||||
calibre -s; calibre-customize -b /path/to/your/plugin/directory; calibre
|
||||
|
||||
calibre -s; zip -r /path/to/plugin/zip/file.zip *; calibre
|
||||
|
||||
This will shutdown a running calibre. Wait for the shutdown to complete, then update your plugin files and relaunch calibre.
|
||||
It relies on the freely available zip command line tool.
|
||||
This will shutdown a running calibre, wait for the shutdown to complete, then update your plugin in |app| and relaunch |app|.
|
||||
|
||||
More plugin examples
|
||||
----------------------
|
||||
|
||||
75
recipes/cato.recipe
Normal file
75
recipes/cato.recipe
Normal file
@ -0,0 +1,75 @@
|
||||
import re
|
||||
from calibre.web.feeds.news import BasicNewsRecipe
|
||||
|
||||
class CATOInstitute(BasicNewsRecipe):
|
||||
title = u'The CATO Institute'
|
||||
description = "The Cato Institute is a public policy research organization — a think tank — \
|
||||
dedicated to the principles of individual liberty, limited government, free markets and peace.\
|
||||
Its scholars and analysts conduct independent, nonpartisan research on a wide range of policy issues."
|
||||
__author__ = '_reader'
|
||||
__date__ = '05 July 2012'
|
||||
__version__ = '1.0'
|
||||
cover_url = 'http://www.cato.org/images/logo.jpg'
|
||||
masthead_url = 'http://www.cato.org/images/logo.jpg'
|
||||
language = 'en'
|
||||
oldest_article = 30 #days
|
||||
max_articles_per_feed = 100
|
||||
needs_subscription = False
|
||||
publisher = 'CATO Institute'
|
||||
category = 'commentary'
|
||||
tags = 'commentary'
|
||||
publication_type = 'blog'
|
||||
no_stylesheets = True
|
||||
use_embedded_content = False
|
||||
encoding = None
|
||||
simultaneous_downloads = 10
|
||||
recursions = 0
|
||||
remove_javascript = True
|
||||
remove_empty_feeds = True
|
||||
auto_cleanup = True
|
||||
|
||||
conversion_options = {
|
||||
'comments' : description,
|
||||
'tags' : tags,
|
||||
'language' : language,
|
||||
'publisher' : publisher,
|
||||
'authors' : publisher,
|
||||
'smarten_punctuation' : True
|
||||
}
|
||||
|
||||
|
||||
feeds = [
|
||||
(u'Cato Recent Op-Eds', u'http://feeds.cato.org/CatoRecentOpeds'),
|
||||
(u'Cato Homepage Headlines', u'http://feeds.cato.org/CatoHomepageHeadlines'),
|
||||
(u'Cato Media Updates', u'http://feeds.cato.org/CatoMediaUpdates'),
|
||||
(u'Cato@Liberty', u'http://feeds.cato.org/Cato-at-liberty'),
|
||||
(u'Cato Unbound', u'http://feeds.feedburner.com/cato-unbound'),
|
||||
(u'Education and Child Policy', u'http://www.cato.org/rss/ra.xml?name=education-child-policy'),
|
||||
(u'Finance, Banking & Monetary Policy', u'http://www.cato.org/rss/ra.xml?name=finance-banking-monetary-policy'),
|
||||
(u'Government and Politics', u'http://www.cato.org/rss/ra.xml?name=government-politics'),
|
||||
(u'International Economics & Development', u'http://www.cato.org/rss/ra.xml?name=international-economics-development'),
|
||||
(u'Political Philosophy', u'http://www.cato.org/rss/ra.xml?name=political-philosophy'),
|
||||
(u'Social Security', u'http://www.cato.org/rss/ra.xml?name=social-security'),
|
||||
(u'Telecom, Internet & Information Policy', u'http://www.cato.org/rss/ra.xml?name=telecom-internet-information-policy'),
|
||||
(u'Energy and Environment', u'http://www.cato.org/rss/ra.xml?name=energy-environment'),
|
||||
(u'Foreign Policy and National Security', u'http://www.cato.org/rss/ra.xml?name=foreign-policy-national-security'),
|
||||
(u'Health Care', u'http://www.cato.org/rss/ra.xml?name=health-care'),
|
||||
(u'Law and Civil Liberties', u'http://www.cato.org/rss/ra.xml?name=law-civil-liberties'),
|
||||
(u'Regulatory Studies', u'http://www.cato.org/rss/ra.xml?name=regulatory-studies'),
|
||||
(u'Tax and Budget Policy', u'http://www.cato.org/rss/ra.xml?name=tax-budget-policy'),
|
||||
(u'Trade and Immigration', u'http://www.cato.org/rss/ra.xml?name=trade-immigration')
|
||||
]
|
||||
|
||||
|
||||
|
||||
|
||||
def print_version(self,url):
|
||||
R_unbound = re.compile(r'(^.*cato-unbound.*)(\/\?utm_source.*$)' , re.DOTALL | re.IGNORECASE ) #CATO Unbound
|
||||
R_pubs = re.compile(r'(^.*\/publications\/.*$)' , re.DOTALL | re.IGNORECASE ) #CATO Publications
|
||||
if re.match(R_unbound, url):
|
||||
printURL = r'\g<1>' + '/print/'
|
||||
elif re.match(R_pubs, url):
|
||||
printURL = url + '?print'
|
||||
else:
|
||||
printURL = url + '/print/'
|
||||
return printURL
|
||||
@ -1,13 +1,13 @@
|
||||
import re
|
||||
from calibre.web.feeds.news import BasicNewsRecipe
|
||||
#from calibre import __appname__
|
||||
from calibre.utils.magick import Image
|
||||
import re
|
||||
from calibre import browser
|
||||
|
||||
class AdvancedUserRecipe1306097511(BasicNewsRecipe):
|
||||
title = u'Cosmopolitan UK'
|
||||
description = 'Fashion, beauty and Gossip for women from COSMOPOLITAN -UK'
|
||||
description = 'Author : D.Asbury : Womens Fashion, beauty and Gossip for women from COSMOPOLITAN -UK'
|
||||
|
||||
__author__ = 'Dave Asbury'
|
||||
#last update 21/12/11
|
||||
#last update 7/7/12 hopefully get current cover from itunes
|
||||
# greyscale code by Starson
|
||||
cover_url = 'http://www.cosmopolitan.magazine.co.uk/files/4613/2085/8988/Cosmo_Cover3.jpg'
|
||||
no_stylesheets = True
|
||||
@ -39,14 +39,19 @@ class AdvancedUserRecipe1306097511(BasicNewsRecipe):
|
||||
feeds = [
|
||||
(u'Love & Sex', u'http://www.cosmopolitan.co.uk/love-sex/rss/'), (u'Men', u'http://cosmopolitan.co.uk/men/rss/'), (u'Fashion', u'http://cosmopolitan.co.uk/fashion/rss/'), (u'Hair & Beauty', u'http://cosmopolitan.co.uk/beauty-hair/rss/'), (u'LifeStyle', u'http://cosmopolitan.co.uk/lifestyle/rss/'), (u'Cosmo On Campus', u'http://cosmopolitan.co.uk/campus/rss/'), (u'Celebrity Gossip', u'http://cosmopolitan.co.uk/celebrity-gossip/rss/')]
|
||||
|
||||
def postprocess_html(self, soup, first):
|
||||
#process all the images
|
||||
for tag in soup.findAll(lambda tag: tag.name.lower()=='img' and tag.has_key('src')):
|
||||
iurl = tag['src']
|
||||
img = Image()
|
||||
img.open(iurl)
|
||||
if img < 0:
|
||||
raise RuntimeError('Out of memory')
|
||||
img.type = "GrayscaleType"
|
||||
img.save(iurl)
|
||||
return soup
|
||||
def get_cover_url(self):
|
||||
soup = self.index_to_soup('http://itunes.apple.com/gb/app/cosmopolitan-uk/id461363572?mt=8')
|
||||
# look for the block containing the sun button and url
|
||||
cov = soup.find(attrs={'alt' : 'iPhone Screenshot 1'})
|
||||
cov2 = str(cov['src'])
|
||||
br = browser()
|
||||
br.set_handle_redirect(False)
|
||||
try:
|
||||
br.open_novisit(cov2)
|
||||
cover_url = cov2
|
||||
except:
|
||||
cover_url = 'http://www.cosmopolitan.magazine.co.uk/files/4613/2085/8988/Cosmo_Cover3.jpg'
|
||||
|
||||
return cover_url
|
||||
|
||||
|
||||
|
||||
51
recipes/empire_magazine.recipe
Normal file
51
recipes/empire_magazine.recipe
Normal file
@ -0,0 +1,51 @@
|
||||
import re
|
||||
from calibre.web.feeds.news import BasicNewsRecipe
|
||||
|
||||
class AdvancedUserRecipe1341650280(BasicNewsRecipe):
|
||||
|
||||
title = u'Empire Magazine'
|
||||
description = 'Author D.Asbury. Film articles from Empire Mag. '
|
||||
__author__ = 'Dave Asbury'
|
||||
# last updated 7/7/12
|
||||
remove_empty_feeds = True
|
||||
remove_javascript = True
|
||||
no_stylesheets = True
|
||||
#oldest_article = 7
|
||||
max_articles_per_feed = 20
|
||||
cover_url = 'http://www.empireonline.com/images/magazine/cover.jpg'
|
||||
conversion_options = {
|
||||
'linearize_tables' : True,
|
||||
}
|
||||
#auto_cleanup = True
|
||||
preprocess_regexps = [
|
||||
(re.compile(r'<a href="http://twitter.com/share.*?</a>', re.IGNORECASE | re.DOTALL), lambda match: ''),
|
||||
(re.compile(r'<head>.*?<!-- CONTENT: START -->', re.IGNORECASE | re.DOTALL), lambda match: '<head></head><!-- CONTENT: START -->'),
|
||||
(re.compile(r'<!-- LATEST NEWS HEADLINES: START -->.*?<!-- LATEST NEWS HEADLINES: END -->', re.IGNORECASE | re.DOTALL), lambda match: '<!-- LATEST NEWS HEADLINES: START --><!-- LATEST NEWS HEADLINES: END -->'),
|
||||
(re.compile(r'<!-- RELATED FUTURE FILMS: START -->.*?<!-- RELATED FUTURE FILMS: END -->', re.IGNORECASE | re.DOTALL), lambda match: '<!-- RELATED FUTURE FILMS: START --><!-- RELATED FUTURE FILMS: END -->'),
|
||||
(re.compile(r'<!-- CURRENT HIGHLIGHTS: START-->.*?<!-- CURRENT HIGHLIGHTS: END -->', re.IGNORECASE | re.DOTALL), lambda match: '<!-- CURRENT HIGHLIGHTS: START--><!-- CURRENT HIGHLIGHTS: END -->'),
|
||||
(re.compile(r'<!-- RELATED REVIEWS: START -->.*?<!-- RELATED REVIEWS: END -->', re.IGNORECASE | re.DOTALL), lambda match: '<!-- RELATED REVIEWS: START --><!-- RELATED REVIEWS: END -->'),
|
||||
(re.compile(r'<!-- RELATED INTERVIEWS -->.*?<!-- RELATED REVIEWS: END -->', re.IGNORECASE | re.DOTALL), lambda match: '<!-- RELATED INTERVIEWS --><!-- RELATED REVIEWS: END -->'),
|
||||
(re.compile(r'<!-- CONTENT: END -->.*?</body>', re.IGNORECASE | re.DOTALL), lambda match: '<!-- CONTENT: END --></body>'),
|
||||
(re.compile(r'<!-- STORY: END -->.*?</body>', re.IGNORECASE | re.DOTALL), lambda match: '<!-- STORY: END --></body>'),
|
||||
(re.compile(r'<!-- RATINGS GUIDE: START-->.*?<!-- RATINGS GUIDE: END-->', re.IGNORECASE | re.DOTALL), lambda match: '<!-- RATINGS GUIDE: START--><!-- RATINGS GUIDE: END-->'),
|
||||
(re.compile(r'<strong>SUBSCRIBE TO EMPIRE</strong>.*?</tbody>', re.IGNORECASE | re.DOTALL), lambda match: '</tbody>'),
|
||||
(re.compile(r'<!-- USER REVIEWS: START -->.*?<!-- USER REVIEWS: END -->', re.IGNORECASE | re.DOTALL), lambda match: '<!-- USER REVIEWS: START --><!-- USER REVIEWS: END -->'),
|
||||
(re.compile(r'Advertisement', re.IGNORECASE | re.DOTALL), lambda match: ''),
|
||||
(re.compile(r'<a name="haveyoursay".*?now to have your say.', re.IGNORECASE | re.DOTALL), lambda match: ''),
|
||||
]
|
||||
keep_only_tags = [
|
||||
# dict(name='h1'),
|
||||
# dict(attrs={'class' : 'mediumblack'}),
|
||||
]
|
||||
remove_tags = [dict(name='td', attrs={'width':'200', 'valign' : 'top'}),
|
||||
dict(name='b'),
|
||||
dict(name='a',attrs={'name' : 'haveyoursay'}),
|
||||
dict(attrs={'class' : 'newslink'}),
|
||||
]
|
||||
|
||||
|
||||
feeds = [(u'News', u'http://feed43.com/7338478755673147.xml'),
|
||||
(u'Recent Features',u'http://feed43.com/4346347750304760.xml'),
|
||||
(u'Interviews',u'http://feed43.com/3418350077724081.xml'),
|
||||
(u'Film Reviews',u'http://feed43.com/2643703076510627.xml'),
|
||||
]
|
||||
71
recipes/heritage_foundation.recipe
Normal file
71
recipes/heritage_foundation.recipe
Normal file
@ -0,0 +1,71 @@
|
||||
from calibre.web.feeds.news import BasicNewsRecipe
|
||||
class HeritageFoundation(BasicNewsRecipe):
|
||||
title = u'The Heritage Foundation'
|
||||
description = 'Founded in 1973, The Heritage Foundation is a research and educational institution—a think tank—\
|
||||
whose mission is to formulate and promote conservative public policies based on the principles of free enterprise, limited government, \
|
||||
individual freedom, traditional American values, and a strong national defense.'
|
||||
__author__ = '_reader'
|
||||
__date__ = '05 July 2012'
|
||||
__version__ = '1.0'
|
||||
oldest_article = 30
|
||||
max_articles_per_feed = 100
|
||||
publisher = 'The Heritage Foundation'
|
||||
category = 'commentary'
|
||||
tags = 'commentary'
|
||||
language = 'en'
|
||||
publication_type = 'blog'
|
||||
cover_url = 'http://www.heritage.org/static/images/logo.jpg'
|
||||
masthead_url = 'http://www.heritage.org/static/images/logo.jpg'
|
||||
encoding = None
|
||||
use_embedded_content = False
|
||||
no_stylesheets = True
|
||||
remove_javascript = True
|
||||
recursions = 0
|
||||
remove_empty_feeds = True
|
||||
auto_cleanup = True
|
||||
|
||||
conversion_options = {
|
||||
'comments' : description,
|
||||
'tags' : tags,
|
||||
'language' : language,
|
||||
'publisher' : publisher,
|
||||
'authors' : publisher,
|
||||
'smarten_punctuation' : True
|
||||
}
|
||||
|
||||
|
||||
feeds = [
|
||||
(u'Agriculture', u'http://www.heritage.org/static/RSS/Agriculture.xml'),
|
||||
(u'Alliances', u'http://www.heritage.org/static/RSS/Alliances.xml'),
|
||||
(u'Arms Control and Non-Proliferation', u'http://www.heritage.org/static/RSS/Arms-Control-and-Non-Proliferation.xml'),
|
||||
(u'Budget and Spending', u'http://www.heritage.org/static/RSS/Budget-and-Spending.xml'),
|
||||
(u'Economic Freedom', u'http://www.heritage.org/static/RSS/Economic-Freedom.xml'),
|
||||
(u'Economy', u'http://www.heritage.org/static/RSS/Economy.xml'),
|
||||
(u'Education', u'http://www.heritage.org/static/RSS/Education.xml'),
|
||||
(u'Energy and Environment', u'http://www.heritage.org/static/RSS/Energy-and-Environment.xml'),
|
||||
(u'Family and Marriage', u'http://www.heritage.org/static/RSS/Family-And-Marriage.xml'),
|
||||
(u'Foreign Aid and Development', u'http://www.heritage.org/static/RSS/Foreign-Aid-and-Development.xml'),
|
||||
(u'Health Care', u'http://www.heritage.org/static/RSS/Health-Care.xml'),
|
||||
(u'Homeland Security', u'http://www.heritage.org/static/RSS/Homeland-Security.xml'),
|
||||
(u'Housing', u'http://www.heritage.org/static/RSS/Housing.xml'),
|
||||
(u'Immigration', u'http://www.heritage.org/static/RSS/Immigration.xml'),
|
||||
(u'International Conflicts', u'http://www.heritage.org/static/RSS/International-Conflicts.xml'),
|
||||
(u'International Law', u'http://www.heritage.org/static/RSS/International-Law.xml'),
|
||||
(u'Labor', u'http://www.heritage.org/static/RSS/Labor.xml'),
|
||||
(u'Legal Issues', u'http://www.heritage.org/static/RSS/Legal.xml'),
|
||||
(u'Missile Defense', u'http://www.heritage.org/static/RSS/Missile-Defense.xml'),
|
||||
(u'National Security and Defense', u'http://www.heritage.org/static/RSS/National-Security-and-Defense.xml'),
|
||||
(u'Political Thought', u'http://www.heritage.org/static/RSS/Political-Thought.xml'),
|
||||
(u'Public Diplomacy', u'http://www.heritage.org/static/RSS/Public-Diplomacy.xml'),
|
||||
(u'Regulation', u'http://www.heritage.org/static/RSS/Regulation.xml'),
|
||||
(u'Religion and Civil Society', u'http://www.heritage.org/static/RSS/Religion-and-Civil-Society.xml'),
|
||||
(u'Retirement Security', u'http://www.heritage.org/static/RSS/Retirement-Security.xml'),
|
||||
(u'Space Policy', u'http://www.heritage.org/static/RSS/Space-Policy.xml'),
|
||||
(u'Taxes', u'http://www.heritage.org/static/RSS/Taxes.xml'),
|
||||
(u'Terrorism', u'http://www.heritage.org/static/RSS/Terrorism.xml'),
|
||||
(u'Trade', u'http://www.heritage.org/static/RSS/Trade.xml'),
|
||||
(u'Transportation', u'http://www.heritage.org/static/RSS/Transportation.xml'),
|
||||
(u'Welfare', u'http://www.heritage.org/static/RSS/Welfare.xml'),
|
||||
(u'Worldwide Freedom and Human Rights', u'http://www.heritage.org/static/RSS/Worldwide-Freedom-and-Human-Rights.xml'),
|
||||
]
|
||||
|
||||
61
recipes/nzz_folio.recipe
Normal file
61
recipes/nzz_folio.recipe
Normal file
@ -0,0 +1,61 @@
|
||||
|
||||
__license__ = 'GPL v3'
|
||||
__copyright__ = '2012 Bernd Leinfelder <skoll1975@gmail.com>'
|
||||
|
||||
'''
|
||||
www.nzzfolio.ch
|
||||
'''
|
||||
|
||||
from calibre.web.feeds.recipes import BasicNewsRecipe
|
||||
|
||||
class Nzzfolio(BasicNewsRecipe):
|
||||
title = 'NZZ Folio'
|
||||
__author__ = 'Bernd Leinfelder'
|
||||
description = 'Aktuelle Artikel des NZZ Folio'
|
||||
publisher = 'NZZ AG'
|
||||
category = 'news, politics, nachrichten, Switzerland'
|
||||
oldest_article = 35
|
||||
max_articles_per_feed = 100
|
||||
no_stylesheets = True
|
||||
encoding = 'utf-8'
|
||||
use_embedded_content = False
|
||||
language = 'de'
|
||||
extra_css = """
|
||||
body{font-family: Georgia,"Times New Roman",Times,serif }
|
||||
.artikel h3,.artikel h4,.bildLegende,.question,.autor{font-family: Arial,Verdana,Helvetica,sans-serif}
|
||||
.bildLegende{font-size: small}
|
||||
.autor{font-size: 0.9375em; color: #666666}
|
||||
.quote{font-size: large !important;
|
||||
font-style: italic;
|
||||
font-weight: normal !important;
|
||||
border-bottom: 1px dotted #BFBFBF;
|
||||
border-top: 1px dotted #BFBFBF;
|
||||
line-height: 1.25em}
|
||||
.quelle{color: #666666; font-style: italic; white-space: nowrap}
|
||||
"""
|
||||
|
||||
conversion_options = {
|
||||
'comments' : description
|
||||
,'tags' : category
|
||||
,'language' : language
|
||||
,'publisher' : publisher
|
||||
,'linearize_tables' : True
|
||||
}
|
||||
|
||||
|
||||
remove_attributes=['width','height','lang']
|
||||
remove_tags_before = dict(id='content')
|
||||
remove_tags_after = dict(id='content')
|
||||
remove_tags = [
|
||||
dict(name=['h2','object','link','base','meta','iframe'])
|
||||
,dict(id='artikelBar')
|
||||
,dict(id='foot')
|
||||
,dict(id='bildLegende')
|
||||
,dict(name='div',attrs={'class':['box']})
|
||||
|
||||
]
|
||||
|
||||
feeds = [
|
||||
(u'NZZ Folio' , u'http://rss.nzzfolio.ch/')
|
||||
]
|
||||
|
||||
@ -1,21 +1,27 @@
|
||||
__license__ = 'GPL v3'
|
||||
__author__ = 'faber1971'
|
||||
description = 'Italian rock webzine - v1.01 (6, July 2012)'
|
||||
from calibre.web.feeds.news import BasicNewsRecipe
|
||||
|
||||
class AdvancedUserRecipe1328535130(BasicNewsRecipe):
|
||||
title = u'Onda Rock'
|
||||
__author__ = 'faber1971'
|
||||
description = 'Italian rock webzine'
|
||||
language = 'it'
|
||||
|
||||
|
||||
oldest_article = 7
|
||||
oldest_article = 15
|
||||
max_articles_per_feed = 100
|
||||
auto_cleanup = False
|
||||
remove_tags = [
|
||||
dict(name='div', attrs={'id':['boxHeader','boxlinks_med','footer','boxinterviste','box_special_med','boxdiscografia_head','path']}),
|
||||
dict(name='div', attrs={'id':['boxHeader','boxlinks_med','footer','boxinterviste','box_special_med','boxdiscografia_head','path','widget','menuarea','headerarea']}),
|
||||
dict(name='div', attrs={'align':'left'}),
|
||||
dict(name='div', attrs={'class':['media','boxarticoli']}),
|
||||
dict(name='div', attrs={'style':'text-align: center'}),
|
||||
dict(name='table', attrs={'cellpadding':'0'}),
|
||||
dict(name='span', attrs={'class':'liketext'}),
|
||||
]
|
||||
no_stylesheets = True
|
||||
feeds = [(u'Onda Rock', u'http://www.ondarock.it/feed.php')]
|
||||
masthead_url = 'http://profile.ak.fbcdn.net/hprofile-ak-snc4/71135_45820579767_4993043_n.jpg'
|
||||
masthead_url = 'http://api.ning.com/files/4ot8ampp*-rYQuwL2NoaHvVqcyu7VMyWyan12a9QMsJUWxk-q5V1-34wnD-Wj9B5qWjc1yPMLGiwQg8hZJxaySeaG2lx8hpV/2009_banner_ondarock.gif'
|
||||
|
||||
extra_css = '''
|
||||
.boxtabscontain_page {border: 1px solid #E0E0E0;clear: both;font-family: "Verdana", "Arial", "Helvetica", sans-serif;font-size: 10px;line-height: 17px;margin: 0px 0px 20px;padding: 10px 10px 10px 40px;position: relative;top: -1px;width: 258px;z-index: 1;}
|
||||
'''
|
||||
|
||||
@ -1,59 +1,100 @@
|
||||
import re
|
||||
from calibre.web.feeds.recipes import BasicNewsRecipe
|
||||
|
||||
class AdvancedUserRecipe1335532466(BasicNewsRecipe):
|
||||
title = u'Richmond Times-Dispatch'
|
||||
description = 'News from Richmond, Virginia, USA'
|
||||
__author__ = 'jde'
|
||||
cover_url = 'http://static2.dukecms.com/va_tn/timesdispatch_com/site-media/img/icons/logo252x97.png'
|
||||
language = 'en'
|
||||
encoding = 'utf8'
|
||||
oldest_article = 1 #days
|
||||
max_articles_per_feed = 25
|
||||
needs_subscription = False
|
||||
remove_javascript = True
|
||||
recursions = 0
|
||||
use_embedded_content = False
|
||||
no_stylesheets = True
|
||||
auto_cleanup = True
|
||||
class RichmondTimesDispatch(BasicNewsRecipe):
|
||||
title = u'Richmond Times-Dispatch'
|
||||
description = "The Richmond Times-Dispatch is the primary daily newspaper in Richmond, \
|
||||
the capital of Virginia, United States, as well as the Virginia cities of Petersburg, \
|
||||
Chester. Hopewell, Colonial Heights, Charlottesville, Lynchburg, Waynesboro, \
|
||||
and is also a default paper for rural regions of the state. \
|
||||
The RTD has published in some form for more than 150 years."
|
||||
__author__ = '_reader'
|
||||
__date__ = '05 July 2012'
|
||||
__version__ = '1.4'
|
||||
cover_url = 'http://static2.dukecms.com/va_tn/timesdispatch_com/site-media/img/icons/logo252x97.png'
|
||||
masthead_url = 'http://static2.dukecms.com/va_tn/timesdispatch_com/site-media/img/icons/logo252x97.png'
|
||||
language = 'en'
|
||||
oldest_article = 1.5 #days
|
||||
max_articles_per_feed = 100
|
||||
needs_subscription = False
|
||||
publisher = 'timesdispatch.com'
|
||||
category = 'news, commentary'
|
||||
tags = 'news'
|
||||
publication_type = 'newspaper'
|
||||
no_stylesheets = True
|
||||
use_embedded_content= False
|
||||
encoding = None
|
||||
simultaneous_downloads = 20
|
||||
recursions = 0
|
||||
remove_javascript = True
|
||||
remove_empty_feeds = True
|
||||
auto_cleanup = False
|
||||
|
||||
conversion_options = {
|
||||
'comments' : description,
|
||||
'tags' : tags,
|
||||
'language' : language,
|
||||
'publisher' : publisher,
|
||||
'authors' : publisher,
|
||||
'smarten_punctuation' : True
|
||||
}
|
||||
|
||||
remove_tags_before = dict(id='hnews hentry item')
|
||||
|
||||
remove_tags_after = dict(name='hr')
|
||||
|
||||
remove_tags = [
|
||||
dict(name='div', attrs={'id':['mg_hd', 'mg_ft', 'sr_b', 'comments_left', 'comments_right']})
|
||||
,dict(name='div', attrs={'class':['bottom_social','article_bottom']})
|
||||
,dict(name='table', attrs={'class':['ap-mediabox-table', 'ap-htmltable-table', 'ap-photogallery-table', 'ap-htmlfragment-table']})
|
||||
]
|
||||
|
||||
|
||||
preprocess_regexps = [
|
||||
(re.compile(r'<table class="ap-story-table hnews hentry item".*?<td class="ap-story-td">', re.DOTALL|re.IGNORECASE), lambda match: ''),
|
||||
(re.compile(r'<p>\s*http://www2.timesdispatch.*?</p>', re.DOTALL|re.IGNORECASE), lambda match: ''),
|
||||
(re.compile(r'<p>\s*<img src="http://static2.dukecms.*?</p>', re.DOTALL|re.IGNORECASE), lambda match: ''),
|
||||
(re.compile(r'<p>\s*<a href="http://www2.timesdispatch.*?</p>', re.DOTALL|re.IGNORECASE), lambda match: ''),
|
||||
(re.compile(r'<hr.*?>', re.DOTALL|re.IGNORECASE), lambda match: ''), #strip <hr /> line break
|
||||
(re.compile(r'<a\s*rel="item-license.*?Use</a>.', re.DOTALL|re.IGNORECASE), lambda match: ''), #strip <hr /> line break
|
||||
(re.compile(r'<small>\s*Richmond Times-Dispatch.*?</small>', re.DOTALL|re.IGNORECASE), lambda match: ''), #strip <hr /> line break
|
||||
]
|
||||
|
||||
|
||||
feeds = [
|
||||
('News', 'http://www2.timesdispatch.com/list/feed/rss/news-archive'),
|
||||
('Breaking News', 'http://www2.timesdispatch.com/list/feed/rss/breaking-news'),
|
||||
('National News', 'http://www2.timesdispatch.com/list/feed/rss/national-news'),
|
||||
('Local News', 'http://www2.timesdispatch.com/list/feed/rss/local-news'),
|
||||
('Business', 'http://www2.timesdispatch.com/list/feed/rss/business'),
|
||||
('Local Business', 'http://www2.timesdispatch.com/list/feed/rss/local-business'),
|
||||
('Politics', 'http://www2.timesdispatch.com/list/feed/rss/politics'),
|
||||
('Virginia Politics', 'http://www2.timesdispatch.com/list/feed/rss/virginia-politics'),
|
||||
('Sports', 'http://www2.timesdispatch.com/list/feed/rss/sports2'),
|
||||
('Health', 'http://www2.timesdispatch.com/feed/rss/lifestyles/health_med_fit/'),
|
||||
('Entertainment/Life', 'http://www2.timesdispatch.com/list/feed/rss/entertainment'),
|
||||
('Arts/Theatre', 'http://www2.timesdispatch.com/feed/rss/entertainment/arts_theatre/'),
|
||||
('Movies', 'http://www2.timesdispatch.com/list/feed/rss/movies'),
|
||||
('Music', 'http://www2.timesdispatch.com/list/feed/rss/music'),
|
||||
('Dining & Food', 'http://www2.timesdispatch.com/list/feed/rss/dining'),
|
||||
('Home & Garden', 'http://www2.timesdispatch.com/list/feed/rss/home-and-garden/'),
|
||||
#inactive('Travel', 'http://www2.timesdispatch.com/feed/rss/travel/'),
|
||||
('Opinion', 'http://www2.timesdispatch.com/feed/rss/news/opinion/'),
|
||||
('Editorials', 'http://www2.timesdispatch.com/list/feed/rss/editorial-desk'),
|
||||
('Columnists and Blogs', 'http://www2.timesdispatch.com/list/feed/rss/news-columnists-blogs'),
|
||||
('Opinion Columnists', 'http://www2.timesdispatch.com/list/feed/rss/opinion-editorial-columnists'),
|
||||
('Letters to the Editor', 'http://www2.timesdispatch.com/list/feed/rss/opinion-letters'),
|
||||
('Traffic', 'http://www2.timesdispatch.com/list/feed/rss/traffic'),
|
||||
]
|
||||
|
||||
('News',
|
||||
'http://www2.timesdispatch.com/list/feed/rss/news-archive'),
|
||||
('Breaking News',
|
||||
'http://www2.timesdispatch.com/list/feed/rss/breaking-news'),
|
||||
('National News',
|
||||
'http://www2.timesdispatch.com/list/feed/rss/national-news'),
|
||||
('Local News',
|
||||
'http://www2.timesdispatch.com/list/feed/rss/local-news'),
|
||||
('Business',
|
||||
'http://www2.timesdispatch.com/list/feed/rss/business'),
|
||||
('Local Business',
|
||||
'http://www2.timesdispatch.com/list/feed/rss/local-business'),
|
||||
('Politics',
|
||||
'http://www2.timesdispatch.com/list/feed/rss/politics'),
|
||||
('Virginia Politics',
|
||||
'http://www2.timesdispatch.com/list/feed/rss/virginia-politics'),
|
||||
('Editorials',
|
||||
'http://www2.timesdispatch.com/list/feed/rss/editorial-desk'),
|
||||
('Columnists and Blogs',
|
||||
'http://www2.timesdispatch.com/list/feed/rss/news-columnists-blogs'),
|
||||
('Opinion Columnists',
|
||||
'http://www2.timesdispatch.com/list/feed/rss/opinion-editorial-columnists'),
|
||||
('Letters to the Editor',
|
||||
'http://www2.timesdispatch.com/list/feed/rss/opinion-letters'),
|
||||
('Traffic',
|
||||
'http://www2.timesdispatch.com/list/feed/rss/traffic'),
|
||||
('Sports',
|
||||
'http://www2.timesdispatch.com/list/feed/rss/sports2'),
|
||||
('Entertainment/Life',
|
||||
'http://www2.timesdispatch.com/list/feed/rss/entertainment'),
|
||||
('Movies',
|
||||
'http://www2.timesdispatch.com/list/feed/rss/movies'),
|
||||
('Music',
|
||||
'http://www2.timesdispatch.com/list/feed/rss/music'),
|
||||
('Dining & Food',
|
||||
'http://www2.timesdispatch.com/list/feed/rss/dining'),
|
||||
|
||||
]
|
||||
|
||||
def print_version(self,url):
|
||||
article_num = re.sub(r'(^.*)\-([0-9]{4,10})\/$', r'\g<2>', url)
|
||||
ap_pat = re.compile('http')
|
||||
#print '\nDEBUG>>>>>>>>: article_num: ', article_num
|
||||
#print 'DEBUG>>>>>>>>: ap_pat.search(article_num): ', ap_pat.search(article_num)
|
||||
if ap_pat.search(article_num): #AP article, no print url
|
||||
#print 'DEBUG>>>>>>>>: AP URL: ', url
|
||||
return url
|
||||
else:
|
||||
printURL = 'http://www2.timesdispatch.com/member-center/share-this/print/?content=ar' + article_num
|
||||
return printURL
|
||||
|
||||
16
recipes/warentest.recipe
Normal file
16
recipes/warentest.recipe
Normal file
@ -0,0 +1,16 @@
|
||||
from calibre.web.feeds.news import BasicNewsRecipe
|
||||
|
||||
class Warentest(BasicNewsRecipe):
|
||||
title = u'Warentest'
|
||||
language = 'de'
|
||||
description = 'Stiftung Warentest is a German consumer organisation and foundation involved in investigating and comparing goods and services in an unbiased way'
|
||||
__author__ = 'asdfdsfksd'
|
||||
needs_subscription = False
|
||||
max_articles_per_feed = 100
|
||||
auto_cleanup = True
|
||||
|
||||
feeds = [(u'Test', u'http://www.test.de/rss/alles/')]
|
||||
|
||||
def get_cover_url(self):
|
||||
return 'http://www.test.de/img/pp/logo.png'
|
||||
|
||||
Binary file not shown.
@ -515,3 +515,13 @@ compile_gpm_templates = True
|
||||
# default_tweak_format = 'remember'
|
||||
default_tweak_format = None
|
||||
|
||||
#: Enable multi-character first-letters in the tag browser
|
||||
# Some languages have letters that can be represented by multiple characters.
|
||||
# For example, Czech has a 'character' "ch" that sorts between "h" and "i".
|
||||
# If this tweak is True, then the tag browser will take these characters into
|
||||
# consideration when partitioning by first letter.
|
||||
# Examples:
|
||||
# enable_multicharacters_in_tag_browser = True
|
||||
# enable_multicharacters_in_tag_browser = True
|
||||
enable_multicharacters_in_tag_browser = True
|
||||
|
||||
|
||||
@ -34,6 +34,7 @@ if iswindows:
|
||||
MT = os.path.join(os.path.dirname(p), 'bin', 'mt.exe')
|
||||
MT = os.path.join(SDK, 'bin', 'mt.exe')
|
||||
os.environ['QMAKESPEC'] = 'win32-msvc'
|
||||
ICU = r'Q:\icu'
|
||||
|
||||
QMAKE = '/Volumes/sw/qt/bin/qmake' if isosx else 'qmake'
|
||||
if find_executable('qmake-qt4'):
|
||||
@ -97,8 +98,9 @@ if iswindows:
|
||||
prefix = r'C:\cygwin\home\kovid\sw'
|
||||
sw_inc_dir = os.path.join(prefix, 'include')
|
||||
sw_lib_dir = os.path.join(prefix, 'lib')
|
||||
icu_inc_dirs = [sw_inc_dir]
|
||||
icu_lib_dirs = [sw_lib_dir]
|
||||
icu_inc_dirs = [os.path.join(ICU, 'source', 'common'), os.path.join(ICU,
|
||||
'source', 'i18n')]
|
||||
icu_lib_dirs = [os.path.join(ICU, 'source', 'lib')]
|
||||
sqlite_inc_dirs = [sw_inc_dir]
|
||||
fc_inc = os.path.join(sw_inc_dir, 'fontconfig')
|
||||
fc_lib = sw_lib_dir
|
||||
|
||||
@ -11,7 +11,7 @@ import subprocess, tempfile, os, time
|
||||
from setup import Command, installer_name
|
||||
from setup.build_environment import HOST, PROJECT
|
||||
|
||||
BASE_RSYNC = ['rsync', '-avz', '--delete']
|
||||
BASE_RSYNC = ['rsync', '-avz', '--delete', '--force']
|
||||
EXCLUDES = []
|
||||
for x in [
|
||||
'src/calibre/plugins', 'src/calibre/manual', 'src/calibre/trac',
|
||||
|
||||
@ -54,10 +54,10 @@ binary_includes = [
|
||||
'/lib/libreadline.so.6',
|
||||
'/usr/lib/libchm.so.0',
|
||||
'/usr/lib/liblcms2.so.2',
|
||||
'/usr/lib/libicudata.so.46',
|
||||
'/usr/lib/libicui18n.so.46',
|
||||
'/usr/lib/libicuuc.so.46',
|
||||
'/usr/lib/libicuio.so.46',
|
||||
'/usr/lib/libicudata.so.49',
|
||||
'/usr/lib/libicui18n.so.49',
|
||||
'/usr/lib/libicuuc.so.49',
|
||||
'/usr/lib/libicuio.so.49',
|
||||
]
|
||||
binary_includes += [os.path.join(QTDIR, 'lib%s.so.4'%x) for x in QTDLLS]
|
||||
|
||||
|
||||
@ -13,6 +13,7 @@ from setup import (Command, modules, functions, basenames, __version__,
|
||||
from setup.build_environment import msvc, MT, RC
|
||||
from setup.installer.windows.wix import WixMixIn
|
||||
|
||||
ICU_DIR = r'Q:\icu'
|
||||
OPENSSL_DIR = r'Q:\openssl'
|
||||
QT_DIR = 'Q:\\Qt\\4.8.2'
|
||||
QT_DLLS = ['Core', 'Gui', 'Network', 'Svg', 'WebKit', 'Xml', 'XmlPatterns']
|
||||
@ -147,6 +148,8 @@ class Win32Freeze(Command, WixMixIn):
|
||||
ignore=shutil.ignore_patterns('msvc*.dll', 'Microsoft.*'))
|
||||
for x in glob.glob(self.j(OPENSSL_DIR, 'bin', '*.dll')):
|
||||
shutil.copy2(x, self.dll_dir)
|
||||
for x in glob.glob(self.j(ICU_DIR, 'source', 'lib', '*.dll')):
|
||||
shutil.copy2(x, self.dll_dir)
|
||||
for x in QT_DLLS:
|
||||
x += '4.dll'
|
||||
if not x.startswith('phonon'): x = 'Qt'+x
|
||||
|
||||
@ -131,11 +131,22 @@ calibre-debug -c "import _imaging, _imagingmath, _imagingft, _imagingcms"
|
||||
ICU
|
||||
-------
|
||||
|
||||
Download the win32 msvc9 binary from http://www.icu-project.org/download/4.4.html
|
||||
Download the win32 source .zip from http://www.icu-project.org/download
|
||||
|
||||
Note that 4.4 is the last version of ICU that can be compiled (is precompiled) with msvc9
|
||||
Extract to q:\icu
|
||||
|
||||
Put the dlls into sw/bin and the unicode dir into sw/include and the contents of lib int sw/lib
|
||||
Add Q:\icu\bin to PATH and reboot
|
||||
|
||||
In a Visual Studio Command Prompt
|
||||
cd to <ICU>\source
|
||||
Run set PATH=%PATH%;c:\cygwin\bin
|
||||
Run dos2unix on configure and runConfigureICU
|
||||
|
||||
Run bash ./runConfigureICU Cygwin/MSVC
|
||||
|
||||
Run make (note that you must have GNU make installed in cygwin)
|
||||
|
||||
Optionally run make test
|
||||
|
||||
Libunrar
|
||||
----------
|
||||
|
||||
@ -40,7 +40,7 @@ class Stage2(Command):
|
||||
class Stage3(Command):
|
||||
|
||||
description = 'Stage 3 of the publish process'
|
||||
sub_commands = ['upload_user_manual', 'upload_demo', 'sdist']
|
||||
sub_commands = ['upload_user_manual', 'upload_demo', 'sdist', 'tag_release']
|
||||
|
||||
class Stage4(Command):
|
||||
|
||||
@ -50,7 +50,7 @@ class Stage4(Command):
|
||||
class Stage5(Command):
|
||||
|
||||
description = 'Stage 5 of the publish process'
|
||||
sub_commands = ['tag_release', 'upload_to_server']
|
||||
sub_commands = ['upload_to_server']
|
||||
|
||||
def run(self, opts):
|
||||
subprocess.check_call('rm -rf build/* dist/*', shell=True)
|
||||
|
||||
@ -4,7 +4,7 @@ __license__ = 'GPL v3'
|
||||
__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
|
||||
__docformat__ = 'restructuredtext en'
|
||||
__appname__ = u'calibre'
|
||||
numeric_version = (0, 8, 58)
|
||||
numeric_version = (0, 8, 59)
|
||||
__version__ = u'.'.join(map(unicode, numeric_version))
|
||||
__author__ = u"Kovid Goyal <kovid@kovidgoyal.net>"
|
||||
|
||||
|
||||
@ -497,6 +497,7 @@ def initialize_plugin(plugin, path_to_zip_file):
|
||||
%tb) + '\n'+tb)
|
||||
|
||||
def has_external_plugins():
|
||||
'True if there are updateable (zip file based) plugins'
|
||||
return bool(config['plugins'])
|
||||
|
||||
def initialize_plugins(perf=False):
|
||||
@ -554,6 +555,23 @@ def initialized_plugins():
|
||||
|
||||
# CLI {{{
|
||||
|
||||
def build_plugin(path):
|
||||
from calibre import prints
|
||||
from calibre.ptempfile import PersistentTemporaryFile
|
||||
from calibre.utils.zipfile import ZipFile, ZIP_STORED
|
||||
path = type(u'')(path)
|
||||
names = frozenset(os.listdir(path))
|
||||
if u'__init__.py' not in names:
|
||||
prints(path, ' is not a valid plugin')
|
||||
raise SystemExit(1)
|
||||
t = PersistentTemporaryFile(u'.zip')
|
||||
with ZipFile(t, u'w', ZIP_STORED) as zf:
|
||||
zf.add_dir(path)
|
||||
t.close()
|
||||
plugin = add_plugin(t.name)
|
||||
os.remove(t.name)
|
||||
prints(u'Plugin updated:', plugin.name, plugin.version)
|
||||
|
||||
def option_parser():
|
||||
parser = OptionParser(usage=_('''\
|
||||
%prog options
|
||||
@ -562,6 +580,10 @@ def option_parser():
|
||||
'''))
|
||||
parser.add_option('-a', '--add-plugin', default=None,
|
||||
help=_('Add a plugin by specifying the path to the zip file containing it.'))
|
||||
parser.add_option('-b', '--build-plugin', default=None,
|
||||
help=_('For plugin developers: Path to the directory where you are'
|
||||
' developing the plugin. This command will automatically zip '
|
||||
'up the plugin and update it in calibre.'))
|
||||
parser.add_option('-r', '--remove-plugin', default=None,
|
||||
help=_('Remove a custom plugin by name. Has no effect on builtin plugins'))
|
||||
parser.add_option('--customize-plugin', default=None,
|
||||
@ -583,6 +605,8 @@ def main(args=sys.argv):
|
||||
if opts.add_plugin is not None:
|
||||
plugin = add_plugin(opts.add_plugin)
|
||||
print 'Plugin added:', plugin.name, plugin.version
|
||||
if opts.build_plugin is not None:
|
||||
build_plugin(opts.build_plugin)
|
||||
if opts.remove_plugin is not None:
|
||||
if remove_plugin(opts.remove_plugin):
|
||||
print 'Plugin removed'
|
||||
|
||||
@ -10,7 +10,7 @@ import cStringIO
|
||||
|
||||
from calibre.devices.usbms.driver import USBMS
|
||||
|
||||
HTC_BCDS = [0x100, 0x0222, 0x0226, 0x227, 0x228]
|
||||
HTC_BCDS = [0x100, 0x0222, 0x0226, 0x227, 0x228, 0x229]
|
||||
|
||||
class ANDROID(USBMS):
|
||||
|
||||
@ -72,6 +72,7 @@ class ANDROID(USBMS):
|
||||
|
||||
# Sony Ericsson
|
||||
0xfce : {
|
||||
0xa173 : [0x216],
|
||||
0xd12e : [0x0100],
|
||||
0xe156 : [0x226],
|
||||
0xe15d : [0x226],
|
||||
@ -99,7 +100,7 @@ class ANDROID(USBMS):
|
||||
0x681c : [0x0222, 0x0223, 0x0224, 0x0400],
|
||||
0x6640 : [0x0100],
|
||||
0x685b : [0x0400, 0x0226],
|
||||
0x685e : [0x0400],
|
||||
0x685e : [0x0400, 0x226],
|
||||
0x6860 : [0x0400],
|
||||
0x6863 : [0x226],
|
||||
0x6877 : [0x0400],
|
||||
@ -208,7 +209,7 @@ class ANDROID(USBMS):
|
||||
'XT910', 'BOOK_A10', 'USB_2.0_DRIVER', 'I9100T', 'P999DW',
|
||||
'KTABLET_PC', 'INGENIC', 'GT-I9001_CARD', 'USB_2.0_DRIVER',
|
||||
'GT-S5830L_CARD', 'UNIVERSE', 'XT875', 'PRO', '.KOBO_VOX',
|
||||
'THINKPAD_TABLET']
|
||||
'THINKPAD_TABLET', 'SGH-T989']
|
||||
WINDOWS_CARD_A_MEM = ['ANDROID_PHONE', 'GT-I9000_CARD', 'SGH-I897',
|
||||
'FILE-STOR_GADGET', 'SGH-T959_CARD', 'SGH-T959', 'SAMSUNG_ANDROID', 'GT-P1000_CARD',
|
||||
'A70S', 'A101IT', '7', 'INCREDIBLE', 'A7EB', 'SGH-T849_CARD',
|
||||
@ -217,7 +218,7 @@ class ANDROID(USBMS):
|
||||
'A1-07___C0541A4F', 'XT912', 'MB855', 'XT910', 'BOOK_A10_CARD',
|
||||
'USB_2.0_DRIVER', 'I9100T', 'P999DW_SD_CARD', 'KTABLET_PC',
|
||||
'FILE-CD_GADGET', 'GT-I9001_CARD', 'USB_2.0_DRIVER', 'XT875',
|
||||
'UMS_COMPOSITE', 'PRO', '.KOBO_VOX']
|
||||
'UMS_COMPOSITE', 'PRO', '.KOBO_VOX', 'SGH-T989_CARD']
|
||||
|
||||
OSX_MAIN_MEM = 'Android Device Main Memory'
|
||||
|
||||
|
||||
@ -23,10 +23,11 @@ class KOBO(USBMS):
|
||||
gui_name = 'Kobo Reader'
|
||||
description = _('Communicate with the Kobo Reader')
|
||||
author = 'Timothy Legge'
|
||||
version = (1, 0, 12)
|
||||
version = (1, 0, 13)
|
||||
|
||||
dbversion = 0
|
||||
fwversion = 0
|
||||
supported_dbversion = 33
|
||||
has_kepubs = False
|
||||
|
||||
supported_platforms = ['windows', 'osx', 'linux']
|
||||
@ -73,6 +74,12 @@ class KOBO(USBMS):
|
||||
':::'+_('Kobo now shows recommendations on the device. In some case these have '
|
||||
'files but in other cases they are just pointers to the web site to buy. '
|
||||
'Enable if you wish to see/delete them.'),
|
||||
_('Attempt to support newer firmware') +
|
||||
':::'+_('Kobo routinely updates the firmware and the '
|
||||
'database version. With this option Calibre will attempt '
|
||||
'to perform full read-write functionality - Here be Dragons!! '
|
||||
'Enable only if you are comfortable with restoring your kobo '
|
||||
'to factory defaults and testing software'),
|
||||
]
|
||||
|
||||
EXTRA_CUSTOMIZATION_DEFAULT = [
|
||||
@ -81,6 +88,7 @@ class KOBO(USBMS):
|
||||
True,
|
||||
True,
|
||||
False,
|
||||
False,
|
||||
False
|
||||
]
|
||||
|
||||
@ -90,6 +98,7 @@ class KOBO(USBMS):
|
||||
OPT_SHOW_EXPIRED_BOOK_RECORDS = 3
|
||||
OPT_SHOW_PREVIEWS = 4
|
||||
OPT_SHOW_RECOMMENDATIONS = 5
|
||||
OPT_SUPPORT_NEWER_FIRMWARE = 6
|
||||
|
||||
def initialize(self):
|
||||
USBMS.initialize(self)
|
||||
@ -238,15 +247,6 @@ class KOBO(USBMS):
|
||||
|
||||
cursor = connection.cursor()
|
||||
|
||||
#query = 'select count(distinct volumeId) from volume_shortcovers'
|
||||
#cursor.execute(query)
|
||||
#for row in (cursor):
|
||||
# numrows = row[0]
|
||||
#cursor.close()
|
||||
|
||||
# Determine the database version
|
||||
# 4 - Bluetooth Kobo Rev 2 (1.4)
|
||||
# 8 - WIFI KOBO Rev 1
|
||||
cursor.execute('select version from dbversion')
|
||||
result = cursor.fetchone()
|
||||
self.dbversion = result[0]
|
||||
@ -422,6 +422,9 @@ class KOBO(USBMS):
|
||||
os.unlink(fpath)
|
||||
|
||||
def delete_books(self, paths, end_session=True):
|
||||
if self.modify_database_check("delete_books") == False:
|
||||
return
|
||||
|
||||
for i, path in enumerate(paths):
|
||||
self.report_progress((i+1) / float(len(paths)), _('Removing books from device...'))
|
||||
path = self.normalize_path(path)
|
||||
@ -458,6 +461,9 @@ class KOBO(USBMS):
|
||||
self.report_progress(1.0, _('Removing books from device...'))
|
||||
|
||||
def remove_books_from_metadata(self, paths, booklists):
|
||||
if self.modify_datbase_check("remove_books_from_metatata") == False:
|
||||
return
|
||||
|
||||
for i, path in enumerate(paths):
|
||||
self.report_progress((i+1) / float(len(paths)), _('Removing books from device metadata listing...'))
|
||||
for bl in booklists:
|
||||
@ -588,6 +594,34 @@ class KOBO(USBMS):
|
||||
|
||||
return path
|
||||
|
||||
def modify_database_check(self, function):
|
||||
# Checks to see whether the database version is supported
|
||||
# and whether the user has chosen to support the firmware version
|
||||
if self.dbversion > self.supported_dbversion:
|
||||
# Unsupported database
|
||||
opts = self.settings()
|
||||
if not opts.extra_customization[self.OPT_SUPPORT_NEWER_FIRMWARE]:
|
||||
debug_print('The database has been upgraded past supported version')
|
||||
debug_print('The database has been upgraded past supported version')
|
||||
self.report_progress(1.0, _('Removing books from device...'))
|
||||
from calibre.devices.errors import UserFeedback
|
||||
raise UserFeedback(_("Kobo database version unsupported - See details"),
|
||||
_('Your Kobo is running an updated firmware/database version '
|
||||
'As Calibre has not been updated, database editing is disabled. '
|
||||
'You can enable support for your Kobo in plugin preferences. '
|
||||
'Doing so may require you to perform a factory reset. '
|
||||
'before selecting the "Attempt to support newer firmware" option '
|
||||
'you should be familiar with restoring your Kobo to factory defaults.'),
|
||||
UserFeedback.WARN)
|
||||
|
||||
return False
|
||||
else:
|
||||
# The user chose to edit the database anyway
|
||||
return True
|
||||
else:
|
||||
# Supported database version
|
||||
return True
|
||||
|
||||
def get_file(self, path, *args, **kwargs):
|
||||
tpath = self.munge_path(path)
|
||||
extension = os.path.splitext(tpath)[1]
|
||||
@ -706,6 +740,9 @@ class KOBO(USBMS):
|
||||
# debug_print(' Commit: Set FavouritesIndex')
|
||||
|
||||
def update_device_database_collections(self, booklists, collections_attributes, oncard):
|
||||
if self.modify_database_check("update_device_database_collections") == False:
|
||||
return
|
||||
|
||||
# Only process categories in this list
|
||||
supportedcategories = {
|
||||
"Im_Reading":1,
|
||||
|
||||
@ -159,16 +159,29 @@ def get_udisks(ver=None):
|
||||
return u
|
||||
return UDisks2() if ver == 2 else UDisks()
|
||||
|
||||
def get_udisks1():
|
||||
u = None
|
||||
try:
|
||||
u = UDisks()
|
||||
except NoUDisks1:
|
||||
try:
|
||||
u = UDisks2()
|
||||
except NoUDisks2:
|
||||
pass
|
||||
if u is None:
|
||||
raise EnvironmentError('UDisks not available on your system')
|
||||
return u
|
||||
|
||||
def mount(node_path):
|
||||
u = UDisks()
|
||||
u = get_udisks1()
|
||||
u.mount(node_path)
|
||||
|
||||
def eject(node_path):
|
||||
u = UDisks()
|
||||
u = get_udisks1()
|
||||
u.eject(node_path)
|
||||
|
||||
def umount(node_path):
|
||||
u = UDisks()
|
||||
u = get_udisks1()
|
||||
u.unmount(node_path)
|
||||
|
||||
def test_udisks(ver=None):
|
||||
|
||||
@ -6,48 +6,7 @@
|
||||
Released under the GPLv3 License
|
||||
###
|
||||
|
||||
log = (args...) -> # {{{
|
||||
if args
|
||||
msg = args.join(' ')
|
||||
if window?.console?.log
|
||||
window.console.log(msg)
|
||||
else if process?.stdout?.write
|
||||
process.stdout.write(msg + '\n')
|
||||
# }}}
|
||||
|
||||
window_scroll_pos = (win=window) -> # {{{
|
||||
if typeof(win.pageXOffset) == 'number'
|
||||
x = win.pageXOffset
|
||||
y = win.pageYOffset
|
||||
else # IE < 9
|
||||
if document.body and ( document.body.scrollLeft or document.body.scrollTop )
|
||||
x = document.body.scrollLeft
|
||||
y = document.body.scrollTop
|
||||
else if document.documentElement and ( document.documentElement.scrollLeft or document.documentElement.scrollTop)
|
||||
y = document.documentElement.scrollTop
|
||||
x = document.documentElement.scrollLeft
|
||||
return [x, y]
|
||||
# }}}
|
||||
|
||||
viewport_to_document = (x, y, doc=window?.document) -> # {{{
|
||||
until doc == window.document
|
||||
# We are in a frame
|
||||
frame = doc.defaultView.frameElement
|
||||
rect = frame.getBoundingClientRect()
|
||||
x += rect.left
|
||||
y += rect.top
|
||||
doc = frame.ownerDocument
|
||||
win = doc.defaultView
|
||||
[wx, wy] = window_scroll_pos(win)
|
||||
x += wx
|
||||
y += wy
|
||||
return [x, y]
|
||||
# }}}
|
||||
|
||||
absleft = (elem) -> # {{{
|
||||
r = elem.getBoundingClientRect()
|
||||
return viewport_to_document(r.left, 0, elem.ownerDocument)[0]
|
||||
# }}}
|
||||
log = window.calibre_utils.log
|
||||
|
||||
class PagedDisplay
|
||||
# This class is a namespace to expose functions via the
|
||||
@ -75,6 +34,7 @@ class PagedDisplay
|
||||
this.cols_per_screen = cols_per_screen
|
||||
|
||||
layout: () ->
|
||||
# start_time = new Date().getTime()
|
||||
body_style = window.getComputedStyle(document.body)
|
||||
# When laying body out in columns, webkit bleeds the top margin of the
|
||||
# first block element out above the columns, leading to an extra top
|
||||
@ -160,8 +120,30 @@ class PagedDisplay
|
||||
|
||||
this.in_paged_mode = true
|
||||
this.current_margin_side = sm
|
||||
# log('Time to layout:', new Date().getTime() - start_time)
|
||||
return sm
|
||||
|
||||
fit_images: () ->
|
||||
# Ensure no images are wider than the available width in a column. Note
|
||||
# that this method use getBoundingClientRect() which means it will
|
||||
# force a relayout if the render tree is dirty.
|
||||
images = []
|
||||
for img in document.getElementsByTagName('img')
|
||||
previously_limited = calibre_utils.retrieve(img, 'width-limited', false)
|
||||
br = img.getBoundingClientRect()
|
||||
left = calibre_utils.viewport_to_document(br.left, 0, doc=img.ownerDocument)[0]
|
||||
col = this.column_at(left) * this.page_width
|
||||
rleft = left - col - this.current_margin_side
|
||||
width = br.right - br.left
|
||||
rright = rleft + width
|
||||
col_width = this.page_width - 2*this.current_margin_side
|
||||
if previously_limited or rright > col_width
|
||||
images.push([img, col_width - rleft])
|
||||
|
||||
for [img, max_width] in images
|
||||
img.style.setProperty('max-width', max_width+'px')
|
||||
calibre_utils.store(img, 'width-limited', true)
|
||||
|
||||
scroll_to_pos: (frac) ->
|
||||
# Scroll to the position represented by frac (number between 0 and 1)
|
||||
xpos = Math.floor(document.body.scrollWidth * frac)
|
||||
@ -297,7 +279,7 @@ class PagedDisplay
|
||||
elem.scrollIntoView()
|
||||
if this.in_paged_mode
|
||||
# Ensure we are scrolled to the column containing elem
|
||||
this.scroll_to_xpos(absleft(elem) + 5)
|
||||
this.scroll_to_xpos(calibre_utils.absleft(elem) + 5)
|
||||
|
||||
snap_to_selection: () ->
|
||||
# Ensure that the viewport is positioned at the start of the column
|
||||
@ -306,7 +288,7 @@ class PagedDisplay
|
||||
sel = window.getSelection()
|
||||
r = sel.getRangeAt(0).getBoundingClientRect()
|
||||
node = sel.anchorNode
|
||||
left = viewport_to_document(r.left, r.top, doc=node.ownerDocument)[0]
|
||||
left = calibre_utils.viewport_to_document(r.left, r.top, doc=node.ownerDocument)[0]
|
||||
|
||||
# Ensure we are scrolled to the column containing the start of the
|
||||
# selection
|
||||
@ -365,5 +347,5 @@ if window?
|
||||
window.paged_display = new PagedDisplay()
|
||||
|
||||
# TODO:
|
||||
# Resizing of images
|
||||
# Highlight on jump_to_anchor
|
||||
# Handle document specified margins and allow them to be overridden
|
||||
|
||||
96
src/calibre/ebooks/oeb/display/utils.coffee
Normal file
96
src/calibre/ebooks/oeb/display/utils.coffee
Normal file
@ -0,0 +1,96 @@
|
||||
#!/usr/bin/env coffee
|
||||
# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
|
||||
|
||||
###
|
||||
Copyright 2012, Kovid Goyal <kovid@kovidgoyal.net>
|
||||
Released under the GPLv3 License
|
||||
###
|
||||
|
||||
class CalibreUtils
|
||||
# This class is a namespace to expose functions via the
|
||||
# window.calibre_utils object.
|
||||
|
||||
constructor: () ->
|
||||
if not this instanceof arguments.callee
|
||||
throw new Error('CalibreUtils constructor called as function')
|
||||
this.dom_attr = 'calibre_f3fa75ca98eb4413a4ee413f20f60226'
|
||||
this.dom_data = []
|
||||
|
||||
# Data API {{{
|
||||
|
||||
retrieve: (node, key, def=null) ->
|
||||
# Retrieve data previously stored on node (a DOM node) with key (a
|
||||
# string). If no such data is found then return the value of def.
|
||||
idx = parseInt(node.getAttribute(this.dom_attr))
|
||||
if isNaN(idx)
|
||||
return def
|
||||
data = this.dom_data[idx]
|
||||
if not data.hasOwnProperty(key)
|
||||
return def
|
||||
return data[key]
|
||||
|
||||
store: (node, key, val) ->
|
||||
# Store arbitrary javscript object val on DOM node node with key (a
|
||||
# string). This can be later retrieved by the retrieve method.
|
||||
idx = parseInt(node.getAttribute(this.dom_attr))
|
||||
if isNaN(idx)
|
||||
idx = this.dom_data.length
|
||||
node.setAttribute(this.dom_attr, idx+'')
|
||||
this.dom_data.push({})
|
||||
this.dom_data[idx][key] = val
|
||||
# }}}
|
||||
|
||||
log: (args...) -> # {{{
|
||||
# Output args to the window.console object. args are automatically
|
||||
# coerced to strings
|
||||
if args
|
||||
msg = args.join(' ')
|
||||
if window?.console?.log
|
||||
window.console.log(msg)
|
||||
else if process?.stdout?.write
|
||||
process.stdout.write(msg + '\n')
|
||||
# }}}
|
||||
|
||||
window_scroll_pos: (win=window) -> # {{{
|
||||
# The current scroll position of the browser window
|
||||
if typeof(win.pageXOffset) == 'number'
|
||||
x = win.pageXOffset
|
||||
y = win.pageYOffset
|
||||
else # IE < 9
|
||||
if document.body and ( document.body.scrollLeft or document.body.scrollTop )
|
||||
x = document.body.scrollLeft
|
||||
y = document.body.scrollTop
|
||||
else if document.documentElement and ( document.documentElement.scrollLeft or document.documentElement.scrollTop)
|
||||
y = document.documentElement.scrollTop
|
||||
x = document.documentElement.scrollLeft
|
||||
return [x, y]
|
||||
# }}}
|
||||
|
||||
viewport_to_document: (x, y, doc=window?.document) -> # {{{
|
||||
# Convert x, y from the viewport (window) co-ordinate system to the
|
||||
# document (body) co-ordinate system
|
||||
until doc == window.document
|
||||
# We are in a frame
|
||||
frame = doc.defaultView.frameElement
|
||||
rect = frame.getBoundingClientRect()
|
||||
x += rect.left
|
||||
y += rect.top
|
||||
doc = frame.ownerDocument
|
||||
win = doc.defaultView
|
||||
[wx, wy] = this.window_scroll_pos(win)
|
||||
x += wx
|
||||
y += wy
|
||||
return [x, y]
|
||||
# }}}
|
||||
|
||||
absleft: (elem) -> # {{{
|
||||
# The left edge of elem in document co-ords. Works in all
|
||||
# circumstances, including column layout. Note that this will cause
|
||||
# a relayout if the render tree is dirty.
|
||||
r = elem.getBoundingClientRect()
|
||||
return this.viewport_to_document(r.left, 0, elem.ownerDocument)[0]
|
||||
# }}}
|
||||
|
||||
if window?
|
||||
window.calibre_utils = new CalibreUtils()
|
||||
|
||||
@ -117,7 +117,6 @@ class PDFMetadata(object):
|
||||
if len(oeb_metadata.creator) >= 1:
|
||||
self.author = authors_to_string([x.value for x in oeb_metadata.creator])
|
||||
|
||||
|
||||
class PDFWriter(QObject): # {{{
|
||||
|
||||
def __init__(self, opts, log, cover_data=None):
|
||||
@ -185,8 +184,8 @@ class PDFWriter(QObject): # {{{
|
||||
from PyQt4.Qt import QSize, QPainter
|
||||
if self.paged_js is None:
|
||||
from calibre.utils.resources import compiled_coffeescript
|
||||
self.paged_js = compiled_coffeescript('ebooks.oeb.display.paged',
|
||||
dynamic=False)
|
||||
self.paged_js = compiled_coffeescript('ebooks.oeb.display.utils')
|
||||
self.paged_js += compiled_coffeescript('ebooks.oeb.display.paged')
|
||||
printer = get_pdf_printer(self.opts, output_file_name=outpath)
|
||||
painter = QPainter(printer)
|
||||
zoomx = printer.logicalDpiX()/self.view.logicalDpiX()
|
||||
@ -202,6 +201,7 @@ class PDFWriter(QObject): # {{{
|
||||
document.body.style.backgroundColor = "white";
|
||||
paged_display.set_geometry(1, 0, 0, 0);
|
||||
paged_display.layout();
|
||||
paged_display.fit_images();
|
||||
''')
|
||||
mf = self.view.page().mainFrame()
|
||||
while True:
|
||||
|
||||
@ -734,8 +734,11 @@ gui_thread = None
|
||||
qt_app = None
|
||||
class Application(QApplication):
|
||||
|
||||
def __init__(self, args, force_calibre_style=False):
|
||||
def __init__(self, args, force_calibre_style=False,
|
||||
override_program_name=None):
|
||||
self.file_event_hook = None
|
||||
if override_program_name:
|
||||
args = [override_program_name] + args[1:]
|
||||
qargs = [i.encode('utf-8') if isinstance(i, unicode) else i for i in args]
|
||||
QApplication.__init__(self, qargs)
|
||||
global gui_thread, qt_app
|
||||
|
||||
@ -216,7 +216,8 @@ class CopyToLibraryAction(InterfaceAction):
|
||||
if ci.isValid():
|
||||
row = ci.row()
|
||||
|
||||
v.model().delete_books_by_id(self.worker.processed)
|
||||
v.model().delete_books_by_id(self.worker.processed,
|
||||
permanent=True)
|
||||
self.gui.iactions['Remove Books'].library_ids_deleted(
|
||||
self.worker.processed, row)
|
||||
|
||||
|
||||
@ -104,8 +104,11 @@ def render_data(mi, use_roman_numbers=True, all_fields=False):
|
||||
field = 'title_sort'
|
||||
if all_fields:
|
||||
display = True
|
||||
if (not display or not metadata or mi.is_null(field) or
|
||||
field == 'comments'):
|
||||
if metadata['datatype'] == 'bool':
|
||||
isnull = mi.get(field) is None
|
||||
else:
|
||||
isnull = mi.is_null(field)
|
||||
if (not display or not metadata or isnull or field == 'comments'):
|
||||
continue
|
||||
name = metadata['name']
|
||||
if not name:
|
||||
|
||||
@ -97,6 +97,9 @@ class MetadataWidget(Widget, Ui_Form):
|
||||
else:
|
||||
self.cover.setPixmap(QPixmap(I('default_cover.png')))
|
||||
self.cover.setToolTip(_('This book has no cover'))
|
||||
for x in ('author', 'series', 'publisher'):
|
||||
x = getattr(self, x)
|
||||
x.lineEdit().deselect()
|
||||
|
||||
def set_cover_tooltip(self, pm):
|
||||
tt = _('Cover size: %(width)d x %(height)d pixels') % dict(
|
||||
|
||||
@ -220,16 +220,15 @@ class BooksModel(QAbstractTableModel): # {{{
|
||||
self.count_changed()
|
||||
self.reset()
|
||||
|
||||
def delete_books(self, indices):
|
||||
def delete_books(self, indices, permanent=False):
|
||||
ids = map(self.id, indices)
|
||||
for id in ids:
|
||||
self.db.delete_book(id, notify=False)
|
||||
self.books_deleted()
|
||||
self.delete_books_by_id(ids, permanent=permanent)
|
||||
return ids
|
||||
|
||||
def delete_books_by_id(self, ids):
|
||||
def delete_books_by_id(self, ids, permanent=False):
|
||||
for id in ids:
|
||||
self.db.delete_book(id)
|
||||
self.db.delete_book(id, permanent=permanent, do_clean=False)
|
||||
self.db.clean()
|
||||
self.books_deleted()
|
||||
|
||||
def books_added(self, num):
|
||||
|
||||
@ -309,7 +309,8 @@ def main(args=sys.argv, logger=None):
|
||||
return 1
|
||||
pid = os.fork() if (islinux or isbsd) else -1
|
||||
if pid <= 0:
|
||||
app = Application(args)
|
||||
override = 'calibre-lrf-viewer' if islinux else None
|
||||
app = Application(args, override_program_name=override)
|
||||
app.setWindowIcon(QIcon(I('viewer.png')))
|
||||
QCoreApplication.setOrganizationName(ORG_NAME)
|
||||
QCoreApplication.setApplicationName(APP_UID)
|
||||
|
||||
@ -8,7 +8,7 @@ from PyQt4.Qt import (QCoreApplication, QIcon, QObject, QTimer,
|
||||
QPixmap, QSplashScreen, QApplication)
|
||||
|
||||
from calibre import prints, plugins, force_unicode
|
||||
from calibre.constants import (iswindows, __appname__, isosx, DEBUG,
|
||||
from calibre.constants import (iswindows, __appname__, isosx, DEBUG, islinux,
|
||||
filesystem_encoding)
|
||||
from calibre.utils.ipc import gui_socket_address, RC
|
||||
from calibre.gui2 import (ORG_NAME, APP_UID, initialize_file_icon_provider,
|
||||
@ -58,7 +58,8 @@ def init_qt(args):
|
||||
prints('Using library at', prefs['library_path'])
|
||||
QCoreApplication.setOrganizationName(ORG_NAME)
|
||||
QCoreApplication.setApplicationName(APP_UID)
|
||||
app = Application(args)
|
||||
override = 'calibre-gui' if islinux else None
|
||||
app = Application(args, override_program_name=override)
|
||||
actions = tuple(Main.create_application_menubar())
|
||||
app.setWindowIcon(QIcon(I('lt.png')))
|
||||
return app, opts, args, actions
|
||||
|
||||
@ -13,6 +13,7 @@ from calibre.gui2.preferences.search_ui import Ui_Form
|
||||
from calibre.gui2 import config, error_dialog
|
||||
from calibre.utils.config import prefs
|
||||
from calibre.utils.icu import sort_key
|
||||
from calibre.library.caches import set_use_primary_find_in_search
|
||||
|
||||
class ConfigWidget(ConfigWidgetBase, Ui_Form):
|
||||
|
||||
@ -26,6 +27,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
|
||||
r('search_as_you_type', config)
|
||||
r('highlight_search_matches', config)
|
||||
r('limit_search_columns', prefs)
|
||||
r('use_primary_find_in_search', prefs)
|
||||
r('limit_search_columns_to', prefs, setting=CommaSeparatedList)
|
||||
fl = db.field_metadata.get_search_terms()
|
||||
self.opt_limit_search_columns_to.update_items_cache(fl)
|
||||
@ -222,6 +224,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
|
||||
return ConfigWidgetBase.commit(self)
|
||||
|
||||
def refresh_gui(self, gui):
|
||||
set_use_primary_find_in_search(prefs['use_primary_find_in_search'])
|
||||
gui.set_highlight_only_button_icon()
|
||||
if self.muc_changed:
|
||||
gui.tags_view.recount()
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>670</width>
|
||||
<height>556</height>
|
||||
<height>663</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
@ -21,14 +21,21 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<item row="0" column="1">
|
||||
<widget class="QCheckBox" name="opt_use_primary_find_in_search">
|
||||
<property name="text">
|
||||
<string>Unaccented characters match accented characters</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0" colspan="2">
|
||||
<widget class="QCheckBox" name="opt_highlight_search_matches">
|
||||
<property name="text">
|
||||
<string>&Highlight search results instead of restricting the book list to the results</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<item row="4" column="0" colspan="2">
|
||||
<widget class="QGroupBox" name="groupBox">
|
||||
<property name="title">
|
||||
<string>What to search by default</string>
|
||||
@ -77,17 +84,7 @@
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QPushButton" name="clear_history_button">
|
||||
<property name="toolTip">
|
||||
<string>Clear search histories from all over calibre. Including the book list, e-book viewer, fetch news dialog, etc.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Clear search &histories</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<item row="6" column="0" colspan="2">
|
||||
<widget class="QGroupBox" name="groupBox_2">
|
||||
<property name="title">
|
||||
<string>Grouped Search Terms</string>
|
||||
@ -107,12 +104,6 @@
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="gst_names">
|
||||
<property name="editable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="minimumContentsLength">
|
||||
<number>10</number>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Contains the names of the currently-defined group search terms.
|
||||
Create a new name by entering it into the empty box, then
|
||||
@ -120,6 +111,12 @@ pressing Save. Rename a search term by selecting it then
|
||||
changing the name and pressing Save. Change the value of
|
||||
a search term by changing the value box then pressing Save.</string>
|
||||
</property>
|
||||
<property name="editable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="minimumContentsLength">
|
||||
<number>10</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
@ -201,7 +198,17 @@ to be shown as user categories</string>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="0">
|
||||
<item row="5" column="0" colspan="2">
|
||||
<widget class="QPushButton" name="clear_history_button">
|
||||
<property name="toolTip">
|
||||
<string>Clear search histories from all over calibre. Including the book list, e-book viewer, fetch news dialog, etc.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Clear search &histories</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="0" colspan="2">
|
||||
<widget class="QGroupBox" name="groupBox22">
|
||||
<property name="title">
|
||||
<string>What to search when searching similar books</string>
|
||||
@ -211,7 +218,7 @@ to be shown as user categories</string>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string><p>When you search for similar books by right clicking the
|
||||
book and selecting "Similar books...",
|
||||
book and selecting "Similar books...",
|
||||
calibre constructs a search using the column lookup names specified below.
|
||||
By changing the lookup name to a grouped search term you can
|
||||
search multiple columns at once.</p></string>
|
||||
@ -239,8 +246,7 @@ to be shown as user categories</string>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2">
|
||||
<widget class="QComboBox" name="opt_similar_authors_match_kind">
|
||||
</widget>
|
||||
<widget class="QComboBox" name="opt_similar_authors_match_kind"/>
|
||||
</item>
|
||||
<item row="1" column="3">
|
||||
<widget class="QLabel" name="label_222">
|
||||
@ -260,8 +266,7 @@ to be shown as user categories</string>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="5">
|
||||
<widget class="QComboBox" name="opt_similar_series_match_kind">
|
||||
</widget>
|
||||
<widget class="QComboBox" name="opt_similar_series_match_kind"/>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_223">
|
||||
@ -271,12 +276,10 @@ to be shown as user categories</string>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QComboBox" name="similar_tags_search_key">
|
||||
</widget>
|
||||
<widget class="QComboBox" name="similar_tags_search_key"/>
|
||||
</item>
|
||||
<item row="2" column="2">
|
||||
<widget class="QComboBox" name="opt_similar_tags_match_kind">
|
||||
</widget>
|
||||
<widget class="QComboBox" name="opt_similar_tags_match_kind"/>
|
||||
</item>
|
||||
<item row="2" column="3">
|
||||
<widget class="QLabel" name="label_224">
|
||||
@ -286,12 +289,10 @@ to be shown as user categories</string>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="4">
|
||||
<widget class="QComboBox" name="similar_publisher_search_key">
|
||||
</widget>
|
||||
<widget class="QComboBox" name="similar_publisher_search_key"/>
|
||||
</item>
|
||||
<item row="2" column="5">
|
||||
<widget class="QComboBox" name="opt_similar_publisher_match_kind">
|
||||
</widget>
|
||||
<widget class="QComboBox" name="opt_similar_publisher_match_kind"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
|
||||
@ -5,7 +5,9 @@ __license__ = 'GPL v3'
|
||||
__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
|
||||
__docformat__ = 'restructuredtext en'
|
||||
|
||||
from functools import partial
|
||||
import textwrap
|
||||
from collections import OrderedDict
|
||||
|
||||
from calibre.gui2.preferences import ConfigWidgetBase, test_widget, AbortCommit
|
||||
from calibre.gui2.preferences.tweaks_ui import Ui_Form
|
||||
@ -18,8 +20,8 @@ from calibre.utils.search_query_parser import (ParseException,
|
||||
SearchQueryParser)
|
||||
|
||||
from PyQt4.Qt import (QAbstractListModel, Qt, QStyledItemDelegate, QStyle,
|
||||
QStyleOptionViewItem, QFont, QDialogButtonBox, QDialog,
|
||||
QVBoxLayout, QPlainTextEdit, QLabel, QModelIndex)
|
||||
QStyleOptionViewItem, QFont, QDialogButtonBox, QDialog, QApplication,
|
||||
QVBoxLayout, QPlainTextEdit, QLabel, QModelIndex, QMenu, QIcon)
|
||||
|
||||
ROOT = QModelIndex()
|
||||
|
||||
@ -46,10 +48,12 @@ class Tweak(object): # {{{
|
||||
if self.doc:
|
||||
self.doc = translate(self.doc)
|
||||
self.var_names = var_names
|
||||
self.default_values = {}
|
||||
if self.var_names:
|
||||
self.doc = u"%s: %s\n\n%s"%(_('ID'), self.var_names[0], self.doc)
|
||||
self.default_values = OrderedDict()
|
||||
for x in var_names:
|
||||
self.default_values[x] = defaults[x]
|
||||
self.custom_values = {}
|
||||
self.custom_values = OrderedDict()
|
||||
for x in var_names:
|
||||
if x in custom:
|
||||
self.custom_values[x] = custom[x]
|
||||
@ -243,7 +247,8 @@ class Tweaks(QAbstractListModel, SearchQueryParser): # {{{
|
||||
query = lower(query)
|
||||
for r in candidates:
|
||||
dat = self.data(self.index(r), Qt.UserRole)
|
||||
if query in lower(dat.name):# or query in lower(dat.doc):
|
||||
var_names = u' '.join(dat.default_values)
|
||||
if query in lower(dat.name) or query in lower(var_names):
|
||||
ans.add(r)
|
||||
return ans
|
||||
|
||||
@ -325,7 +330,29 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
|
||||
self.search.initialize('tweaks_search_history', help_text=
|
||||
_('Search for tweak'))
|
||||
self.search.search.connect(self.find)
|
||||
self.view.setContextMenuPolicy(Qt.CustomContextMenu)
|
||||
self.view.customContextMenuRequested.connect(self.show_context_menu)
|
||||
self.copy_icon = QIcon(I('edit-copy.png'))
|
||||
|
||||
def show_context_menu(self, point):
|
||||
idx = self.tweaks_view.currentIndex()
|
||||
if not idx.isValid():
|
||||
return True
|
||||
tweak = self.tweaks.data(idx, Qt.UserRole)
|
||||
self.context_menu = QMenu(self)
|
||||
self.context_menu.addAction(self.copy_icon,
|
||||
_('Copy to clipboard'),
|
||||
partial(self.copy_item_to_clipboard,
|
||||
val=u"%s (%s: %s)"%(tweak.name,
|
||||
_('ID'),
|
||||
tweak.var_names[0])))
|
||||
self.context_menu.popup(self.mapToGlobal(point))
|
||||
return True
|
||||
|
||||
def copy_item_to_clipboard(self, val):
|
||||
cb = QApplication.clipboard();
|
||||
cb.clear()
|
||||
cb.setText(val)
|
||||
|
||||
def plugin_tweaks(self):
|
||||
raw = self.tweaks.plugin_tweaks_string
|
||||
@ -441,7 +468,6 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
from PyQt4.Qt import QApplication
|
||||
app = QApplication([])
|
||||
#Tweaks()
|
||||
#test_widget
|
||||
|
||||
@ -6,7 +6,7 @@ __license__ = 'GPL 3'
|
||||
__copyright__ = '2011, John Schember <john@nachtimwald.com>'
|
||||
__docformat__ = 'restructuredtext en'
|
||||
|
||||
import urllib2, re
|
||||
import urllib2
|
||||
from contextlib import closing
|
||||
|
||||
from lxml import html
|
||||
|
||||
@ -17,7 +17,7 @@ from PyQt4.Qt import (QAbstractItemModel, QIcon, QVariant, QFont, Qt,
|
||||
from calibre.gui2 import NONE, gprefs, config, error_dialog
|
||||
from calibre.library.database2 import Tag
|
||||
from calibre.utils.config import tweaks
|
||||
from calibre.utils.icu import sort_key, lower, strcmp
|
||||
from calibre.utils.icu import sort_key, lower, strcmp, contractions
|
||||
from calibre.library.field_metadata import TagsIcons, category_icon_map
|
||||
from calibre.gui2.dialogs.confirm_delete import confirm
|
||||
from calibre.utils.formatter import EvalFormatter
|
||||
@ -258,6 +258,16 @@ class TagsModel(QAbstractItemModel): # {{{
|
||||
self.hidden_categories.add(cat)
|
||||
db.prefs.set('tag_browser_hidden_categories', list(self.hidden_categories))
|
||||
|
||||
conts = contractions()
|
||||
if len(conts) == 0 or not tweaks['enable_multicharacters_in_tag_browser']:
|
||||
self.do_contraction = False
|
||||
else:
|
||||
self.do_contraction = True
|
||||
nconts = set()
|
||||
for s in conts:
|
||||
nconts.add(icu_upper(s))
|
||||
self.contraction_set = frozenset(nconts)
|
||||
|
||||
self.db = db
|
||||
self._run_rebuild()
|
||||
self.endResetModel()
|
||||
@ -335,7 +345,6 @@ class TagsModel(QAbstractItemModel): # {{{
|
||||
node.is_gst = is_gst
|
||||
if not is_gst:
|
||||
node.tag.is_hierarchical = '5state'
|
||||
if not is_gst:
|
||||
tree_root[p] = {}
|
||||
tree_root = tree_root[p]
|
||||
else:
|
||||
@ -417,7 +426,14 @@ class TagsModel(QAbstractItemModel): # {{{
|
||||
if not tag.sort:
|
||||
c = ' '
|
||||
else:
|
||||
c = icu_upper(tag.sort[0])
|
||||
if not self.do_contraction:
|
||||
c = icu_upper(tag.sort)[0]
|
||||
else:
|
||||
v = icu_upper(tag.sort)
|
||||
c = v[0]
|
||||
for s in self.contraction_set:
|
||||
if len(s) > len(c) and v.startswith(s):
|
||||
c = s
|
||||
if c not in chardict:
|
||||
chardict[c] = [idx, idx]
|
||||
else:
|
||||
@ -519,7 +535,7 @@ class TagsModel(QAbstractItemModel): # {{{
|
||||
# category display order is important here. The following works
|
||||
# only if all the non-user categories are displayed before the
|
||||
# user categories
|
||||
if category_is_hierarchical:
|
||||
if category_is_hierarchical or tag.is_hierarchical:
|
||||
components = get_name_components(tag.original_name)
|
||||
else:
|
||||
components = [tag.original_name]
|
||||
@ -581,6 +597,14 @@ class TagsModel(QAbstractItemModel): # {{{
|
||||
return [(t.tag.id, t.tag.original_name, t.tag.count)
|
||||
for t in cat.child_tags() if t.tag.count > 0]
|
||||
|
||||
def is_in_user_category(self, index):
|
||||
if not index.isValid():
|
||||
return False
|
||||
p = self.get_node(index)
|
||||
while p.type != TagTreeItem.CATEGORY:
|
||||
p = p.parent
|
||||
return p.tag.category.startswith('@')
|
||||
|
||||
# Drag'n Drop {{{
|
||||
def mimeTypes(self):
|
||||
return ["application/calibre+from_library",
|
||||
@ -646,13 +670,13 @@ class TagsModel(QAbstractItemModel): # {{{
|
||||
action is Qt.CopyAction or Qt.MoveAction
|
||||
'''
|
||||
def process_source_node(user_cats, src_parent, src_parent_is_gst,
|
||||
is_uc, dest_key, node):
|
||||
is_uc, dest_key, idx):
|
||||
'''
|
||||
Copy/move an item and all its children to the destination
|
||||
'''
|
||||
copied = False
|
||||
src_name = node.tag.original_name
|
||||
src_cat = node.tag.category
|
||||
src_name = idx.tag.original_name
|
||||
src_cat = idx.tag.category
|
||||
# delete the item if the source is a user category and action is move
|
||||
if is_uc and not src_parent_is_gst and src_parent in user_cats and \
|
||||
action == Qt.MoveAction:
|
||||
@ -675,7 +699,7 @@ class TagsModel(QAbstractItemModel): # {{{
|
||||
if add_it:
|
||||
user_cats[dest_key].append([src_name, src_cat, 0])
|
||||
|
||||
for c in node.children:
|
||||
for c in idx.children:
|
||||
copied = process_source_node(user_cats, src_parent, src_parent_is_gst,
|
||||
is_uc, dest_key, c)
|
||||
return copied
|
||||
@ -696,11 +720,11 @@ class TagsModel(QAbstractItemModel): # {{{
|
||||
if dest_key not in user_cats:
|
||||
continue
|
||||
|
||||
node = self.index_for_path(path)
|
||||
if node:
|
||||
idx = self.index_for_path(path)
|
||||
if idx.isValid():
|
||||
process_source_node(user_cats, src_parent, src_parent_is_gst,
|
||||
is_uc, dest_key,
|
||||
self.get_node(node))
|
||||
self.get_node(idx))
|
||||
|
||||
self.db.prefs.set('user_categories', user_cats)
|
||||
self.refresh_required.emit()
|
||||
@ -1139,6 +1163,8 @@ class TagsModel(QAbstractItemModel): # {{{
|
||||
return QModelIndex()
|
||||
|
||||
ans = self.createIndex(parent_item.row(), 0, parent_item)
|
||||
if not ans.isValid():
|
||||
return QModelIndex()
|
||||
return ans
|
||||
|
||||
def rowCount(self, parent):
|
||||
|
||||
@ -12,7 +12,8 @@ from functools import partial
|
||||
from itertools import izip
|
||||
|
||||
from PyQt4.Qt import (QStyledItemDelegate, Qt, QTreeView, pyqtSignal, QSize,
|
||||
QIcon, QApplication, QMenu, QPoint, QModelIndex, QToolTip, QCursor)
|
||||
QIcon, QApplication, QMenu, QPoint, QModelIndex, QToolTip, QCursor,
|
||||
QDrag)
|
||||
|
||||
from calibre.gui2.tag_browser.model import (TagTreeItem, TAG_SEARCH_STATES,
|
||||
TagsModel)
|
||||
@ -101,6 +102,7 @@ class TagsView(QTreeView): # {{{
|
||||
self.setDragEnabled(True)
|
||||
self.setDragDropMode(self.DragDrop)
|
||||
self.setDropIndicatorShown(True)
|
||||
self.in_drag_drop = False
|
||||
self.setAutoExpandDelay(500)
|
||||
self.pane_is_visible = False
|
||||
self.search_icon = QIcon(I('search.png'))
|
||||
@ -232,10 +234,35 @@ class TagsView(QTreeView): # {{{
|
||||
s = s if s else None
|
||||
self._model.set_search_restriction(s)
|
||||
|
||||
def mouseMoveEvent(self, event):
|
||||
dex = self.indexAt(event.pos())
|
||||
if self.in_drag_drop or not dex.isValid():
|
||||
QTreeView.mouseMoveEvent(self, event)
|
||||
return
|
||||
# Must deal with odd case where the node being dragged is 'virtual',
|
||||
# created to form a hierarchy. We can't really drag this node, but in
|
||||
# addition we can't allow drag recognition to notice going over some
|
||||
# other node and grabbing that one. So we set in_drag_drop to prevent
|
||||
# this from happening, turning it off when the user lifts the button.
|
||||
self.in_drag_drop = True
|
||||
if not self._model.flags(dex) & Qt.ItemIsDragEnabled:
|
||||
QTreeView.mouseMoveEvent(self, event)
|
||||
return
|
||||
md = self._model.mimeData([dex])
|
||||
pixmap = dex.data(Qt.DecorationRole).toPyObject().pixmap(25, 25)
|
||||
drag = QDrag(self)
|
||||
drag.setPixmap(pixmap)
|
||||
drag.setMimeData(md)
|
||||
if self._model.is_in_user_category(dex):
|
||||
drag.exec_(Qt.CopyAction|Qt.MoveAction, Qt.CopyAction)
|
||||
else:
|
||||
drag.exec_(Qt.CopyAction)
|
||||
|
||||
def mouseReleaseEvent(self, event):
|
||||
# Swallow everything except leftButton so context menus work correctly
|
||||
if event.button() == Qt.LeftButton:
|
||||
if event.button() == Qt.LeftButton or self.in_drag_drop:
|
||||
QTreeView.mouseReleaseEvent(self, event)
|
||||
self.in_drag_drop = False
|
||||
|
||||
def mouseDoubleClickEvent(self, event):
|
||||
# swallow these to avoid toggling and editing at the same time
|
||||
@ -622,11 +649,13 @@ class TagsView(QTreeView): # {{{
|
||||
path = self.model().path_for_index(ci) if self.is_visible(ci) else None
|
||||
expanded_categories, state_map = self.get_state()
|
||||
self._model.rebuild_node_tree(state_map=state_map)
|
||||
self.blockSignals(True)
|
||||
for category in expanded_categories:
|
||||
idx = self._model.index_for_category(category)
|
||||
if idx is not None and idx.isValid():
|
||||
self.expand(idx)
|
||||
self.show_item_at_path(path)
|
||||
self.blockSignals(False)
|
||||
|
||||
def show_item_at_path(self, path, box=False,
|
||||
position=QTreeView.PositionAtCenter):
|
||||
@ -639,12 +668,19 @@ class TagsView(QTreeView): # {{{
|
||||
self.show_item_at_index(self._model.index_for_path(path), box=box,
|
||||
position=position)
|
||||
|
||||
def expand_parent(self, idx):
|
||||
# Needed otherwise Qt sometimes segfaults if the node is buried in a
|
||||
# collapsed, off screen hierarchy. To be safe, we expand from the
|
||||
# outermost in
|
||||
p = self._model.parent(idx)
|
||||
if p.isValid():
|
||||
self.expand_parent(p)
|
||||
self.expand(idx)
|
||||
|
||||
def show_item_at_index(self, idx, box=False,
|
||||
position=QTreeView.PositionAtCenter):
|
||||
if idx.isValid() and idx.data(Qt.UserRole).toPyObject() is not self._model.root_item:
|
||||
self.expand(self._model.parent(idx)) # Needed otherwise Qt sometimes segfaults if the
|
||||
# node is buried in a collapsed, off
|
||||
# screen hierarchy
|
||||
self.expand_parent(idx)
|
||||
self.setCurrentIndex(idx)
|
||||
self.scrollTo(idx, position)
|
||||
if box:
|
||||
|
||||
@ -11,6 +11,7 @@ import cPickle, os
|
||||
|
||||
from PyQt4.Qt import QDialog, QProgressDialog, QString, QTimer
|
||||
|
||||
from calibre.constants import DEBUG
|
||||
from calibre.ptempfile import PersistentTemporaryFile
|
||||
from calibre.gui2 import warning_dialog, question_dialog
|
||||
from calibre.gui2.convert.single import NoSupportedInputFormats
|
||||
|
||||
@ -136,7 +136,7 @@ class Document(QWebPage): # {{{
|
||||
self.max_fs_width = min(opts.max_fs_width, screen_width-50)
|
||||
|
||||
def fit_images(self):
|
||||
if self.do_fit_images:
|
||||
if self.do_fit_images and not self.in_paged_mode:
|
||||
self.javascript('setup_image_scaling_handlers()')
|
||||
|
||||
def add_window_objects(self):
|
||||
@ -219,6 +219,7 @@ class Document(QWebPage): # {{{
|
||||
if scroll_width > self.window_width:
|
||||
sz.setWidth(scroll_width+side_margin)
|
||||
self.setPreferredContentsSize(sz)
|
||||
self.javascript('window.paged_display.fit_images()')
|
||||
|
||||
@property
|
||||
def column_boundaries(self):
|
||||
|
||||
@ -31,10 +31,11 @@ class JavaScriptLoader(object):
|
||||
'cfi':'ebooks.oeb.display.cfi',
|
||||
'indexing':'ebooks.oeb.display.indexing',
|
||||
'paged':'ebooks.oeb.display.paged',
|
||||
'utils':'ebooks.oeb.display.utils',
|
||||
}
|
||||
|
||||
ORDER = ('jquery', 'jquery_scrollTo', 'bookmarks', 'referencing', 'images',
|
||||
'hyphenation', 'hyphenator', 'cfi', 'indexing', 'paged')
|
||||
'hyphenation', 'hyphenator', 'utils', 'cfi', 'indexing', 'paged')
|
||||
|
||||
|
||||
def __init__(self, dynamic_coffeescript=False):
|
||||
|
||||
@ -1006,7 +1006,8 @@ def main(args=sys.argv):
|
||||
except:
|
||||
open_at = None
|
||||
if pid <= 0:
|
||||
app = Application(args)
|
||||
override = 'calibre-ebook-viewer' if islinux else None
|
||||
app = Application(args, override_program_name=override)
|
||||
app.setWindowIcon(QIcon(I('viewer.png')))
|
||||
QApplication.setOrganizationName(ORG_NAME)
|
||||
QApplication.setApplicationName(APP_UID)
|
||||
|
||||
@ -26,8 +26,8 @@ class Printing(QObject):
|
||||
for x in (Qt.Horizontal, Qt.Vertical):
|
||||
mf.setScrollBarPolicy(x, Qt.ScrollBarAlwaysOff)
|
||||
self.view.loadFinished.connect(self.load_finished)
|
||||
self.paged_js = compiled_coffeescript('ebooks.oeb.display.paged',
|
||||
dynamic=False)
|
||||
self.paged_js = compiled_coffeescript('ebooks.oeb.display.utils')
|
||||
self.paged_js += compiled_coffeescript('ebooks.oeb.display.paged')
|
||||
|
||||
def load_finished(self, ok):
|
||||
self.loaded_ok = ok
|
||||
@ -70,6 +70,7 @@ class Printing(QObject):
|
||||
document.body.style.backgroundColor = "white";
|
||||
paged_display.set_geometry(1, 0, 0, 0);
|
||||
paged_display.layout();
|
||||
paged_display.fit_images();
|
||||
''')
|
||||
|
||||
while True:
|
||||
|
||||
@ -6,7 +6,7 @@ __license__ = 'GPL v3'
|
||||
__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
|
||||
__docformat__ = 'restructuredtext en'
|
||||
|
||||
import re, itertools, time, traceback
|
||||
import re, itertools, time, traceback, locale
|
||||
from itertools import repeat, izip, imap
|
||||
from datetime import timedelta
|
||||
from threading import Thread
|
||||
@ -15,11 +15,11 @@ from calibre.utils.config import tweaks, prefs
|
||||
from calibre.utils.date import parse_date, now, UNDEFINED_DATE, clean_date_for_sort
|
||||
from calibre.utils.search_query_parser import SearchQueryParser
|
||||
from calibre.utils.pyparsing import ParseException
|
||||
from calibre.utils.localization import (canonicalize_lang, lang_map, get_udc,
|
||||
get_lang)
|
||||
from calibre.utils.localization import (canonicalize_lang, lang_map, get_udc)
|
||||
from calibre.ebooks.metadata import title_sort, author_to_author_sort
|
||||
from calibre.ebooks.metadata.opf2 import metadata_to_opf
|
||||
from calibre import prints
|
||||
from calibre.utils.icu import primary_find
|
||||
|
||||
class MetadataBackup(Thread): # {{{
|
||||
'''
|
||||
@ -118,7 +118,15 @@ class MetadataBackup(Thread): # {{{
|
||||
|
||||
# }}}
|
||||
|
||||
|
||||
### Global utility function for get_match here and in gui2/library.py
|
||||
# This is a global for performance
|
||||
pref_use_primary_find_in_search = False
|
||||
|
||||
def set_use_primary_find_in_search(toWhat):
|
||||
global pref_use_primary_find_in_search
|
||||
pref_use_primary_find_in_search = toWhat
|
||||
|
||||
CONTAINS_MATCH = 0
|
||||
EQUALS_MATCH = 1
|
||||
REGEXP_MATCH = 2
|
||||
@ -130,8 +138,8 @@ def _match(query, value, matchkind):
|
||||
else:
|
||||
internal_match_ok = False
|
||||
for t in value:
|
||||
t = icu_lower(t)
|
||||
try: ### ignore regexp exceptions, required because search-ahead tries before typing is finished
|
||||
t = icu_lower(t)
|
||||
if (matchkind == EQUALS_MATCH):
|
||||
if internal_match_ok:
|
||||
if query == t:
|
||||
@ -147,9 +155,13 @@ def _match(query, value, matchkind):
|
||||
return True
|
||||
elif query == t:
|
||||
return True
|
||||
elif ((matchkind == REGEXP_MATCH and re.search(query, t, re.I|re.UNICODE)) or ### search unanchored
|
||||
(matchkind == CONTAINS_MATCH and query in t)):
|
||||
return True
|
||||
elif matchkind == REGEXP_MATCH:
|
||||
return re.search(query, t, re.I|re.UNICODE)
|
||||
elif matchkind == CONTAINS_MATCH:
|
||||
if pref_use_primary_find_in_search:
|
||||
return primary_find(query, t)[0] != -1
|
||||
else:
|
||||
return query in t
|
||||
except re.error:
|
||||
pass
|
||||
return False
|
||||
@ -226,10 +238,6 @@ class ResultCache(SearchQueryParser): # {{{
|
||||
'''
|
||||
def __init__(self, FIELD_MAP, field_metadata, db_prefs=None):
|
||||
self.FIELD_MAP = FIELD_MAP
|
||||
l = get_lang()
|
||||
asciize_author_names = l and l.lower() in ('en', 'eng')
|
||||
if not asciize_author_names:
|
||||
self.ascii_name = lambda x: False
|
||||
self.db_prefs = db_prefs
|
||||
self.composites = {}
|
||||
self.udc = get_udc()
|
||||
@ -249,6 +257,9 @@ class ResultCache(SearchQueryParser): # {{{
|
||||
SearchQueryParser.__init__(self, self.all_search_locations, optimize=True)
|
||||
self.build_date_relop_dict()
|
||||
self.build_numeric_relop_dict()
|
||||
# Do this here so the var get updated when a library changes
|
||||
global pref_use_primary_find_in_search
|
||||
pref_use_primary_find_in_search = prefs['use_primary_find_in_search']
|
||||
|
||||
def break_cycles(self):
|
||||
self._data = self.field_metadata = self.FIELD_MAP = \
|
||||
@ -279,15 +290,6 @@ class ResultCache(SearchQueryParser): # {{{
|
||||
|
||||
# Search functions {{{
|
||||
|
||||
def ascii_name(self, name):
|
||||
try:
|
||||
ans = self.udc.decode(name)
|
||||
if ans == name:
|
||||
ans = False
|
||||
except:
|
||||
ans = False
|
||||
return ans
|
||||
|
||||
def universal_set(self):
|
||||
return set([i[0] for i in self._data if i is not None])
|
||||
|
||||
@ -623,6 +625,8 @@ class ResultCache(SearchQueryParser): # {{{
|
||||
|
||||
def get_matches(self, location, query, candidates=None,
|
||||
allow_recursion=True):
|
||||
# If candidates is not None, it must not be modified. Changing its
|
||||
# value will break query optimization in the search parser
|
||||
matches = set([])
|
||||
if candidates is None:
|
||||
candidates = self.universal_set()
|
||||
@ -649,8 +653,13 @@ class ResultCache(SearchQueryParser): # {{{
|
||||
else:
|
||||
invert = False
|
||||
for loc in location:
|
||||
matches |= self.get_matches(loc, query,
|
||||
candidates=candidates, allow_recursion=False)
|
||||
c = candidates.copy()
|
||||
m = self.get_matches(loc, query,
|
||||
candidates=c, allow_recursion=False)
|
||||
matches |= m
|
||||
c -= m
|
||||
if len(c) == 0:
|
||||
break
|
||||
if invert:
|
||||
matches = self.universal_set() - matches
|
||||
return matches
|
||||
@ -665,10 +674,15 @@ class ResultCache(SearchQueryParser): # {{{
|
||||
if l and l != 'all' and l in self.all_search_locations:
|
||||
terms.add(l)
|
||||
if terms:
|
||||
c = candidates.copy()
|
||||
for l in terms:
|
||||
try:
|
||||
matches |= self.get_matches(l, query,
|
||||
candidates=candidates, allow_recursion=allow_recursion)
|
||||
m = self.get_matches(l, query,
|
||||
candidates=c, allow_recursion=allow_recursion)
|
||||
matches |= m
|
||||
c -= m
|
||||
if len(c) == 0:
|
||||
break
|
||||
except:
|
||||
pass
|
||||
return matches
|
||||
@ -745,6 +759,7 @@ class ResultCache(SearchQueryParser): # {{{
|
||||
for i, loc in enumerate(location):
|
||||
location[i] = db_col[loc]
|
||||
|
||||
current_candidates = candidates.copy()
|
||||
for loc in location: # location is now an array of field indices
|
||||
if loc == db_col['authors']:
|
||||
### DB stores authors with commas changed to bars, so change query
|
||||
@ -761,9 +776,7 @@ class ResultCache(SearchQueryParser): # {{{
|
||||
else:
|
||||
q = query
|
||||
|
||||
au_loc = self.FIELD_MAP['authors']
|
||||
|
||||
for id_ in candidates:
|
||||
for id_ in current_candidates:
|
||||
item = self._data[id_]
|
||||
if item is None: continue
|
||||
|
||||
@ -805,14 +818,12 @@ class ResultCache(SearchQueryParser): # {{{
|
||||
if loc not in exclude_fields: # time for text matching
|
||||
if is_multiple_cols[loc] is not None:
|
||||
vals = [v.strip() for v in item[loc].split(is_multiple_cols[loc])]
|
||||
if loc == au_loc:
|
||||
vals += filter(None, map(self.ascii_name,
|
||||
vals))
|
||||
else:
|
||||
vals = [item[loc]] ### make into list to make _match happy
|
||||
if _match(q, vals, matchkind):
|
||||
matches.add(item[0])
|
||||
continue
|
||||
current_candidates -= matches
|
||||
return matches
|
||||
|
||||
def search(self, query, return_matches=False):
|
||||
@ -1081,15 +1092,14 @@ class SortKeyGenerator(object):
|
||||
dt = 'datetime'
|
||||
elif sb == 'number':
|
||||
try:
|
||||
val = val.replace(',', '').strip()
|
||||
p = 1
|
||||
for i, candidate in enumerate(
|
||||
(' B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB')):
|
||||
('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB')):
|
||||
if val.endswith(candidate):
|
||||
p = 1024**(i)
|
||||
val = val[:-len(candidate)].strip()
|
||||
break
|
||||
val = float(val) * p
|
||||
val = locale.atof(val) * p
|
||||
except:
|
||||
val = 0.0
|
||||
dt = 'float'
|
||||
|
||||
@ -11,7 +11,6 @@ import os
|
||||
from collections import namedtuple
|
||||
|
||||
from calibre import strftime
|
||||
from calibre.constants import DEBUG
|
||||
from calibre.customize import CatalogPlugin
|
||||
from calibre.customize.conversion import OptionRecommendation, DummyReporter
|
||||
|
||||
@ -277,6 +276,7 @@ class EPUB_MOBI(CatalogPlugin):
|
||||
log.error("coercing thumb_width from '%s' to '%s'" % (opts.thumb_width,self.THUMB_SMALLEST))
|
||||
opts.thumb_width = "1.0"
|
||||
|
||||
|
||||
# Display opts
|
||||
keys = opts_dict.keys()
|
||||
keys.sort()
|
||||
@ -315,11 +315,10 @@ class EPUB_MOBI(CatalogPlugin):
|
||||
recommendations = []
|
||||
recommendations.append(('remove_fake_margins', False,
|
||||
OptionRecommendation.HIGH))
|
||||
if DEBUG:
|
||||
recommendations.append(('comments', '\n'.join(line for line in build_log),
|
||||
OptionRecommendation.HIGH))
|
||||
else:
|
||||
recommendations.append(('comments', '', OptionRecommendation.HIGH))
|
||||
recommendations.append(('comments', '', OptionRecommendation.HIGH))
|
||||
|
||||
# Use to debug generated catalog code before conversion
|
||||
#setattr(opts,'debug_pipeline',os.path.expanduser("~/Desktop/Catalog debug"))
|
||||
|
||||
dp = getattr(opts, 'debug_pipeline', None)
|
||||
if dp is not None:
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
__license__ = 'GPL v3'
|
||||
__copyright__ = '2010, Greg Riker'
|
||||
|
||||
import datetime, htmlentitydefs, os, re, shutil, zlib
|
||||
import datetime, htmlentitydefs, os, re, shutil, unicodedata, zlib
|
||||
from copy import deepcopy
|
||||
from xml.sax.saxutils import escape
|
||||
|
||||
@ -14,12 +14,12 @@ from calibre.ebooks.chardet import substitute_entites
|
||||
from calibre.ptempfile import PersistentTemporaryDirectory
|
||||
from calibre.utils.config import config_dir
|
||||
from calibre.utils.date import format_date, is_date_undefined, now as nowf
|
||||
from calibre.utils.icu import capitalize
|
||||
from calibre.utils.filenames import ascii_text
|
||||
from calibre.utils.icu import capitalize, sort_key
|
||||
from calibre.utils.magick.draw import thumbnail
|
||||
from calibre.utils.zipfile import ZipFile
|
||||
|
||||
|
||||
|
||||
class CatalogBuilder(object):
|
||||
'''
|
||||
Generates catalog source files from calibre database
|
||||
@ -41,6 +41,9 @@ class CatalogBuilder(object):
|
||||
# [] = No date ranges added
|
||||
DATE_RANGE=[30]
|
||||
|
||||
# Text used in generated catalog for title section with other-than-ASCII leading letter
|
||||
SYMBOLS = _('Symbols')
|
||||
|
||||
# basename output file basename
|
||||
# creator dc:creator in OPF metadata
|
||||
# descriptionClip limits size of NCX descriptions (Kindle only)
|
||||
@ -564,10 +567,9 @@ class CatalogBuilder(object):
|
||||
|
||||
self.updateProgressFullStep("Sorting database")
|
||||
self.booksByAuthor = list(self.booksByTitle)
|
||||
|
||||
# Test for author_sort mismatches
|
||||
self.booksByAuthor = sorted(self.booksByAuthor, key=self.booksByAuthorSorter_author)
|
||||
# Build the unique_authors set from existing data
|
||||
|
||||
# Build the unique_authors set from existing data, test for author_sort mismatches
|
||||
authors = [(record['author'], record['author_sort']) for record in self.booksByAuthor]
|
||||
current_author = authors[0]
|
||||
for (i,author) in enumerate(authors):
|
||||
@ -602,7 +604,8 @@ Author '{0}':
|
||||
|
||||
current_author = author
|
||||
|
||||
self.booksByAuthor = sorted(self.booksByAuthor, key=self.booksByAuthorSorter_author_sort)
|
||||
self.booksByAuthor = sorted(self.booksByAuthor,
|
||||
key=lambda x: sort_key(self.booksByAuthorSorter_author_sort(x)))
|
||||
|
||||
# Build the unique_authors set from existing data
|
||||
authors = [(record['author'], capitalize(record['author_sort'])) for record in self.booksByAuthor]
|
||||
@ -778,8 +781,11 @@ Author '{0}':
|
||||
|
||||
# Re-sort based on title_sort
|
||||
if len(titles):
|
||||
self.booksByTitle = sorted(titles,
|
||||
key=lambda x:(x['title_sort'].upper(), x['title_sort'].upper()))
|
||||
#self.booksByTitle = sorted(titles,
|
||||
# key=lambda x:(x['title_sort'].upper(), x['title_sort'].upper()))
|
||||
|
||||
self.booksByTitle = sorted(titles, key=lambda x: sort_key(x['title_sort'].upper()))
|
||||
|
||||
if False and self.verbose:
|
||||
self.opts.log.info("fetchBooksByTitle(): %d books" % len(self.booksByTitle))
|
||||
self.opts.log.info(" %-40s %-40s" % ('title', 'title_sort'))
|
||||
@ -921,29 +927,24 @@ Author '{0}':
|
||||
body = soup.find('body')
|
||||
btc = 0
|
||||
|
||||
# Insert section tag
|
||||
pTag = Tag(soup, "p")
|
||||
pTag['class'] = 'title'
|
||||
ptc = 0
|
||||
aTag = Tag(soup,'a')
|
||||
aTag['name'] = 'section_start'
|
||||
body.insert(btc, aTag)
|
||||
btc += 1
|
||||
|
||||
# Insert the anchor
|
||||
aTag = Tag(soup, "a")
|
||||
aTag['name'] = "bytitle"
|
||||
body.insert(btc, aTag)
|
||||
btc += 1
|
||||
aTag['id'] = 'section_start'
|
||||
pTag.insert(ptc, aTag)
|
||||
ptc += 1
|
||||
|
||||
if not self.__generateForKindle:
|
||||
# We don't need this because the Kindle shows section titles
|
||||
#<h2><a name="byalphatitle" id="byalphatitle"></a>By Title</h2>
|
||||
pTag = Tag(soup, "p")
|
||||
pTag['class'] = 'title'
|
||||
# Kindle don't need this because it shows section titles in Periodical format
|
||||
aTag = Tag(soup, "a")
|
||||
aTag['name'] = "bytitle"
|
||||
pTag.insert(0,aTag)
|
||||
pTag.insert(1,NavigableString('Titles'))
|
||||
body.insert(btc,pTag)
|
||||
btc += 1
|
||||
aTag['id'] = "bytitle"
|
||||
pTag.insert(ptc,aTag)
|
||||
ptc += 1
|
||||
pTag.insert(ptc,NavigableString('Titles'))
|
||||
|
||||
body.insert(btc,pTag)
|
||||
btc += 1
|
||||
|
||||
divTag = Tag(soup, "div")
|
||||
dtc = 0
|
||||
@ -953,7 +954,7 @@ Author '{0}':
|
||||
# Incoming title <series> <series_index>: <title>
|
||||
if not self.useSeriesPrefixInTitlesSection:
|
||||
nspt = deepcopy(self.booksByTitle)
|
||||
nspt = sorted(nspt, key=lambda x:(x['title_sort'].upper(), x['title_sort'].upper()))
|
||||
nspt = sorted(nspt, key=lambda x: sort_key(x['title_sort'].upper()))
|
||||
self.booksByTitle_noSeriesPrefix = nspt
|
||||
|
||||
# Loop through the books by title
|
||||
@ -975,11 +976,14 @@ Author '{0}':
|
||||
if dtc > 0:
|
||||
divRunningTag['class'] = "initial_letter"
|
||||
drtc = 0
|
||||
current_letter = self.letter_or_symbol(book['title_sort'][0])
|
||||
pIndexTag = Tag(soup, "p")
|
||||
pIndexTag['class'] = "author_title_letter_index"
|
||||
aTag = Tag(soup, "a")
|
||||
aTag['name'] = "%s" % self.letter_or_symbol(book['title_sort'][0])
|
||||
current_letter = self.letter_or_symbol(book['title_sort'][0])
|
||||
if current_letter == self.SYMBOLS:
|
||||
aTag['id'] = self.SYMBOLS
|
||||
else:
|
||||
aTag['id'] = "%s" % self.generateUnicodeName(current_letter)
|
||||
pIndexTag.insert(0,aTag)
|
||||
pIndexTag.insert(1,NavigableString(self.letter_or_symbol(book['title_sort'][0])))
|
||||
divRunningTag.insert(dtc,pIndexTag)
|
||||
@ -1072,19 +1076,6 @@ Author '{0}':
|
||||
|
||||
btc = 0
|
||||
|
||||
# Insert section tag
|
||||
aTag = Tag(soup,'a')
|
||||
aTag['name'] = 'section_start'
|
||||
body.insert(btc, aTag)
|
||||
btc += 1
|
||||
|
||||
# Insert the anchor
|
||||
aTag = Tag(soup, "a")
|
||||
anchor_name = friendly_name.lower()
|
||||
aTag['name'] = anchor_name.replace(" ","")
|
||||
body.insert(btc, aTag)
|
||||
btc += 1
|
||||
|
||||
divTag = Tag(soup, "div")
|
||||
dtc = 0
|
||||
divOpeningTag = None
|
||||
@ -1115,7 +1106,6 @@ Author '{0}':
|
||||
drtc = 0
|
||||
divRunningTag = None
|
||||
|
||||
current_letter = self.letter_or_symbol(book['author_sort'][0].upper())
|
||||
author_count = 0
|
||||
divOpeningTag = Tag(soup, 'div')
|
||||
if dtc > 0:
|
||||
@ -1124,7 +1114,11 @@ Author '{0}':
|
||||
pIndexTag = Tag(soup, "p")
|
||||
pIndexTag['class'] = "author_title_letter_index"
|
||||
aTag = Tag(soup, "a")
|
||||
aTag['name'] = "%sauthors" % self.letter_or_symbol(current_letter)
|
||||
current_letter = self.letter_or_symbol(book['author_sort'][0].upper())
|
||||
if current_letter == self.SYMBOLS:
|
||||
aTag['id'] = self.SYMBOLS
|
||||
else:
|
||||
aTag['id'] = "%s_authors" % self.generateUnicodeName(current_letter)
|
||||
pIndexTag.insert(0,aTag)
|
||||
pIndexTag.insert(1,NavigableString(self.letter_or_symbol(book['author_sort'][0].upper())))
|
||||
divOpeningTag.insert(dotc,pIndexTag)
|
||||
@ -1156,7 +1150,7 @@ Author '{0}':
|
||||
pAuthorTag = Tag(soup, "p")
|
||||
pAuthorTag['class'] = "author_index"
|
||||
aTag = Tag(soup, "a")
|
||||
aTag['name'] = "%s" % self.generateAuthorAnchor(current_author)
|
||||
aTag['id'] = "%s" % self.generateAuthorAnchor(current_author)
|
||||
aTag.insert(0,NavigableString(current_author))
|
||||
pAuthorTag.insert(0,aTag)
|
||||
if author_count == 1:
|
||||
@ -1245,19 +1239,25 @@ Author '{0}':
|
||||
|
||||
# Loop ends here
|
||||
|
||||
pTag = Tag(soup, "p")
|
||||
pTag['class'] = 'title'
|
||||
ptc = 0
|
||||
aTag = Tag(soup,'a')
|
||||
aTag['id'] = 'section_start'
|
||||
pTag.insert(ptc, aTag)
|
||||
ptc += 1
|
||||
|
||||
if not self.__generateForKindle:
|
||||
# Insert the <h2> tag with book_count at the head
|
||||
#<h2><a name="byalphaauthor" id="byalphaauthor"></a>By Author</h2>
|
||||
pTag = Tag(soup, "p")
|
||||
pTag['class'] = 'title'
|
||||
# Kindle don't need this because it shows section titles in Periodical format
|
||||
aTag = Tag(soup, "a")
|
||||
anchor_name = friendly_name.lower()
|
||||
aTag['name'] = anchor_name.replace(" ","")
|
||||
pTag.insert(0,aTag)
|
||||
#h2Tag.insert(1,NavigableString('%s (%d)' % (friendly_name, book_count)))
|
||||
pTag.insert(1,NavigableString('%s' % (friendly_name)))
|
||||
body.insert(btc,pTag)
|
||||
btc += 1
|
||||
aTag['id'] = anchor_name.replace(" ","")
|
||||
pTag.insert(ptc,aTag)
|
||||
ptc += 1
|
||||
pTag.insert(ptc,NavigableString('%s' % (friendly_name)))
|
||||
|
||||
body.insert(btc,pTag)
|
||||
btc += 1
|
||||
|
||||
if author_count == 1:
|
||||
divTag.insert(dtc, divOpeningTag)
|
||||
@ -1292,7 +1292,7 @@ Author '{0}':
|
||||
pIndexTag = Tag(soup, "p")
|
||||
pIndexTag['class'] = "date_index"
|
||||
aTag = Tag(soup, "a")
|
||||
aTag['name'] = "bda_%s-%s" % (current_date.year, current_date.month)
|
||||
aTag['id'] = "bda_%s-%s" % (current_date.year, current_date.month)
|
||||
pIndexTag.insert(0,aTag)
|
||||
pIndexTag.insert(1,NavigableString(date_string))
|
||||
divTag.insert(dtc,pIndexTag)
|
||||
@ -1310,7 +1310,7 @@ Author '{0}':
|
||||
pAuthorTag['class'] = "author_index"
|
||||
aTag = Tag(soup, "a")
|
||||
if self.opts.generate_authors:
|
||||
aTag['name'] = "%s" % self.generateAuthorAnchor(current_author)
|
||||
aTag['id'] = "%s" % self.generateAuthorAnchor(current_author)
|
||||
aTag.insert(0,NavigableString(current_author))
|
||||
pAuthorTag.insert(0,aTag)
|
||||
divTag.insert(dtc,pAuthorTag)
|
||||
@ -1384,7 +1384,7 @@ Author '{0}':
|
||||
pIndexTag = Tag(soup, "p")
|
||||
pIndexTag['class'] = "date_index"
|
||||
aTag = Tag(soup, "a")
|
||||
aTag['name'] = "bda_%s" % date_range.replace(' ','')
|
||||
aTag['id'] = "bda_%s" % date_range.replace(' ','')
|
||||
pIndexTag.insert(0,aTag)
|
||||
pIndexTag.insert(1,NavigableString(date_range))
|
||||
divTag.insert(dtc,pIndexTag)
|
||||
@ -1455,30 +1455,27 @@ Author '{0}':
|
||||
|
||||
btc = 0
|
||||
|
||||
# Insert section tag
|
||||
aTag = Tag(soup,'a')
|
||||
aTag['name'] = 'section_start'
|
||||
body.insert(btc, aTag)
|
||||
btc += 1
|
||||
pTag = Tag(soup, "p")
|
||||
pTag['class'] = 'title'
|
||||
ptc = 0
|
||||
|
||||
# Insert the anchor
|
||||
aTag = Tag(soup, "a")
|
||||
anchor_name = friendly_name.lower()
|
||||
aTag['name'] = anchor_name.replace(" ","")
|
||||
body.insert(btc, aTag)
|
||||
btc += 1
|
||||
aTag = Tag(soup,'a')
|
||||
aTag['id'] = 'section_start'
|
||||
pTag.insert(ptc, aTag)
|
||||
ptc += 1
|
||||
|
||||
if not self.__generateForKindle:
|
||||
#<h2><a name="byalphaauthor" id="byalphaauthor"></a>By Author</h2>
|
||||
pTag = Tag(soup, "p")
|
||||
pTag['class'] = 'title'
|
||||
# Kindle don't need this because it shows section titles in Periodical format
|
||||
aTag = Tag(soup, "a")
|
||||
anchor_name = friendly_name.lower()
|
||||
aTag['name'] = anchor_name.replace(" ","")
|
||||
pTag.insert(0,aTag)
|
||||
pTag.insert(1,NavigableString('%s' % friendly_name))
|
||||
body.insert(btc,pTag)
|
||||
btc += 1
|
||||
aTag['id'] = anchor_name.replace(" ","")
|
||||
|
||||
pTag.insert(ptc,aTag)
|
||||
ptc += 1
|
||||
pTag.insert(ptc, NavigableString('%s' % friendly_name))
|
||||
|
||||
body.insert(btc,pTag)
|
||||
btc += 1
|
||||
|
||||
divTag = Tag(soup, "div")
|
||||
dtc = 0
|
||||
@ -1893,11 +1890,10 @@ Author '{0}':
|
||||
self.updateProgressFullStep("'Genres'")
|
||||
|
||||
self.genre_tags_dict = self.filterDbTags(self.db.all_tags())
|
||||
|
||||
# Extract books matching filtered_tags
|
||||
genre_list = []
|
||||
for friendly_tag in sorted(self.genre_tags_dict):
|
||||
#print "\ngenerateHTMLByTags(): looking for books with friendly_tag '%s'" % friendly_tag
|
||||
for friendly_tag in sorted(self.genre_tags_dict, key=sort_key):
|
||||
#print("\ngenerateHTMLByTags(): looking for books with friendly_tag '%s'" % friendly_tag)
|
||||
# tag_list => { normalized_genre_tag : [{book},{},{}],
|
||||
# normalized_genre_tag : [{book},{},{}] }
|
||||
|
||||
@ -2266,7 +2262,7 @@ Author '{0}':
|
||||
navPointTag.insert(1, contentTag)
|
||||
|
||||
cmiTag = Tag(soup, '%s' % 'calibre:meta-img')
|
||||
cmiTag['name'] = "mastheadImage"
|
||||
cmiTag['id'] = "mastheadImage"
|
||||
cmiTag['src'] = "images/mastheadImage.gif"
|
||||
navPointTag.insert(2,cmiTag)
|
||||
navMapTag.insert(0,navPointTag)
|
||||
@ -2550,7 +2546,10 @@ Author '{0}':
|
||||
navLabelTag.insert(0, textTag)
|
||||
navPointByLetterTag.insert(0,navLabelTag)
|
||||
contentTag = Tag(soup, 'content')
|
||||
contentTag['src'] = "content/%s.html#%s" % (output, title_letters[i])
|
||||
if title_letters[i] == self.SYMBOLS:
|
||||
contentTag['src'] = "content/%s.html#%s" % (output, title_letters[i])
|
||||
else:
|
||||
contentTag['src'] = "content/%s.html#%s" % (output, self.generateUnicodeName(title_letters[i]))
|
||||
navPointByLetterTag.insert(1,contentTag)
|
||||
|
||||
if self.generateForKindle:
|
||||
@ -2638,7 +2637,7 @@ Author '{0}':
|
||||
navLabelTag.insert(0, textTag)
|
||||
navPointByLetterTag.insert(0,navLabelTag)
|
||||
contentTag = Tag(soup, 'content')
|
||||
contentTag['src'] = "%s#%sauthors" % (HTML_file, authors_by_letter[1])
|
||||
contentTag['src'] = "%s#%s_authors" % (HTML_file, self.generateUnicodeName(authors_by_letter[1]))
|
||||
|
||||
navPointByLetterTag.insert(1,contentTag)
|
||||
|
||||
@ -3211,7 +3210,7 @@ Author '{0}':
|
||||
ans = '%s%d %s:\n' % (' ' * indent, len(tags), header)
|
||||
ans += ' ' * (indent + 1)
|
||||
out_str = ''
|
||||
sorted_tags = sorted(tags)
|
||||
sorted_tags = sorted(tags, key=sort_key)
|
||||
for tag in next_tag(sorted_tags):
|
||||
out_str += tag
|
||||
if len(out_str) >= line_break:
|
||||
@ -3232,7 +3231,7 @@ Author '{0}':
|
||||
if tag == ' ':
|
||||
continue
|
||||
|
||||
normalized_tags.append(re.sub('\W','',tag).lower())
|
||||
normalized_tags.append(re.sub('\W','',ascii_text(tag)).lower())
|
||||
friendly_tags.append(tag)
|
||||
|
||||
genre_tags_dict = dict(zip(friendly_tags,normalized_tags))
|
||||
@ -3291,18 +3290,24 @@ Author '{0}':
|
||||
body = soup.find('body')
|
||||
|
||||
btc = 0
|
||||
divTag = Tag(soup, 'div')
|
||||
dtc = 0
|
||||
|
||||
|
||||
# Insert section tag if this is the section start - first article only
|
||||
if section_head:
|
||||
aTag = Tag(soup,'a')
|
||||
aTag['name'] = 'section_start'
|
||||
body.insert(btc, aTag)
|
||||
btc += 1
|
||||
aTag['id'] = 'section_start'
|
||||
divTag.insert(dtc, aTag)
|
||||
dtc += 1
|
||||
#body.insert(btc, aTag)
|
||||
#btc += 1
|
||||
|
||||
# Create an anchor from the tag
|
||||
aTag = Tag(soup, 'a')
|
||||
aTag['name'] = "Genre_%s" % genre
|
||||
body.insert(btc,aTag)
|
||||
aTag['id'] = "Genre_%s" % genre
|
||||
divTag.insert(dtc, aTag)
|
||||
body.insert(btc,divTag)
|
||||
btc += 1
|
||||
|
||||
titleTag = body.find(attrs={'class':'title'})
|
||||
@ -3475,7 +3480,7 @@ Author '{0}':
|
||||
for (i, tag) in enumerate(sorted(book.get('tags', []))):
|
||||
aTag = Tag(_soup,'a')
|
||||
if self.opts.generate_genres:
|
||||
aTag['href'] = "Genre_%s.html" % re.sub("\W","",tag.lower())
|
||||
aTag['href'] = "Genre_%s.html" % re.sub("\W","",ascii_text(tag).lower())
|
||||
aTag.insert(0,escape(NavigableString(tag)))
|
||||
genresTag.insert(gtc, aTag)
|
||||
gtc += 1
|
||||
@ -3542,8 +3547,10 @@ Author '{0}':
|
||||
btc = 0
|
||||
# Insert the title anchor for inbound links
|
||||
aTag = Tag(soup, "a")
|
||||
aTag['name'] = "book%d" % int(book['id'])
|
||||
body.insert(btc, aTag)
|
||||
aTag['id'] = "book%d" % int(book['id'])
|
||||
divTag = Tag(soup, 'div')
|
||||
divTag.insert(0, aTag)
|
||||
body.insert(btc, divTag)
|
||||
btc += 1
|
||||
|
||||
# Insert the link to the series or remove <a class="series">
|
||||
@ -3822,6 +3829,14 @@ Author '{0}':
|
||||
with zf:
|
||||
zf.writestr(title['uuid']+cover_crc, thumb_data)
|
||||
|
||||
def generateUnicodeName(self, c):
|
||||
'''
|
||||
Generate an anchor name string
|
||||
'''
|
||||
fullname = unicodedata.name(unicode(c))
|
||||
terms = fullname.split()
|
||||
return "_".join(terms)
|
||||
|
||||
def getFriendlyGenreTag(self, genre):
|
||||
# Find the first instance of friendly_tag matching genre
|
||||
for friendly_tag in self.genre_tags_dict:
|
||||
@ -3835,8 +3850,8 @@ Author '{0}':
|
||||
return markerTags
|
||||
|
||||
def letter_or_symbol(self,char):
|
||||
if not re.search('[a-zA-Z]',char):
|
||||
return 'Symbols'
|
||||
if not re.search('[a-zA-Z]', ascii_text(char)):
|
||||
return self.SYMBOLS
|
||||
else:
|
||||
return char
|
||||
|
||||
|
||||
@ -999,6 +999,55 @@ def command_saved_searches(args, dbpath):
|
||||
|
||||
return 0
|
||||
|
||||
def backup_metadata_option_parser():
|
||||
parser = get_parser(_('''\
|
||||
%prog backup_metadata [options]
|
||||
|
||||
Backup the metadata stored in the database into individual OPF files in each
|
||||
books directory. This normally happens automatically, but you can run this
|
||||
command to force re-generation of the OPF files, with the --all option.
|
||||
|
||||
Note that there is normally no need to do this, as the OPF files are backed up
|
||||
automatically, every time metadata is changed.
|
||||
'''))
|
||||
parser.add_option('--all', default=False, action='store_true',
|
||||
help=_('Normally, this command only operates on books that have'
|
||||
' out of date OPF files. This option makes it operate on all'
|
||||
' books.'))
|
||||
return parser
|
||||
|
||||
class BackupProgress(object):
|
||||
|
||||
def __init__(self):
|
||||
self.total = 0
|
||||
self.count = 0
|
||||
|
||||
def __call__(self, book_id, mi, ok):
|
||||
if mi is True:
|
||||
self.total = book_id
|
||||
else:
|
||||
self.count += 1
|
||||
prints(u'%.1f%% %s - %s'%((self.count*100)/float(self.total),
|
||||
book_id, mi.title))
|
||||
|
||||
def command_backup_metadata(args, dbpath):
|
||||
parser = backup_metadata_option_parser()
|
||||
opts, args = parser.parse_args(args)
|
||||
if len(args) != 0:
|
||||
parser.print_help()
|
||||
return 1
|
||||
|
||||
if opts.library_path is not None:
|
||||
dbpath = opts.library_path
|
||||
if isbytestring(dbpath):
|
||||
dbpath = dbpath.decode(preferred_encoding)
|
||||
db = LibraryDatabase2(dbpath)
|
||||
book_ids = None
|
||||
if opts.all:
|
||||
book_ids = db.all_ids()
|
||||
db.dump_metadata(book_ids=book_ids, callback=BackupProgress())
|
||||
|
||||
|
||||
def check_library_option_parser():
|
||||
from calibre.library.check_library import CHECKS
|
||||
parser = get_parser(_('''\
|
||||
@ -1275,7 +1324,7 @@ COMMANDS = ('list', 'add', 'remove', 'add_format', 'remove_format',
|
||||
'show_metadata', 'set_metadata', 'export', 'catalog',
|
||||
'saved_searches', 'add_custom_column', 'custom_columns',
|
||||
'remove_custom_column', 'set_custom', 'restore_database',
|
||||
'check_library', 'list_categories')
|
||||
'check_library', 'list_categories', 'backup_metadata')
|
||||
|
||||
|
||||
def option_parser():
|
||||
|
||||
@ -808,18 +808,30 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
|
||||
pass
|
||||
|
||||
def dump_metadata(self, book_ids=None, remove_from_dirtied=True,
|
||||
commit=True):
|
||||
commit=True, callback=None):
|
||||
'''
|
||||
Write metadata for each record to an individual OPF file
|
||||
Write metadata for each record to an individual OPF file. If callback
|
||||
is not None, it is called once at the start with the number of book_ids
|
||||
being processed. And once for every book_id, with arguments (book_id,
|
||||
mi, ok).
|
||||
'''
|
||||
if book_ids is None:
|
||||
book_ids = [x[0] for x in self.conn.get(
|
||||
'SELECT book FROM metadata_dirtied', all=True)]
|
||||
|
||||
if callback is not None:
|
||||
book_ids = tuple(book_ids)
|
||||
callback(len(book_ids), True, False)
|
||||
|
||||
for book_id in book_ids:
|
||||
if not self.data.has_id(book_id):
|
||||
if callback is not None:
|
||||
callback(book_id, None, False)
|
||||
continue
|
||||
path, mi, sequence = self.get_metadata_for_dump(book_id)
|
||||
if path is None:
|
||||
if callback is not None:
|
||||
callback(book_id, mi, False)
|
||||
continue
|
||||
try:
|
||||
raw = metadata_to_opf(mi)
|
||||
@ -829,6 +841,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
|
||||
self.clear_dirtied(book_id, sequence)
|
||||
except:
|
||||
pass
|
||||
if callback is not None:
|
||||
callback(book_id, mi, True)
|
||||
if commit:
|
||||
self.conn.commit()
|
||||
|
||||
@ -1411,7 +1425,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
|
||||
opath = self.format_abspath(book_id, nfmt, index_is_id=True)
|
||||
return fmt if opath is None else nfmt
|
||||
|
||||
def delete_book(self, id, notify=True, commit=True, permanent=False):
|
||||
def delete_book(self, id, notify=True, commit=True, permanent=False,
|
||||
do_clean=True):
|
||||
'''
|
||||
Removes book from the result cache and the underlying database.
|
||||
If you set commit to False, you must call clean() manually afterwards
|
||||
@ -1428,7 +1443,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
|
||||
self.conn.execute('DELETE FROM books WHERE id=?', (id,))
|
||||
if commit:
|
||||
self.conn.commit()
|
||||
self.clean()
|
||||
if do_clean:
|
||||
self.clean()
|
||||
self.data.books_deleted([id])
|
||||
if notify:
|
||||
self.notify('delete', [id])
|
||||
|
||||
@ -5,6 +5,7 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
|
||||
|
||||
import sys, os, cPickle, textwrap, stat
|
||||
from subprocess import check_call
|
||||
from functools import partial
|
||||
|
||||
from calibre import __appname__, prints, guess_type
|
||||
from calibre.constants import islinux, isnetbsd, isbsd
|
||||
@ -346,19 +347,28 @@ class PostInstall:
|
||||
try:
|
||||
self.info('Setting up desktop integration...')
|
||||
|
||||
env = os.environ.copy()
|
||||
cc = check_call
|
||||
if getattr(sys, 'frozen_path', False) and 'LD_LIBRARY_PATH' in env:
|
||||
paths = env.get('LD_LIBRARY_PATH', '').split(os.pathsep)
|
||||
paths = [x for x in paths if x]
|
||||
npaths = [x for x in paths if x != sys.frozen_path+'/lib']
|
||||
env['LD_LIBRARY_PATH'] = os.pathsep.join(npaths)
|
||||
cc = partial(check_call, env=env)
|
||||
|
||||
with TemporaryDirectory() as tdir, CurrentDir(tdir), \
|
||||
PreserveMIMEDefaults():
|
||||
render_img('mimetypes/lrf.png', 'calibre-lrf.png')
|
||||
check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
|
||||
cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
|
||||
self.icon_resources.append(('mimetypes', 'application-lrf', '128'))
|
||||
check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
|
||||
cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
|
||||
self.icon_resources.append(('mimetypes', 'application-lrs',
|
||||
'128'))
|
||||
render_img('lt.png', 'calibre-gui.png', width=256, height=256)
|
||||
check_call('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True)
|
||||
cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True)
|
||||
self.icon_resources.append(('apps', 'calibre-gui', '128'))
|
||||
render_img('viewer.png', 'calibre-viewer.png')
|
||||
check_call('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
|
||||
cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
|
||||
self.icon_resources.append(('apps', 'calibre-viewer', '128'))
|
||||
|
||||
mimetypes = set([])
|
||||
@ -385,14 +395,14 @@ class PostInstall:
|
||||
'calibre-ebook-viewer.desktop')
|
||||
for x in des:
|
||||
cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
|
||||
check_call(' '.join(cmd), shell=True)
|
||||
cc(' '.join(cmd), shell=True)
|
||||
self.menu_resources.append(x)
|
||||
check_call(['xdg-desktop-menu', 'forceupdate'])
|
||||
cc(['xdg-desktop-menu', 'forceupdate'])
|
||||
f = open('calibre-mimetypes', 'wb')
|
||||
f.write(MIME)
|
||||
f.close()
|
||||
self.mime_resources.append('calibre-mimetypes')
|
||||
check_call('xdg-mime install ./calibre-mimetypes', shell=True)
|
||||
cc('xdg-mime install ./calibre-mimetypes', shell=True)
|
||||
except Exception:
|
||||
if self.opts.fatal_errors:
|
||||
raise
|
||||
|
||||
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
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user