display message on details page

src/main/java/com/commafeed/backend/HttpGetter.java

@@ -42,7 +42,7 @@ import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.util.EntityUtils;
 
 /**
- * Smart HTTP getter
+ * Smart HTTP getter: handles gzip, ssl, last modified and etag headers
  * 
  */
 @Slf4j
@@ -110,14 +110,14 @@ public class HttpGetter {
 				response = client.execute(httpget);
 				int code = response.getStatusLine().getStatusCode();
 				if (code == HttpStatus.SC_NOT_MODIFIED) {
-					throw new NotModifiedException("304 http code");
+					throw new NotModifiedException("'304 - not modified' http code received");
 				} else if (code >= 300) {
 					throw new HttpResponseException(code, "Server returned HTTP error code " + code);
 				}
 
 			} catch (HttpResponseException e) {
 				if (e.getStatusCode() == HttpStatus.SC_NOT_MODIFIED) {
-					throw new NotModifiedException("304 http code");
+					throw new NotModifiedException("'304 - not modified' http code received");
 				} else {
 					throw e;
 				}

src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java

@@ -101,8 +101,9 @@ public class FeedRefreshUpdater {
 			boolean ok = true;
 			Feed feed = context.getFeed();
 			List<FeedEntry> entries = context.getEntries();
-			if (entries.isEmpty() == false) {
+			if (entries.isEmpty()) {
-
+				feed.setMessage("Feed has no entries");
+			} else {
 				List<String> lastEntries = cache.getLastEntries(feed);
 				List<String> currentEntries = Lists.newArrayList();
 
@@ -125,6 +126,10 @@ public class FeedRefreshUpdater {
 				}
 				cache.setLastEntries(feed, currentEntries);
 
+				if (subscriptions == null) {
+					feed.setMessage("No new entries found");
+				}
+
 				if (CollectionUtils.isNotEmpty(subscriptions)) {
 					List<User> users = Lists.newArrayList();
 					for (FeedSubscription sub : subscriptions) {

src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java

@@ -124,7 +124,7 @@ public class FeedRefreshWorker {
 				disabledUntil = FeedUtils.buildDisabledUntil(feed.getLastEntryDate(), feed.getAverageEntryInterval(), disabledUntil);
 			}
 			feed.setErrorCount(0);
-			feed.setMessage(null);
+			feed.setMessage(e.getMessage());
 			feed.setDisabledUntil(disabledUntil);
 
 			taskGiver.giveBack(feed);

src/main/resources/i18n/en.properties

@@ -78,6 +78,7 @@ details.category=Category
 details.position=Position
 details.last_refresh=Last refresh
 details.next_refresh=Next refresh
+details.message=Message
 details.queued_for_refresh=Queued for refresh
 details.feed_url=Feed URL
 details.generate_api_key_first=Generate an API key in your profile first.

src/main/webapp/templates/feeds.feed_details.html

@@ -54,6 +54,13 @@
 			</div>
 		</div>
 		
+		<div class="control-group">
+			<label class="control-label">${details.message}</label>
+			<div class="controls horizontal-align">
+				<span>{{sub.message}}</span>
+			</div>
+		</div>
+
 		<div class="control-group">
 			<label class="control-label">${details.feed_url}</label>
 			<div class="controls horizontal-align">