projects / rss2email.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 14f0797)
feed: Split entry link extraction out into Feed._get_entry_link
authorW. Trevor King <wking@tremily.us>
Thu, 10 Jan 2013 11:43:05 +0000 (06:43 -0500)
committerW. Trevor King <wking@tremily.us>
Thu, 10 Jan 2013 11:43:05 +0000 (06:43 -0500)
Now other methods can all access the same link, without having to
extract it in _process_entry and pass the extracted link around
explicitly.  Currently, nothing special happens during link
extraction, but the new method helps future proof us.

Signed-off-by: W. Trevor King <wking@tremily.us>
rss2email/feed.py patch | blob | history

diff --git a/rss2email/feed.py b/rss2email/feed.py
index 0ff48b5f94ff426b408bbfa0635a20a583a254c5..c9df4339997714fc2eedd683475bea292c391481 100644 (file)
--- a/rss2email/feed.py
+++ b/rss2email/feed.py
@@ -401,7 +401,6 @@ class Feed (object):
                 _LOG.debug('already seen {}'.format(id_))
                 return  # already seen
         sender = self._get_entry_email(parsed=parsed, entry=entry)
-        link = entry.get('link', None)
         subject = self._get_entry_title(entry)
         extra_headers = _collections.OrderedDict((
                 ('Date', self._get_entry_date(entry)),
@@ -409,7 +408,7 @@ class Feed (object):
                 ('User-Agent', 'rss2email'),
                 ('X-RSS-Feed', self.url),
                 ('X-RSS-ID', id_),
-                ('X-RSS-URL', link),
+                ('X-RSS-URL', self._get_entry_link(entry)),
                 ('X-RSS-TAGS', self._get_entry_tags(entry)),
                 ))
         for k,v in extra_headers.items():  # remove empty tags, etc.
@@ -427,7 +426,7 @@ class Feed (object):
 
         content = self._get_entry_content(entry)
         content = self._process_entry_content(
-            entry=entry, content=content, link=link, subject=subject)
+            entry=entry, content=content, subject=subject)
         message = _email.get_message(
             sender=sender,
             recipient=self.to,
@@ -457,6 +456,9 @@ class Feed (object):
             return _hashlib.sha1(
                 entry.title.encode('unicode-escape')).hexdigest()
 
+    def _get_entry_link(self, entry):
+        return entry.get('link', None)
+
     def _get_entry_title(self, entry):
         if hasattr(entry, 'title_detail') and entry.title_detail:
             title = entry.title_detail.value
@@ -651,8 +653,9 @@ class Feed (object):
             return contents[0]
         return {'type': 'text/plain', 'value': ''}
 
-    def _process_entry_content(self, entry, content, link, subject):
+    def _process_entry_content(self, entry, content, subject):
         "Convert entry content to the requested format."
+        link = self._get_entry_link(entry)
         if self.html_mail:
             lines = [
                 '<!DOCTYPE html>',
Python script for converting RSS newsfeeds to email