update subscriptions

1 files changed, 57 insertions, 25 deletions

diff --git a/feeder.pl b/feeder.pl
index cdfccda..2bb44b3 100644
--- a/feeder.pl
+++ b/feeder.pl
@@ -7,7 +7,7 @@ use Feed::Utils;
 use Log::Log4perl;
 
 Log::Log4perl::init(\<<'LOG');
-log4perl.rootLogger = ERROR, Screen
+log4perl.rootLogger = WARN, Screen
 log4perl.appender.Screen = Log::Log4perl::Appender::Screen
 log4perl.appender.Screen.stderr = 1
 log4perl.appender.Screen.layout = PatternLayout
@@ -31,6 +31,27 @@ feeds_from_opml(
         mail_folders => 'Gentoo',
     },
     'http://planet.gentoo.org/opml.xml',
+    {
+        exclude => [
+            'http://www.deathwing00.org/wordpress/category/gentoo/feed',
+            'http://home.coming.dk/index.php?tempskin=_rss2',
+            'http://blog.vandium.net/category/gentoo-org/feed/',
+            'http://blog.i-no.de//rss.xml',
+            'http://blog.i-no.de/rss.xml',
+            'https://barelysufficient.org/category/gentoo/feed/',
+            'http://rrr.thetruth.de/category/planetgentoo/feed/',
+            'http://pi-ist-genau-3.de/?cat=441&#038;feed=atom',
+            'http://blog.oldworld.fr/index.php?feed/tag/gentoo/atom',
+            'http://blog.cafarelli.fr:82/feed/category/Gentoo/rss2',
+        ],
+    },
+);
+
+feeds(
+    {
+        mail_folders => 'Gentoo',
+    },
+    'http://pi-ist-genau-3.de/?cat=441&feed=atom',
 );
 
 feeds_from_opml(
@@ -38,6 +59,16 @@ feeds_from_opml(
         mail_folders => 'Perl',
     },
     'http://planet.perl.org/opml.xml',
+    {
+        exclude => [
+            'http://blog.urth.org/programming/atom.xml',
+            'http://blogs.perl.org/users/john_mcnamara/',
+            'http://www.dev411.com/blog/xml/atom/category/feed.xml',
+            'http://chainsawblues.vox.com/library/posts/page/1/atom.xml',
+            'http://pjf.id.au/blog/index.rss?tag=perl',
+            'http://log.perl.org/index.rdf',
+        ],
+    },
 );
 
 feeds_from_opml(
@@ -61,7 +92,7 @@ feeds(
     'http://feeds2.feedburner.com/rsspect/fJur',
     'http://feeds2.feedburner.com/sydneypadua/yBZX',
     {
-        uri=>'http://oglaf.com/feeds/rss/',
+        uri => 'http://oglaf.com/feeds/rss/',
         title=>'Oglaf',
     },
     'http://www.bureau42.com/bureau42.rss',
@@ -74,6 +105,7 @@ feeds(
     {
         uri => 'http://bakabt.me/rss.php?uid=714931&pass=94346a8e67f313b3cf64bef311eaf551',
         title => 'BakaBT releases',
+        dedupe_use_date => 0,
     },
 );
 
@@ -94,21 +126,15 @@ feeds(
         mail_folders => 'Perl',
     },
     'http://www.simon-cozens.org/blogs/simon/feed',
-    'http://use.perl.org/~Allison/journal/rss',
-    'http://use.perl.org/~chip/journal/rss/',
-    'http://use.perl.org/~chip/journal/rss',
     'http://search.cpan.org/uploads.rdf',
-    'http://use.perl.org/~jesse/journal/rss',
-    'http://use.perl.org/~luqui/journal/rss',
-    'http://use.perl.org/~pmichaud/journal/rss',
     'http://pugs.blogs.com/pugs/index.rdf',
-    'http://use.perl.org/~Stevan/journal/rss',
     'http://blog.plover.com/index.atom',
-    'http://use.perl.org/search.pl?op=journals;content_type=atom',
     'http://blogs.perl.org/atom.xml',
     'http://YAPHB.blogspot.com/atom.xml',
     'http://pugs.blogs.com/audrey/atom.xml',
     'http://blog.fsck.com/atom.xml',
+    'http://blog.urth.org/feed/',
+    'http://log.perl.org/feeds/posts/default',
 );
 
 feeds(
@@ -121,12 +147,10 @@ feeds(
     'http://glottorellando.wordpress.com/feed/',
     'http://languagelog.ldc.upenn.edu/nll/?feed=atom',
     'http://scientopia.org/blogs/goodmath/feed/',
-    'http://www.illuminatingscience.org/wp-rss2.php',
     'http://www.randi.org/site/index.php?format=feed&type=atom',
     'http://cattaneo-lescienze.blogautore.espresso.repubblica.it/feed/atom/',
-    'http://blog.makezine.com/archive/news_from_the_future/index.xml',
+    'http://feeds.feedburner.com/makezineonline',
     'http://ovadia-lescienze.blogautore.espresso.repubblica.it/feed/atom/',
-    'http://www.psygeek.com/?feed=rss2',
     'http://rudimatematici-lescienze.blogautore.espresso.repubblica.it/feed/atom/',
     'http://www.schneier.com/blog/index.rdf',
     'http://bressanini-lescienze.blogautore.espresso.repubblica.it/feed/atom/',
@@ -138,10 +162,9 @@ feeds(
     {
         mail_folders => 'Stuff',
     },
-    'http://www.freedom-to-tinker.com/rss.xml?feed=atom',
-    'http://us.gizmodo.net/index.xml',
+    'https://freedom-to-tinker.com/feed/atom/',
+    'http://feeds.gawker.com/gizmodo/full',
     'http://hackaday.com/feed/',
-    'http://watchinghorology.com/feeds/posts/default',
     'http://watchismo.blogspot.com/feeds/posts/default',
 );
 
@@ -149,17 +172,14 @@ feeds(
     {
         mail_folders => 'Weblogs',
     },
-    'http://allisonrandal.vox.com/library/posts/atom.xml',
-    'http://www.axis-of-aevil.org/index.xml',
     'http://www.beppegrillo.it/atom.xml',
     'http://feeds.feedburner.com/boingboing/iBag',
     'http://feeds.feedburner.com/butshesagirl',
     'http://dilbertblog.typepad.com/the_dilbert_blog/index.rdf',
     'http://dilbert.com/blog/entry.feed/',
     'http://duecents.blogspot.com/feeds/posts/default',
-    'http://www.anzeledda.it/wp/feed',
+    'http://www.anzeledda.it/wp/feed/',
     'http://www.haibane.info/feed/',
-    'http://syndication.splinder.com/stilgar/atom.xml',
     'http://feeds.gawker.com/io9/full',
     'http://nobodyharks.blogspot.com/feeds/posts/default',
     'http://spaghettovolante.wordpress.com/feed/',
@@ -174,24 +194,36 @@ feeds(
         mail_folders => 'Writers',
     },
     'http://scienceinmyfiction.com/feed/',
-    'http://www.antipope.org/charlie/blog-static/atom.xml',
-    'http://elizabethbear.livejournal.com/data/atom',
+    {
+        uri => 'http://www.antipope.org/charlie/blog-static/atom.xml',
+        dedupe_use_date => 0,
+    },
+    {
+        uri => 'http://elizabethbear.livejournal.com/data/atom',
+        dedupe_use_body => 0,
+    },
     'http://lisagoldresearch.wordpress.com/feed/',
-    'http://www.myspace.com/loismcmasterbujold/blog/rss',
+    #'http://www.myspace.com/loismcmasterbujold/blog/rss',
     'http://journal.neilgaiman.com/feeds/posts/default',
     'http://www.tor.com/index.php?option=com_content&view=all&format=feed&type=rss&content=frontpage',
     'http://www.thewaythefutureblogs.com/feed/',
     'http://whatever.scalzi.com/feed/',
     'http://www.webcomicsnation.com/rss.php?type=creator&creator=1318',
-    'http://caption.org/?q=rss.xml',
     'http://thecomposites.tumblr.com/rss',
 );
 
+feed(
+    mail_folders => '3dPrinter',
+);
+
 feeds(
     {
         mail_folders => '3dPrinter',
     },
-    'http://hydraraptor.blogspot.com/feeds/posts/default',
+    {
+        uri => 'http://hydraraptor.blogspot.com/feeds/posts/default',
+        dedupe_use_body => 0,
+    },
     'http://blog.makerbot.com/feed/',
     'http://blog.thingiverse.com/feed/atom/',
 );