More explicit warning on empty feeds.

Marks them as in error, with an explicit message in the Activity window.
ViennaRSS · Aug 9, 2015 · c63ddf2 · c63ddf2
1 parent cd51a95
commit c63ddf2
Show file tree

Hide file tree

Showing 22 changed files with 73 additions and 9 deletions.
diff --git a/lproj/cs.lproj/Localizable.strings b/lproj/cs.lproj/Localizable.strings
@@ -450,3 +450,6 @@
 
 /*Added in 3.0.5 */
 "Redirection attempt treated as temporary for safety concern" = "Redirection attempt treated as temporary for safety concern";
+
+/*Added in 3.0.7 */
+"No articles in feed" = "No articles in feed";
diff --git a/lproj/da.lproj/Localizable.strings b/lproj/da.lproj/Localizable.strings
@@ -451,3 +451,5 @@
 /*Added in 3.0.5 */
 "Redirection attempt treated as temporary for safety concern" = "Redirection attempt treated as temporary for safety concern";
 
+/*Added in 3.0.7 */
+"No articles in feed" = "No articles in feed";
diff --git a/lproj/de.lproj/Localizable.strings b/lproj/de.lproj/Localizable.strings
@@ -450,3 +450,6 @@
 
 /*Added in 3.0.5 */
 "Redirection attempt treated as temporary for safety concern" = "Redirection attempt treated as temporary for safety concern";
+
+/*Added in 3.0.7 */
+"No articles in feed" = "No articles in feed";
diff --git a/lproj/en.lproj/Localizable.strings b/lproj/en.lproj/Localizable.strings
@@ -449,4 +449,7 @@
 "RSS Icon not found!" = "RSS Icon not found!";
 
 /*Added in 3.0.5 */
-"Redirection attempt treated as temporary for safety concern" = "Redirection attempt treated as temporary for safety concern";
+"Redirection attempt treated as temporary for safety concern" = "Redirection attempt treated as temporary for safety concern";
+
+/*Added in 3.0.7 */
+"No articles in feed" = "No articles in feed";
diff --git a/lproj/es.lproj/Localizable.strings b/lproj/es.lproj/Localizable.strings
@@ -450,4 +450,7 @@
 "RSS Icon not found!" = "¡Icono de la suscripción no encontrado!";
 
 /*Added in 3.0.5 */
-"Redirection attempt treated as temporary for safety concern" = "Redirection attempt treated as temporary for safety concern";
+"Redirection attempt treated as temporary for safety concern" = "Redirection attempt treated as temporary for safety concern";
+
+/*Added in 3.0.7 */
+"No articles in feed" = "No articles in feed";
diff --git a/lproj/eus.lproj/Localizable.strings b/lproj/eus.lproj/Localizable.strings
@@ -449,4 +449,7 @@
 "RSS Icon not found!" = "RSS Icon not found!";
 
 /*Added in 3.0.5 */
-"Redirection attempt treated as temporary for safety concern" = "Redirection attempt treated as temporary for safety concern";
+"Redirection attempt treated as temporary for safety concern" = "Redirection attempt treated as temporary for safety concern";
+
+/*Added in 3.0.7 */
+"No articles in feed" = "No articles in feed";
diff --git a/lproj/fr.lproj/Localizable.strings b/lproj/fr.lproj/Localizable.strings
@@ -449,4 +449,7 @@
 "RSS Icon not found!" = "Icône RSS non trouvée !";
 
 /*Added in 3.0.5 */
-"Redirection attempt treated as temporary for safety concern" = "Tentative de redirection traitée de façon temporaire par souci de prudence";
+"Redirection attempt treated as temporary for safety concern" = "Tentative de redirection traitée de façon temporaire par souci de prudence";
+
+/*Added in 3.0.7 */
+"No articles in feed" = "Aucun article dans le flux";
diff --git a/lproj/gl.lproj/Localizable.strings b/lproj/gl.lproj/Localizable.strings
@@ -452,5 +452,5 @@
 /*Added in 3.0.5 */
 "Redirection attempt treated as temporary for safety concern" = "A tentiva de redirección foi tratada como temporal por seguridade";
 
-    Status API Training Shop Blog About Help 
-
+/*Added in 3.0.7 */
+"No articles in feed" = "No articles in feed";
diff --git a/lproj/it.lproj/Localizable.strings b/lproj/it.lproj/Localizable.strings
@@ -450,3 +450,6 @@
 
 /*Added in 3.0.5 */
 "Redirection attempt treated as temporary for safety concern" = "Redirection attempt treated as temporary for safety concern";
+
+/*Added in 3.0.7 */
+"No articles in feed" = "No articles in feed";
diff --git a/lproj/ja.lproj/Localizable.strings b/lproj/ja.lproj/Localizable.strings
@@ -450,3 +450,6 @@
 
 /*Added in 3.0.5 */
 "Redirection attempt treated as temporary for safety concern" = "Redirection attempt treated as temporary for safety concern";
+
+/*Added in 3.0.7 */
+"No articles in feed" = "No articles in feed";
diff --git a/lproj/ko.lproj/Localizable.strings b/lproj/ko.lproj/Localizable.strings
@@ -450,3 +450,6 @@
 
 /*Added in 3.0.5 */
 "Redirection attempt treated as temporary for safety concern" = "Redirection attempt treated as temporary for safety concern";
+
+/*Added in 3.0.7 */
+"No articles in feed" = "No articles in feed";
diff --git a/lproj/nl.lproj/Localizable.strings b/lproj/nl.lproj/Localizable.strings
@@ -450,3 +450,6 @@
 
 /*Added in 3.0.5 */
 "Redirection attempt treated as temporary for safety concern" = "Redirection attempt treated as temporary for safety concern";
+
+/*Added in 3.0.7 */
+"No articles in feed" = "No articles in feed";
diff --git a/lproj/pt.lproj/Localizable.strings b/lproj/pt.lproj/Localizable.strings
@@ -450,3 +450,6 @@
 
 /*Added in 3.0.5 */
 "Redirection attempt treated as temporary for safety concern" = "Redirection attempt treated as temporary for safety concern";
+
+/*Added in 3.0.7 */
+"No articles in feed" = "No articles in feed";
diff --git a/lproj/pt_BR.lproj/Localizable.strings b/lproj/pt_BR.lproj/Localizable.strings
@@ -450,3 +450,6 @@
 
 /*Added in 3.0.5 */
 "Redirection attempt treated as temporary for safety concern" = "Redirection attempt treated as temporary for safety concern";
+
+/*Added in 3.0.7 */
+"No articles in feed" = "No articles in feed";
diff --git a/lproj/ru.lproj/Localizable.strings b/lproj/ru.lproj/Localizable.strings
@@ -450,3 +450,6 @@
 
 /*Added in 3.0.5 */
 "Redirection attempt treated as temporary for safety concern" = "Redirection attempt treated as temporary for safety concern";
+
+/*Added in 3.0.7 */
+"No articles in feed" = "No articles in feed";
diff --git a/lproj/sv.lproj/Localizable.strings b/lproj/sv.lproj/Localizable.strings
@@ -450,3 +450,6 @@
 
 /*Added in 3.0.5 */
 "Redirection attempt treated as temporary for safety concern" = "Redirection attempt treated as temporary for safety concern";
+
+/*Added in 3.0.7 */
+"No articles in feed" = "No articles in feed";
diff --git a/lproj/tr.lproj/Localizable.strings b/lproj/tr.lproj/Localizable.strings
@@ -450,3 +450,6 @@
 
 /*Added in 3.0.5 */
 "Redirection attempt treated as temporary for safety concern" = "Redirection attempt treated as temporary for safety concern";
+
+/*Added in 3.0.7 */
+"No articles in feed" = "No articles in feed";
diff --git a/lproj/uk.lproj/Localizable.strings b/lproj/uk.lproj/Localizable.strings
@@ -450,3 +450,6 @@
 
 /*Added in 3.0.5 */
 "Redirection attempt treated as temporary for safety concern" = "Redirection attempt treated as temporary for safety concern";
+
+/*Added in 3.0.7 */
+"No articles in feed" = "No articles in feed";
diff --git a/lproj/zh_CN.lproj/Localizable.strings b/lproj/zh_CN.lproj/Localizable.strings
@@ -450,3 +450,6 @@
 
 /*Added in 3.0.5 */
 "Redirection attempt treated as temporary for safety concern" = "Redirection attempt treated as temporary for safety concern";
+
+/*Added in 3.0.7 */
+"No articles in feed" = "No articles in feed";
diff --git a/lproj/zh_TW.lproj/Localizable.strings b/lproj/zh_TW.lproj/Localizable.strings
@@ -450,3 +450,6 @@
 
 /*Added in 3.0.5 */
 "Redirection attempt treated as temporary for safety concern" = "Redirection attempt treated as temporary for safety concern";
+
+/*Added in 3.0.7 */
+"No articles in feed" = "No articles in feed";
diff --git a/src/RefreshManager.m b/src/RefreshManager.m
@@ -858,6 +858,15 @@ -(void)finalizeFolderRefresh:(NSDictionary*)parameters;
 			// Log number of bytes we received
 			[connectorItem appendDetail:[NSString stringWithFormat:NSLocalizedString(@"%ld bytes received", nil), [receivedData length]]];
 
+			if([[newFeed items] count] == 0)
+			{
+				// Mark the feed as empty
+				[self setFolderErrorFlag:folder flag:YES];
+				[connectorItem setStatus:NSLocalizedString(@"No articles in feed", nil)];
+				[newFeed release];
+				return;
+			}
+
 			// Extract the latest title and description
 			NSString * feedTitle = [newFeed title];
 			NSString * feedDescription = [newFeed description];

diff --git a/src/RichXMLParser.m b/src/RichXMLParser.m
@@ -464,7 +464,7 @@ -(void)parseSequence:(NSXMLElement *)seqElement
  */
 -(BOOL)initRSSFeedItems:(NSXMLElement *)startElement
 {
-	BOOL success = NO;
+	BOOL success = YES;
 
 	// Allocate an items array
 	NSAssert(items == nil, @"initRSSFeedItems called more than once per initialisation");
@@ -596,11 +596,9 @@ -(BOOL)initRSSFeedItems:(NSXMLElement *)startElement
 			NSUInteger indexOfItem = (orderArray && itemIdentifier) ? [orderArray indexOfStringInArray:itemIdentifier] : NSNotFound;
             if (indexOfItem == NSNotFound || indexOfItem >= [items count]) {
 				[items addObject:newFeedItem];
-                success = YES;
             }
             else {
 				[items insertObject:newFeedItem atIndex:indexOfItem];
-                success = YES;
             }
 		}
 	}
@@ -635,6 +633,7 @@ -(BOOL)initAtomFeed:(NSXMLElement *)atomElement
 		if ([atomChildElement.name isEqualToString:@"title"])
 		{
 			[self setTitle:[[atomChildElement.stringValue stringByUnescapingExtendedCharacters] summaryTextFromHTML]];
+            success = YES;
 			continue;
 		}