From: Adam Sampson <ats@offog.org>
Date: Sat, 3 May 2003 12:50:57 +0000 (+0000)
Subject: Add get_html_name and get_html_link to Feed.
X-Git-Tag: v0.3~4
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=86603fab7a6987773139b284077217d33efb4b13;p=rawdog%2F.git

Add get_html_name and get_html_link to Feed.
---

diff --git a/rawdog b/rawdog
index bbf94fa..c41278c 100644
--- 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')