From 29444f04db933796caf7273abb033b57de33a480 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 22 Jan 2010 17:41:29 -0700 Subject: [PATCH 1/5] ... --- Changelog.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.yaml b/Changelog.yaml index c9ece5cfbc..db050844d8 100644 --- a/Changelog.yaml +++ b/Changelog.yaml @@ -36,7 +36,7 @@ - title: "News downloads: When getting an article URL from a RSS feed, look first for an original article link. This speeds up the download of news services that use a syndication service like feedburner or pheedo to publish their RSS feeds." bug fixes: - - "Windows device detection: Don't do expensive polling while waiting for device disconnect. This should fix the problems people have with their floppy drive being activated while an e-book reader is connected" + - title: "Windows device detection: Don't do expensive polling while waiting for device disconnect. This should fix the problems people have with their floppy drive being activated while an e-book reader is connected" - title: "PML Input: Fix creation of metadata Table of Contents" tickets: [5633] From 4d7a1cbf7cdd27f1caea0a6b922737b2d2b5cac1 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 22 Jan 2010 17:44:27 -0700 Subject: [PATCH 2/5] ... --- Changelog.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.yaml b/Changelog.yaml index db050844d8..f5835a0b1a 100644 --- a/Changelog.yaml +++ b/Changelog.yaml @@ -84,7 +84,7 @@ author: Darko Miletic - title: Pajamas Media - autor: Krittika Goyal + author: Krittika Goyal - title: Algemeen Dagbla author: kwetal From 74a4e630fcecde5c9686e595f50985435b5367cc Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 23 Jan 2010 08:05:30 -0700 Subject: [PATCH 3/5] New recipe for The National Review Online by Walt Anthony --- .../images/news/nationalreviewonline.png | Bin 0 -> 815 bytes resources/recipes/nationalreviewonline.recipe | 50 ++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 resources/images/news/nationalreviewonline.png create mode 100644 resources/recipes/nationalreviewonline.recipe diff --git a/resources/images/news/nationalreviewonline.png b/resources/images/news/nationalreviewonline.png new file mode 100644 index 0000000000000000000000000000000000000000..9070b3c71dc31f50a3f98a029524a94bc682185a GIT binary patch literal 815 zcmV+~1JL}5P)kzTH$m6|3@fdMfV-aJex4)-x z{`?1d9vI&}$h|x7ByJ{rdwQ8H&C#Bo3Wr~qp|8J}xY=aKJ!3>s#MrLwG#fEf`zF}6 zV+)g$<2*h!N|q%&@z@Zrzchx`fTl@Gsc4yb=4ndh5^)^UZf7(bIhQV9W8wM=)oL$8 z!&N^0{1jiz{>JflzGrl6iM@L&XrbUackTx+{CJ6H56w_6mk0#bl9cJ`X&Q0H`Jb-R zN?^5-P>d|~C+w?jl*Lgmy%2;=aq8wrMUe z-|CD}<1v{e69Z8KWDB6GQ|N?Q}p@fzX)+keooy z;O6c{egBQ;J`m)8_=;>qI{X7F+`bioCnxzxLI`1Qo@2*PoP7S~twxu3KB%*Zc3kIg tyV0n}s6~yHZQF+H2cH^vcj^H?{u?wQ4K}ND5sCl+002ovPDHLkV1hdQbY}nn literal 0 HcmV?d00001 diff --git a/resources/recipes/nationalreviewonline.recipe b/resources/recipes/nationalreviewonline.recipe new file mode 100644 index 0000000000..5f002019d9 --- /dev/null +++ b/resources/recipes/nationalreviewonline.recipe @@ -0,0 +1,50 @@ +__license__ = 'GPL v3' +__copyright__ = '2010, Walt Anthony ' +''' +www.nationalreview.com +''' + +from calibre.web.feeds.news import BasicNewsRecipe + +class NRO(BasicNewsRecipe): + title = u'National Review Online' + __author__ = 'Walt Anthony' + description = "National Review is America's most widely read and influential magazine and web site for Republican/conservative news, commentary, and opinion." + publisher = 'National Review, Inc.' + category = 'news, politics, USA' + oldest_article = 3 + max_articles_per_feed = 100 + summary_length = 150 + language = 'en' + encoding = 'utf-8' + use_embedded_content = True + remove_javascript = True + + + conversion_options = { + 'comment' : description + , 'tags' : category + , 'publisher' : publisher + , 'language' : language + } + + remove_tags = [ + dict(name=['embed','object','iframe']), + + ] + + feeds = [ + + (u'National Review', u'http://www.nationalreview.com/index.xml'), + (u'The Corner', u'http://corner.nationalreview.com/corner.xml'), + (u'The Agenda', u'http://agenda.nationalreview.com/agenda.xml'), + (u'Bench Memos', u'http://bench.nationalreview.com/bench.xml'), + (u'Campaign Spot', u'http://campaignspot.nationalreview.com/campaignspot.xml'), + (u'Critical Care', u'http://healthcare.nationalreview.com/healthcare.xml'), + (u'Doctor, Doctor', u'http://www.nationalreview.com/doctor/doctor.xml'), + (u"Kudlow's Money Politic$", u'http://kudlow.nationalreview.com/kudlow.xml'), + (u'Media Blog', u'http://media.nationalreview.com/media.xml'), + (u'Phi Beta Cons', u'http://phibetacons.nationalreview.com/phibetacons.xml'), + (u'Planet Gore', u'http://planetgore.nationalreview.com/planetgore.xml') + + ] From 0159adc585344176bcba76b8ed21935fada27aad Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 23 Jan 2010 08:11:28 -0700 Subject: [PATCH 4/5] Fix Barrons to work with new get_article_url --- resources/recipes/barrons.recipe | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/recipes/barrons.recipe b/resources/recipes/barrons.recipe index 8106243cc0..9d79aed728 100644 --- a/resources/recipes/barrons.recipe +++ b/resources/recipes/barrons.recipe @@ -98,6 +98,9 @@ class Barrons(BasicNewsRecipe): ('Funds/Q&A', 'http://online.barrons.com/xml/rss/3_7519.xml'), ] + def get_article_url(self, article): + return article.get('link', None) + def get_cover_url(self): cover_url = None From 065a091c23c9201c439914f7b9c3344a64d419a6 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 23 Jan 2010 08:35:33 -0700 Subject: [PATCH 5/5] New recipe for ionline by Darko Miletic --- resources/images/news/ionline_pt.png | Bin 0 -> 647 bytes resources/recipes/ionline_pt.recipe | 58 +++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 resources/images/news/ionline_pt.png create mode 100644 resources/recipes/ionline_pt.recipe diff --git a/resources/images/news/ionline_pt.png b/resources/images/news/ionline_pt.png new file mode 100644 index 0000000000000000000000000000000000000000..f66d4aa797fd946da7e25c539cefa352732d932f GIT binary patch literal 647 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zK-vS0-A-oPfdtD69Mgd`SU*F|v9*U87#KHrx;TbdoPIlTZ&pa5z|nf+|NramtkLV- z;gO_}sZ_?vA-3|((eMr1J~8I#UOC3T;j7{np{;@&O%oJ70s;ifH)qFue|FFM_@i~V zZr-R$=(22|X)OQkNAlA2$5NHd6AiPTa871i^!=0Izi*-!-%j$=I@LYB^RBkZ&husW zPxv1haWOFvwwdnx931tQwP`6rk8u4Z`gPC->Qip*?cV8f)rA9 zm@J>HQZiSa=lE_%`G%WrIFQlptJIcla#(QgWVRX3!NIXNl-XF7 z1Sa^JZYYVHG-L6mme1BY>+T*o@#FjYBd4@JzutavrfvpPfstn8(y})$)i#ZH5d8Vh_nEVqWOv@Ze9pf${h~vE-+4x0M5>m!MwFx^mZVxG7o`Fz1|tJQ16>0{T_fWV z0}Cr-BP&xAT?2C~1A~O9d<7H@x%nxXX_Y7%EUgTUt&D;CK^i>eKNbNsFnGH9xvX