Moved html parsing from phd_pp.py to reindex_blog.py.

[phdru.name/phdru.name.git] / news.py

diff --git a/news.py b/news.py
index 9e47cb325c578f557e0b2f3e47c403d387544c6d..0ee227090de30fef1680cb3d1a4559df50ed9d7e 100644 (file)
--- a/news.py
+++ b/news.py
@@ -3,19 +3,36 @@
 __version__ = "$Revision$"[11:-2]
 __revision__ = "$Id$"[5:-2]
 __date__ = "$Date$"[7:-2]
-__author__ = "Oleg BroytMann <phd@phd.pp.ru>"
-__copyright__ = "Copyright (C) 2006 PhiloSoft Design"
+__author__ = "Oleg Broytman <phd@phd.pp.ru>"
+__copyright__ = "Copyright (C) 2006-2009 PhiloSoft Design"
 __docformat__ = "epytext en"
 
 __all__ = ["get_news", "write_if_changed"]
 
 
+from datetime import date
+from urlparse import urljoin
+
 class NewsItem(object):
+   baseURL = "http://phd.pp.ru/"
+   excerpt = None
+   content = None
+   categoryList = []
+
    def __init__(self, date, title, rel_link):
       self.date = date
       self.title = title
       self.rel_link = rel_link
 
+   def URL(self):
+      return urljoin(self.baseURL, self.rel_link)
+
+   def rfc822_date(self):
+      y, m, d = self.date.split('-')
+      d = date(int(y), int(m), int(d))
+      return d.strftime("%a, %d %b %Y %H:%M:%S +0300")
+
+
 def get_news_header(lang):
    news_tmpl_file = open("news.tmpl-%s" % lang, 'r')
    header = news_tmpl_file.read()
@@ -44,7 +61,7 @@ def get_news(lang):
    @return: a tuple of (lnaguge-dependent header, a list of new items)
 
    """
-   return get_news_header(), get_news_items()
+   return get_news_header(lang), get_news_items(lang)
 
 
 def write_if_changed(filename, new_text):