new crawler with cache control and error handling

1 files changed, 6 insertions, 11 deletions

diff --git a/pyaggr3g470r/controllers/feed.py b/pyaggr3g470r/controllers/feed.py
index 56cef997..286bea1e 100644
--- a/pyaggr3g470r/controllers/feed.py
+++ b/pyaggr3g470r/controllers/feed.py
@@ -13,17 +13,12 @@ class FeedController(AbstractController):
         from pyaggr3g470r.controllers import UserController
         now = datetime.now()
         user = UserController(self.user_id).get(id=self.user_id)
-        max_last_refresh = now - timedelta(minutes=user.refresh_rate or 60)
+        max_last = now - timedelta(minutes=user.refresh_rate or 60)
         feeds = [feed for feed in self.read(user_id=self.user_id,
-                          error_count__le=max_error,
-                          last_modified=max_last_refresh).limit(limit)]
+                            error_count__le=max_error, enabled=True,
+                            last_retreived__lt=max_last).limit(limit)]
 
-        self.update({'id__in': [feed.id for feed in feeds]},
-                    {'last_modified': now})
+        if feeds:
+            self.update({'id__in': [feed.id for feed in feeds]},
+                        {'last_retreived': now})
         return feeds
-
-    def list_last_articles(self, feed_id, limit=50):
-        from pyaggr3g470r.controllers import ArticleController
-        return ArticleController(self.user_id)._get(feed_id=feed_id)\
-                .order_by(ArticleController._db_cls.retrieved_date.desc())\
-                .limit(limit)