Merged in jaesivsm/pyaggr3g470r (pull request #11)

misc improvement in http crawler

6 files changed, 35 insertions, 17 deletions

diff --git a/pyaggr3g470r/views/api/article.py b/pyaggr3g470r/views/api/article.py
index c3ec2d34..516eef8f 100644
--- a/pyaggr3g470r/views/api/article.py
+++ b/pyaggr3g470r/views/api/article.py
@@ -11,7 +11,8 @@ from pyaggr3g470r.views.api.common import PyAggAbstractResource,\
                                           PyAggResourceMulti
 
 
-ARTICLE_ATTRS = {'feed_id': {'type': str},
+ARTICLE_ATTRS = {'user_id': {'type': int},
+                 'feed_id': {'type': int},
                  'entry_id': {'type': str},
                  'link': {'type': str},
                  'title': {'type': str},
diff --git a/pyaggr3g470r/views/api/common.py b/pyaggr3g470r/views/api/common.py
index b8477d4b..ca344c04 100644
--- a/pyaggr3g470r/views/api/common.py
+++ b/pyaggr3g470r/views/api/common.py
@@ -51,7 +51,8 @@ def authenticate(func):
             # authentication via HTTP only
             auth = request.authorization
             if auth is not None:
-                user = User.query.filter(User.nickname == auth.username).first()
+                user = User.query.filter(
+                        User.nickname == auth.username).first()
                 if user and user.check_password(auth.password) \
                         and user.activation_key == "":
                     g.user = user
@@ -61,6 +62,7 @@ def authenticate(func):
         raise Unauthorized({'WWWAuthenticate': 'Basic realm="Login Required"'})
     return wrapper
 
+
 def to_response(func):
     """Will cast results of func as a result, and try to extract
     a status_code for the Response object"""
@@ -158,7 +160,8 @@ class PyAggResourceMulti(PyAggAbstractResource):
             return [res for res in self.controller.read().limit(limit)]
         if not limit:
             return [res for res in self.controller.read(**request.json).all()]
-        return [res for res in self.controller.read(**request.json).limit(limit)]
+        return [res
+                for res in self.controller.read(**request.json).limit(limit)]
 
     def post(self):
         """creating several objects. payload should be a list of dict.
diff --git a/pyaggr3g470r/views/api/feed.py b/pyaggr3g470r/views/api/feed.py
index 7d0e2862..ad185de9 100644
--- a/pyaggr3g470r/views/api/feed.py
+++ b/pyaggr3g470r/views/api/feed.py
@@ -3,8 +3,10 @@
 
 from flask import g
 
-from pyaggr3g470r.controllers.feed import FeedController, \
-                                          DEFAULT_MAX_ERROR, DEFAULT_LIMIT
+from pyaggr3g470r.controllers.feed import (FeedController,
+                                           DEFAULT_MAX_ERROR,
+                                           DEFAULT_LIMIT,
+                                           DEFAULT_REFRESH_RATE)
 
 from pyaggr3g470r.views.api.common import PyAggAbstractResource, \
                                           PyAggResourceNew, \
@@ -41,11 +43,20 @@ class FetchableFeedAPI(PyAggAbstractResource):
     controller_cls = FeedController
     to_date = ['date', 'last_retrieved']
     attrs = {'max_error': {'type': int, 'default': DEFAULT_MAX_ERROR},
-             'limit': {'type': int, 'default': DEFAULT_LIMIT}}
+             'limit': {'type': int, 'default': DEFAULT_LIMIT},
+             'refresh_rate': {'type': int, 'default': DEFAULT_REFRESH_RATE},
+             'retreive_all': {'type': bool, 'default': False}}
 
     def get(self):
-        return [feed for feed in self.controller.list_fetchable(
-                                                    **self.reqparse_args())]
+        args = self.reqparse_args()
+        if g.user.refresh_rate:
+            args['refresh_rate'] = g.user.refresh_rate
+
+        dont_filter_by_user = args.pop('retreive_all') and g.user.is_admin()
+
+        contr = self.controller_cls() if dont_filter_by_user \
+                else self.controller
+        return [feed for feed in contr.list_fetchable(**args)]
 
 g.api.add_resource(FeedNewAPI, '/feed', endpoint='feed_new.json')
 g.api.add_resource(FeedAPI, '/feed/<int:obj_id>', endpoint='feed.json')
diff --git a/pyaggr3g470r/views/article.py b/pyaggr3g470r/views/article.py
index 08c92686..75360485 100644
--- a/pyaggr3g470r/views/article.py
+++ b/pyaggr3g470r/views/article.py
@@ -49,7 +49,7 @@ def article(article_id=None):
         next_article = article.source.articles[-1]
 
     return render_template('article.html',
-                           head_title=utils.clear_string(article.title),
+                           head_titles=[utils.clear_string(article.title)],
                            article=article,
                            previous_article=previous_article,
                            next_article=next_article)
diff --git a/pyaggr3g470r/views/feed.py b/pyaggr3g470r/views/feed.py
index 159dce64..bc75aa29 100644
--- a/pyaggr3g470r/views/feed.py
+++ b/pyaggr3g470r/views/feed.py
@@ -53,7 +53,7 @@ def feed(feed_id=None):
     elapsed = today - last_article
 
     return render_template('feed.html',
-                           head_title=utils.clear_string(feed.title),
+                           head_titles=[utils.clear_string(feed.title)],
                            feed=feed, tag_cloud=tag_cloud,
                            first_post_date=first_article,
                            end_post_date=last_article,
diff --git a/pyaggr3g470r/views/views.py b/pyaggr3g470r/views/views.py
index 9f4ef0b7..f344ad61 100644
--- a/pyaggr3g470r/views/views.py
+++ b/pyaggr3g470r/views/views.py
@@ -228,15 +228,19 @@ def signup():
             flash(gettext('Problem while sending activation email') + ': ' + str(e), 'danger')
             return redirect(url_for('home'))
 
-        flash(gettext('Your account has been created. Check your mail to confirm it.'), 'success')
+        flash(gettext('Your account has been created. '
+                      'Check your mail to confirm it.'), 'success')
         return redirect(url_for('home'))
 
     return render_template('signup.html', form=form)
 
 
-def render_home(filters=None, head_title='', page_to_render='home', **kwargs):
+def render_home(filters=None, head_titles=None,
+                page_to_render='home', **kwargs):
     if filters is None:
         filters = {}
+    if head_titles is None:
+        head_titles = []
     feed_contr = FeedController(g.user.id)
     arti_contr = ArticleController(g.user.id)
     feeds = {feed.id: feed.title for feed in feed_contr.read()}
@@ -255,8 +259,7 @@ def render_home(filters=None, head_title='', page_to_render='home', **kwargs):
         filters['readed'] = filter_ == 'read'
     if feed_id:
         filters['feed_id'] = feed_id
-        head_title = "%s%s" % (feed_contr.get(id=feed_id).title,
-                               (' - %s' % head_title) if head_title else '')
+        head_titles.append(feed_contr.get(id=feed_id).title)
 
     sort_param = {"feed": Article.title.desc(),
                   "date": Article.date.desc(),
@@ -286,7 +289,7 @@ def render_home(filters=None, head_title='', page_to_render='home', **kwargs):
     return render_template('home.html', gen_url=gen_url, feed_id=feed_id,
                            filter_=filter_, limit=limit, feeds=feeds,
                            unread=unread, articles=articles, in_error=in_error,
-                           head_title=head_title, sort_=sort_, **kwargs)
+                           head_titles=head_titles, sort_=sort_, **kwargs)
 
 
 @app.route('/')
@@ -299,7 +302,7 @@ def home():
 @app.route('/favorites')
 @login_required
 def favorites():
-    return render_home({'like': True}, gettext('Favorites'), 'favorites')
+    return render_home({'like': True}, [gettext('Favorites')], 'favorites')
 
 
 @app.route('/search', methods=['GET'])
@@ -319,7 +322,7 @@ def search():
         filters['content__like'] = "%%%s%%" % query
     if len(filters) > 1:
         filters = {"__or__": filters}
-    return render_home(filters, "%s %s" % (gettext('Search:'), query),
+    return render_home(filters, ["%s %s" % (gettext('Search:'), query)],
                        'search', search_query=query, search_title=search_title,
                        search_content=search_content)