Date: Fri, 5 Feb 2010 21:20:19 +0100 Subject: Improvements of the display and navigation in unread articles. --- pyAggr3g470r.py | 101 +++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 81 insertions(+), 20 deletions(-) diff --git a/pyAggr3g470r.py b/pyAggr3g470r.py index d12fc942..a100eeb0 100644 --- a/pyAggr3g470r.py +++ b/pyAggr3g470r.py @@ -38,7 +38,8 @@ htmlfooter = """This software is under GPLv3 license. You are welcome to copy, """ htmlnav = """

pyAggr3g470r - RSS Feed Reader

pyAggr3g470r (source code) +href="http://bitbucket.org/cedricbonhomme/pyaggr3g470r/" rel="noreferrer" target="_blank"> +pyAggr3g470r (source code) """ @@ -47,25 +48,32 @@ class Root: """ Main page containing the list of feeds and articles. """ - self.dic = self.load_feed() + self.dic, self.dic_info = self.load_feed() html = htmlheader html += htmlnav html += """

\n""" - html += """Fetch all feeds\n
\n""" - html += """Management of feed\n""" + html += """Fetch all feeds\n
\n""" + html += """Management of feed\n""" html += """\n""" html += "

\n" - html += "Your feeds:
\n" - for rss_feed in self.dic.keys(): - html += """%s
\n""" % (rss_feed.encode('utf-8'), \ - self.dic[rss_feed][0][5].encode('utf-8')) + html += """Your feeds (%s):
\n""" % len(self.dic.keys()) + for rss_feed_id in self.dic.keys(): + + html += """%s (%s / %s)
\n""" % \ + (rss_feed_id.encode('utf-8'), \ + self.dic[rss_feed_id][0][5].encode('utf-8'), \ + rss_feed_id, self.dic_info[rss_feed_id][1], \ + self.dic_info[rss_feed_id][0]) + html += """

\n""" for rss_feed_id in self.dic.keys(): html += '

' + \ '' + self.dic[rss_feed_id][0][5].encode('utf-8') + "

\n" + '" rel="noreferrer" target="_blank">' + \ + self.dic[rss_feed_id][0][5].encode('utf-8') + "\n" # The main page display only 10 articles by feeds. for article in self.dic[rss_feed_id][:10]: @@ -78,7 +86,7 @@ class Root: not_read_begin = "" not_read_end = "" - html += article[1].encode('utf-8') + " - " + \ + html += article[1].encode('utf-8') + \ not_read_begin + \ """ - %s""" % \ (article[0].encode('utf-8'), article[2].encode('utf-8')) + \ @@ -86,7 +94,11 @@ class Root: "
\n" html += "
\n" - html += """[All articles]""" % (rss_feed_id,) + html += """All articles""" % (rss_feed_id,) + if self.dic_info[rss_feed_id][1] != 0: + html += """ Unread article(s) (%s)""" % (rss_feed_id, \ + self.dic_info[rss_feed_id][1]) html += """

Top

""" html += "

\n" html += htmlfooter @@ -116,7 +128,9 @@ class Root: for article in self.dic[rss_feed_id]: if article_id == article[0]: - self.mark_as_read(article[3]) + if article[7] == "0": + self.mark_as_read(article[3]) # update the database + article[7] == 1 # avoids to reload self.dic html += """

%s from %s

""" % \ (article[2].encode('utf-8'), rss_feed_id, article[5].encode('utf-8')) @@ -139,10 +153,20 @@ class Root: html += """

Articles of the feed %s

""" % (self.dic[feed_id][0][5].encode('utf-8')) for article in self.dic[feed_id]: - html += article[1].encode('utf-8') + " - " + \ - '' + article[2].encode('utf-8') + "" + \ - """ - [description]""" % (article[0].encode('utf-8'),) + \ + + if article[7] == "0": + # not readed articles are in bold + not_read_begin = "" + not_read_end = "" + else: + not_read_begin = "" + not_read_end = "" + + html += article[1].encode('utf-8') + \ + not_read_begin + \ + """ - %s""" % \ + (article[0].encode('utf-8'), article[2].encode('utf-8')) + \ + not_read_end + \ "
\n" html += """

All feeds

""" @@ -150,6 +174,30 @@ class Root: html += htmlfooter return html + def unread(self, feed_id): + """ + Display all unread articles of a feed ('feed_title'). + """ + html = htmlheader + html += htmlnav + html += """

""" + html += """

Unread article(s) of the feed %s

+
""" % (feed_id, self.dic[feed_id][0][5].encode('utf-8')) + + for article in self.dic[feed_id]: + + if article[7] == "0": + + html += article[1].encode('utf-8') + \ + """ - %s""" % \ + (article[0].encode('utf-8'), article[2].encode('utf-8')) + \ + "
\n" + + html += """

All feeds

""" + html += "

\n" + html += htmlfooter + return html + def load_feed(self): """ Load feeds in a dictionary. @@ -164,8 +212,11 @@ class Root: pass # The key of dic is the id of the feed: - # dic[feed_id] = (article_id, article_date, article_title, article_link, article_description, feed_title, feed_link) - dic = {} + # dic[feed_id] = (article_id, article_date, article_title, + # article_link, article_description, feed_title, + # feed_link, article_readed) + # dic_info[feed_id] = (nb_article, nb_article_readed) + dic, dic_info = {}, {} if list_of_articles is not None: for article in list_of_articles: sha256_hash = hashlib.sha256() @@ -186,8 +237,14 @@ class Root: for feeds in dic.keys(): dic[feeds].sort(lambda x,y: compare(y[1], x[1])) - return dic - return dic + for rss_feed_id in dic.keys(): + dic_info[rss_feed_id] = (len(dic.keys()), \ + len([article for article in dic[rss_feed_id] \ + if article[7]=="0"]) \ + ) + + return (dic, dic_info) + return (dic, dic_info) def mark_as_read(self, article_link): """ @@ -200,6 +257,9 @@ class Root: c.execute("UPDATE rss_feed SET article_readed=1 WHERE article_link='" + article_link + "'") conn.commit() c.close() + + + except Exception, e: pass @@ -208,6 +268,7 @@ class Root: f.exposed = True description.exposed = True all_articles.exposed = True + unread.exposed = True def compare(stringtime1, stringtime2): -- cgit