diff --git a/Changelog.yaml b/Changelog.yaml
index 129af0afd5..ae7802da1b 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -5,7 +5,7 @@
# Also, each release can have new and improved recipes.
# - version: ?.?.?
-# date: 2012-??-??
+# date: 2013-??-??
#
# new features:
# - title:
@@ -19,6 +19,596 @@
# new recipes:
# - title:
+- version: 0.9.19
+ date: 2013-02-15
+
+ new features:
+ - title: "New tool: \"Polish books\" that allows you to perform various automated cleanup actions on EPUB and AZW3 files without doing a full conversion."
+ type: major
+ description: "Polishing books is all about putting the shine of perfection on your ebook files. You can use it to subset embedded fonts, update the metadata in the book files from the metadata in the calibre library, manipulate the book jacket, etc. More features will be added in the future. To use this tool, go to Preferences->Toolbar and add the Polish books tool to the main toolbar. Then simply select the books you want to be polished and click the Polish books button. Polishing, unlike conversion, does not change the internal structure/markup of your book, it performs only the minimal set of actions needed to achieve its goals. Note that polish books is a completely new codebase, so there may well be bugs, polishing a book backs up the original as ORIGINAL_EPUB or ORIGINAL_AZW3, unless you have turned off this feature in Preferences->Tweaks, in which case you should backup your files manually. You can also use this tool from the command line with ebook-polish.exe."
+
+ - title: "Driver for the Trekstor Pyrus Mini."
+ tickets: [1124120]
+
+ - title: "E-book viewer: Add an option to change the minimum font size."
+ tickets: [1122333]
+
+ - title: "PDF Output: Add support for converting documents with math typesetting, as described here: http://manual.calibre-ebook.com/typesetting_math.html"
+
+ - title: "Column coloring/icons: Add more conditions when using date based columns with reference to 'today'."
+
+ bug fixes:
+ - title: "Transforming to titlecase - handle typographic hyphens in all caps phrases"
+
+ - title: "Dont ignore file open events that occur before the GUI is initialized on OS X"
+ tickets: [1122713]
+
+ - title: "News download: Handle feeds that have entries with empty ids"
+
+ - title: "Fix a regression that broke using the template editor"
+
+ - title: "Do not block startup while scanning the computer for available network interfaces. Speeds up startup time on some windows computers with lots of spurious network interfaces."
+
+ improved recipes:
+ - New Yorker
+ - Kommersant
+ - Le Monde (Subscription version)
+ - NZ Herald
+
+ new recipes:
+ - title: Navegalo
+ author: Douglas Delgado
+
+ - title: El Guardian and More Intelligent Life
+ author: Darko Miletic
+
+- version: 0.9.18
+ date: 2013-02-08
+
+ new features:
+ - title: "New metadata source: Edelweiss, a catalog of books that is updated directly by publishers. To enable it, go to Preferences->Metadata download and enable the Edelweiss plugin."
+ tickets: [1091073]
+
+ - title: "Add an option to add extra spacing between rows in the book list. (Preferences->Look & Feel)"
+ tickets: [1117907]
+
+ - title: "Column coloring/icons: Add a 'days ago' condition, useable with columns that store dates to set colors/icons based on the number of days before today"
+
+ - title: "E-book viewer: Add shortcuts Ctrl+= and Ctrl+- to increase/decrease text size."
+ tickets: [ 1117524 ]
+
+ - title: "When showing possible duplicates after adding books, also show the file formats."
+
+ - title: "Driver for Trekstor Ventos Tablet"
+
+ bug fixes:
+ - title: "Conversion: When transliterating unicode characters, handle « and » correctly."
+ tickets: [1117270]
+
+ - title: "Fix adding books from multiple directories with multiple books per directory treating opf files as an ebook"
+
+ - title: "Fix download metadata window not resizable on smaller screens"
+ tickets: [1116849]
+
+ - title: "Tweak Book: When rebuilding azw3 files handle tags that have name but not id attribute, these are apparently produced by kindlegen."
+ tickets: [ 1112934 ]
+
+ - title: "Fix regression in advanced column color rules."
+ tickets: [1118678]
+
+ improved recipes:
+ - El Mundo today
+ - fluter.de
+ - Birmingham Post
+ - Japan Times
+ - The Toronto Star
+ - Le Monde (subscription version)
+ - Globe and Mail
+
+ new recipes:
+ - title: VICE Magazine Deutschland
+ author: Alex
+
+ - title: Libertad Digital
+ author: Darko Miletic
+
+- version: 0.9.17
+ date: 2013-02-01
+
+ new features:
+ - title: "Allow adding user specified icons to the main book list for books whose metadata matches specific criteria. Go to Preferences->Look & Feel->Column icons to setup these icons. They work in the same way as the column coloring rules."
+ type: major
+
+ - title: "Allow choosing which page of a PDF to use as the cover."
+ description: "To access this functionality add the PDF to calibre then click the edit metadata button. In the top right area of the edit metadata dialog there is a button to get the cover from the ebook file, this will now allow you to choose which page (from the first ten pages) of the pdf to use as the cover."
+ tickets: [1110019]
+
+ - title: "Add option to turn off reflections in the cover browser (Preferences->Look & Feel->Cover Browser)"
+
+ - title: "PDF Output: Add an option to add page numbers to the bottom of every page in the generated PDF file (look in the PDF Output section of the conversion dialog)"
+
+ - title: "Add the full item name to the tool tip of a leaf item displayed in the tag browser."
+ tickets: [1106231]
+
+ bug fixes:
+ - title: "Fix out-of-bounds data causing errors in the Tag Browser"
+ tickets: [1108017]
+
+ - title: "Conversion: Handle input documents that use multiple prefixes referring to the XHTML namespace correctly."
+ tickets: [1107220]
+
+ - title: "PDF Output: Fix regression that caused some svg images to be rendered as black rectangles."
+ tickets: [1105294]
+
+ - title: "Metadata download: Only normalize title case if the result has no language set or its language is English"
+
+ improved recipes:
+ - Baltimore Sun
+ - Harvard Business Review
+ - Victoria Times
+ - South China Morning Post
+ - Volksrant
+ - Seattle Times
+
+ new recipes:
+ - title: Dob NeviNosti
+ author: Darko Miletic
+
+ - title: La Nacion (CR)
+ author: Douglas Delgado
+
+- version: 0.9.16
+ date: 2013-01-25
+
+ new features:
+ - title: "News download: Add support for logging in to sites that require javascript for their logins."
+ tickets: [1101809]
+
+ - title: "News download: Do not convert all downloaded images to JPG format. This fixes the problem of PNG images with transparent backgrounds being rendered with black backgrounds"
+
+ - title: "CHM Input: Support hierarchical table of contents. Do not generate an inline table of contents when a metadata table of contents is present. Also correctly decode the text in the table of contents"
+
+ - title: "Get Books: Add the beam-ebooks.de store"
+
+ - title: "Make custom yes/no columns using icons put text values under the icons."
+
+ - title: "Driver for LG E400 and SayCoolA710"
+ tickets: [1103741,1104528]
+
+ - title: "Speed up device connection when there are lots of books on the device by not generating cover thumbnails unless they are actually needed."
+
+ - title: "Have the metadata download dialog remember its last used size."
+ tickets: [1101150]
+
+ bug fixes:
+ - title: "Fix deleting a custom column that was used in a column coloring rule makes the column coloring preferences panel unusable"
+ tickets: [1103504]
+
+ - title: "Store caches outside the config directory for non-portable calibre installs"
+
+ - title: "PDF Output: Dont crash if the user has a font on his system that is missing the OS/2 table"
+ tickets: [1102403]
+
+ - title: "Conversion: Do not error out because of an error in user supplied search replace rules."
+ tickets: [1102647]
+
+ - title: "Conversion: Replace all non-ascii characters in CSS class names, as they cause problems with some broken EPUB renderers."
+ tickets: [1102587]
+
+ - title: "Do not choke when reading metadata from MOBI files with incorrectly encoded metadata fields"
+
+ - title: "Conversion: Preserve ToC entries that point nowhere instead of causing them to point to a non-existent file"
+
+ - title: "E-book viewer: Allow entries in the Table of Contents that do not point anywhere, instead of just ignoring them."
+
+ - title: "Content server: Fix the 'Previous' link in the mobile version of the content server webpage skipping an entry"
+ tickets: [1101124]
+
+ improved recipes:
+ - TSN
+ - St. Louis Post Dispatch
+ - Metro UK
+ - Michelle Malkin
+ - Barrons
+
+ new recipes:
+ - title: Contemporary Argentine Writers
+ author: Darko Miletic
+
+- version: 0.9.15
+ date: 2013-01-18
+
+ new features:
+ - title: "Linux MTP driver: Detect devices that have MTP interfaces even if their USB ids are not known"
+
+ - title: "Content server: Allow picking a random book by clicking the 'Random book' link on the start page. You can also refresh the random book page to get a new random book"
+
+ - title: "E-book viewer: Add an option to hide the toolbars in the viewer window (Preferences->Miscellaneous->Show controls in the viewr preferences). You can unhide them by right clicking in the viewer window."
+
+ - title: "Kobo driver: Speedup initial connect by avoiding unnecessary update of series metadata in some situations."
+ tickets: [1099190]
+
+ - title: "Get Books: Allow the store plugins to be dynamically loaded so that future website changes of a store dont require a calibre update to fix Get Books."
+
+ - title: "Wireless driver: Always replace file when resending a previously sent book to the device, even if the title/author have changed."
+
+ - title: "Add PocketBook Pro 912 driver."
+ tickets: [1099571]
+
+ - title: "When creating/exporting epub and mobi files, add the calibre book identifier as a special field in the book's metadata. This allows third party tools to identify the book record in calibre to which the file belongs."
+
+ - title: "Wireless driver: Add support for using the book uuid as the filename"
+
+ - title: "Remove the experimental tag from the subset fonts feature, since there has been only one reported problem (now fixed) with it in the two months since it was released"
+
+ bug fixes:
+ - title: "Get Books: Update the amazon, waterstones and libri.de plugins to account for website changes"
+
+ - title: "MOBI Input: Do not choke on MOBI files with incorrectly encoded titles."
+ tickets: [1100601]
+
+ - title: "Font subsetting: Fix a bug in the parsing of the GSUB table that could cause some ligatures to not be included in the subset font"
+
+ - title: "E-book-viewer: Fix TOC links without anchors not scrolling to the top of the current flow"
+
+ - title: "LIT Input: Handle lit files that set an incorrect XML mimetype for their text."
+ tickets: [1099621]
+
+ - title: "Catalogs: Fix 'X' being droppen from isbns on export"
+ tickets: [1098325]
+
+ - title: "Fix an error when editing date in the main book list and all visible dates are blank."
+ tickets: [1098675]
+
+ - title: "Fix calibre-smtp using incorrect escaping for non-ascii attachment filenames"
+ tickets: [1098478]
+
+ - title: "Conversion: When subsetting fonts, handle multiple @font-face rules referring to the same physical font"
+
+ - title: "Content server: Update metadata when serving azw3 files"
+
+ - title: "CHM Input: Handle chm files that contain files with url unsafe filenames."
+ tickets: [1100610]
+
+ - title: "Content server: Fix custom icons for top level categories incorrect."
+ tickets: [1095016]
+
+ - title: "Kobo driver: When resending a file to the device, update the filesize in the Kobo db to prevent the device from deleting the file."
+ tickets: [1100607]
+
+ improved recipes:
+ - The Chronicle of Higher Education
+ - Smithsonian Magazine
+ - Philosophy Now
+ - The Economist
+ - Business Week Magazine
+
+ new recipes:
+ - title: Asco de Vida
+ author: Krittika Goyal
+
+ - title: Schattenblick
+ author: ThB
+
+- version: 0.9.14
+ date: 2013-01-11
+
+ new features:
+ - title: "When adding multiple books and duplicates are found, allow the user to select which of the duplicate books will be added anyway."
+ tickets: [1095256]
+
+ - title: "Device drivers for Kobo Arc on linux, Polaroid Android tablet"
+ tickets: [1098049]
+
+ - title: "When sorting by series, use the language of the book to decide what leading articles to remove, just as is done for sorting by title"
+
+ bug fixes:
+ - title: "PDF Output: Do not error out when the input document contains links with anchors not present in the document."
+ tickets: [1096428]
+
+ - title: "Add support for upgraded db on newest Kobo firmware"
+ tickets: [1095617]
+
+ - title: "PDF Output: Fix typo that broke use of custom paper sizes."
+ tickets: [1097563]
+
+ - title: "PDF Output: Handle empty anchors present at the end of a page"
+
+ - title: "PDF Output: Fix side margins of last page in a flow being incorrect when large side margins are used."
+ tickets: [1096290]
+
+ - title: "Edit metadata dialog: Allow setting the series number for custom series type columns to zero"
+
+ - title: "When bulk editing custom series-type columns and not provding a series number use 1 as the default, instead of None"
+
+ - title: "Catalogs: Fix issue with catalog generation using Hungarian UI and author_sort beginning with multiple letter groups."
+ tickets: [1091581]
+
+ - title: "PDF Output: Dont error out on files that have invalid font-family declarations."
+ tickets: [1096279]
+
+ - title: "Do not load QRawFont at global level, to allow calibre installation on systems with missing dependencies"
+ tickets: [1096170]
+
+ - title: "PDF Output: Fix cover not present in generated PDF files"
+ tickets: [1096098]
+
+ improved recipes:
+ - Sueddeutsche Zeitung mobil
+ - Boerse Online
+ - TidBits
+ - New York Review of Books
+ - Fleshbot
+ - Il Messaggero
+ - Libero
+
+ new recipes:
+ - title: Spectator Magazine, Oxford Mail and Outside Magazine
+ author: Krittika Goyal
+
+ - title: Libartes
+ author: Darko Miletic
+
+ - title: El Diplo
+ author: Tomas De Domenico
+
+- version: 0.9.13
+ date: 2013-01-04
+
+ new features:
+ - title: "Complete rewrite of the PDF Output engine, to support links and fix various bugs"
+ type: major
+ description: "calibre now has a new PDF output engine that supports links in the text. It also fixes various bugs, detailed below. In order to implement support for links and fix these bugs, the engine had to be completely rewritten, so there may be some regressions."
+
+ - title: "Show disabled device plugins in Preferences->Ignored Devices"
+
+ - title: "Get Books: Fix Smashwords, Google books and B&N stores. Add Nook UK store"
+
+ - title: "Allow series numbers lower than -100 for custom series columns."
+ tickets: [1094475]
+
+ - title: "Add mass storage driver for rockhip based android smart phones"
+ tickets: [1087809]
+
+ - title: "Add a clear ratings button to the edit metadata dialog"
+
+ bug fixes:
+ - title: "PDF Output: Fix custom page sizes not working on OS X"
+
+ - title: "PDF Output: Fix embedding of many fonts not supported (note that embedding of OpenType fonts with Postscript outlines is still not supported on windows, though it is supported on other operating systems)"
+
+ - title: "PDF Output: Fix crashes converting some books to PDF on OS X"
+ tickets: [1087688]
+
+ - title: "HTML Input: Handle entities inside href attributes when following the links in an HTML file."
+ tickets: [1094203]
+
+ - title: "Content server: Fix custom icons not used for sub categories"
+ tickets: [1095016]
+
+ - title: "Force use of non-unicode constants in compiled templates. Fixes a problem with regular expression character classes and probably other things."
+
+ - title: "Kobo driver: Do not error out if there are invalid dates in the device database"
+ tickets: [1094597]
+
+ - title: "Content server: Fix for non-unicode hostnames when using mDNS"
+ tickets: [1094063]
+
+ improved recipes:
+ - Today's Zaman
+ - The Economist
+ - Foreign Affairs
+ - New York Times
+ - Alternet
+ - Harper's Magazine
+ - La Stampa
+
+- version: 0.9.12
+ date: 2012-12-28
+
+ new features:
+ - title: "Drivers for Kibano e-reader and Slick ER-700-2"
+ tickets: [1093570, 1093732]
+
+ - title: "Add support for downloading metadata from Amazon Brazil."
+ tickets: [1092594]
+
+ - title: "Copy to library: Allow specifying the destination library by path."
+ tickets: [1093231]
+
+ - title: "When adding empty books, allow setting of the series for the new books. Also select the newly added book records after adding."
+
+ - title: "PDF Output: Add a checkbox to override the page size defined by the output profile. This allows you to specify a custom page size even if the output profile is not set to default."
+
+ - title: "Add usb ids for newer kindle fire to the linux mtp driver"
+
+ bug fixes:
+ - title: "Linux: Temporarily redirect stdout to get rid of the annoying and pointless message about mtpz during libmtp initialization"
+
+ - title: "Fix multiple 'All column' coloring rules not being applied"
+ tickets: [1093574]
+
+ - title: "Use custom icons in the content server as well."
+ tickets: [1092098]
+
+ improved recipes:
+ - La Voce
+ - Harpers Magazine (printed edition)
+ - Pajamas Media
+ - NSFW corp
+ - The Hindu
+ - Nikkei News
+
+ new recipes:
+ - title: Various Ukranian news sources
+ author: rpalyvoda
+
+- version: 0.9.11
+ date: 2012-12-21
+
+ new features:
+ - title: "Merry Christmas and Happy Holidays to all ☺"
+
+ - title: "When connecting to MTP devices such as the Kindle Fire HD or the Nook HD, speed up the process by ignoring some folders."
+ description: "calibre will now ignore folders for music, video, pictures, etc. when scanning the device. This can substantially speed up the connection process if you have thousands of non-ebook files on the device. The list of folders to be ignored can be customized by right clicking on the device icon in calibre and selecting 'Configure this device'."
+
+ - title: "Allow changing the icons for categories in the Tag Browser. Right click on a category and choose 'Change category icon'."
+ tickets: [1092098]
+
+ - title: "Allow setting the color of all columns with a single rule in Preferences->Look & Feel->Column Coloring"
+
+ - title: "MOBI: When reading metadata from mobi files, put the contents of the ASIN field into an identifier named mobi-asin. Note that this value is not used when downloading metadata as it is not possible to know which (country specific) amazon website the ASIN comes from."
+ tickets: [1090394]
+
+ bug fixes:
+ - title: "Windows build: Fix a regression in 0.9.9 that caused calibre to not start on some windows system that were missing the VC.90 dlls (some older XP systems)"
+
+ - title: "Kobo driver: Workaround for invalid shelves created by bugs in the Kobo server"
+ tickets: [1091932]
+
+ - title: "Metadata download: Fix cover downloading from non-US amazon sites broken by a website change."
+ tickets: [1090765]
+
+ improved recipes:
+ - Le Devoir
+ - Nin online
+ - countryfile
+ - Birmingham Post
+ - The Independent
+ - Various Polish news sources
+
+ new recipes:
+ - title: MobileBulgaria
+ author: Martin Tsanchev
+
+ - title: Various Polish news sources
+ author: fenuks
+
+- version: 0.9.10
+ date: 2012-12-14
+
+ new features:
+ - title: "Drivers for Nextbook Premium 8 se, HTC Desire X and Emerson EM 543"
+ tickets: [1088149, 1088112, 1087978]
+
+ bug fixes:
+ - title: "Fix rich text delegate not working with Qt compiled in debug mode."
+ tickets: [1089011]
+
+ - title: "When deleting all books in the library, blank the book details panel"
+
+ - title: "Conversion: Fix malformed values in the bgcolor attribute causing conversion to abort"
+
+ - title: "Conversion: Fix heuristics applying incorrect style in some circumstances"
+ tickets: [1066507]
+
+ - title: "Possible fix for 64bit calibre not starting up on some Windows systems"
+ tickets: [1087816]
+
+ improved recipes:
+ - Sivil Dusunce
+ - Anchorage Daily News
+ - Le Monde
+ - Harpers
+
+ new recipes:
+ - title: Titanic
+ author: Krittika Goyal
+
+- version: 0.9.9
+ date: 2012-12-07
+
+ new features:
+ - title: "64 bit build for windows"
+ type: major
+ description: "calibre now has a 64 bit version for windows, available at: http://calibre-ebook.com/download_windows64 The 64bit build is not limited to using only 3GB of RAM when converting large/complex documents. It may also be slightly faster for some tasks. You can have both the 32 bit and the 64 bit build installed at the same time, they will use the same libraries, plugins and settings."
+
+ - title: "Content server: Make the identifiers in each books metadata clickable."
+ tickets: [1085726]
+
+ bug fixes:
+ - title: "EPUB Input: Fix an infinite loop while trying to recover a damaged EPUB file."
+ tickets: [1086917]
+
+ - title: "KF8 Input: Fix handling of links in files that link to the obsolete tags instead of tags with an id attribute."
+ tickets: [1086705]
+
+ - title: "Conversion: Fix a bug in removal of invalid entries from the spine, where not all invalid entries were removed, causing conversion to fail."
+ tickets: [1086054]
+
+ - title: "KF8 Input: Ignore invalid flow references in the KF8 document instead of erroring out on them."
+ tickets: [1085306]
+
+ - title: "Fix command line output on linux systems with incorrect LANG/LC_TYPE env vars."
+ tickets: [1085103]
+
+ - title: "KF8 Input: Fix page breaks specified using the data-AmznPageBreak attribute being ignored by calibre."
+
+ - title: "PDF Output: Fix custom size field not accepting fractional numbers as sizes"
+
+ - title: "Get Books: Update libre.de and publio for website changes"
+
+ - title: "Wireless driver: Increase timeout interval, and when allocating a random port try 9090 first"
+
+ improved recipes:
+ - New York Times
+ - Weblogs SL
+ - Zaman Gazetesi
+ - Aksiyon Dergisi
+ - Endgadget
+ - Metro UK
+ - Heise Online
+
+- version: 0.9.8
+ date: 2012-11-30
+
+ new features:
+ - title: "Add an option to show the cover size in the book details panel on the right. Option is in Preferences->Look & Feel->Book Details"
+
+ - title: "Kobo driver: Add support for firmware 2.2. Also add an option to send series information to the device."
+ description: "The newest Kobo firmware can display series information. Unfortunately, the Kobo does not read this information from the ebook file itself. It has to be sent separately after the Kobo has finished processing the new files. So you might have to connect - send books - disconnect and then re-connect for the series infor to show up. Fixes #1084388 (Add support for series on Kobo devices)"
+
+ - title: "Catalogs: Allow using custom columns as the source for Genres when generating catalogs"
+
+ - title: "When the user asks calibre to convert a book, show a small animation to highlight that the convert job has been queued to run in the background"
+
+ - title: "Add support for the notification center in OS X 10.8"
+
+ - title: "calibredb: Add an option to specify the cover to use when adding books with calibredb add."
+ tickets: [1083932]
+
+ - title: "EPUB Input: Add support for EPUB files with broken central directory records *and* data descriptors"
+
+ - title: "Comic metadata: Support reading metadata from cbr files. Also read the comments and published date info from the metadata."
+ tickets: [1082340]
+
+ - title: "Speed up processing of RAR and CBR files by avoiding an extra file copy"
+
+ - title: "Add driver for Nexus 10 on linux."
+ tickets: [1082563]
+
+ bug fixes:
+ - title: "KF8 Input: Handle invalid KF8 files with links pointing to non-existent locations and incorrect values in the div table."
+ tickets: [1082669]
+
+ - title: "Viewer: Fix handling of empty self closing tags."
+ tickets: [1083278]
+
+ - title: "Fix use of {formats} in save to disk templates. Fix some formatter functions causing plugboards to not validate."
+
+ - title: "Fix calibre quitting when minimized to system tray and an update available message is shown and then closed."
+ tickets: [1082630]
+
+ - title: "Viewer: Fix vertical margin at the top of the first page of a chapter incorrect in a certain rare circumstance (first child of body being an empty paragraph)."
+ tickets: [1082640]
+
+ - title: "E-book viewer: Fix bug that caused the default language for hyphenation to be ignored for books that do not specify a language"
+
+ improved recipes:
+ - Pro Physik
+ - Aachener Nachrichten
+ - Science News
+
- version: 0.9.7
date: 2012-11-23
diff --git a/README b/README
index 2ffab4e2f6..a1e3081988 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
-calibre is an e-book library manager. It can view, convert and catalog e-books \
-in most of the major e-book formats. It can also talk to e-book reader \
-devices. It can go out to the internet and fetch metadata for your books. \
-It can download newspapers and convert them into e-books for convenient \
+calibre is an e-book library manager. It can view, convert and catalog e-books
+in most of the major e-book formats. It can also talk to e-book reader
+devices. It can go out to the internet and fetch metadata for your books.
+It can download newspapers and convert them into e-books for convenient
reading. It is cross platform, running on Linux, Windows and OS X.
For screenshots: https://calibre-ebook.com/demo
@@ -15,5 +15,5 @@ bzr branch lp:calibre
To update your copy of the source code:
bzr merge
-Tarballs of the source code for each release are now available \
+Tarballs of the source code for each release are now available
at http://code.google.com/p/calibre-ebook
diff --git a/imgsrc/polish.svg b/imgsrc/polish.svg
new file mode 100644
index 0000000000..7affaaf4bd
--- /dev/null
+++ b/imgsrc/polish.svg
@@ -0,0 +1,366 @@
+
+
+
diff --git a/manual/develop.rst b/manual/develop.rst
index b9fba195d3..823a31b5c2 100644
--- a/manual/develop.rst
+++ b/manual/develop.rst
@@ -39,27 +39,27 @@ All the |app| python code is in the ``calibre`` package. This package contains t
* devices - All the device drivers. Just look through some of the built-in drivers to get an idea for how they work.
- * For details, see: devices.interface which defines the interface supported by device drivers and devices.usbms which
+ * For details, see: devices.interface which defines the interface supported by device drivers and ``devices.usbms`` which
defines a generic driver that connects to a USBMS device. All USBMS based drivers in |app| inherit from it.
* ebooks - All the ebook conversion/metadata code. A good starting point is ``calibre.ebooks.conversion.cli`` which is the
- module powering the :command:`ebook-convert` command. The conversion process is controlled via conversion.plumber.
- The format independent code is all in ebooks.oeb and the format dependent code is in ebooks.format_name.
+ module powering the :command:`ebook-convert` command. The conversion process is controlled via ``conversion.plumber``.
+ The format independent code is all in ``ebooks.oeb`` and the format dependent code is in ``ebooks.format_name``.
- * Metadata reading, writing, and downloading is all in ebooks.metadata
+ * Metadata reading, writing, and downloading is all in ``ebooks.metadata``
* Conversion happens in a pipeline, for the structure of the pipeline,
see :ref:`conversion-introduction`. The pipeline consists of an input
- plugin, various transforms and an output plugin. The code constructs
- and drives the pipeline is in plumber.py. The pipeline works on a
+ plugin, various transforms and an output plugin. The that code constructs
+ and drives the pipeline is in :file:`plumber.py`. The pipeline works on a
representation of an ebook that is like an unzipped epub, with
manifest, spine, toc, guide, html content, etc. The
- class that manages this representation is OEBBook in oeb/base.py. The
+ class that manages this representation is OEBBook in ``ebooks.oeb.base``. The
various transformations that are applied to the book during
- conversions live in `oeb/transforms/*.py`. And the input and output
- plugins live in `conversion/plugins/*.py`.
+ conversions live in :file:`oeb/transforms/*.py`. And the input and output
+ plugins live in :file:`conversion/plugins/*.py`.
- * library - The database back-end and the content server. See library.database2 for the interface to the |app| library. library.server is the |app| Content Server.
- * gui2 - The Graphical User Interface. GUI initialization happens in gui2.main and gui2.ui. The ebook-viewer is in gui2.viewer.
+ * library - The database back-end and the content server. See ``library.database2`` for the interface to the |app| library. ``library.server`` is the |app| Content Server.
+ * gui2 - The Graphical User Interface. GUI initialization happens in ``gui2.main`` and ``gui2.ui``. The ebook-viewer is in ``gui2.viewer``.
If you need help understanding the code, post in the `development forum `_
and you will most likely get help from one of |app|'s many developers.
@@ -74,10 +74,6 @@ After installing Bazaar, you can get the |app| source code with the command::
On Windows you will need the complete path name, that will be something like :file:`C:\\Program Files\\Bazaar\\bzr.exe`.
-To update a branch to the latest code, use the command::
-
- bzr merge
-
|app| is a very large project with a very long source control history, so the
above can take a while (10mins to an hour depending on your internet speed).
@@ -88,6 +84,11 @@ using::
bzr branch --stacked lp:calibre
+
+To update a branch to the latest code, use the command::
+
+ bzr merge
+
Submitting your changes to be included
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/manual/faq.rst b/manual/faq.rst
index 109aff440d..9b1c862436 100644
--- a/manual/faq.rst
+++ b/manual/faq.rst
@@ -158,12 +158,23 @@ My device is not being detected by |app|?
Follow these steps to find the problem:
- * Make sure that you are connecting only a single device to your computer at a time. Do not have another |app| supported device like an iPhone/iPad etc. at the same time.
- * If you are connecting an Apple iDevice (iPad, iPod Touch, iPhone), use the 'Connect to iTunes' method in the 'Getting started' instructions in `Calibre + Apple iDevices: Start here `_.
- * Make sure you are running the latest version of |app|. The latest version can always be downloaded from `the calibre website `_.
- * Ensure your operating system is seeing the device. That is, the device should show up in Windows Explorer (in Windows) or Finder (in OS X).
- * In |app|, go to Preferences->Plugins->Device Interface plugin and make sure the plugin for your device is enabled, the plugin icon next to it should be green when it is enabled.
- * If all the above steps fail, go to Preferences->Miscellaneous and click debug device detection with your device attached and post the output as a ticket on `the calibre bug tracker `_.
+ * Make sure that you are connecting only a single device to your computer
+ at a time. Do not have another |app| supported device like an iPhone/iPad
+ etc. at the same time.
+ * If you are connecting an Apple iDevice (iPad, iPod Touch, iPhone), use
+ the 'Connect to iTunes' method in the 'Getting started' instructions in
+ `Calibre + Apple iDevices: Start here `_.
+ * Make sure you are running the latest version of |app|. The latest version
+ can always be downloaded from `the calibre website `_.
+ You can tell what version of |app| you are currently running by looking
+ at the bottom line of the main |app| window.
+ * Ensure your operating system is seeing the device. That is, the device
+ should show up in Windows Explorer (in Windows) or Finder (in OS X).
+ * In |app|, go to Preferences->Ignored Devices and check that your device
+ is not being ignored
+ * If all the above steps fail, go to Preferences->Miscellaneous and click
+ debug device detection with your device attached and post the output as a
+ ticket on `the calibre bug tracker `_.
My device is non-standard or unusual. What can I do to connect to it?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -239,42 +250,71 @@ If you don't want to uninstall it altogether, there are a couple of tricks you c
simplest is to simply re-name the executable file that launches the library program. More detail
`in the forums `_.
-How do I use |app| with my iPad/iPhone/iTouch?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+How do I use |app| with my iPad/iPhone/iPod touch?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Over the air
^^^^^^^^^^^^^^
-The easiest way to browse your |app| collection on your Apple device (iPad/iPhone/iPod) is by using the calibre content server, which makes your collection available over the net. First perform the following steps in |app|
+The easiest way to browse your |app| collection on your Apple device
+(iPad/iPhone/iPod) is by using the |app| content server, which makes your
+collection available over the net. First perform the following steps in |app|
- * Set the Preferred Output Format in |app| to EPUB (The output format can be set under :guilabel:`Preferences->Interface->Behavior`)
- * Set the output profile to iPad (this will work for iPhone/iPods as well), under :guilabel:`Preferences->Conversion->Common Options->Page Setup`
- * Convert the books you want to read on your iPhone to EPUB format by selecting them and clicking the Convert button.
- * Turn on the Content Server in |app|'s preferences and leave |app| running.
+ * Set the Preferred Output Format in |app| to EPUB (The output format can be
+ set under :guilabel:`Preferences->Interface->Behavior`)
+ * Set the output profile to iPad (this will work for iPhone/iPods as well),
+ under :guilabel:`Preferences->Conversion->Common Options->Page Setup`
+ * Convert the books you want to read on your iDevice to EPUB format by
+ selecting them and clicking the Convert button.
+ * Turn on the Content Server by clicking the :guilabel:`Connect/Share` button
+ and leave |app| running. You can also tell |app| to automatically start the
+ content server via :guilabel:`Preferences->Sharing over the net`.
-Now on your iPad/iPhone you have two choices, use either iBooks (version 1.2 and later) or Stanza (version 3.0 and later). Both are available free from the app store.
+There are many apps for your iDevice that can connect to |app|. Here we
+describe using two of them, iBooks and Stanza.
Using Stanza
***************
-Now you should be able to access your books on your iPhone by opening Stanza. Go to "Get Books" and then click the "Shared" tab. Under Shared you will see an entry "Books in calibre". If you don't, make sure your iPad/iPhone is connected using the WiFi network in your house, not 3G. If the |app| catalog is still not detected in Stanza, you can add it manually in Stanza. To do this, click the "Shared" tab, then click the "Edit" button and then click "Add book source" to add a new book source. In the Add Book Source screen enter whatever name you like and in the URL field, enter the following::
+You should be able to access your books on your iPhone by opening Stanza. Go to
+"Get Books" and then click the "Shared" tab. Under Shared you will see an entry
+"Books in calibre". If you don't, make sure your iPad/iPhone is connected using
+the WiFi network in your house, not 3G. If the |app| catalog is still not
+detected in Stanza, you can add it manually in Stanza. To do this, click the
+"Shared" tab, then click the "Edit" button and then click "Add book source" to
+add a new book source. In the Add Book Source screen enter whatever name you
+like and in the URL field, enter the following::
http://192.168.1.2:8080/
-Replace ``192.168.1.2`` with the local IP address of the computer running |app|. If you have changed the port the |app| content server is running on, you will have to change ``8080`` as well to the new port. The local IP address is the IP address you computer is assigned on your home network. A quick Google search will tell you how to find out your local IP address. Now click "Save" and you are done.
+Replace ``192.168.1.2`` with the local IP address of the computer running
+|app|. If you have changed the port the |app| content server is running on, you
+will have to change ``8080`` as well to the new port. The local IP address is
+the IP address you computer is assigned on your home network. A quick Google
+search will tell you how to find out your local IP address. Now click "Save"
+and you are done.
-If you get timeout errors while browsing the calibre catalog in Stanza, try increasing the connection timeout value in the stanza settings. Go to Info->Settings and increase the value of Download Timeout.
+If you get timeout errors while browsing the calibre catalog in Stanza, try
+increasing the connection timeout value in the stanza settings. Go to
+Info->Settings and increase the value of Download Timeout.
Using iBooks
**************
-Start the Safari browser and type in the IP address and port of the computer running the calibre server, like this::
+Start the Safari browser and type in the IP address and port of the computer
+running the calibre server, like this::
http://192.168.1.2:8080/
-Replace ``192.168.1.2`` with the local IP address of the computer running |app|. If you have changed the port the |app| content server is running on, you will have to change ``8080`` as well to the new port. The local IP address is the IP address you computer is assigned on your home network. A quick Google search will tell you how to find out your local IP address.
+Replace ``192.168.1.2`` with the local IP address of the computer running
+|app|. If you have changed the port the |app| content server is running on, you
+will have to change ``8080`` as well to the new port. The local IP address is
+the IP address you computer is assigned on your home network. A quick Google
+search will tell you how to find out your local IP address.
-You will see a list of books in Safari, just click on the epub link for whichever book you want to read, Safari will then prompt you to open it with iBooks.
+You will see a list of books in Safari, just click on the epub link for
+whichever book you want to read, Safari will then prompt you to open it with
+iBooks.
With the USB cable + iTunes
@@ -436,10 +476,10 @@ that allows you to create collections on your Kindle from the |app| metadata. It
.. note:: Amazon have removed the ability to manipulate collections completely in their newer models, like the Kindle Touch and Kindle Fire, making even the above plugin useless. If you really want the ability to manage collections on your Kindle via a USB connection, we encourage you to complain to Amazon about it, or get a reader where this is supported, like the SONY or Kobo Readers.
-I am getting an error when I try to use |app| with my Kobo Touch?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+I am getting an error when I try to use |app| with my Kobo Touch/Glo/etc.?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The Kobo Touch has very buggy firmware. Connecting to it has been known to fail at random. Certain combinations of motherboard, USB ports/cables/hubs can exacerbate this tendency to fail. If you are getting an error when connecting to your touch with |app| try the following, each of which has solved the problem for *some* |app| users.
+The Kobo has very buggy firmware. Connecting to it has been known to fail at random. Certain combinations of motherboard, USB ports/cables/hubs can exacerbate this tendency to fail. If you are getting an error when connecting to your touch with |app| try the following, each of which has solved the problem for *some* |app| users.
* Connect the Kobo directly to your computer, not via USB Hub
* Try a different USB cable and a different USB port on your computer
@@ -539,9 +579,9 @@ Yes, you can. Follow the instructions in the answer above for adding custom colu
How do I move my |app| library from one computer to another?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Simply copy the |app| library folder from the old to the new computer. You can find out what the library folder is by clicking the calibre icon in the toolbar. The very first item is the path to the library folder. Now on the new computer, start |app| for the first time. It will run the Welcome Wizard asking you for the location of the |app| library. Point it to the previously copied folder. If the computer you are transferring to already has a calibre installation, then the Welcome wizard wont run. In that case, click the calibre icon in the tooolbar and point it to the newly copied directory. You will now have two calibre libraries on your computer and you can switch between them by clicking the calibre icon on the toolbar.
+Simply copy the |app| library folder from the old to the new computer. You can find out what the library folder is by clicking the calibre icon in the toolbar. The very first item is the path to the library folder. Now on the new computer, start |app| for the first time. It will run the Welcome Wizard asking you for the location of the |app| library. Point it to the previously copied folder. If the computer you are transferring to already has a calibre installation, then the Welcome wizard wont run. In that case, right-click the |app| icon in the tooolbar and point it to the newly copied directory. You will now have two calibre libraries on your computer and you can switch between them by clicking the |app| icon on the toolbar. Transferring your library in this manner preserver all your metadata, tags, custom columns, etc.
-Note that if you are transferring between different types of computers (for example Windows to OS X) then after doing the above you should also right-click the calibre icon on the tool bar, select Library Maintenance and run the Check Library action. It will warn you about any problems in your library, which you should fix by hand.
+Note that if you are transferring between different types of computers (for example Windows to OS X) then after doing the above you should also right-click the |app| icon on the tool bar, select Library Maintenance and run the Check Library action. It will warn you about any problems in your library, which you should fix by hand.
.. note:: A |app| library is just a folder which contains all the book files and their metadata. All the metadata is stored in a single file called metadata.db, in the top level folder. If this file gets corrupted, you may see an empty list of books in |app|. In this case you can ask |app| to restore your books by doing a right-click on the |app| icon in the toolbar and selecting Library Maintenance->Restore Library.
@@ -652,7 +692,7 @@ Post any output you see in a help message on the `Forum `.
diff --git a/manual/gui.rst b/manual/gui.rst
index a51ced54d3..98954ebabd 100755
--- a/manual/gui.rst
+++ b/manual/gui.rst
@@ -537,6 +537,8 @@ Calibre has several keyboard shortcuts to save you time and mouse movement. Thes
- Merge selected records, keeping originals
* - :kbd:`O`
- Open containing folder
+ * - :kbd:`P`
+ - Polish books
* - :kbd:`S`
- Save to Disk
* - :kbd:`V`
diff --git a/recipes/aachener_nachrichten.recipe b/recipes/aachener_nachrichten.recipe
index a2294fc472..cdcb6895bc 100644
--- a/recipes/aachener_nachrichten.recipe
+++ b/recipes/aachener_nachrichten.recipe
@@ -2,41 +2,70 @@ from calibre.web.feeds.recipes import BasicNewsRecipe
class AdvancedUserRecipe(BasicNewsRecipe):
title = u'Aachener Nachrichten'
- __author__ = 'schuster'
- oldest_article = 1
+ __author__ = 'schuster' #AGE update 2012-11-28
+ oldest_article = 1
max_articles_per_feed = 100
- use_embedded_content = False
- language = 'de'
- remove_javascript = True
- cover_url = 'http://www.an-online.de/einwaage/images/an_logo.png'
- masthead_url = 'http://www.an-online.de/einwaage/images/an_logo.png'
- extra_css = '''
- .fliesstext_detail:{margin-bottom:10%;}
- .headline_1:{margin-bottom:25%;}
- b{font-family:Arial,Helvetica,sans-serif; font-weight:200;font-size:large;}
- a{font-family:Arial,Helvetica,sans-serif; font-weight:400;font-size:large;}
- ll{font-family:Arial,Helvetica,sans-serif; font-weight:100;font-size:large;}
- h4{font-family:Arial,Helvetica,sans-serif; font-weight:normal;font-size:small;}
- img {min-width:300px; max-width:600px; min-height:300px; max-height:800px}
- dd{font-family:Arial,Helvetica,sans-serif;font-size:large;}
- body{font-family:Helvetica,Arial,sans-serif;font-size:small;}
- '''
-
+ no_stylesheets = True
+ remove_javascript = True
+ remove_empty_feeds = True
+ language = 'de'
+# cover_url = 'http://www.aachener-nachrichten.de/img/logos/an_website_retina.png'
+ masthead_url = 'http://www.aachener-nachrichten.de/img/logos/an_website_retina.png'
keep_only_tags = [
- dict(name='span', attrs={'class':['fliesstext_detail', 'headline_1', 'autor_detail']}),
- dict(id=['header-logo'])
- ]
+ dict(name='article', attrs={'class':['single']})
+ ]
- feeds = [(u'Euregio', u'http://www.an-online.de/an/rss/Euregio.xml'),
- (u'Aachen', u'http://www.an-online.de/an/rss/Aachen.xml'),
- (u'Nordkreis', u'http://www.an-online.de/an/rss/Nordkreis.xml'),
- (u'Düren', u'http://www.an-online.de/an/rss/Dueren.xml'),
- (u'Eiffel', u'http://www.an-online.de/an/rss/Eifel.xml'),
- (u'Eschweiler', u'http://www.an-online.de/an/rss/Eschweiler.xml'),
- (u'Geilenkirchen', u'http://www.an-online.de/an/rss/Geilenkirchen.xml'),
- (u'Heinsberg', u'http://www.an-online.de/an/rss/Heinsberg.xml'),
- (u'Jülich', u'http://www.an-online.de/an/rss/Juelich.xml'),
- (u'Stolberg', u'http://www.an-online.de/an/rss/Stolberg.xml'),
- (u'Ratgebenr', u'http://www.an-online.de/an/rss/Ratgeber.xml')]
+ remove_tags = [
+ dict(name='div', attrs={'class':["clearfix navi-wrapper"]}),
+ dict(name='div', attrs={'id':["article_actions"]}),
+ dict(name='style', attrs={'type':["text/css"]}),
+ dict(name='aside'),
+ dict(name='a', attrs={'class':["btn btn-action"]})
+ ]
+
+ feeds = [
+ (u'Lokales - Euregio', u'http://www.aachener-nachrichten.de/cmlink/euregio-rss-1.357285'),
+ (u'Lokales - Aachen', u'http://www.aachener-nachrichten.de/cmlink/aachen-rss-1.357286'),
+ (u'Lokales - Nordkreis', u'http://www.aachener-nachrichten.de/cmlink/nordkreis-rss-1.358150'),
+ (u'Lokales - Düren', u'http://www.aachener-nachrichten.de/cmlink/dueren-rss-1.358626'),
+ (u'Lokales - Eiffel', u'http://www.aachener-nachrichten.de/cmlink/eifel-rss-1.358978'),
+ (u'Lokales - Eschweiler', u'http://www.aachener-nachrichten.de/cmlink/eschweiler-rss-1.359332'),
+ (u'Lokales - Geilenkirchen', u'http://www.aachener-nachrichten.de/cmlink/geilenkirchen-rss-1.359643'),
+ (u'Lokales - Heinsberg', u'http://www.aachener-nachrichten.de/cmlink/heinsberg-rss-1.359724'),
+ (u'Lokales - Jülich', u'http://www.aachener-nachrichten.de/cmlink/juelich-rss-1.359725'),
+ (u'Lokales - Stolberg', u'http://www.aachener-nachrichten.de/cmlink/stolberg-rss-1.359726'),
+ (u'News - Politik', u'http://www.aachener-nachrichten.de/cmlink/politik-rss-1.359727'),
+ (u'News - Aus aller Welt', u'http://www.aachener-nachrichten.de/cmlink/ausallerwelt-rss-1.453282'),
+ (u'News - Wirtschaft', u'http://www.aachener-nachrichten.de/cmlink/wirtschaft-rss-1.359872'),
+ (u'News - Kultur', u'http://www.aachener-nachrichten.de/cmlink/kultur-rss-1.365018'),
+ (u'News - Kino', u'http://www.aachener-nachrichten.de/cmlink/kino-rss-1.365019'),
+ (u'News - Digital', u'http://www.aachener-nachrichten.de/cmlink/digital-rss-1.365020'),
+ (u'News - Wissenschaft', u'http://www.aachener-nachrichten.de/cmlink/wissenschaft-rss-1.365021'),
+ (u'News - Hochschule', u'http://www.aachener-nachrichten.de/cmlink/hochschule-rss-1.365022'),
+ (u'News - Auto', u'http://www.aachener-nachrichten.de/cmlink/auto-rss-1.365023'),
+ (u'News - Kurioses', u'http://www.aachener-nachrichten.de/cmlink/kurioses-rss-1.365067'),
+ (u'News - Musik', u'http://www.aachener-nachrichten.de/cmlink/musik-rss-1.365305'),
+ (u'News - Tagesthema', u'http://www.aachener-nachrichten.de/cmlink/tagesthema-rss-1.365519'),
+ (u'News - Newsticker', u'http://www.aachener-nachrichten.de/cmlink/newsticker-rss-1.451948'),
+ (u'Sport - Aktuell', u'http://www.aachener-nachrichten.de/cmlink/aktuell-rss-1.366716'),
+ (u'Sport - Fußball', u'http://www.aachener-nachrichten.de/cmlink/fussball-rss-1.367060'),
+ (u'Sport - Bundesliga', u'http://www.aachener-nachrichten.de/cmlink/bundesliga-rss-1.453367'),
+ (u'Sport - Alemannia Aachen', u'http://www.aachener-nachrichten.de/cmlink/alemanniaaachen-rss-1.366057'),
+ (u'Sport - Volleyball', u'http://www.aachener-nachrichten.de/cmlink/volleyball-rss-1.453370'),
+ (u'Sport - Chio', u'http://www.aachener-nachrichten.de/cmlink/chio-rss-1.453371'),
+ (u'Dossier - Kinderuni', u'http://www.aachener-nachrichten.de/cmlink/kinderuni-rss-1.453375'),
+ (u'Dossier - Karlspreis', u'http://www.aachener-nachrichten.de/cmlink/karlspreis-rss-1.453376'),
+ (u'Dossier - Ritterorden', u'http://www.aachener-nachrichten.de/cmlink/ritterorden-rss-1.453377'),
+ (u'Dossier - ZAB-Aachen', u'http://www.aachener-nachrichten.de/cmlink/zabaachen-rss-1.453380'),
+ (u'Dossier - Karneval', u'http://www.aachener-nachrichten.de/cmlink/karneval-rss-1.453384'),
+ (u'Ratgeber - Geld', u'http://www.aachener-nachrichten.de/cmlink/geld-rss-1.453385'),
+ (u'Ratgeber - Recht', u'http://www.aachener-nachrichten.de/cmlink/recht-rss-1.453386'),
+ (u'Ratgeber - Gesundheit', u'http://www.aachener-nachrichten.de/cmlink/gesundheit-rss-1.453387'),
+ (u'Ratgeber - Familie', u'http://www.aachener-nachrichten.de/cmlink/familie-rss-1.453388'),
+ (u'Ratgeber - Livestyle', u'http://www.aachener-nachrichten.de/cmlink/lifestyle-rss-1.453389'),
+ (u'Ratgeber - Reisen', u'http://www.aachener-nachrichten.de/cmlink/reisen-rss-1.453390'),
+ (u'Ratgeber - Bauen und Wohnen', u'http://www.aachener-nachrichten.de/cmlink/bauen-rss-1.453398'),
+ (u'Ratgeber - Bildung und Beruf', u'http://www.aachener-nachrichten.de/cmlink/bildung-rss-1.453400'),
+ ]
diff --git a/recipes/adventure_zone_pl.recipe b/recipes/adventure_zone_pl.recipe
index 485a2e0c5b..b02460695e 100644
--- a/recipes/adventure_zone_pl.recipe
+++ b/recipes/adventure_zone_pl.recipe
@@ -9,18 +9,19 @@ class Adventure_zone(BasicNewsRecipe):
no_stylesheets = True
oldest_article = 20
max_articles_per_feed = 100
+ cover_url = 'http://www.adventure-zone.info/inne/logoaz_2012.png'
index='http://www.adventure-zone.info/fusion/'
- use_embedded_content=False
+ use_embedded_content = False
preprocess_regexps = [(re.compile(r"| Komentarze | ", re.IGNORECASE), lambda m: ''),
- (re.compile(r'\'), lambda match: ''),
- (re.compile(r'\'), lambda match: '')]
+ (re.compile(r''), lambda match: ''),
+ (re.compile(r''), lambda match: '')]
remove_tags_before= dict(name='td', attrs={'class':'main-bg'})
remove_tags= [dict(name='img', attrs={'alt':'Drukuj'})]
remove_tags_after= dict(id='comments')
extra_css = '.main-bg{text-align: left;} td.capmain{ font-size: 22px; }'
feeds = [(u'Nowinki', u'http://www.adventure-zone.info/fusion/feeds/news.php')]
- def parse_feeds (self):
+ '''def parse_feeds (self):
feeds = BasicNewsRecipe.parse_feeds(self)
soup=self.index_to_soup(u'http://www.adventure-zone.info/fusion/feeds/news.php')
tag=soup.find(name='channel')
@@ -33,24 +34,33 @@ class Adventure_zone(BasicNewsRecipe):
for feed in feeds:
for article in feed.articles[:]:
article.title=titles[feed.articles.index(article)]
- return feeds
+ return feeds'''
- def get_cover_url(self):
+ '''def get_cover_url(self):
soup = self.index_to_soup('http://www.adventure-zone.info/fusion/news.php')
cover=soup.find(id='box_OstatninumerAZ')
self.cover_url='http://www.adventure-zone.info/fusion/'+ cover.center.a.img['src']
- return getattr(self, 'cover_url', self.cover_url)
-
+ return getattr(self, 'cover_url', self.cover_url)'''
+ def populate_article_metadata(self, article, soup, first):
+ result = re.search('(.+) - Adventure Zone', soup.title.string)
+ if result:
+ article.title = result.group(1)
+ else:
+ result = soup.body.find('strong')
+ if result:
+ article.title = result.string
def skip_ad_pages(self, soup):
skip_tag = soup.body.find(name='td', attrs={'class':'main-bg'})
skip_tag = skip_tag.findAll(name='a')
- for r in skip_tag:
- if r.strong:
- word=r.strong.string.lower()
- if word and (('zapowied' in word) or ('recenzj' in word) or ('solucj' in word) or ('poradnik' in word)):
- return self.index_to_soup('http://www.adventure-zone.info/fusion/print.php?type=A&item'+r['href'][r['href'].find('article_id')+7:], raw=True)
+ title = soup.title.string.lower()
+ if (('zapowied' in title) or ('recenzj' in title) or ('solucj' in title) or ('poradnik' in title)):
+ for r in skip_tag:
+ if r.strong and r.strong.string:
+ word=r.strong.string.lower()
+ if (('zapowied' in word) or ('recenzj' in word) or ('solucj' in word) or ('poradnik' in word)):
+ return self.index_to_soup('http://www.adventure-zone.info/fusion/print.php?type=A&item'+r['href'][r['href'].find('article_id')+7:], raw=True)
def preprocess_html(self, soup):
footer=soup.find(attrs={'class':'news-footer middle-border'})
diff --git a/recipes/aksiyon_derigisi.recipe b/recipes/aksiyon_derigisi.recipe
index bc15b39095..d7be418413 100644
--- a/recipes/aksiyon_derigisi.recipe
+++ b/recipes/aksiyon_derigisi.recipe
@@ -20,6 +20,7 @@ class Aksiyon (BasicNewsRecipe):
auto_cleanup = True
cover_img_url = 'http://www.aksiyon.com.tr/aksiyon/images/aksiyon/top-page/aksiyon_top_r2_c1.jpg'
masthead_url = 'http://aksiyon.com.tr/aksiyon/images/aksiyon/top-page/aksiyon_top_r2_c1.jpg'
+ ignore_duplicate_articles = { 'title', 'url' }
remove_empty_feeds= True
feeds = [
( u'KAPAK', u'http://www.aksiyon.com.tr/aksiyon/rss?sectionId=26'),
diff --git a/recipes/alternet.recipe b/recipes/alternet.recipe
index e58376cc42..0bd608e0e7 100644
--- a/recipes/alternet.recipe
+++ b/recipes/alternet.recipe
@@ -10,14 +10,12 @@ class Alternet(BasicNewsRecipe):
category = 'News, Magazine'
description = 'News magazine and online community'
feeds = [
- (u'Front Page', u'http://feeds.feedblitz.com/alternet'),
- (u'Breaking News', u'http://feeds.feedblitz.com/alternet_breaking_news'),
- (u'Top Ten Campaigns', u'http://feeds.feedblitz.com/alternet_top_10_campaigns'),
- (u'Special Coverage Areas', u'http://feeds.feedblitz.com/alternet_coverage')
+ (u'Front Page', u'http://feeds.feedblitz.com/alternet')
]
+
remove_attributes = ['width', 'align','cellspacing']
remove_javascript = True
- use_embedded_content = False
+ use_embedded_content = True
no_stylesheets = True
language = 'en'
encoding = 'UTF-8'
diff --git a/recipes/ambito_financiero.recipe b/recipes/ambito_financiero.recipe
index 08c056e8ee..c45fa8fbce 100644
--- a/recipes/ambito_financiero.recipe
+++ b/recipes/ambito_financiero.recipe
@@ -42,7 +42,7 @@ class Ambito_Financiero(BasicNewsRecipe):
remove_attributes = ['align']
def get_browser(self):
- br = BasicNewsRecipe.get_browser()
+ br = BasicNewsRecipe.get_browser(self)
br.open(self.INDEX)
if self.username is not None and self.password is not None:
br.open(self.LOGIN)
diff --git a/recipes/anchorage_daily.recipe b/recipes/anchorage_daily.recipe
index 4ce2f13a14..7bda0f5bcd 100644
--- a/recipes/anchorage_daily.recipe
+++ b/recipes/anchorage_daily.recipe
@@ -5,14 +5,16 @@ class AdvancedUserRecipe1278347258(BasicNewsRecipe):
__author__ = 'rty'
oldest_article = 7
max_articles_per_feed = 100
+ auto_cleanup = True
+
feeds = [(u'Alaska News', u'http://www.adn.com/news/alaska/index.xml'),
- (u'Business', u'http://www.adn.com/money/index.xml'),
- (u'Sports', u'http://www.adn.com/sports/index.xml'),
- (u'Politics', u'http://www.adn.com/politics/index.xml'),
- (u'Lifestyles', u'http://www.adn.com/life/index.xml'),
- (u'Iditarod', u'http://www.adn.com/iditarod/index.xml')
- ]
+ (u'Business', u'http://www.adn.com/money/index.xml'),
+ (u'Sports', u'http://www.adn.com/sports/index.xml'),
+ (u'Politics', u'http://www.adn.com/politics/index.xml'),
+ (u'Lifestyles', u'http://www.adn.com/life/index.xml'),
+ (u'Iditarod', u'http://www.adn.com/iditarod/index.xml')
+ ]
description = ''''Alaska's Newspaper'''
publisher = 'http://www.adn.com'
category = 'news, Alaska, Anchorage'
@@ -28,13 +30,13 @@ class AdvancedUserRecipe1278347258(BasicNewsRecipe):
conversion_options = {'linearize_tables':True}
masthead_url = 'http://media.adn.com/includes/assets/images/adn_logo.2.gif'
- keep_only_tags = [
- dict(name='div', attrs={'class':'left_col story_mainbar'}),
- ]
- remove_tags = [
- dict(name='div', attrs={'class':'story_tools'}),
- dict(name='p', attrs={'class':'ad_label'}),
- ]
- remove_tags_after = [
- dict(name='div', attrs={'class':'advertisement'}),
- ]
+ #keep_only_tags = [
+ #dict(name='div', attrs={'class':'left_col story_mainbar'}),
+ #]
+ #remove_tags = [
+ #dict(name='div', attrs={'class':'story_tools'}),
+ #dict(name='p', attrs={'class':'ad_label'}),
+ #]
+ #remove_tags_after = [
+ #dict(name='div', attrs={'class':'advertisement'}),
+ #]
diff --git a/recipes/android_com_pl.recipe b/recipes/android_com_pl.recipe
index c7a4a97d3c..a4a387d414 100644
--- a/recipes/android_com_pl.recipe
+++ b/recipes/android_com_pl.recipe
@@ -3,11 +3,11 @@ from calibre.web.feeds.news import BasicNewsRecipe
class Android_com_pl(BasicNewsRecipe):
title = u'Android.com.pl'
__author__ = 'fenuks'
- description = 'Android.com.pl - biggest polish Android site'
+ description = u'Android.com.pl - to największe w Polsce centrum Android OS. Znajdziesz tu: nowości, forum, pomoc, recenzje, gry, aplikacje.'
category = 'Android, mobile'
language = 'pl'
use_embedded_content=True
- cover_url =u'http://upload.wikimedia.org/wikipedia/commons/thumb/d/d7/Android_robot.svg/220px-Android_robot.svg.png'
+ cover_url =u'http://android.com.pl/wp-content/themes/android/images/logo.png'
oldest_article = 8
max_articles_per_feed = 100
- feeds = [(u'Android', u'http://android.com.pl/component/content/frontpage/frontpage.feed?type=rss')]
+ feeds = [(u'Android', u'http://android.com.pl/feed/')]
diff --git a/recipes/apple_daily.recipe b/recipes/apple_daily.recipe
index 1e9953af43..763136c9b0 100644
--- a/recipes/apple_daily.recipe
+++ b/recipes/apple_daily.recipe
@@ -37,7 +37,7 @@ class AppleDaily(BasicNewsRecipe):
#def get_browser(self):
- #br = BasicNewsRecipe.get_browser()
+ #br = BasicNewsRecipe.get_browser(self)
#if self.username is not None and self.password is not None:
# br.open('http://www.nytimes.com/auth/login')
# br.select_form(name='login')
diff --git a/recipes/archeowiesci.recipe b/recipes/archeowiesci.recipe
index e121ba4d42..6bcc9bef6c 100644
--- a/recipes/archeowiesci.recipe
+++ b/recipes/archeowiesci.recipe
@@ -22,7 +22,7 @@ class Archeowiesci(BasicNewsRecipe):
return feeds
def get_browser(self):
- br = BasicNewsRecipe.get_browser()
+ br = BasicNewsRecipe.get_browser(self)
if self.username is not None and self.password is not None:
br.open('http://archeowiesci.pl/wp-login.php')
br.select_form(name='loginform')
diff --git a/recipes/asco_de_vida.recipe b/recipes/asco_de_vida.recipe
new file mode 100644
index 0000000000..fa1944f95d
--- /dev/null
+++ b/recipes/asco_de_vida.recipe
@@ -0,0 +1,20 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class HindustanTimes(BasicNewsRecipe):
+ title = u'Asco de vida'
+ language = 'es'
+ __author__ = 'Krittika Goyal'
+ oldest_article = 1 #days
+ max_articles_per_feed = 25
+ #encoding = 'cp1252'
+ use_embedded_content = False
+
+ no_stylesheets = True
+ keep_only_tags = dict(name='div', attrs={'class':'box story'})
+
+
+ feeds = [
+('News',
+ 'http://feeds2.feedburner.com/AscoDeVida'),
+]
+
diff --git a/recipes/astroflesz.recipe b/recipes/astroflesz.recipe
new file mode 100644
index 0000000000..0b92fdfa29
--- /dev/null
+++ b/recipes/astroflesz.recipe
@@ -0,0 +1,19 @@
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Astroflesz(BasicNewsRecipe):
+ title = u'Astroflesz'
+ oldest_article = 7
+ __author__ = 'fenuks'
+ description = u'astroflesz.pl - to portal poświęcony astronomii. Informuje zarówno o aktualnych wydarzeniach i odkryciach naukowych, jak również zapowiada ciekawe zjawiska astronomiczne'
+ category = 'astronomy'
+ language = 'pl'
+ cover_url = 'http://www.astroflesz.pl/templates/astroflesz/images/logo/logo.png'
+ ignore_duplicate_articles = {'title', 'url'}
+ max_articles_per_feed = 100
+ no_stylesheets = True
+ use_embedded_content = False
+ keep_only_tags = [dict(id="k2Container")]
+ remove_tags_after = dict(name='div', attrs={'class':'itemLinks'})
+ remove_tags = [dict(name='div', attrs={'class':['itemLinks', 'itemToolbar', 'itemRatingBlock']})]
+ feeds = [(u'Wszystkie', u'http://astroflesz.pl/?format=feed')]
diff --git a/recipes/azstarnet.recipe b/recipes/azstarnet.recipe
index 45339ae208..3ab10a9b6f 100644
--- a/recipes/azstarnet.recipe
+++ b/recipes/azstarnet.recipe
@@ -31,7 +31,7 @@ class Azstarnet(BasicNewsRecipe):
def get_browser(self):
- br = BasicNewsRecipe.get_browser()
+ br = BasicNewsRecipe.get_browser(self)
br.open('http://azstarnet.com/')
if self.username is not None and self.password is not None:
data = urllib.urlencode({ 'm':'login'
diff --git a/recipes/badania_net.recipe b/recipes/badania_net.recipe
new file mode 100644
index 0000000000..01499f6369
--- /dev/null
+++ b/recipes/badania_net.recipe
@@ -0,0 +1,17 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+class BadaniaNet(BasicNewsRecipe):
+ title = u'badania.net'
+ __author__ = 'fenuks'
+ description = u'chcesz wiedzieć więcej?'
+ category = 'science'
+ language = 'pl'
+ cover_url = 'http://badania.net/wp-content/badanianet_green_transparent.png'
+ oldest_article = 7
+ max_articles_per_feed = 100
+ no_stylesheets = True
+ remove_empty_feeds = True
+ use_embedded_content = False
+ remove_tags = [dict(attrs={'class':['omc-flex-category', 'omc-comment-count', 'omc-single-tags']})]
+ remove_tags_after = dict(attrs={'class':'omc-single-tags'})
+ keep_only_tags = [dict(id='omc-full-article')]
+ feeds = [(u'Psychologia', u'http://badania.net/category/psychologia/feed/'), (u'Technologie', u'http://badania.net/category/technologie/feed/'), (u'Biologia', u'http://badania.net/category/biologia/feed/'), (u'Chemia', u'http://badania.net/category/chemia/feed/'), (u'Zdrowie', u'http://badania.net/category/zdrowie/'), (u'Seks', u'http://badania.net/category/psychologia-ewolucyjna-tematyka-seks/feed/')]
diff --git a/recipes/baltimore_sun.recipe b/recipes/baltimore_sun.recipe
index 006a4c4ae6..3cd5c8edbc 100644
--- a/recipes/baltimore_sun.recipe
+++ b/recipes/baltimore_sun.recipe
@@ -19,6 +19,7 @@ class BaltimoreSun(BasicNewsRecipe):
use_embedded_content = False
no_stylesheets = True
remove_javascript = True
+ #auto_cleanup = True
recursions = 1
ignore_duplicate_articles = {'title'}
@@ -78,6 +79,7 @@ class BaltimoreSun(BasicNewsRecipe):
#(u'High School', u'http://www.baltimoresun.com/sports/high-school/rss2.0.xml'),
#(u'Outdoors', u'http://www.baltimoresun.com/sports/outdoors/rss2.0.xml'),
+
## Entertainment ##
(u'Celebrity News', u'http://www.baltimoresun.com/entertainment/celebrities/rss2.0.xml'),
(u'Arts & Theater', u'http://www.baltimoresun.com/entertainment/arts/rss2.0.xml'),
@@ -142,12 +144,12 @@ class BaltimoreSun(BasicNewsRecipe):
(u'Read Street', u'http://www.baltimoresun.com/features/books/read-street/rss2.0.xml'),
(u'Z on TV', u'http://www.baltimoresun.com/entertainment/tv/z-on-tv-blog/rss2.0.xml'),
-## Life Blogs ##
- (u'BMore Green', u'http://weblogs.baltimoresun.com/features/green/index.xml'),
- (u'Baltimore Insider',u'http://www.baltimoresun.com/features/baltimore-insider-blog/rss2.0.xml'),
- (u'Homefront', u'http://www.baltimoresun.com/features/parenting/homefront/rss2.0.xml'),
- (u'Picture of Health', u'http://www.baltimoresun.com/health/blog/rss2.0.xml'),
- (u'Unleashed', u'http://weblogs.baltimoresun.com/features/mutts/blog/index.xml'),
+### Life Blogs ##
+ #(u'BMore Green', u'http://weblogs.baltimoresun.com/features/green/index.xml'),
+ #(u'Baltimore Insider',u'http://www.baltimoresun.com/features/baltimore-insider-blog/rss2.0.xml'),
+ #(u'Homefront', u'http://www.baltimoresun.com/features/parenting/homefront/rss2.0.xml'),
+ #(u'Picture of Health', u'http://www.baltimoresun.com/health/blog/rss2.0.xml'),
+ #(u'Unleashed', u'http://weblogs.baltimoresun.com/features/mutts/blog/index.xml'),
## b the site blogs ##
(u'Game Cache', u'http://www.baltimoresun.com/entertainment/bthesite/game-cache/rss2.0.xml'),
@@ -167,6 +169,7 @@ class BaltimoreSun(BasicNewsRecipe):
]
+
def get_article_url(self, article):
ans = None
try:
diff --git a/recipes/barrons.recipe b/recipes/barrons.recipe
index 9d79aed728..58c62e20e9 100644
--- a/recipes/barrons.recipe
+++ b/recipes/barrons.recipe
@@ -28,6 +28,8 @@ class Barrons(BasicNewsRecipe):
## Don't grab articles more than 7 days old
oldest_article = 7
+ use_javascript_to_login = True
+ requires_version = (0, 9, 16)
extra_css = '''
.datestamp{font-family:Verdana,Geneva,Kalimati,sans-serif; font-size:x-small;}
@@ -40,7 +42,7 @@ class Barrons(BasicNewsRecipe):
.insettipUnit{font-size: x-small;}
'''
remove_tags = [
- dict(name ='div', attrs={'class':['tabContainer artTabbedNav','rssToolBox hidden','articleToolbox']}),
+ dict(name ='div', attrs={'class':['sTools sTools-t', 'tabContainer artTabbedNav','rssToolBox hidden','articleToolbox']}),
dict(name = 'a', attrs ={'class':'insetClose'})
]
@@ -60,21 +62,17 @@ class Barrons(BasicNewsRecipe):
]
]
- def get_browser(self):
- br = BasicNewsRecipe.get_browser()
- if self.username is not None and self.password is not None:
- br.open('http://commerce.barrons.com/auth/login')
- br.select_form(name='login_form')
- br['user'] = self.username
- br['password'] = self.password
- br.submit()
- return br
+ def javascript_login(self, br, username, password):
+ br.visit('http://commerce.barrons.com/auth/login')
+ f = br.select_form(nr=0)
+ f['username'] = username
+ f['password'] = password
+ br.submit(timeout=120)
## Use the print version of a page when available.
-
def print_version(self, url):
main, sep, rest = url.rpartition('?')
- return main + '#printmode'
+ return main + '#text.print'
def postprocess_html(self, soup, first):
diff --git a/recipes/bash_org_pl.recipe b/recipes/bash_org_pl.recipe
index 4ed59614e7..a04f267ca3 100644
--- a/recipes/bash_org_pl.recipe
+++ b/recipes/bash_org_pl.recipe
@@ -35,8 +35,8 @@ class Bash_org_pl(BasicNewsRecipe):
soup=self.index_to_soup(u'http://bash.org.pl/random/')
#date=soup.find('div', attrs={'class':'right'}).string
url=soup.find('a', attrs={'class':'qid click'})
- title=url.string
- url='http://bash.org.pl' +url['href']
+ title=''
+ url='http://bash.org.pl/random/'
articles.append({'title' : title,
'url' : url,
'date' : '',
@@ -44,6 +44,8 @@ class Bash_org_pl(BasicNewsRecipe):
})
return articles
+ def populate_article_metadata(self, article, soup, first):
+ article.title = soup.find(attrs={'class':'qid click'}).string
def parse_index(self):
feeds = []
diff --git a/recipes/big_oven.recipe b/recipes/big_oven.recipe
index ba3a5dec38..a1e9a5c042 100644
--- a/recipes/big_oven.recipe
+++ b/recipes/big_oven.recipe
@@ -25,7 +25,7 @@ class BigOven(BasicNewsRecipe):
}
def get_browser(self):
- br = BasicNewsRecipe.get_browser()
+ br = BasicNewsRecipe.get_browser(self)
if self.username is not None and self.password is not None:
br.open('http://www.bigoven.com/account/login?ReturnUrl=/')
br.select_form(nr=1)
diff --git a/recipes/birmingham_post.recipe b/recipes/birmingham_post.recipe
index b9b3c3fc57..db2e29c821 100644
--- a/recipes/birmingham_post.recipe
+++ b/recipes/birmingham_post.recipe
@@ -1,9 +1,11 @@
from calibre.web.feeds.news import BasicNewsRecipe
+import re
+import mechanize
+
class AdvancedUserRecipe1306097511(BasicNewsRecipe):
title = u'Birmingham post'
description = 'Author D.Asbury. News for Birmingham UK'
#timefmt = ''
- # last update 8/9/12
__author__ = 'Dave Asbury'
cover_url = 'http://profile.ak.fbcdn.net/hprofile-ak-snc4/161987_9010212100_2035706408_n.jpg'
oldest_article = 2
@@ -12,27 +14,36 @@ class AdvancedUserRecipe1306097511(BasicNewsRecipe):
remove_empty_feeds = True
remove_javascript = True
no_stylesheets = True
- #auto_cleanup = True
+ auto_cleanup = True
language = 'en_GB'
+ cover_url = 'http://profile.ak.fbcdn.net/hprofile-ak-snc4/161987_9010212100_2035706408_n.jpg'
- masthead_url = 'http://www.pressgazette.co.uk/Pictures/web/t/c/g/birmingham_post.jpg'
+ masthead_url = 'http://www.trinitymirror.com/images/birminghampost-logo.gif'
+ def get_cover_url(self):
+ soup = self.index_to_soup('http://www.birminghampost.net')
+ # look for the block containing the sun button and url
+ cov = soup.find(attrs={'height' : re.compile('3'), 'alt' : re.compile('Post')})
+ print
+ print '%%%%%%%%%%%%%%%',cov
+ print
+ cov2 = str(cov['src'])
+ # cov2=cov2[7:]
+ print '88888888 ',cov2,' 888888888888'
+
+ #cover_url=cov2
+ #return cover_url
+ br = mechanize.Browser()
+ br.set_handle_redirect(False)
+ try:
+ br.open_novisit(cov2)
+ cover_url = cov2
+ except:
+ cover_url = 'http://profile.ak.fbcdn.net/hprofile-ak-snc4/161987_9010212100_2035706408_n.jpg'
+ return cover_url
- keep_only_tags = [
- dict(attrs={'id' : 'article-header'}),
- #dict(name='h1',attrs={'id' : 'article-header'}),
- dict(attrs={'class':['article-meta-author','article-meta-date','article main','art-o art-align-center otm-1 ']}),
- dict(name='div',attrs={'class' : 'article-image full'}),
- dict(attrs={'clas' : 'art-o art-align-center otm-1 '}),
- dict(name='div',attrs={'class' : 'article main'}),
-#dict(name='p')
- #dict(attrs={'id' : 'three-col'})
- ]
- remove_tags = [
- # dict(name='div',attrs={'class' : 'span-33 last header-links'})
- ]
feeds = [
#(u'News',u'http://www.birminghampost.net/news/rss.xml'),
(u'West Mids. News', u'http://www.birminghampost.net/news/west-midlands-news/rss.xml'),
@@ -41,9 +52,3 @@ class AdvancedUserRecipe1306097511(BasicNewsRecipe):
(u'Bloggs & Comments',u'http://www.birminghampost.net/comment/rss.xml')
]
- extra_css = '''
- h1{font-family:Arial,Helvetica,sans-serif; font-weight:bold;font-size:large;text-align:center;}
- h2{font-family:Arial,Helvetica,sans-serif; font-weight:normal;font-size:small;}
- p{font-family:Arial,Helvetica,sans-serif;font-size:small;}
- body{font-family:Helvetica,Arial,sans-serif;font-size:small;}
- '''
diff --git a/recipes/borse_online.recipe b/recipes/borse_online.recipe
index c192ce2b8d..ddd9ac456b 100644
--- a/recipes/borse_online.recipe
+++ b/recipes/borse_online.recipe
@@ -1,33 +1,36 @@
from calibre.web.feeds.recipes import BasicNewsRecipe
class AdvancedUserRecipe1303841067(BasicNewsRecipe):
- title = u'Börse-online'
- __author__ = 'schuster'
- oldest_article = 1
+ title = u'Börse-online'
+ __author__ = 'schuster, Armin Geller'
+ oldest_article = 1
max_articles_per_feed = 100
- no_stylesheets = True
- use_embedded_content = False
- language = 'de'
- remove_javascript = True
- cover_url = 'http://www.dpv.de/images/1995/source.gif'
- masthead_url = 'http://www.zeitschriften-cover.de/cover/boerse-online-cover-januar-2010-x1387.jpg'
- extra_css = '''
- h1{font-family:Arial,Helvetica,sans-serif; font-weight:bold;font-size:large;}
- h4{font-family:Arial,Helvetica,sans-serif; font-weight:normal;font-size:small;}
- img {min-width:300px; max-width:600px; min-height:300px; max-height:800px}
- p{font-family:Arial,Helvetica,sans-serif;font-size:small;}
- body{font-family:Helvetica,Arial,sans-serif;font-size:small;}
- '''
- remove_tags_bevor = [dict(name='h3')]
- remove_tags_after = [dict(name='div', attrs={'class':'artikelfuss'})]
- remove_tags = [dict(attrs={'class':['moduleTopNav', 'moduleHeaderNav', 'text', 'blau', 'poll1150']}),
- dict(id=['newsletterlayer', 'newsletterlayerClose', 'newsletterlayer_body', 'newsletterarray_error', 'newsletterlayer_emailadress', 'newsletterlayer_submit', 'kommentar']),
- dict(name=['h2', 'Gesamtranking', 'h3',''])]
+ no_stylesheets = True
+ use_embedded_content = False
+ language = 'de'
+ remove_javascript = True
+ encoding = 'iso-8859-1'
+ timefmt = ' [%a, %d %b %Y]'
+
+
+ cover_url = 'http://www.wirtschaftsmedien-shop.de/s/media/coverimages/7576_2013107.jpg'
+ masthead_url = 'http://upload.wikimedia.org/wikipedia/de/5/56/B%C3%B6rse_Online_Logo.svg'
+ remove_tags_after = [dict(name='div', attrs={'class':['artikelfuss', 'rahmen600']})]
+
+ remove_tags = [
+ dict(name='div', attrs={'id':['breadcrumb', 'rightCol', 'clearall']}),
+ dict(name='div', attrs={'class':['footer', 'artikelfuss']}),
+ ]
+
+ keep_only_tags = [
+ dict(name='div', attrs={'id':['contentWrapper']})
+ ]
+
+ feeds = [(u'Börsennachrichten', u'http://www.boerse-online.de/rss/')]
+
def print_version(self, url):
return url.replace('.html#nv=rss', '.html?mode=print')
- feeds = [(u'Börsennachrichten', u'http://www.boerse-online.de/rss/')]
-
diff --git a/recipes/brecha.recipe b/recipes/brecha.recipe
index da58710dd5..3eef48379f 100644
--- a/recipes/brecha.recipe
+++ b/recipes/brecha.recipe
@@ -40,7 +40,7 @@ class Brecha(BasicNewsRecipe):
def get_browser(self):
- br = BasicNewsRecipe.get_browser()
+ br = BasicNewsRecipe.get_browser(self)
br.open('http://www.brecha.com.uy/index.php/acceder-miembros')
if self.username is not None and self.password is not None:
data = urllib.urlencode({ 'task':'login'
diff --git a/recipes/bwmagazine2.recipe b/recipes/bwmagazine2.recipe
index 77143bbefc..cba255afa8 100644
--- a/recipes/bwmagazine2.recipe
+++ b/recipes/bwmagazine2.recipe
@@ -11,16 +11,15 @@ class BusinessWeekMagazine(BasicNewsRecipe):
category = 'news'
encoding = 'UTF-8'
keep_only_tags = [
- dict(name='div', attrs={'id':'article_body_container'}),
- ]
- remove_tags = [dict(name='ui'),dict(name='li')]
+ dict(name='div', attrs={'id':'article_body_container'}),
+ ]
+ remove_tags = [dict(name='ui'),dict(name='li'),dict(name='div', attrs={'id':['share-email']})]
no_javascript = True
no_stylesheets = True
cover_url = 'http://images.businessweek.com/mz/covers/current_120x160.jpg'
def parse_index(self):
-
#Go to the issue
soup = self.index_to_soup('http://www.businessweek.com/magazine/news/articles/business_news.htm')
@@ -39,7 +38,7 @@ class BusinessWeekMagazine(BasicNewsRecipe):
title=self.tag_to_string(div.a).strip()
url=div.a['href']
soup0 = self.index_to_soup(url)
- urlprint=soup0.find('li', attrs={'class':'print'}).a['href']
+ urlprint=soup0.find('li', attrs={'class':'print tracked'}).a['href']
articles.append({'title':title, 'url':urlprint, 'description':'', 'date':''})
@@ -47,7 +46,6 @@ class BusinessWeekMagazine(BasicNewsRecipe):
if section_title not in feeds:
feeds[section_title] = []
feeds[section_title] += articles
-
div1 = soup.find ('div', attrs={'class':'column center'})
section_title = ''
for div in div1.findAll('h5'):
@@ -57,7 +55,7 @@ class BusinessWeekMagazine(BasicNewsRecipe):
title=self.tag_to_string(div.a).strip()
url=div.a['href']
soup0 = self.index_to_soup(url)
- urlprint=soup0.find('li', attrs={'class':'print'}).a['href']
+ urlprint=soup0.find('li', attrs={'class':'print tracked'}).a['href']
articles.append({'title':title, 'url':urlprint, 'description':desc, 'date':''})
if articles:
diff --git a/recipes/cacm.recipe b/recipes/cacm.recipe
index e4af9d2024..a7b1c602a3 100644
--- a/recipes/cacm.recipe
+++ b/recipes/cacm.recipe
@@ -17,7 +17,7 @@ class AdvancedUserRecipe1286242553(BasicNewsRecipe):
cover_url_pattern = 'http://cacm.acm.org/magazines/%d/%d'
def get_browser(self):
- br = BasicNewsRecipe.get_browser()
+ br = BasicNewsRecipe.get_browser(self)
if self.username is not None and self.password is not None:
br.open('https://cacm.acm.org/login')
br.select_form(nr=1)
diff --git a/recipes/caijing.recipe b/recipes/caijing.recipe
index 34e6c1e8a9..05bc9314b3 100644
--- a/recipes/caijing.recipe
+++ b/recipes/caijing.recipe
@@ -34,7 +34,7 @@ class Caijing(BasicNewsRecipe):
def get_browser(self):
- br = BasicNewsRecipe.get_browser()
+ br = BasicNewsRecipe.get_browser(self)
if self.username is not None and self.password is not None:
br.open('http://service.caijing.com.cn/usermanage/login')
br.select_form(name='mainLoginForm')
diff --git a/recipes/calgary_herald.recipe b/recipes/calgary_herald.recipe
index d1b28de9de..f7b1ee71d5 100644
--- a/recipes/calgary_herald.recipe
+++ b/recipes/calgary_herald.recipe
@@ -132,14 +132,14 @@ class CanWestPaper(BasicNewsRecipe):
def get_cover_url(self):
from datetime import timedelta, date
cover = 'http://webmedia.newseum.org/newseum-multimedia/dfp/jpg'+str(date.today().day)+'/lg/'+self.fp_tag+'.jpg'
- br = BasicNewsRecipe.get_browser()
+ br = BasicNewsRecipe.get_browser(self)
daysback=1
try:
br.open(cover)
except:
while daysback<7:
cover = 'http://webmedia.newseum.org/newseum-multimedia/dfp/jpg'+str((date.today() - timedelta(days=daysback)).day)+'/lg/'+self.fp_tag+'.jpg'
- br = BasicNewsRecipe.get_browser()
+ br = BasicNewsRecipe.get_browser(self)
try:
br.open(cover)
except:
diff --git a/recipes/chronicle_higher_ed.recipe b/recipes/chronicle_higher_ed.recipe
index 15b284cd7a..cac0cf77da 100644
--- a/recipes/chronicle_higher_ed.recipe
+++ b/recipes/chronicle_higher_ed.recipe
@@ -12,10 +12,10 @@ class Chronicle(BasicNewsRecipe):
category = 'news'
encoding = 'UTF-8'
keep_only_tags = [
- dict(name='div', attrs={'class':'article'}),
+ dict(name='div', attrs={'class':['article','blog-mod']}),
]
- remove_tags = [dict(name='div',attrs={'class':['related module1','maintitle']}),
- dict(name='div', attrs={'id':['section-nav','icon-row', 'enlarge-popup']}),
+ remove_tags = [dict(name='div',attrs={'class':['related module1','maintitle','entry-utility','object-meta']}),
+ dict(name='div', attrs={'id':['section-nav','icon-row', 'enlarge-popup','confirm-popup']}),
dict(name='a', attrs={'class':'show-enlarge enlarge'})]
no_javascript = True
no_stylesheets = True
@@ -23,7 +23,7 @@ class Chronicle(BasicNewsRecipe):
needs_subscription = True
def get_browser(self):
- br = BasicNewsRecipe.get_browser()
+ br = BasicNewsRecipe.get_browser(self)
if self.username is not None and self.password is not None:
br.open('http://chronicle.com/myaccount/login')
br.select_form(nr=1)
diff --git a/recipes/cnn.recipe b/recipes/cnn.recipe
index 6043f8b401..3cb66d2967 100644
--- a/recipes/cnn.recipe
+++ b/recipes/cnn.recipe
@@ -73,7 +73,7 @@ class CNN(BasicNewsRecipe):
def get_masthead_url(self):
masthead = 'http://i.cdn.turner.com/cnn/.element/img/3.0/global/header/intl/hdr-globe-central.gif'
- br = BasicNewsRecipe.get_browser()
+ br = BasicNewsRecipe.get_browser(self)
try:
br.open(masthead)
except:
diff --git a/recipes/conowego_pl.recipe b/recipes/conowego_pl.recipe
old mode 100755
new mode 100644
diff --git a/recipes/contemporary_argentine_writers.recipe b/recipes/contemporary_argentine_writers.recipe
new file mode 100644
index 0000000000..bd69967f3d
--- /dev/null
+++ b/recipes/contemporary_argentine_writers.recipe
@@ -0,0 +1,35 @@
+__license__ = 'GPL v3'
+__copyright__ = '2013, Darko Miletic '
+'''
+contemporaryargentinewriters.wordpress.com
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class contemporaryargentinewriters(BasicNewsRecipe):
+ title = 'Contemporary Argentine Writers'
+ __author__ = 'Darko Miletic'
+ description = 'Short stories by Argentine writers (and others) translated into English'
+ publisher = 'Dario Bard'
+ category = 'fiction, literature, Argentina, english'
+ oldest_article = 25
+ max_articles_per_feed = 200
+ no_stylesheets = True
+ encoding = 'utf8'
+ use_embedded_content = True
+ language = 'en_AR'
+ remove_empty_feeds = True
+ publication_type = 'blog'
+ extra_css = """
+ body{font-family: Arial,Helvetica,sans-serif }
+ img{margin-bottom: 0.4em; display:block}
+ """
+
+ conversion_options = {
+ 'comment' : description
+ , 'tags' : category
+ , 'publisher' : publisher
+ , 'language' : language
+ }
+
+ feeds = [(u'Posts', u'http://contemporaryargentinewriters.wordpress.com/feed/')]
diff --git a/recipes/corriere_della_sera_it.recipe b/recipes/corriere_della_sera_it.recipe
index b3bcebf505..01d8dbe720 100644
--- a/recipes/corriere_della_sera_it.recipe
+++ b/recipes/corriere_della_sera_it.recipe
@@ -62,7 +62,7 @@ class ilCorriere(BasicNewsRecipe):
day = "%.2d" % st.tm_mday
#http://images.corriere.it/primapagina/storico/2010_05_17/images/prima_pagina_grande.png
cover='http://images.corriere.it/primapagina/storico/'+ year + '_' + month +'_' + day +'/images/prima_pagina_grande.png'
- br = BasicNewsRecipe.get_browser()
+ br = BasicNewsRecipe.get_browser(self)
try:
br.open(cover)
except:
diff --git a/recipes/countryfile.recipe b/recipes/countryfile.recipe
index 4f2e8cd95f..86769b78cd 100644
--- a/recipes/countryfile.recipe
+++ b/recipes/countryfile.recipe
@@ -7,25 +7,30 @@ class AdvancedUserRecipe1325006965(BasicNewsRecipe):
#cover_url = 'http://www.countryfile.com/sites/default/files/imagecache/160px_wide/cover/2_1.jpg'
__author__ = 'Dave Asbury'
description = 'The official website of Countryfile Magazine'
- # last updated 7/10/12
+ # last updated 8/12/12
language = 'en_GB'
oldest_article = 30
max_articles_per_feed = 25
remove_empty_feeds = True
no_stylesheets = True
auto_cleanup = True
+ ignore_duplicate_articles = {'title', 'url'}
#articles_are_obfuscated = True
- ignore_duplicate_articles = {'title'}
+ #article_already_exists = False
+ #feed_hash = ''
def get_cover_url(self):
- soup = self.index_to_soup('http://www.countryfile.com/')
+ soup = self.index_to_soup('http://www.countryfile.com/magazine')
+ cov = soup.find(attrs={'class' : re.compile('imagecache imagecache-250px_wide')})#'width' : '160',
+ print '&&&&&&&& ',cov,' ***'
+ cov=str(cov)
+ #cov2 = re.findall('http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', cov)
+ cov2 = re.findall('/(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', cov)
+
+ cov2 = str(cov2)
+ cov2= "http://www.countryfile.com"+cov2[2:len(cov2)-8]
- cov = soup.find(attrs={'width' : '160', 'class' : re.compile('imagecache imagecache-160px_wide')})
- print '******** ',cov,' ***'
- cov2 = str(cov)
- cov2=cov2[10:101]
print '******** ',cov2,' ***'
- #cov2='http://www.countryfile.com/sites/default/files/imagecache/160px_wide/cover/1b_0.jpg'
- # try to get cover - if can't get known cover
+ # try to get cover - if can't get known cover
br = browser()
br.set_handle_redirect(False)
@@ -45,5 +50,3 @@ class AdvancedUserRecipe1325006965(BasicNewsRecipe):
(u'Countryside', u'http://www.countryfile.com/rss/countryside'),
]
-
-
diff --git a/recipes/czas_gentlemanow.recipe b/recipes/czas_gentlemanow.recipe
new file mode 100644
index 0000000000..6df677f25f
--- /dev/null
+++ b/recipes/czas_gentlemanow.recipe
@@ -0,0 +1,20 @@
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class CzasGentlemanow(BasicNewsRecipe):
+ title = u'Czas Gentlemanów'
+ __author__ = 'fenuks'
+ description = u'Historia mężczyzn z dala od wielkiej polityki'
+ category = 'blog'
+ language = 'pl'
+ cover_url = 'http://czasgentlemanow.pl/wp-content/uploads/2012/10/logo-Czas-Gentlemanow1.jpg'
+ ignore_duplicate_articles = {'title', 'url'}
+ oldest_article = 7
+ max_articles_per_feed = 100
+ no_stylesheets = True
+ remove_empty_feeds = True
+ use_embedded_content = False
+ keep_only_tags = [dict(name='div', attrs={'class':'content'})]
+ remove_tags = [dict(attrs={'class':'meta_comments'})]
+ remove_tags_after = dict(name='div', attrs={'class':'fblikebutton_button'})
+ feeds = [(u'M\u0119ski \u015awiat', u'http://czasgentlemanow.pl/category/meski-swiat/feed/'), (u'Styl', u'http://czasgentlemanow.pl/category/styl/feed/'), (u'Vademecum Gentlemana', u'http://czasgentlemanow.pl/category/vademecum/feed/'), (u'Dom i rodzina', u'http://czasgentlemanow.pl/category/dom-i-rodzina/feed/'), (u'Honor', u'http://czasgentlemanow.pl/category/honor/feed/'), (u'Gad\u017cety Gentlemana', u'http://czasgentlemanow.pl/category/gadzety-gentlemana/feed/')]
diff --git a/recipes/dani.recipe b/recipes/dani.recipe
index d11eecfeb9..740d5c2381 100644
--- a/recipes/dani.recipe
+++ b/recipes/dani.recipe
@@ -40,7 +40,7 @@ class BHDani(BasicNewsRecipe):
remove_attributes = ['height','width','align']
def get_browser(self):
- br = BasicNewsRecipe.get_browser()
+ br = BasicNewsRecipe.get_browser(self)
if self.username is not None and self.password is not None:
br.open(self.INDEX)
br.select_form(name='form')
diff --git a/recipes/der_spiegel.recipe b/recipes/der_spiegel.recipe
index 3a12378405..9ea4be6201 100644
--- a/recipes/der_spiegel.recipe
+++ b/recipes/der_spiegel.recipe
@@ -42,7 +42,7 @@ class DerSpiegel(BasicNewsRecipe):
else:
return True
- br = BasicNewsRecipe.get_browser()
+ br = BasicNewsRecipe.get_browser(self)
if self.username is not None and self.password is not None:
br.open(self.PREFIX + '/meinspiegel/login.html')
br.select_form(predicate=has_login_name)
diff --git a/recipes/discover_magazine.recipe b/recipes/discover_magazine.recipe
index 02cdb952b5..a7f080bb5f 100644
--- a/recipes/discover_magazine.recipe
+++ b/recipes/discover_magazine.recipe
@@ -33,6 +33,21 @@ class DiscoverMagazine(BasicNewsRecipe):
remove_tags_after = [dict(name='div', attrs={'class':'listingBar'})]
+ # Login stuff
+ needs_subscription = True
+ use_javascript_to_login = True
+ requires_version = (0, 9, 20)
+
+ def javascript_login(self, br, username, password):
+ br.visit('http://discovermagazine.com', timeout=120)
+ f = br.select_form('div.login.section div.form')
+ f['username'] = username
+ f['password'] = password
+ br.submit('input[id="signInButton"]', timeout=120)
+ br.run_for_a_time(20)
+ # End login stuff
+
+
def append_page(self, soup, appendtag, position):
pager = soup.find('span',attrs={'class':'next'})
if pager:
diff --git a/recipes/dobanevinosti.recipe b/recipes/dobanevinosti.recipe
new file mode 100644
index 0000000000..9d148be8b4
--- /dev/null
+++ b/recipes/dobanevinosti.recipe
@@ -0,0 +1,46 @@
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Darko Miletic '
+'''
+dobanevinosti.blogspot.com
+'''
+import re
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class DobaNevinosti(BasicNewsRecipe):
+ title = 'Doba Nevinosti'
+ __author__ = 'Darko Miletic'
+ description = 'Filmski blog'
+ oldest_article = 15
+ max_articles_per_feed = 100
+ language = 'sr'
+ encoding = 'utf-8'
+ no_stylesheets = True
+ use_embedded_content = True
+ publication_type = 'blog'
+ auto_cleanup = True
+ extra_css = """
+ @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)}
+ body{font-family: "Trebuchet MS",Trebuchet,Verdana,sans1,sans-serif}
+ img{margin-bottom: 0.8em; display:block;}
+ """
+
+ conversion_options = {
+ 'comment' : description
+ , 'tags' : 'film, blog, srbija, tv'
+ , 'publisher': 'Dimitrije Vojinov'
+ , 'language' : language
+ }
+ remove_attributes = ['lang', 'border']
+ preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+
+ feeds = [(u'Tekstovi', u'http://dobanevinosti.blogspot.com/feeds/posts/default')]
+
+ def preprocess_html(self, soup):
+ for item in soup.findAll(style=True):
+ del item['style']
+ for item in soup.findAll('img'):
+ if not item.has_key('alt'):
+ item['alt'] = 'image'
+ return soup
+
diff --git a/recipes/dzieje_pl.recipe b/recipes/dzieje_pl.recipe
index 0aafa5d2f4..603591e9f0 100644
--- a/recipes/dzieje_pl.recipe
+++ b/recipes/dzieje_pl.recipe
@@ -7,18 +7,64 @@ class Dzieje(BasicNewsRecipe):
cover_url = 'http://www.dzieje.pl/sites/default/files/dzieje_logo.png'
category = 'history'
language = 'pl'
- index='http://dzieje.pl'
+ ignore_duplicate_articles = {'title', 'url'}
+ index = 'http://dzieje.pl'
oldest_article = 8
max_articles_per_feed = 100
remove_javascript=True
no_stylesheets= True
keep_only_tags = [dict(name='h1', attrs={'class':'title'}), dict(id='content-area')]
remove_tags = [dict(attrs={'class':'field field-type-computed field-field-tagi'}), dict(id='dogory')]
- feeds = [(u'Dzieje', u'http://dzieje.pl/rss.xml')]
+ #feeds = [(u'Dzieje', u'http://dzieje.pl/rss.xml')]
+ def append_page(self, soup, appendtag):
+ tag = appendtag.find('li', attrs={'class':'pager-next'})
+ if tag:
+ while tag:
+ url = tag.a['href']
+ if not url.startswith('http'):
+ url = 'http://dzieje.pl'+tag.a['href']
+ soup2 = self.index_to_soup(url)
+ pagetext = soup2.find(id='content-area').find(attrs={'class':'content'})
+ for r in pagetext.findAll(attrs={'class':['fieldgroup group-groupkul', 'fieldgroup group-zdjeciekult', 'fieldgroup group-zdjecieciekaw', 'fieldgroup group-zdjecieksiazka', 'fieldgroup group-zdjeciedu', 'field field-type-filefield field-field-zdjecieglownawyd']}):
+ r.extract()
+ pos = len(appendtag.contents)
+ appendtag.insert(pos, pagetext)
+ tag = soup2.find('li', attrs={'class':'pager-next'})
+ for r in appendtag.findAll(attrs={'class':['item-list', 'field field-type-computed field-field-tagi', ]}):
+ r.extract()
+
+ def find_articles(self, url):
+ articles = []
+ soup=self.index_to_soup(url)
+ tag=soup.find(id='content-area').div.div
+ for i in tag.findAll('div', recursive=False):
+ temp = i.find(attrs={'class':'views-field-title'}).span.a
+ title = temp.string
+ url = self.index + temp['href']
+ date = '' #i.find(attrs={'class':'views-field-created'}).span.string
+ articles.append({'title' : title,
+ 'url' : url,
+ 'date' : date,
+ 'description' : ''
+ })
+ return articles
+
+ def parse_index(self):
+ feeds = []
+ feeds.append((u"Wiadomości", self.find_articles('http://dzieje.pl/wiadomosci')))
+ feeds.append((u"Kultura i sztuka", self.find_articles('http://dzieje.pl/kulturaisztuka')))
+ feeds.append((u"Film", self.find_articles('http://dzieje.pl/kino')))
+ feeds.append((u"Rozmaitości historyczne", self.find_articles('http://dzieje.pl/rozmaitości')))
+ feeds.append((u"Książka", self.find_articles('http://dzieje.pl/ksiazka')))
+ feeds.append((u"Wystawa", self.find_articles('http://dzieje.pl/wystawa')))
+ feeds.append((u"Edukacja", self.find_articles('http://dzieje.pl/edukacja')))
+ feeds.append((u"Dzieje się", self.find_articles('http://dzieje.pl/wydarzenia')))
+ return feeds
def preprocess_html(self, soup):
for a in soup('a'):
if a.has_key('href') and 'http://' not in a['href'] and 'https://' not in a['href']:
a['href']=self.index + a['href']
+ self.append_page(soup, soup.body)
return soup
\ No newline at end of file
diff --git a/recipes/dziennik_polski.recipe b/recipes/dziennik_polski.recipe
index 83b9d06ecd..253bda2ebe 100644
--- a/recipes/dziennik_polski.recipe
+++ b/recipes/dziennik_polski.recipe
@@ -116,7 +116,7 @@ class DziennikPolski24(BasicNewsRecipe):
loop=True
def get_browser(self):
- br=BasicNewsRecipe.get_browser()
+ br=BasicNewsRecipe.get_browser(self)
if self.username is not None and self.password is not None:
br.open('http://www.dziennikpolski24.pl/pl/moje-konto/950606-loguj.html')
br.select_form(nr = 1)
diff --git a/recipes/economist.recipe b/recipes/economist.recipe
index 25e46892f8..d7af32a243 100644
--- a/recipes/economist.recipe
+++ b/recipes/economist.recipe
@@ -41,10 +41,11 @@ class Economist(BasicNewsRecipe):
remove_tags = [
dict(name=['script', 'noscript', 'title', 'iframe', 'cf_floatingcontent']),
dict(attrs={'class':['dblClkTrk', 'ec-article-info',
- 'share_inline_header', 'related-items']}),
+ 'share_inline_header', 'related-items',
+ 'main-content-container']}),
{'class': lambda x: x and 'share-links-header' in x},
]
- keep_only_tags = [dict(id='ec-article-body')]
+ keep_only_tags = [dict(name='article')]
no_stylesheets = True
preprocess_regexps = [(re.compile('