Issue #6: fix missing title while subscribing directly to a feed URL.

passiomatic · Mar 14, 2015 · 9463bf6 · 9463bf6
1 parent 2a10aa9
commit 9463bf6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/coldsweat/controllers.py b/coldsweat/controllers.py
@@ -309,7 +309,7 @@ def feed_worker(feed):
     # Each worker has its own connection
     connect()
     fetcher = Fetcher(feed)
-    fetcher.fetch_feed()
+    fetcher.update_feed()
 
 
 

diff --git a/coldsweat/fetcher.py b/coldsweat/fetcher.py
@@ -109,9 +109,9 @@ def handle_200(self, response):
     handle_302 = handle_200 # Alias
 
 
-    def fetch_feed(self):
+    def update_feed(self):
 
-        logger.debug(u"fetching %s" % self.netloc)
+        logger.debug(u"updating %s" % self.netloc)
 
         # Check freshness
         for value in [self.feed.last_checked_on, self.feed.last_updated_on]:
@@ -153,8 +153,8 @@ def fetch_feed(self):
                 self.feed.last_status = status
                 logger.warn(u"%s replied with status %d, aborted" % (self.netloc, status))
                 return
-            self.parse_feed(response.text)
-            self.fetch_icon()
+            self._parse_feed(response.text)
+            self._fetch_icon()
         except (HTTPError, HTTPNotModified, DuplicatedFeedError):
             return # Bail out
         finally:
@@ -163,8 +163,12 @@ def fetch_feed(self):
                 logger.warn(u"%s has accomulated too many errors, disabled" % self.netloc)
                 self.feed.is_enabled = False
             self.feed.save()
-
-    def parse_feed(self, data):
+
+    def update_feed_with_data(self, data):
+        self._parse_feed(data)
+        self.feed.save()
+
+    def _parse_feed(self, data):
 
         soup = feedparser.parse(data)         
         # Got parsing error?
@@ -177,8 +181,6 @@ def parse_feed(self, data):
         self.feed.alternate_link     = ft.get_alternate_link()        
         self.feed.title              = self.feed.title or ft.get_title() # Do not set again if already set
 
-        #self.feed.save()
-
         entries = []
         feed_author = ft.get_author()
 
@@ -228,7 +230,7 @@ def parse_feed(self, data):
         return entries
 
 
-    def fetch_icon(self):
+    def _fetch_icon(self):
 
         if not self.feed.icon or not self.feed.icon_last_updated_on or (self.instant - self.feed.icon_last_updated_on).days > FETCH_ICONS_DELTA:
             # Prefer alternate_link if available since self_link could 
@@ -237,7 +239,6 @@ def fetch_icon(self):
             self.feed.icon_last_updated_on  = self.instant
 
             logger.debug(u"fetched favicon %s..." % (self.feed.icon[:70]))    
-            #self.feed.save()
 
 
     def _google_favicon_fetcher(self, url):

diff --git a/coldsweat/frontend.py b/coldsweat/frontend.py
@@ -367,10 +367,11 @@ def feed_add_1(self):
 
         # It's a feed
 
-        #@@TODO: add plugin events
-        feed = self.add_feed_from_url(self_link, fetch_data=False)
-        ff = Fetcher(feed)
-        ff.parse_feed(response.text)
+        feed = self.add_feed_from_url(self_link, fetch_data=False)        
+        logger.debug(u"starting fetcher")
+        trigger_event('fetch_started')        
+        Fetcher(feed).update_feed_with_data(response.text)        
+        trigger_event('fetch_done', [feed])
 
         return self._add_subscription(feed, group_id)