Changeset 1656

Timestamp:

07/07/08 13:39:57 (5 months ago)

Author:

JensDiemer

Message:

Update RSS plugin: Used feedparser by Mark Pilgrim: http://feedparser.org
http://feedparser.googlecode.com/svn/trunk/LICENSE

Location:

trunk/pylucid

Files:

• media/PyLucid/internal_page/RSS/RSS.html (modified) (1 diff)
• PyLucid/plugins_internal/RSS/RSS.py (modified) (4 diffs)
• PyLucid/plugins_internal/RSS/RSS_cfg.py (modified) (1 diff)
• PyLucid/tools/feedparser.py (added)

trunk/pylucid/media/PyLucid/internal_page/RSS/RSS.html

@@ -1 +1 @@
 <fieldset>
-{% if title %}<legend><a href="{{ url }}">{{ title }}</a></legend>{% endif %}
+<legend><a href="{{ url }}">{{ feed.feed.title }}</a></legend>
 <ul>
-{% for entry in entries %}
+{% for entry in feed.entries %}
     <li>
-    <h1><a href="{{ entry.title_link }}">{{ entry.title|escape }}</a></h1>
+    <h1><a href="{{ entry.title_detail.base }}">{{ entry.title|safe }}</a></h1>
     <p>
-    {% if entry.date %}
-        {{ entry.date }}
-        <br />
-    {% endif %}
-        {{ entry.description }}
+      {{ entry.updated }}<br />
+      {{ entry.summary|safe }}
     </p>
     </li>

trunk/pylucid/PyLucid/plugins_internal/RSS/RSS.py

@@ -2 +2 @@
 
 """
-PyLucid Plugin
-Blendet RSS-Daten von einem anderen Server in die CMS-Seite ein.
-Bsp.:
-<lucidFunction:RSS>http://sourceforge.net/export/rss2_projnews.php?group_id=146328</lucidFunction>
+    PyLucid RSS plugin
+    ~~~~~~~~~~~~~~~~~~
 
-Last commit info:
-----------------------------------
-$LastChangedDate$
-$Rev$
-$Author$
+    Include external RSS Feeds directly into a CMS page.
+    Used feedparser by Mark Pilgrim: http://feedparser.org
+    http://feedparser.googlecode.com/svn/trunk/LICENSE
 
-Created by Jens Diemer
+    Last commit info:
+    ~~~~~~~~~~~~~~~~~
+    $LastChangedDate$
+    $Rev$
+    $Author$
 
-license:
-    GNU General Public License v2 or above
-    http://www.opensource.org/licenses/gpl-license.php
-
+    :copyleft: 2007 by the PyLucid team, see AUTHORS for more details.
+    :license: GNU GPL v3 or above, see LICENSE for more details.
 """
 
 __version__= "$Rev$"
 
-import xml.dom.minidom
-import md5, sys, os, urllib, time
+import time
 
 import socket
@@ -34 +31 @@
 
 from PyLucid.system.BasePlugin import PyLucidBasePlugin
-from PyLucid.system.response import SimpleStringIO
+from PyLucid.tools import feedparser
+
 from django.core.cache import cache
-
-
+from django.utils.safestring import mark_safe
 
 class RSS(PyLucidBasePlugin):
 
-    info_txt = '<small class="RSS_info">\n\t%s\n</small>\n'
+    def _debug(self, url, feed):
+        from pprint import pformat
+        self.response.write("<h2>RSS debug for '%s':</h2>\n" % url)
+        self.response.write("<pre>\n")
+        self.response.write(pformat(feed))
+        self.response.write("</pre>\n")
 
-    def lucidTag(self, url, title=None):
-
+    def lucidTag(self, url, debug=False, title=None):
 #        rss_page = cache.get(url)
 #        if rss_page:
@@ -54 +55 @@
 
         try:
-            rss_data = urllib.urlopen(url)
+            feed = feedparser.parse(url)
         except Exception, e:
             self.response.write(
@@ -63 +64 @@
 #            cache.set(url, rss_page)
 
-        server_response = time.time() - start_time
+        duration = time.time() - start_time
 
-        start_time = time.time()
-        r = RSS_Maker()
-        data = r.feed(rss_data)
-        paser_duration = time.time() - start_time
+        if debug:
+            self._debug(url, feed)
 
         context = {
             "url": url,
-            "title": title,
-            "entries": data,
-            "server_response": server_response,
-            "paser_duration": paser_duration,
+            "feed": feed,
+            "duration": duration,
         }
         self._render_template("RSS", context)#, debug=True)
 
-
-#_____________________________________________________________________________
-
-DEFAULT_NAMESPACES = (
-    None, # RSS 0.91, 0.92, 0.93, 0.94, 2.0
-    'http://purl.org/rss/1.0/', # RSS 1.0
-    'http://my.netscape.com/rdf/simple/0.9/' # RSS 0.90
-)
-DUBLIN_CORE = ('http://purl.org/dc/elements/1.1/',)
-
-class RSS_Maker(object):
-
-    def feed(self, rss_data):
-        """
-        Diese Funktion wird direkt vom Modul-Manager ausgeführt.
-        """
-        rssDocument = xml.dom.minidom.parse(rss_data)
-
-        entries = []
-        for node in self.getElementsByTagName(rssDocument, 'item'):
-            entry_data = {
-                "title_link": self.get_txt(node, "link", "#"),
-                "title": self.get_txt(node, "title", None),
-                "date": self.get_txt(node, "date", None),
-                "description": self.get_txt(node, "description", None),
-            }
-            entries.append(entry_data)
-        return entries
-
-
-    def getElementsByTagName(self, node, tagName,
-            possibleNamespaces=DEFAULT_NAMESPACES
-        ):
-        for namespace in possibleNamespaces:
-            children = node.getElementsByTagNameNS(namespace, tagName)
-            if len(children): return children
-        return []
-
-    def node_data( self, node, tagName,
-            possibleNamespaces=DEFAULT_NAMESPACES
-        ):
-        children = self.getElementsByTagName(node, tagName, possibleNamespaces)
-        node = len(children) and children[0] or None
-        return node and "".join(
-            [child.data.encode("utf_8") for child in node.childNodes]
-        ) or None
-
-    def get_txt(self, node, tagName, default_txt=""):
-        """
-        Liefert den Inhalt >tagName< des >node< zurück, ist dieser nicht
-        vorhanden, wird >default_txt< zurück gegeben.
-        """
-        return self.node_data(node, tagName) or self.node_data(
-            node, tagName, DUBLIN_CORE
-        ) or default_txt
-
-

trunk/pylucid/PyLucid/plugins_internal/RSS/RSS_cfg.py

@@ -16 +16 @@
 
 plugin_manager_data = {
+    "debug" : {
+        "must_login"    : True,
+        "must_admin"    : False,
+    },
     "lucidTag" : {
         "must_login"    : False,
         "must_admin"    : False,
-    }
+    },
 }