public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding error handling for insta-fetching stories.

Browse source
This commit is contained in:
Samuel Clay 2012-01-08 14:15:22 -08:00
parent cbcc9d5546
commit aa96e288d2
3 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/rss_feeds/models.py
View file

@ -95,7 +95,7 @@ class Feed(models.Model):
if include_favicon:
try:
feed_icon = MFeedIcon.objects.get(feed_id=self.pk)
feed_icon = MFeedIcon.objects.filter(feed_id=self.pk).first()
feed['favicon'] = feed_icon.data
except MFeedIcon.DoesNotExist:
pass

14
media/js/newsblur/assetmodel.js
View file

@ -73,7 +73,7 @@ NEWSBLUR.AssetModel.Reader.prototype = {
if (clear_queue) {
this.ajax[options['ajax_group']].clear(true);
}
this.ajax[options['ajax_group']].add(_.extend({
url: url,
data: data,
@ -93,12 +93,12 @@ NEWSBLUR.AssetModel.Reader.prototype = {
}
},
error: function(e, textStatus, errorThrown) {
NEWSBLUR.log(['AJAX Error', e, textStatus, errorThrown]);
NEWSBLUR.log(['AJAX Error', e, textStatus, errorThrown, !!error_callback, error_callback]);
if (errorThrown == 'abort') {
return;
}
if ($.isFunction(error_callback)) {
if (error_callback) {
error_callback();
} else if ($.isFunction(callback)) {
var message = "Please create an account. Not much to do without an account.";
@ -435,7 +435,7 @@ NEWSBLUR.AssetModel.Reader.prototype = {
}
},
refresh_feeds: function(callback, has_unfetched_feeds, feed_id) {
refresh_feeds: function(callback, has_unfetched_feeds, feed_id, error_callback) {
var self = this;
var pre_callback = function(data) {
@ -461,7 +461,7 @@ NEWSBLUR.AssetModel.Reader.prototype = {
}
if (NEWSBLUR.Globals.is_authenticated || feed_id) {
this.make_request('/reader/refresh_feeds', data, pre_callback);
this.make_request('/reader/refresh_feeds', data, pre_callback, error_callback);
}
},
@ -833,7 +833,7 @@ NEWSBLUR.AssetModel.Reader.prototype = {
}
},
save_exception_retry: function(feed_id, callback) {
save_exception_retry: function(feed_id, callback, error_callback) {
var self = this;
var pre_callback = function(data) {
@ -844,7 +844,7 @@ NEWSBLUR.AssetModel.Reader.prototype = {
this.make_request('/rss_feeds/exception_retry', {
'feed_id': feed_id,
'reset_fetch': !!(this.feeds[feed_id].has_feed_exception || this.feeds[feed_id].has_page_exception)
}, pre_callback);
}, pre_callback, error_callback);
},
save_exception_change_feed_link: function(feed_id, feed_link, callback) {

26
media/js/newsblur/reader.js
View file

@ -79,6 +79,12 @@
this.$s.$feed_stories.bind('mousemove', $.rescope(this.handle_mousemove_feed_view, this));
this.handle_keystrokes();
// ============
// = Bindings =
// ============
_.bindAll(this, 'show_stories_error');
// ==================
// = Initialization =
// ==================
@ -1740,7 +1746,7 @@
_.delay(_.bind(function() {
if (!delay || feed_id == self.next_feed) {
this.model.load_feed(feed_id, 1, true, $.rescope(this.post_open_feed, this),
_.bind(this.show_stories_error, this));
this.show_stories_error);
}
}, this), delay || 0);
@ -1963,7 +1969,7 @@
this.setup_mousemove_on_views();
this.model.fetch_starred_stories(1, _.bind(this.post_open_starred_stories, this),
_.bind(this.show_stories_error, this), true);
this.show_stories_error, true);
},
post_open_starred_stories: function(data, first_load) {
@ -2026,7 +2032,7 @@
this.cache['river_feeds_with_unreads'] = feeds;
this.show_stories_progress_bar(feeds.length);
this.model.fetch_river_stories(this.active_feed, feeds, 1,
_.bind(this.post_open_river_stories, this), _.bind(this.show_stories_error, this), true);
_.bind(this.post_open_river_stories, this), this.show_stories_error, true);
},
post_open_river_stories: function(data, first_load) {
@ -3156,14 +3162,14 @@
$story_titles.data('page', page+1);
if (this.active_feed == 'starred') {
this.model.fetch_starred_stories(page+1, _.bind(this.post_open_starred_stories, this),
_.bind(this.show_stories_error, this), false);
this.show_stories_error, false);
} else if (this.flags['river_view']) {
this.model.fetch_river_stories(this.active_feed, this.cache['river_feeds_with_unreads'],
page+1, _.bind(this.post_open_river_stories, this),
_.bind(this.show_stories_error, this), false);
this.show_stories_error, false);
} else {
this.model.load_feed(feed_id, page+1, false,
$.rescope(this.post_open_feed, this), _.bind(this.show_stories_error, this));
$.rescope(this.post_open_feed, this), this.show_stories_error);
}
}
},
@ -5118,7 +5124,7 @@
var $feed = this.find_feed_in_feed_list(feed_id);
$feed.addClass('NB-feed-unfetched').removeClass('NB-feed-exception');
this.model.save_exception_retry(feed_id, _.bind(this.force_feed_refresh, this, feed_id, $feed));
this.model.save_exception_retry(feed_id, _.bind(this.force_feed_refresh, this, feed_id, $feed), this.show_stories_error);
},
setup_socket_realtime_unread_counts: function(force) {
@ -5194,10 +5200,10 @@
if (self.active_feed == feed_id || self.active_feed == new_feed_id) {
self.open_feed(new_feed_id, true, $new_feed);
}
}, true, new_feed_id);
}, true, new_feed_id, this.show_stories_error);
},
force_feeds_refresh: function(callback, replace_active_feed, feed_id) {
force_feeds_refresh: function(callback, replace_active_feed, feed_id, error_callback) {
if (callback) {
this.cache.refresh_callback = callback;
} else {
@ -5208,7 +5214,7 @@
this.model.refresh_feeds(_.bind(function(updated_feeds) {
this.post_feed_refresh(updated_feeds, replace_active_feed, feed_id);
}, this), this.flags['has_unfetched_feeds'], feed_id);
}, this), this.flags['has_unfetched_feeds'], feed_id, error_callback);
},
post_feed_refresh: function(updated_feeds, replace_active_feed, single_feed_id) {