From 7b9bfeb816116b594ca14c325d6df5ca76780bfd Mon Sep 17 00:00:00 2001 From: Athou Date: Tue, 9 Apr 2013 09:03:52 +0200 Subject: [PATCH] fix #25 --- .../com/commafeed/backend/dao/FeedEntryService.java | 1 + .../java/com/commafeed/backend/feeds/FeedUpdater.java | 1 + src/main/java/com/commafeed/backend/model/Feed.java | 10 ++++++++++ .../java/com/commafeed/frontend/model/Entries.java | 9 +++++++++ .../commafeed/frontend/rest/resources/EntriesREST.java | 1 + src/main/webapp/directives/category.html | 2 +- src/main/webapp/js/controllers.js | 4 ++++ src/main/webapp/templates/feeds.view.html | 4 ++-- 8 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryService.java b/src/main/java/com/commafeed/backend/dao/FeedEntryService.java index 28d6c40f..2767f3f9 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedEntryService.java +++ b/src/main/java/com/commafeed/backend/dao/FeedEntryService.java @@ -66,6 +66,7 @@ public class FeedEntryService extends GenericDAO { feed.setLastUpdated(Calendar.getInstance().getTime()); feed.setMessage(null); + feed.setErrorCount(0); feedService.update(feed); } diff --git a/src/main/java/com/commafeed/backend/feeds/FeedUpdater.java b/src/main/java/com/commafeed/backend/feeds/FeedUpdater.java index f1a49619..cc6c5e73 100644 --- a/src/main/java/com/commafeed/backend/feeds/FeedUpdater.java +++ b/src/main/java/com/commafeed/backend/feeds/FeedUpdater.java @@ -49,6 +49,7 @@ public class FeedUpdater { + e.getMessage()); feed.setLastUpdated(Calendar.getInstance().getTime()); feed.setMessage("Unable to refresh feed: " + e.getMessage()); + feed.setErrorCount(feed.getErrorCount() + 1); feedService.update(feed); } } diff --git a/src/main/java/com/commafeed/backend/model/Feed.java b/src/main/java/com/commafeed/backend/model/Feed.java index 6e57b1a6..92f3c824 100644 --- a/src/main/java/com/commafeed/backend/model/Feed.java +++ b/src/main/java/com/commafeed/backend/model/Feed.java @@ -34,6 +34,8 @@ public class Feed extends AbstractModel { @Column(length = 1024) private String message; + private int errorCount; + @ManyToMany(mappedBy = "feeds") private Set entries = Sets.newHashSet(); @@ -104,4 +106,12 @@ public class Feed extends AbstractModel { this.link = link; } + public int getErrorCount() { + return errorCount; + } + + public void setErrorCount(int errorCount) { + this.errorCount = errorCount; + } + } diff --git a/src/main/java/com/commafeed/frontend/model/Entries.java b/src/main/java/com/commafeed/frontend/model/Entries.java index 2eaa25be..48ac00c7 100644 --- a/src/main/java/com/commafeed/frontend/model/Entries.java +++ b/src/main/java/com/commafeed/frontend/model/Entries.java @@ -9,6 +9,7 @@ import com.google.common.collect.Lists; public class Entries implements Serializable { private String name; private String message; + private int errorCount; private List entries = Lists.newArrayList(); public String getName() { @@ -35,4 +36,12 @@ public class Entries implements Serializable { this.message = message; } + public int getErrorCount() { + return errorCount; + } + + public void setErrorCount(int errorCount) { + this.errorCount = errorCount; + } + } diff --git a/src/main/java/com/commafeed/frontend/rest/resources/EntriesREST.java b/src/main/java/com/commafeed/frontend/rest/resources/EntriesREST.java index fb669a47..6c7bceb0 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/EntriesREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/EntriesREST.java @@ -55,6 +55,7 @@ public class EntriesREST extends AbstractREST { if (subscription != null) { entries.setName(subscription.getTitle()); entries.setMessage(subscription.getFeed().getMessage()); + entries.setErrorCount(subscription.getFeed().getErrorCount()); List unreadEntries = feedEntryStatusService .getStatuses(subscription.getFeed(), getUser(), diff --git a/src/main/webapp/directives/category.html b/src/main/webapp/directives/category.html index f310a629..24233e30 100644 --- a/src/main/webapp/directives/category.html +++ b/src/main/webapp/directives/category.html @@ -3,7 +3,7 @@ ng-class="{selected: (node.id == selectedId && selectedType == 'category')}">{{formatCategoryName({category:node})}}
    -
  • +
    • diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js index 5cf12742..34f078dd 100644 --- a/src/main/webapp/js/controllers.js +++ b/src/main/webapp/js/controllers.js @@ -253,6 +253,7 @@ module.controller('FeedListCtrl', function($scope, $stateParams, $http, $route, $scope.name = null; $scope.message = null; + $scope.errorCount = 0; $scope.entries = []; $scope.settingsService = SettingsService; @@ -287,6 +288,7 @@ module.controller('FeedListCtrl', function($scope, $stateParams, $http, $route, } $scope.name = data.name; $scope.message = data.message; + $scope.errorCount = data.errorCount; $scope.busy = false; $scope.hasMore = data.entries.length == limit; }; @@ -407,6 +409,8 @@ module.controller('FeedListCtrl', function($scope, $stateParams, $http, $route, $scope.$on('reload', function(event, args) { $scope.name = null; $scope.entries = []; + $scope.message = null; + $scope.errorCount = 0; $scope.busy = false; $scope.hasMore = true; $scope.loadMoreEntries(); diff --git a/src/main/webapp/templates/feeds.view.html b/src/main/webapp/templates/feeds.view.html index c14b2041..d4544fa6 100644 --- a/src/main/webapp/templates/feeds.view.html +++ b/src/main/webapp/templates/feeds.view.html @@ -5,7 +5,7 @@
    -
    Error while loading this feed : {{message}}
    +
    Error while loading this feed : {{message}}
    @@ -29,6 +29,6 @@
    -
    "{{name}}" has no unread items.
    +
    "{{name}}" has no unread items.
    \ No newline at end of file