Add get_html_name and get_html_link to Feed.

diff --git a/rawdog b/rawdog
index bbf94fa5b1b4c1e6f63c2453dcde81c713486f46..c41278c46119cf67a4475fe0cf30ec8dd1282869 100644 (file)
--- a/rawdog
+++ b/rawdog
@@ -82,6 +82,21 @@ class Feed:
                                articles[hash] = Article(feed, title,
                                        link, description, hash, now)
 
+       def get_html_name(self):
+               if self.title is not None:
+                       return self.title
+               elif self.link is not None:
+                       return self.link
+               else:
+                       return self.url
+
+       def get_html_link(self):
+               s = self.get_html_name()
+               if self.link is not None:
+                       return '<a href="' + self.link + '">' + s + '</a>'
+               else:
+                       return s
+
 class Article:
        """An article retrieved from an RSS feed."""
 
@@ -238,14 +253,7 @@ class Rawdog:
                        if link is not None: f.write('</a>')
                        f.write('</span>\n')
 
-                       f.write('<span class="itemfrom">[')
-                       if feed.link is not None: f.write('<a href="' + feed.link + '">')
-                       if feed.title is None:
-                               f.write(feed.url,)
-                       else:
-                               f.write(feed.title,)
-                       if feed.link is not None: f.write('</a>',)
-                       f.write(']</span>\n')
+                       f.write('<span class="itemfrom">[' + feed.get_html_link() + ']</span>')
 
                        f.write('</p>\n')