aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcedricbonhomme <devnull@localhost>2012-03-03 18:46:28 +0100
committercedricbonhomme <devnull@localhost>2012-03-03 18:46:28 +0100
commiteb439384ebfe13bc95d1065fb8fb507453533efd (patch)
treef74b22a63a0e38804a89d016688868dd03441adf
parentfeedgetter.py now uses MongoDB database? (diff)
downloadnewspipe-eb439384ebfe13bc95d1065fb8fb507453533efd.tar.gz
newspipe-eb439384ebfe13bc95d1065fb8fb507453533efd.tar.bz2
newspipe-eb439384ebfe13bc95d1065fb8fb507453533efd.zip
Main page almost working.
-rwxr-xr-xfeedgetter.py17
-rw-r--r--mongodb.py83
-rwxr-xr-xpyAggr3g470r.py211
-rwxr-xr-xutils.py6
4 files changed, 200 insertions, 117 deletions
diff --git a/feedgetter.py b/feedgetter.py
index cc4fb5ca..74b7b3a0 100755
--- a/feedgetter.py
+++ b/feedgetter.py
@@ -30,6 +30,7 @@ import traceback
import sqlite3
import threading
import feedparser
+import hashlib
from BeautifulSoup import BeautifulSoup
from datetime import datetime
@@ -118,7 +119,12 @@ class FeedGetter(object):
except:
feed_image = "/img/feed-icon-28x28.png"
- collection_dic = {"collection_id": feed_link,\
+ sha1_hash = hashlib.sha1()
+ sha1_hash.update(feed_link.encode('utf-8'))
+ feed_id = sha1_hash.hexdigest()
+
+ collection_dic = {"feed_id": feed_id, \
+ "type": 0, \
"feed_image": feed_image, \
"feed_title": utils.clear_string(a_feed.feed.title.encode('utf-8')), \
"feed_link": feed_link, \
@@ -149,7 +155,12 @@ class FeedGetter(object):
post_date = datetime(*article.published_parsed[:6])
- article = {"article_id": article.link.encode('utf-8'), \
+ sha1_hash = hashlib.sha1()
+ sha1_hash.update(article.link.encode('utf-8'))
+ article_id = sha1_hash.hexdigest()
+
+ article = {"article_id": article_id, \
+ "type":1, \
"article_date": post_date, \
"article_link": article.link.encode('utf-8'), \
"article_title": article_title, \
@@ -160,7 +171,7 @@ class FeedGetter(object):
articles.append(article)
- self.articles.add_articles(articles, feed_link)
+ self.articles.add_articles(articles, feed_id)
# send new articles by e-mail if desired.
#threading.Thread(None, utils.send_mail, None, (utils.mail_from, utils.mail_to, \
diff --git a/mongodb.py b/mongodb.py
index 42aef4bb..3faaa318 100644
--- a/mongodb.py
+++ b/mongodb.py
@@ -9,9 +9,10 @@ __copyright__ = "Copyright (c) Cedric Bonhomme"
__license__ = "GPLv3"
import time
-
import pymongo
+from operator import itemgetter, attrgetter
+
class Articles(object):
"""
"""
@@ -26,25 +27,26 @@ class Articles(object):
"""
Creates a new collection for a new feed.
"""
- new_collection["type"] = 0
-
- name = str(new_collection["collection_id"])
- pymongo.collection.Collection(self.db, name)
- collection = self.db[name]
+ #pymongo.collection.Collection(self.db, new_collection["feed_id"])
+ collection = self.db[new_collection["feed_id"]]
collection.create_index([("article_link", pymongo.ASCENDING)], {"unique":True, "sparse":True})
collection.insert(new_collection)
- def add_articles(self, articles, collection_id):
+ def add_articles(self, articles, feed_id):
"""
Add article(s) in a collection.
"""
- collection = self.db[str(collection_id)]
+ collection = self.db[str(feed_id)]
for article in articles:
- article["type"] = 1
cursor = collection.find({"article_id":article["article_id"]})
if cursor.count() == 0:
collection.insert(article)
+ def get_collection(self, feed_id):
+ """
+ """
+ return self.db[str(feed_id)].find().next()
+
def get_all_articles(self):
"""
Return all articles from all collections.
@@ -56,12 +58,26 @@ class Articles(object):
articles.append(collection)
return articles
- def get_articles_from_collection(self, collection_id):
+ def get_all_collections(self):
+ """
+ """
+ feeds = []
+ collections = self.db.collection_names()
+ for collection_name in collections:
+ if collection_name != "system.indexes":
+ cursor = self.db[collection_name].find({"type":0})
+ if cursor.count() != 0:
+ feeds.append(cursor.next())
+ feeds = sorted(feeds, key=itemgetter('feed_title'))
+ return feeds
+
+ def get_articles_from_collection(self, feed_id):
"""
Return all the articles of a collection.
"""
- collection = self.db[str(collection_id)]
- return collection
+ collection = self.db[str(feed_id)]
+ cursor = collection.find({"type":1})
+ return cursor.sort([("article_date", pymongo.DESCENDING)])
def print_articles_from_collection(self, collection_id):
"""
@@ -74,13 +90,34 @@ class Articles(object):
print d
print
- def nb_users(self):
+ def nb_articles(self, feed_id=None):
"""
Return the number of users.
"""
- collection = self.db.users
- collection.count()
-
+ if feed_id is not None:
+ collection = self.db[feed_id]
+ return collection.find({"type":1}).count()
+
+ def nb_favorites(self):
+ return "12"
+
+ def nb_mail_notifications(self):
+ return "42"
+
+ def nb_unread_articles(self, feed_id=None):
+ if feed_id is not None:
+ collection = self.db[feed_id]
+ cursor = collection.find({'article_readed':False})
+ return cursor.count()
+ else:
+ unread_articles = 0
+ for feed_id in self.db.collection_names():
+ unread_articles += self.nb_unread_articles(feed_id)
+ return unread_articles
+
+
+
+
def list_collections(self):
"""
List all collections (feed).
@@ -137,11 +174,23 @@ if __name__ == "__main__":
# Print articles of the collection
- articles.print_articles_from_collection("http://esr.ibiblio.org/?feed=rss2")
+ #articles.print_articles_from_collection("http://esr.ibiblio.org/?feed=rss2")
print "All articles:"
#print articles.get_all_articles()
+
+
+
+
+ for feed in articles.get_all_collections():
+ for article in articles.get_articles_from_collection(feed["feed_id"]):
+ try:
+ #print article["article_title"], article["article_date"]
+ pass
+ except:
+ pass
+
# Drop the database
#articles.drop_database() \ No newline at end of file
diff --git a/pyAggr3g470r.py b/pyAggr3g470r.py
index 28e3ca46..9a88d05a 100755
--- a/pyAggr3g470r.py
+++ b/pyAggr3g470r.py
@@ -2,7 +2,7 @@
#-*- coding: utf-8 -*-
# pyAggr3g470r - A Web based news aggregator.
-# Copyright (C) 2010 Cédric Bonhomme - http://cedricbonhomme.org/
+# Copyright (C) 2010-2012 Cédric Bonhomme - http://cedricbonhomme.org/
#
# For more information : http://bitbucket.org/cedricbonhomme/pyaggr3g470r/
#
@@ -22,7 +22,7 @@
__author__ = "Cedric Bonhomme"
__version__ = "$Revision: 3.1 $"
__date__ = "$Date: 2010/01/29 $"
-__revision__ = "$Date: 2011/11/29 $"
+__revision__ = "$Date: 2012/03/03 $"
__copyright__ = "Copyright (c) Cedric Bonhomme"
__license__ = "GPLv3"
@@ -51,6 +51,7 @@ import datetime
import utils
import export
+import mongodb
import feedgetter
from qrcode.pyqrnative.PyQRNative import QRCode, QRErrorCorrectLevel, CodeOverflowException
from qrcode import qr
@@ -107,89 +108,104 @@ class Root:
Root class.
All pages of pyAggr3g470r are described in this class.
"""
+ def __init__(self):
+ """
+ """
+ self.articles = mongodb.Articles()
+
def index(self):
"""
Main page containing the list of feeds and articles.
"""
+ feeds = self.articles.get_all_collections()
+
# if there are unread articles, display the number in the tab of the browser
- html = htmlheader((self.nb_unread_articles and \
- ['(' + str(self.nb_unread_articles) +') '] or \
+ html = htmlheader((self.articles.nb_unread_articles() and \
+ ['(' + str(self.articles.nb_unread_articles()) +') '] or \
[""])[0])
html += htmlnav
html += self.create_right_menu()
html += """<div class="left inner">\n"""
- if self.feeds:
+ if feeds:
html += '<a href="/management/"><img src="/img/management.png" title="Management" /></a>\n'
html += '<a href="/history/"><img src="/img/history.png" title="History" /></a>\n'
html += '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;\n'
html += """<a href="/favorites/"><img src="/img/heart-32x32.png" title="Your favorites (%s)" /></a>\n""" % \
- (self.nb_favorites,)
+ (self.articles.nb_favorites(),)
html += """<a href="/notifications/"><img src="/img/email-follow.png" title="Active e-mail notifications (%s)" /></a>\n""" % \
- (self.nb_mail_notifications,)
+ (self.articles.nb_mail_notifications(),)
html += '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'
- if self.nb_unread_articles != 0:
+ if self.articles.nb_unread_articles != 0:
html += '<a href="/mark_as_read/"><img src="/img/mark-as-read.png" title="Mark articles as read" /></a>\n'
html += """<a href="/unread/"><img src="/img/unread.png" title="Unread article(s): %s" /></a>\n""" % \
- (self.nb_unread_articles,)
+ (self.articles.nb_unread_articles(),)
html += '<a accesskey="F" href="/fetch/"><img src="/img/check-news.png" title="Check for news" /></a>\n'
+
+ #for feed in feeds:
+ #for article in self.articles.get_articles_from_collection(feed["collection_id"]):
+ #try:
+ #print article["article_title"], article["article_date"], article["article_readed"]
+ #except:
+ #pass
+
# The main page display all the feeds.
- for feed in self.feeds.values():
+ for feed in feeds:
html += """<h2><a name="%s"><a href="%s" rel="noreferrer"
target="_blank">%s</a></a>
<a href="%s" rel="noreferrer"
target="_blank"><img src="%s" width="28" height="28" /></a></h2>\n""" % \
- (feed.feed_id, feed.feed_site_link, feed.feed_title, \
- feed.feed_link, feed.feed_image)
+ (feed["feed_id"], feed["feed_link"], feed["feed_title"], \
+ feed["feed_link"], feed["feed_image"])
# The main page display only 10 articles by feeds.
- for article in feed.articles.values()[:10]:
-
- if article.article_readed == "0":
+ for article in self.articles.get_articles_from_collection(feed["feed_id"])[:10]:
+ if article["article_readed"] == False:
# not readed articles are in bold
not_read_begin, not_read_end = "<b>", "</b>"
else:
not_read_begin, not_read_end = "", ""
# display a heart for faved articles
- if article.like == "1":
+ if article["article_like"] == True:
like = """ <img src="/img/heart.png" title="I like this article!" />"""
else:
like = ""
# Descrition for the CSS ToolTips
- article_content = utils.clear_string(article.article_description)
+ article_content = utils.clear_string(article["article_content"])
if article_content:
description = " ".join(article_content.split(' ')[:55])
else:
description = "No description."
# Title of the article
- article_title = article.article_title
+ article_title = article["article_title"]
if len(article_title) >= 110:
article_title = article_title[:110] + " ..."
# a description line per article (date, title of the article and
# CSS description tooltips on mouse over)
- html += article.article_date + " - " + \
+ html += str(article["article_date"]) + " - " + \
"""<a class="tooltip" href="/article/%s:%s" rel="noreferrer" target="_blank">%s%s%s<span class="classic">%s</span></a>""" % \
- (feed.feed_id, article.article_id, not_read_begin, \
+ (feed["feed_id"], article["article_id"], not_read_begin, \
article_title, not_read_end, description) + like + "<br />\n"
html += "<br />\n"
# some options for the current feed
- html += """<a href="/articles/%s">All articles</a>&nbsp;&nbsp;&nbsp;""" % (feed.feed_id,)
- html += """<a href="/feed/%s">Feed summary</a>&nbsp;&nbsp;&nbsp;""" % (feed.feed_id,)
- if feed.nb_unread_articles != 0:
- html += """&nbsp;&nbsp;<a href="/mark_as_read/Feed_FromMainPage:%s">Mark all as read</a>""" % (feed.feed_id,)
- html += """&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="/unread/%s" title="Unread article(s)">Unread article(s) (%s)</a>""" % (feed.feed_id, feed.nb_unread_articles)
- if feed.mail == "0":
- html += """<br />\n<a href="/mail_notification/1:%s" title="By e-mail">Stay tuned</a>""" % (feed.feed_id,)
+ html += """<a href="/articles/%s">All articles</a>&nbsp;&nbsp;&nbsp;""" % (feed["feed_id"],)
+ html += """<a href="/feed/%s">Feed summary</a>&nbsp;&nbsp;&nbsp;""" % (feed["feed_id"],)
+ feed["nb_unread_articles"] = 0 #hack
+ if feed["nb_unread_articles"] != 0:
+ html += """&nbsp;&nbsp;<a href="/mark_as_read/Feed_FromMainPage:%s">Mark all as read</a>""" % (feed["feed_id"],)
+ html += """&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="/unread/%s" title="Unread article(s)">Unread article(s) (%s)</a>""" % (feed["feed_id"], feed["nb_unread_articles"])
+ if feed["mail"] == "0":
+ html += """<br />\n<a href="/mail_notification/1:%s" title="By e-mail">Stay tuned</a>""" % (feed["feed_id"],)
else:
- html += """<br />\n<a href="/mail_notification/0:%s" title="By e-mail">Stop staying tuned</a>""" % (feed.feed_id,)
+ html += """<br />\n<a href="/mail_notification/0:%s" title="By e-mail">Stop staying tuned</a>""" % (feed["feed_id"],)
html += """<h4><a href="/#top">Top</a></h4>"""
html += "<hr />\n"
html += htmlfooter
@@ -215,16 +231,19 @@ class Root:
"""
Create the list of feeds.
"""
- html = """<div class="nav_container">Your feeds (%s):<br />\n""" % len(self.feeds)
- for feed in self.feeds.values():
- if feed.nb_unread_articles != 0:
+ feeds = self.articles.get_all_collections()
+ html = """<div class="nav_container">Your feeds (%s):<br />\n""" % len(feeds)
+ for feed in feeds:
+ feed["nb_unread_articles"] = 0 #hack
+ if feed["nb_unread_articles"] != 0:
# not readed articles are in bold
not_read_begin, not_read_end = "<b>", "</b>"
else:
not_read_begin, not_read_end = "", ""
+ feed["nb_articles"] = "5"
html += """<div><a href="/#%s">%s</a> (<a href="/unread/%s" title="Unread article(s)">%s%s%s</a> / %s)</div>""" % \
- (feed.feed_id, feed.feed_title, feed.feed_id, not_read_begin, \
- feed.nb_unread_articles, not_read_end, feed.nb_articles)
+ (feed["feed_id"], feed["feed_title"], feed["feed_id"], not_read_begin, \
+ self.articles.nb_unread_articles(feed["feed_id"]), not_read_end, self.articles.nb_articles(feed["feed_id"]))
return html + "</div>"
@@ -319,8 +338,9 @@ class Root:
html += htmlfooter
return html
-
statistics.exposed = True
+
+
def q(self, querystring=None):
"""
Simply search for the string 'querystring'
@@ -550,76 +570,77 @@ class Root:
favourite articles for the current feed.
"""
try:
- feed = self.feeds[feed_id]
+ feed = self.articles.get_collection(feed_id)
+ articles = self.articles.get_articles_from_collection(feed_id)
except KeyError:
return self.error_page("This feed do not exists.")
html = htmlheader()
html += htmlnav
html += """<div class="left inner">"""
- html += "<p>The feed <b>" + feed.feed_title + "</b> contains <b>" + str(feed.nb_articles) + "</b> articles. "
- html += "Representing " + str((round(float(feed.nb_articles) / self.nb_articles, 4)) * 100) + " % of the total "
- html += "(" + str(self.nb_articles) + ").</p>"
- if feed.articles.values() != []:
- html += "<p>" + (feed.nb_unread_articles == 0 and ["All articles are read"] or [str(feed.nb_unread_articles) + \
- " unread article" + (feed.nb_unread_articles == 1 and [""] or ["s"])[0]])[0] + ".</p>"
- if feed.mail == "1":
+ html += "<p>The feed <b>" + feed["feed_title"] + "</b> contains <b>" + str(self.articles.nb_articles(feed_id)) + "</b> articles. "
+ html += "Representing " + str((round(float(self.articles.nb_articles(feed_id)) / 1000, 4)) * 100) + " % of the total " #hack
+ html += "(" + str(1000) + ").</p>"
+ if articles != []:
+ html += "<p>" + (self.articles.nb_unread_articles(feed_id) == 0 and ["All articles are read"] or [str(self.articles.nb_unread_articles(feed_id)) + \
+ " unread article" + (self.articles.nb_unread_articles(feed_id) == 1 and [""] or ["s"])[0]])[0] + ".</p>"
+ if feed["mail"] == True:
html += """<p>You are receiving articles from this feed to the address: <a href="mail:%s">%s</a>. """ % \
(utils.mail_to, utils.mail_to)
html += """<a href="/mail_notification/0:%s">Stop</a> receiving articles from this feed.</p>""" % \
- (feed.feed_id, )
+ (feed[feed_id], )
- if feed.articles.values() != []:
- last_article = utils.string_to_datetime(feed.articles.values()[0].article_date)
- first_article = utils.string_to_datetime(feed.articles.values()[-1].article_date)
+ if articles != []:
+ last_article = utils.string_to_datetime(str(articles[0]["article_date"]))
+ first_article = utils.string_to_datetime(str(articles[self.articles.nb_articles(feed_id)-2]["article_date"]))
delta = last_article - first_article
delta_today = datetime.datetime.fromordinal(datetime.date.today().toordinal()) - last_article
html += "<p>The last article was posted " + str(abs(delta_today.days)) + " day(s) ago.</p>"
if delta.days > 0:
- html += """<p>Daily average: %s,""" % (str(round(float(feed.nb_articles)/abs(delta.days), 2)),)
+ html += """<p>Daily average: %s,""" % (str(round(float(self.articles.nb_articles(feed_id))/abs(delta.days), 2)),)
html += """ between the %s and the %s.</p>\n""" % \
- (feed.articles.values()[-1].article_date[:10], feed.articles.values()[0].article_date[:10])
+ (str(articles[self.articles.nb_articles(feed_id)-2]["article_date"])[:10], str(articles[0]["article_date"])[:10])
html += "<br /><h1>Recent articles</h1>"
- for article in feed.articles.values()[:10]:
- if article.article_readed == "0":
+ for article in articles[:10]:
+ if article["article_readed"] == False:
# not readed articles are in bold
not_read_begin, not_read_end = "<b>", "</b>"
else:
not_read_begin, not_read_end = "", ""
# display a heart for faved articles
- if article.like == "1":
+ if article["article_like"] == True:
like = """ <img src="/img/heart.png" title="I like this article!" />"""
else:
like = ""
# Descrition for the CSS ToolTips
- article_content = utils.clear_string(article.article_description)
+ article_content = utils.clear_string(article["article_content"])
if article_content:
description = " ".join(article_content[:500].split(' ')[:-1])
else:
description = "No description."
# Title of the article
- article_title = article.article_title
+ article_title = article["article_title"]
if len(article_title) >= 110:
article_title = article_title[:110] + " ..."
# a description line per article (date, title of the article and
# CSS description tooltips on mouse over)
- html += article.article_date + " - " + \
+ html += str(article["article_date"]) + " - " + \
"""<a class="tooltip" href="/article/%s:%s" rel="noreferrer" target="_blank">%s%s%s<span class="classic">%s</span></a>""" % \
- (feed.feed_id, article.article_id, not_read_begin, \
+ (feed["feed_id"], article["article_id"], not_read_begin, \
article_title, not_read_end, description) + like + "<br />\n"
html += "<br />\n"
- html += """<a href="/articles/%s">All articles</a>&nbsp;&nbsp;&nbsp;""" % (feed.feed_id,)
+ html += """<a href="/articles/%s">All articles</a>&nbsp;&nbsp;&nbsp;""" % (feed["feed_id"],)
- favs = [article for article in feed.articles.values() if article.like == "1"]
+ favs = [article for article in articles if article["article_like"] == True]
if len(favs) != 0:
html += "<br /></br /><h1>Your favorites articles for this feed</h1>"
for article in favs:
- if article.like == "1":
+ if article["like"] == True:
# descrition for the CSS ToolTips
- article_content = utils.clear_string(article.article_description)
+ article_content = utils.clear_string(article["article_content"])
if article_content:
description = " ".join(article_content[:500].split(' ')[:-1])
else:
@@ -627,9 +648,9 @@ class Root:
# a description line per article (date, title of the article and
# CSS description tooltips on mouse over)
- html += article.article_date + " - " + \
+ html += str(article["article_date"]) + " - " + \
"""<a class="tooltip" href="/article/%s:%s" rel="noreferrer" target="_blank">%s<span class="classic">%s</span></a><br />\n""" % \
- (feed.feed_id, article.article_id, article.article_title[:150], description)
+ (feed["feed_id"], article["article_id"], article["article_title"][:150], description)
# This section enables the user to edit informations about
@@ -642,25 +663,25 @@ class Root:
'<input type="text" name="new_feed_name" value="" ' + \
'placeholder="Enter a new name (then press Enter)." maxlength=2048 autocomplete="on" size="50" />' + \
"""<input type="hidden" name="feed_url" value="%s" /></form>\n""" % \
- (feed.feed_link,)
+ (feed["feed_link"],)
html += '\n\n<form method=post action="/change_feed_url/">' + \
'<input type="url" name="new_feed_url" value="" ' + \
'placeholder="Enter a new URL in order to retrieve articles (then press Enter)." maxlength=2048 autocomplete="on" size="50" />' + \
"""<input type="hidden" name="old_feed_url" value="%s" /></form>\n""" % \
- (feed.feed_link,)
+ (feed["feed_link"],)
html += '\n\n<form method=post action="/change_feed_logo/">' + \
'<input type="url" name="new_feed_logo" value="" ' + \
'placeholder="Enter the URL of the logo (then press Enter)." maxlength=2048 autocomplete="on" size="50" />' + \
"""<input type="hidden" name="feed_url" value="%s" /></form>\n""" % \
- (feed.feed_link,)
+ (feed["feed_link"],)
dic = {}
- dic[feed.feed_id] = self.feeds[feed.feed_id]
- top_words = utils.top_words(dic, n=50, size=int(word_size))
+ #dic[feed.feed_id] = self.feeds[feed.feed_id]
+ top_words = utils.top_words([articles], n=50, size=int(word_size))
html += "</br /><h1>Tag cloud</h1>\n<br />\n"
# Tags cloud
html += 'Minimum size of a word:'
- html += """<form method=get action="/feed/%s">""" % (feed.feed_id,)
+ html += """<form method=get action="/feed/%s">""" % (feed["feed_id"],)
html += """<input type="number" name="word_size" value="%s" min="2" max="15" step="1" size="2">""" % (word_size,)
html += '<input type="submit" value="OK"></form>\n'
html += '<div style="width: 35%; overflow:hidden; text-align: justify">' + \
@@ -678,8 +699,9 @@ class Root:
"""
This page displays all articles of a feed.
"""
+ print "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
try:
- feed = self.feeds[feed_id]
+ feed = self.articles.get_articles_from_collection(feed_id)
except KeyError:
return self.error_page("This feed do not exists.")
html = htmlheader()
@@ -690,23 +712,23 @@ class Root:
html += "<hr />\n"
html += self.create_list_of_feeds()
html += """</div> <div class="left inner">"""
- html += """<h1>Articles of the feed <i>%s</i></h1><br />""" % (feed.feed_title)
+ html += """<h1>Articles of the feed <i>%s</i></h1><br />""" % (feed_id,)
- for article in feed.articles.values():
+ for article in feed:
- if article.article_readed == "0":
+ if article["article_readed"] == False:
# not readed articles are in bold
not_read_begin, not_read_end = "<b>", "</b>"
else:
not_read_begin, not_read_end = "", ""
- if article.like == "1":
+ if article["article_like"] == True:
like = """ <img src="/img/heart.png" title="I like this article!" />"""
else:
like = ""
# descrition for the CSS ToolTips
- article_content = utils.clear_string(article.article_description)
+ article_content = utils.clear_string(article["content"])
if article_content:
description = " ".join(article_content[:500].split(' ')[:-1])
else:
@@ -714,10 +736,10 @@ class Root:
# a description line per article (date, title of the article and
# CSS description tooltips on mouse over)
- html += article.article_date + " - " + \
+ html += str(article["article_date"]) + " - " + \
"""<a class="tooltip" href="/article/%s:%s" rel="noreferrer" target="_blank">%s%s%s<span class="classic">%s</span></a>""" % \
- (feed.feed_id, article.article_id, not_read_begin, \
- article.article_title[:150], not_read_end, description) + like + "<br />\n"
+ (feed_id, article["article_id"], not_read_begin, \
+ article["article_title"][:150], not_read_end, description) + like + "<br />\n"
html += """\n<h4><a href="/">All feeds</a></h4>"""
html += "<hr />\n"
@@ -1321,25 +1343,26 @@ if __name__ == '__main__':
root = Root()
root.favicon_ico = cherrypy.tools.staticfile.handler(filename=os.path.join(utils.path + "/img/favicon.png"))
cherrypy.config.update({ 'server.socket_port': 12556, 'server.socket_host': "0.0.0.0"})
- cherrypy.config.update({'error_page.404': error_page_404})
+ #cherrypy.config.update({'error_page.404': error_page_404})
_cp_config = {'request.error_response': handle_error}
- if not os.path.isfile(utils.sqlite_base):
- # create the SQLite base if not exists
- print "Creating data base..."
- utils.create_base()
- # load the informations from base in memory
- print "Loading informations from data base..."
- root.update()
- # launch the available base monitoring method (gamin or classic)
- try:
- import gamin
- thread_watch_base = threading.Thread(None, root.watch_base, None, ())
- except:
- print "The gamin module is not installed."
- print "The base of feeds will be monitored with the simple method."
- thread_watch_base = threading.Thread(None, root.watch_base_classic, None, ())
- thread_watch_base.setDaemon(True)
- thread_watch_base.start()
+
+ #if not os.path.isfile(utils.sqlite_base):
+ ## create the SQLite base if not exists
+ #print "Creating data base..."
+ #utils.create_base()
+ ## load the informations from base in memory
+ #print "Loading informations from data base..."
+ #root.update()
+ ## launch the available base monitoring method (gamin or classic)
+ #try:
+ #import gamin
+ #thread_watch_base = threading.Thread(None, root.watch_base, None, ())
+ #except:
+ #print "The gamin module is not installed."
+ #print "The base of feeds will be monitored with the simple method."
+ #thread_watch_base = threading.Thread(None, root.watch_base_classic, None, ())
+ #thread_watch_base.setDaemon(True)
+ #thread_watch_base.start()
cherrypy.quickstart(root, "/" ,config=utils.path + "/cfg/cherrypy.cfg")
diff --git a/utils.py b/utils.py
index 0f5453c3..e44239e4 100755
--- a/utils.py
+++ b/utils.py
@@ -171,9 +171,9 @@ def top_words(feeds, n=10, size=5):
"""
words = Counter()
wordre = re.compile(r'\b\w{%s,}\b' % size, re.I)
- for feed in feeds.values():
- for article in feed.articles.values():
- for word in wordre.findall(clear_string(article.article_description)):
+ for feed in feeds:
+ for article in feed:
+ for word in wordre.findall(clear_string(article["article_content"])):
words[word.lower()] += 1
return words.most_common(n)
bgstack15