Merge branch 'master' of https://github.com/CoderAllan/calibre

2025-07-07 10:14:46 -04:00 · 2016-10-07 19:37:24 +05:30 · 2016-10-07 19:37:24 +05:30 · 6c292a0f98
commit 6c292a0f98
parent 6ae156f174 c4f59c5c10
8 changed files with 105 additions and 74 deletions
--- a/recipes/air_force_times.recipe
+++ b/recipes/air_force_times.recipe
@ -26,13 +26,17 @@ class AirForceTimes(BasicNewsRecipe):
    auto_cleanup = True

    feeds = [
-
-        ('News',   'http://www.airforcetimes.com/rss_news.php'),
-        ('Benefits',   'http://www.airforcetimes.com/rss_benefits.php'),
-        ('Money',   'http://www.airforcetimes.com/rss_money.php'),
-        ('Careers & Education',  'http://www.airforcetimes.com/rss_careers.php'),
-        ('Community',  'http://www.airforcetimes.com/rss_community.php'),
-        ('Off Duty',   'http://www.airforcetimes.com/rss_off_duty.php'),
-        ('Entertainment',  'http://www.airforcetimes.com/rss_entertainment.php'),
-        ('Guard & Reserve',  'http://www.airforcetimes.com/rss_guard.php'),
+        ('Home','http://feeds.feedburner.com/rss/category/air-home?format=xml'),
+        ('Health Benefits','http://feeds.feedburner.com/rss/category/air-healthbenefits?format=xml'),
+        ('Retirement Benefits','http://feeds.feedburner.com/rss/category/air-retirementbenefits?format=xml'),
+        ('Veterans Benefits','http://feeds.feedburner.com/rss/category/air-VeteransBenefits?format=xml'),
+        ('Education Benefits','http://feeds.feedburner.com/rss/category/air-educationbenefits?format=xml'),
+        ('Adventure','http://feeds.feedburner.com/rss/category/air-adventure?format=xml'),
+        ('Entertainment','http://feeds.feedburner.com/rss/category/air-Entertainment?format=xml'),
+        ('Careers','http://feeds.feedburner.com/rss/category/air-careers?format=xml'),
+        ('Technology','http://feeds.feedburner.com/rss/category/air-technology?format=xml'),
+        ('Opinion','http://feeds.feedburner.com/rss/category/air-opinion?format=xml'),
+        ('Pay','http://feeds.feedburner.com/rss/category/air-pay?format=xml'),
+        ('Guard','http://feeds.feedburner.com/rss/category/air-guard?format=xml'),
+        ('Your Air Force','http://feeds.feedburner.com/rss/category/air-yourairforce?format=xml'),
    ]
--- a/recipes/al_jazeera.recipe
+++ b/recipes/al_jazeera.recipe
@ -44,7 +44,7 @@ class AlJazeera(BasicNewsRecipe):
    ]

    feeds = [(u'Al Jazeera English',
-              u'http://english.aljazeera.net/Services/Rss/?PostingId=2007731105943979989')]
+              u'http://www.aljazeera.com/xml/rss/all.xml')]

    def get_article_url(self, article):
        artlurl = article.get('link',  None)
--- a/recipes/arizona_republic.recipe
+++ b/recipes/arizona_republic.recipe
@ -62,16 +62,36 @@ class AdvancedUserRecipe1307301031(BasicNewsRecipe):
    ]

    feeds = [
-        (u'FrontPage', u'http://www.azcentral.com/rss/feeds/republicfront.xml'),
-        (u'TopUS-News', u'http://hosted.ap.org/lineups/USHEADS.rss?SITE=AZPHG&SECTION=HOME'),
-        (u'WorldNews', u'http://hosted.ap.org/lineups/WORLDHEADS.rss?SITE=AZPHG&SECTION=HOME'),
-        (u'TopBusiness', u'http://hosted.ap.org/lineups/BUSINESSHEADS.rss?SITE=AZPHG&SECTION=HOME'),
-        (u'Entertainment', u'http://hosted.ap.org/lineups/ENTERTAINMENT.rss?SITE=AZPHG&SECTION=HOME'),
-        (u'ArizonaNews', u'http://www.azcentral.com/rss/feeds/news.xml'),
-        (u'Gilbert', u'http://www.azcentral.com/rss/feeds/gilbert.xml'),
-        (u'Chandler', u'http://www.azcentral.com/rss/feeds/chandler.xml'),
-        (u'DiningReviews', u'http://www.azcentral.com/rss/feeds/diningreviews.xml'),
-        (u'AZBusiness', u'http://www.azcentral.com/rss/feeds/business.xml'),
-        (u'ArizonaDeals', u'http://www.azcentral.com/members/Blog%7E/RealDealsblog'),
-        (u'GroceryDeals', u'http://www.azcentral.com/members/Blog%7E/RealDealsblog/tag/2646')
+        ('Local', 'http://rssfeeds.azcentral.com/phoenix/local'),
+        ('Nation', 'http://rssfeeds.azcentral.com/phoenix/nation'),
+        ('Business', 'http://rssfeeds.azcentral.com/phoenix/business'),
+        ('Politics', 'http://rssfeeds.azcentral.com/phoenix/politics'),
+        ('Fact check', 'http://rssfeeds.azcentral.com/phoenix/fact-check'),
+        ('Opinions', 'http://rssfeeds.azcentral.com/phoenix/opinions'),
+        ('Things to Do', 'http://rssfeeds.azcentral.com/phoenix/thingstodo'),
+        ('Events', 'http://rssfeeds.azcentral.com/phoenix/events'),
+        ('Dining', 'http://rssfeeds.azcentral.com/phoenix/dining'),
+        ('Movies &amp; TV', 'http://rssfeeds.azcentral.com/phoenix/moviesandtv'),
+        ('Kids', 'http://rssfeeds.azcentral.com/phoenix/kids'),
+        ('Arts', 'http://rssfeeds.azcentral.com/phoenix/arts'),
+        ('Music', 'http://rssfeeds.azcentral.com/phoenix/music'),
+        ('Celebrities', 'http://rssfeeds.azcentral.com/phoenix/celebrities'),
+        ('Travel &amp; Explore', 'http://rssfeeds.azcentral.com/phoenix/travelandexplore'),
+        ('Arizona History', 'http://rssfeeds.azcentral.com/phoenix/az-history'),
+        ('Sports', 'http://rssfeeds.azcentral.com/phoenix/sports'),
+        ('Suns', 'http://rssfeeds.azcentral.com/phoenix/suns'),
+        ('Diamondbacks', 'http://rssfeeds.azcentral.com/phoenix/diamondbacks'),
+        ('Coyotes', 'http://rssfeeds.azcentral.com/phoenix/coyotes'),
+        ('ASU', 'http://rssfeeds.azcentral.com/phoenix/asu'),
+        ('UA', 'http://rssfeeds.azcentral.com/phoenix/ua'),
+        ('High School Sports', 'http://rssfeeds.azcentral.com/high-school-sports'),
+        ('Chandler', 'http://rssfeeds.azcentral.com/phoenix/chandler'),
+        ('Gilbert', 'http://rssfeeds.azcentral.com/phoenix/gilbert'),
+        ('Glendale &amp; Peoria', 'http://rssfeeds.azcentral.com/phoenix/glendaleandpeoria'),
+        ('Mesa', 'http://rssfeeds.azcentral.com/phoenix/mesa'),
+        ('Phoenix', 'http://rssfeeds.azcentral.com/phoenix/phoenix'),
+        ('Scottsdale', 'http://rssfeeds.azcentral.com/phoenix/scottsdale'),
+        ('SW Valley', 'http://rssfeeds.azcentral.com/phoenix/swvalley'),
+        ('Suprise', 'http://rssfeeds.azcentral.com/phoenix/surprise'),
+        ('Tempe &amp; Ahwatukee', 'http://rssfeeds.azcentral.com/phoenix/tempe'),
    ]
--- a/recipes/army_times.recipe
+++ b/recipes/army_times.recipe
@ -26,14 +26,13 @@ class ArmyTimes(BasicNewsRecipe):
    auto_cleanup = True

    feeds = [
-
-        ('News',   'http://www.armytimes.com/rss_news.php'),
-        ('Benefits',   'http://www.armytimes.com/rss_benefits.php'),
-        ('Money',   'http://www.armytimes.com/rss_money.php'),
-        ('Careers & Education',  'http://www.armytimes.com/rss_careers.php'),
-        ('Community',  'http://www.armytimes.com/rss_community.php'),
-        ('Off Duty',   'http://www.armytimes.com/rss_off_duty.php'),
-        ('Entertainment',  'http://www.armytimes.com/rss_entertainment.php'),
-        ('Guard & Reserve',  'http://www.armytimes.com/rss_guard.php'),
-
+        ('Home', 'http://feeds.feedburner.com/rss/category/arm-home?format=xml'),
+        ('Education', 'http://feeds.feedburner.com/rss/category/arm-education?format=xml'),
+        ('Careers', 'http://feeds.feedburner.com/rss/category/arm-careers?format=xml'),
+        ('Adventure', 'http://feeds.feedburner.com/rss/category/arm-Adventure?format=xml'),
+        ('Entertainment', 'http://feeds.feedburner.com/rss/category/arm-entertainment?format=xml'),
+        ('Technology', 'http://feeds.feedburner.com/rss/category/arm-technology?format=xml'),
+        ('Reserve', 'http://feeds.feedburner.com/rss/category/arm-reserve?format=xml'),
+        ('Opinion', 'http://feeds.feedburner.com/rss/category/arm-opinion?format=xml'),
+        ('Pay', 'http://feeds.feedburner.com/rss/category/arm-pay?format=xml'),
    ]
--- a/recipes/ars_technica.recipe
+++ b/recipes/ars_technica.recipe
@ -44,19 +44,26 @@ class ArsTechnica(BasicNewsRecipe):
    ]
    remove_attributes = ['lang', 'style']

+    # Feed are found here: http://arstechnica.com/rss-feeds/
    feeds = [
-        (u'Ars Features (All our long-form feature articles)', u'http://feeds.arstechnica.com/arstechnica/features'),
-        (u'Technology Lab (Information Technology)', u'http://feeds.arstechnica.com/arstechnica/technology-lab'),
-        (u'Gear & Gadgets', u'http://feeds.arstechnica.com/arstechnica/gadgets'),
-        (u'Ministry of Innovation (Business of Technology)', u'http://feeds.arstechnica.com/arstechnica/business'),
-        (u'Risk Assessment (Security & Hacktivism)', u'http://feeds.arstechnica.com/arstechnica/security'),
-        (u'Law & Disorder (Civilizations & Discontents)', u'http://feeds.arstechnica.com/arstechnica/tech-policy'),
-        (u'Infinite Loop (Apple Ecosystem)', u'http://feeds.arstechnica.com/arstechnica/apple'),
-        (u'Opposable Thumbs (Gaming & Entertainment)', u'http://feeds.arstechnica.com/arstechnica/gaming'),
-        (u'Scientific Method (Science & Exploration)', u'http://feeds.arstechnica.com/arstechnica/science'),
-        (u'Multiverse (Exploratoins & Meditations on Sci-Fi)', u'http://feeds.arstechnica.com/arstechnica/multiverse'),
-        (u'Cars Technica (All Things Automotive)', u'http://feeds.arstechnica.com/arstechnica/cars'),
-        (u'Staff Blogs (From the Minds of Ars)', u'http://feeds.arstechnica.com/arstechnica/staff-blogs')
+        ('Ars Technica', 'http://feeds.arstechnica.com/arstechnica/index'),
+        ('Features', 'http://feeds.arstechnica.com/arstechnica/features'),
+        ('Technology Lab', 'http://feeds.arstechnica.com/arstechnica/technology-lab'),
+        ('Gear &amp; Gadgets', 'http://feeds.arstechnica.com/arstechnica/gadgets'),
+        ('Ministry of Innovation', 'http://feeds.arstechnica.com/arstechnica/business'),
+        ('Risk Assessment', 'http://feeds.arstechnica.com/arstechnica/security'),
+        ('Law &amp; Disorder', 'http://feeds.arstechnica.com/arstechnica/tech-policy'),
+        ('Infinite Loop', 'http://feeds.arstechnica.com/arstechnica/apple'),
+        ('Opposable Thumbs', 'http://feeds.arstechnica.com/arstechnica/gaming'),
+        ('Scientific Method', 'http://feeds.arstechnica.com/arstechnica/science'),
+        ('The Multiverse', 'http://feeds.arstechnica.com/arstechnica/multiverse'),
+        ('Cars Technica', 'http://feeds.arstechnica.com/arstechnica/cars'),
+        ('Staff', 'http://feeds.arstechnica.com/arstechnica/staff-blogs'),
+        ('Open Source', 'http://feeds.arstechnica.com/arstechnica/open-source'),
+        ('microsoft', 'http://feeds.arstechnica.com/arstechnica/microsoft'),
+        ('software', 'http://feeds.arstechnica.com/arstechnica/software'),
+        ('telecom', 'http://feeds.arstechnica.com/arstechnica/telecom'),
+        ('Internet', 'http://feeds.arstechnica.com/arstechnica/web'),
    ]

    def append_page(self, soup, appendtag, position):
--- a/recipes/atlantic_com.recipe
+++ b/recipes/atlantic_com.recipe
@ -17,16 +17,24 @@ class AdvancedUserRecipe1421956712(BasicNewsRecipe):
    def print_version(self, url):
        return url.replace('/archive/', '/print/')

+    # Feed are found here: http://www.theatlantic.com/follow-the-atlantic/#follow-rssfeeds
    feeds = [
-        ('Politics', 'http://feeds.feedburner.com/AtlanticPoliticsChannel'),
-        ('International', 'http://feeds.feedburner.com/AtlanticInternational'),
-        ('National', 'http://feeds.feedburner.com/AtlanticNational'),
-        ('Science and Tech', 'http://feeds.feedburner.com/AtlanticScienceAndTechnology'),
-        ('Business', 'http://feeds.feedburner.com/AtlanticBusinessChannel'),
-        ('Health', 'http://feeds.feedburner.com/AtlanticFood'),
-        ('Education', 'http://feeds.feedburner.com/AtlanticEducationChannel'),
-        ('Entertainment', 'http://feeds.feedburner.com/AtlanticCulture'),
-        ('Sexes', 'http://feeds.feedburner.com/AtlanticSexesChannel'),
-        ('The Atlantic', 'http://feeds.feedburner.com/TheAtlantic'),
-        ('The Atlatic Wire', 'http://feeds.feedburner.com/TheAtlanticWire'),
+        ('The Atlantic', 'http://www.theatlantic.com/feed/all/'),
+        ('Best of The Atlantic', 'http://www.theatlantic.com/feed/best-of/'),
+        ('Politics | The Atlantic', 'http://www.theatlantic.com/feed/channel/politics/'),
+        ('Business | The Atlantic', 'http://www.theatlantic.com/feed/channel/business/'),
+        ('Culture | The Atlantic', 'http://www.theatlantic.com/feed/channel/entertainment/'),
+        ('Global | The Atlantic', 'http://www.theatlantic.com/feed/channel/international/'),
+        ('Technology | The Atlantic', 'http://www.theatlantic.com/feed/channel/technology/'),
+        ('U.S. | The Atlantic', 'http://www.theatlantic.com/feed/channel/national/'),
+        ('Health | The Atlantic', 'http://www.theatlantic.com/feed/channel/health/'),
+        ('Video | The Atlantic', 'http://www.theatlantic.com/feed/channel/video/'),
+        ('Sexes | The Atlantic', 'http://www.theatlantic.com/feed/channel/sexes/'),
+        ('Education | The Atlantic', 'http://www.theatlantic.com/feed/channel/education/'),
+        ('Science | The Atlantic', 'http://www.theatlantic.com/feed/channel/science/'),
+        ('News | The Atlantic', 'http://www.theatlantic.com/feed/channel/news/'),
+        ('Press Releases | The Atlantic', 'http://www.theatlantic.com/feed/channel/press-releases/'),
+        ('Newsletters | The Atlantic', 'http://www.theatlantic.com/feed/channel/newsletters/'),
+        ('The Atlantic Photo', 'http://feeds.feedburner.com/theatlantic/infocus'),
+        ('Notes | The Atlantic', 'http://feeds.feedburner.com/TheAtlanticNotes'),
    ]
--- a/recipes/biggovernment.recipe
+++ b/recipes/biggovernment.recipe
@ -16,7 +16,7 @@ class BigGovernmentRecipe(BasicNewsRecipe):
    max_articles_per_feed = 100
    use_embedded_content = True

-    feeds = [(u'Big Government', u'http://feeds.feedburner.com/BigGovernment')]
+    feeds = [(u'Big Government', u'http://feeds.feedburner.com/breitbart')]

    conversion_options = {'comments': description, 'tags': category, 'language': 'en',
                          'publisher': publisher}
--- a/recipes/wired_daily.recipe
+++ b/recipes/wired_daily.recipe
@ -43,24 +43,17 @@ class WiredDailyNews(BasicNewsRecipe):
    ]

    feeds = [
-
-    (u'Top Stories', u'http://feeds.wired.com/wired/index'),
-    (u'Product reviews', u'http://feeds.wired.com/WiredReviews'),
-    (u'Autopia', u'http://feeds.wired.com/wiredautopia'),
-    (u'Business', u'http://feeds.wired.com/wiredbusinessblog'),
-    (u'Danger Room', u'http://feeds.wired.com/WiredDangerRoom'),
-    (u'Gadget Lab', u'http://feeds.wired.com/GearFactor'),
-    (u'Game Life', u'http://feeds.wired.com/Gamelife'),
-    (u'GeekMom', u'http://feeds.wired.com/wiredgeekmom/'),
-    (u'Innovation Insights', u'http://feeds.wired.com/wiredinsights'),
-    (u'Opinion', u'http://feeds.wired.com/wiredopinion/'),
-    (u'Playbook', u'http://feeds.wired.com/wiredplaybook/'),
-    (u'This day in Tech', u'http://feeds.wired.com/ThisDayInTech'),
-    (u'Threat level', u'http://feeds.wired.com/wired27b'),
-    (u'Design', u'http://feeds.wired.com/wired/design'),
-    (u'Underwire', u'http://feeds.wired.com/wiredunderwire'),
-    (u'Enterprise', u'http://feeds.wired.com/wiredenterprise/'),
-    (u'Science', u'http://feeds.wired.com/wiredscience')
+    (u'Top Stories', u'https://www.wired.com/feed/'),
+    (u'Business', u'https://www.wired.com/category/business/feed/'),
+    (u'Design', u'https://www.wired.com/category/design/feed/'),
+    (u'Entertainment', u'https://www.wired.com/category/underwire/feed/'),
+    (u'Tech', u'https://www.wired.com/category/gear/feed/'),
+    (u'Product Reviews', u'https://www.wired.com/category/reviews/feed/'),
+    (u'Science', u'https://www.wired.com/category/science/feed/'),
+    (u'Science Blogs', u'https://www.wired.com/category/science/science-blogs/feed/'),
+    (u'Security', u'https://www.wired.com/category/security/feed/'),
+    (u'Transportation', u'https://www.wired.com/category/transportation/feed/'),
+    (u'Photo', u'https://www.wired.com/category/photo/feed/'),
    ]

    def get_article_url(self, article):