提交: d6001badc277c83a67e29255429130c140289dc5 - newsfour (git)

news4 - RSS aggrigation system

Commit MetaInfo

• 修订版: d6001badc277c83a67e29255429130c140289dc5 (tree)
• 时间: 2012-10-31 20:06:14
• 作者: hylom <hylom@user...>
• Commiter: hylom

Log Message

Merge branch 'master' of hylom.net:~/gitroot/gnews into live

更改概述

• add: config2ini.py
• modified: fetcher.py
• modified: gnews.py
• modified: logger.py
• modified: renderer.py
• add: sources.ini.sample
• modified: templates/index.tmpl.html

差异

--- /dev/null
+++ b/config2ini.py
@@ -0,0 +1,21 @@
+#!/usr/bin/python
+
+from config import config as config, target_rss as target_rss
+import ConfigParser
+import sys
+
+def main():
+    config = ConfigParser.SafeConfigParser()
+    for item in target_rss:
+        config.add_section(item["name"])
+        config.set(item["name"], 'source', item["url"])
+        config.set(item["name"], 'url', item["source_url"])
+        if 'filter' in item:
+            filters = ",".join(item["filter"])
+            config.set(item["name"], 'filters', filters)
+    config.write(sys.stdout)
+
+if __name__ == '__main__':
+    main()
+
+

--- a/fetcher.py
+++ b/fetcher.py
@@ -5,7 +5,7 @@ import re
 
 import feedparser
 import dateutil.parser
-from config import config as config, target_rss as target_rss
+from config import config as config
 from logger import log
 
 class FeedFetcher(object):
@@ -15,7 +15,7 @@ class FeedFetcher(object):
 
     def _fetch(self):
         'do fetch'
-        f = feedparser.parse(self._feed["url"])
+        f = feedparser.parse(self._feed["source"])
         entries = []
         for e in f['entries']:
             entry = {
@@ -58,8 +58,8 @@ class FeedFetcher(object):
         entries = self._fetch()
         entries = self._apply_pre_filters(entries)
 
-        if 'filter' in self._feed:
-            filters = self._feed.get('filter', None)
+        if 'filters' in self._feed:
+            filters = self._feed.get('filters', None)
             entries = self._apply_filters(filters, entries)
 
         entries = self._apply_post_filters(entries)

--- a/gnews.py
+++ b/gnews.py
@@ -1,20 +1,24 @@
 #!/usr/bin/python
 'gnews.py - google news clone'
 
-from config import config as config, target_rss as target_rss
+from config import config as config
 import renderer
 import fetcher
 import os.path
 import urllib
 from logger import log
+import configloader
+
+sources = configloader.load()
 
 def main():
     "gnews's main function"
-    # TODO: argv check
+# TODO: argv check
+
 
     # fetch RSS feed
     entries = []
-    for feed in target_rss:
+    for feed in sources:
         f = fetcher.FeedFetcher(feed)
         e = f.get_entries()
         entries.extend(e)
@@ -61,7 +65,7 @@ def main():
 def do_rendering(page_type, filename, entries, params):
     "rendering page"
 
-    r = renderer.Renderer()
+    r = renderer.Renderer(sources)
     tmpl = config[page_type]['template']
     output_dir = config[page_type]['output_directory']
 

--- a/logger.py
+++ b/logger.py
@@ -1,6 +1,6 @@
 'logger.py - log output utility'
 
-from config import config, target_rss
+from config import config
 
 def log(*args):
     "log helper function"

--- a/renderer.py
+++ b/renderer.py
@@ -7,7 +7,7 @@ from mako.lookup import TemplateLookup
 from mako.exceptions import RichTraceback
 import dateutil.parser
 
-from config import config, target_rss
+from config import config
 from propertizer import propertize
 from logger import log
 
@@ -16,8 +16,9 @@ def date_format(date):
     return date.strftime('%Y/%m/%d %H:%M')
 
 class Renderer(object):
-    def __init__(self):
+    def __init__(self, sources):
         self.template_dir = config['template_directory']
+        self._sources = sources
         
     def _get_template(self, template_name):
         'read template file'
@@ -38,7 +39,7 @@ class Renderer(object):
             'entries': entries,
             'params': params,
             'site': config['site_parameter'],
-            'targets': target_rss,
+            'sources': self._sources,
             }
         for key in kwargs:
             d = propertize(kwargs[key])

--- /dev/null
+++ b/sources.ini.sample
@@ -0,0 +1,54 @@
+[So-netセキュリティ通信]
+url = http://security-t.blog.so-net.ne.jp/
+source = http://security-t.blog.so-net.ne.jp/index.rdf
+filters = tagging
+
+[Impress Watch]
+url = http://www.watch.impress.co.jp/
+source = http://rss.rssad.jp/rss/headline/headline.rdf
+filters = tagging
+
+[japan.internet.com]
+url = http://japan.internet.com/
+source = http://rss.internetcom.jp/rss/japaninternetcom/index.rdf
+filters = tagging
+
+[SourceForge.JP Magazine]
+url = http://sourceforge.jp/magazine/
+source = http://rss.rssad.jp/rss/sourceforge/magazine/rss
+
+[WIRED.jp]
+url = http://wired.jp/
+source = http://rss.rssad.jp/rss/h/wired/feed.rdf
+filters = tagging
+
+[CNET Japan]
+url = http://japan.cnet.com/
+source = http://feeds.japan.cnet.com/rss/cnet/all.rdf
+filters = tagging
+
+[TechCrunch Japan]
+url = http://jp.techcrunch.com/
+source = http://jp.techcrunch.com/feed/
+filters = tagging
+
+[ギズモード・ジャパン]
+url = http://www.gizmodo.jp/
+source = http://feeds.gizmodo.jp/rss/gizmodo/index.xml
+filters = tagging
+
+[Slashdot Japan]
+url = http://slashdot.jp/
+source = http://rss.rssad.jp/rss/slashdot/slashdot.rss
+filters = slashdotjp
+
+[Engadget Japanese]
+url = http://japanese.engadget.com/
+source = http://japanese.engadget.com/rss.xml
+filters = tagging
+
+[ITmedia]
+url = http://www.itmedia.co.jp/
+source = http://rss.rssad.jp/rss/itmtop/2.0/itmedia_all.xml
+filters = tagging,itmedia
+

--- a/templates/index.tmpl.html
+++ b/templates/index.tmpl.html
@@ -79,7 +79,7 @@ s.parentNode.insertBefore(ga, s);
                 <a href='${entry.link}'>［続きを読む］</a>
               </div>
               <div class="information">
-                <span>情報元：<a href='${entry.feed.source_url}'>${entry.feed.name}</a></span>
+                <span>情報元：<a href='${entry.feed.url}'>${entry.feed.name}</a></span>
                 <span>（${date_format(entry.date)}）</span>
                 <span>タグ：</span>
                 % for tag in entry.tags:
@@ -114,8 +114,8 @@ s.parentNode.insertBefore(ga, s);
           <div class="feed-provider">
             <h3>情報提供サイト:</h3>
             <ul class="nav nav-pills nav-stacked">
-              % for item in targets:
-              <li><a href="${item.source_url}">${item.name}</a></li>
+              % for item in sources:
+              <li><a href="${item.source}">${item.name}</a></li>
               % endfor
             </ul>
           </div>