aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcedricbonhomme <devnull@localhost>2010-04-15 21:05:41 +0200
committercedricbonhomme <devnull@localhost>2010-04-15 21:05:41 +0200
commitcf76d25b2e4196dd0b77e188695f71d4a6439e6b (patch)
treeeddd3cd74ad52dd4a28bd19db88b92fb51d2051d
parentAdded images and two links on the main page. (diff)
downloadnewspipe-cf76d25b2e4196dd0b77e188695f71d4a6439e6b.tar.gz
newspipe-cf76d25b2e4196dd0b77e188695f71d4a6439e6b.tar.bz2
newspipe-cf76d25b2e4196dd0b77e188695f71d4a6439e6b.zip
Release 1.1. Added links for favorites articles on the main page.
-rw-r--r--README16
-rwxr-xr-xfeedgetter.py4
-rwxr-xr-xpyAggr3g470r.py31
-rwxr-xr-xutils.py4
4 files changed, 37 insertions, 18 deletions
diff --git a/README b/README
index 8884663c..6cc28c13 100644
--- a/README
+++ b/README
@@ -5,9 +5,11 @@ based on CherryPy. Articles are stored in a SQLite base.
==== Features ====
-* notification by e-mail
-* language detection
-* TuxDroid support (for the notification of unread articles)
+* notification of new articles by e-mail for selected feeds;
+* mark or unmark an article as favorites;
+* share an article on Google Buzz, del.icio.us, Digg, reddit, Scoopeo and Blogmarks;
+* language detection and search articles by language;
+* TuxDroid support (for the notification of unread articles).
@@ -18,8 +20,14 @@ based on CherryPy. Articles are stored in a SQLite base.
* CherryPy (version 3 and up)
* sqlite
+
=== Optional module ===
These modules are not required but provides better features.
+These modules are:
+* oice.langdet
+* matplotlib
+* gamin.
+If you want to install these modules:
== Language detection ==
Name: oice.langdet
@@ -27,6 +35,8 @@ Enable the detection of the language of articles.
Installation:
http://pypi.python.org/pypi/oice.langdet/
+Download the archive, decompress, go to the folder and type:
+python setup.py install
== Histogram ==
diff --git a/feedgetter.py b/feedgetter.py
index 2fb43bc5..3f44fdcb 100755
--- a/feedgetter.py
+++ b/feedgetter.py
@@ -4,8 +4,8 @@
from __future__ import with_statement
__author__ = "Cedric Bonhomme"
-__version__ = "$Revision: 0.8 $"
-__date__ = "$Date: 2010/03/01 $"
+__version__ = "$Revision: 0.9 $"
+__date__ = "$Date: 2010/04/15 $"
__copyright__ = "Copyright (c) 2010 Cedric Bonhomme"
__license__ = "GPLv3"
diff --git a/pyAggr3g470r.py b/pyAggr3g470r.py
index 661d3251..c95d90a7 100755
--- a/pyAggr3g470r.py
+++ b/pyAggr3g470r.py
@@ -2,8 +2,8 @@
#-*- coding: utf-8 -*-
__author__ = "Cedric Bonhomme"
-__version__ = "$Revision: 1.0 $"
-__date__ = "$Date: 2010/03/01 $"
+__version__ = "$Revision: 1.1 $"
+__date__ = "$Date: 2010/04/15 $"
__copyright__ = "Copyright (c) 2010 Cedric Bonhomme"
__license__ = "GPLv3"
@@ -75,10 +75,12 @@ class Root:
html += """<div class="left inner">\n"""
if self.articles:
- html += """<a href="/list_like/"><img src="/css/img/heart.png" title="Your favorites (%s)" /></a>\n""" % \
- sum([len([article for article in self.articles[feed_id] if article[7]=="1"]) for feed_id in self.feeds.keys()])
+ html += """<a href="/list_favorites/"><img src="/css/img/heart.png" title="Your favorites (%s)" /></a>\n""" % \
+ (sum([len([article for article in self.articles[feed_id] if article[7] == "1"]) \
+ for feed_id in self.feeds.keys()]),)
- html += """<a href="/list_notification"><img src="/css/img/email.png" title="Active e-mail notifications" /></a>\n"""
+ html += """<a href="/list_notification"><img src="/css/img/email.png" title="Active e-mail notifications (%s)" /></a>\n""" % \
+ (len([feed for feed in self.feeds.values() if feed[6] == "1"]),)
for rss_feed_id in self.articles.keys():
html += """<h2><a name="%s"><a href="%s" rel="noreferrer"
@@ -102,11 +104,16 @@ class Root:
not_read_begin = ""
not_read_end = ""
+ if article[7] == "1":
+ like = """ <img src="/css/img/heart.png" title="I like this article!" />"""
+ else:
+ like = ""
+
html += article[1].encode('utf-8') + \
" - " + not_read_begin + \
"""<a href="/description/%s:%s" rel="noreferrer" target="_blank">%s</a>""" % \
(rss_feed_id, article[0].encode('utf-8'), article[2].encode('utf-8')) + \
- not_read_end + \
+ not_read_end + like + \
"<br />\n"
html += "<br />\n"
@@ -184,9 +191,11 @@ class Root:
html += """\t<option value="%s">%s</option>\n""" % \
(feed_id, self.feeds[feed_id][3].encode('utf-8'))
html += """</select></form>\n"""
- html += """<p><a href="/list_notification">Active e-mail notifications</a></p>\n"""
- html += """<p>You like <a href="/list_like/">%s</a> article(s).</p>\n""" % \
- sum([len([article for article in self.articles[feed_id] if article[7]=="1"]) for feed_id in self.feeds.keys()])
+ html += """<p>Active e-mail notifications: <a href="/list_notification">%s</a></p>\n""" % \
+ (len([feed for feed in self.feeds.values() if feed[6] == "1"]),)
+ html += """<p>You like <a href="/list_favorites/">%s</a> article(s).</p>\n""" % \
+ (sum([len([article for article in self.articles[feed_id] if article[7] == "1"]) \
+ for feed_id in self.feeds.keys()]), )
html += "<hr />\n"
html += """<p>The database contains a total of %s article(s) with
@@ -687,7 +696,7 @@ class Root:
like.exposed = True
- def list_like(self):
+ def list_favorites(self):
"""
List of favorites articles
"""
@@ -708,7 +717,7 @@ class Root:
html += htmlfooter
return html
- list_like.exposed = True
+ list_favorites.exposed = True
def update(self, path=None, event = None):
diff --git a/utils.py b/utils.py
index f7faffd1..ffdbc082 100755
--- a/utils.py
+++ b/utils.py
@@ -2,8 +2,8 @@
#-*- coding: utf-8 -*-
__author__ = "Cedric Bonhomme"
-__version__ = "$Revision: 0.4 $"
-__date__ = "$Date: 2010/03/10 $"
+__version__ = "$Revision: 0.5 $"
+__date__ = "$Date: 2010/04/15 $"
__copyright__ = "Copyright (c) 2010 Cedric Bonhomme"
__license__ = "GPLv3"
bgstack15