FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for RSS 1.0 (RDF) feeds. Added so we can handle Pinboard feeds. (Not sure if anyone else is still using RSS 1.0.) Fix #231.

Browse Source
This commit is contained in:
Brent Simmons 2017-12-02 16:37:24 -08:00
parent 9731524c89
commit f99cd162bb
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Frameworks/RSParser/Feeds/XML/RSRSSParser.m
View File

@ -32,6 +32,7 @@
@property (nonatomic) NSString *link; @property (nonatomic) NSString *link;
@property (nonatomic) NSString *title; @property (nonatomic) NSString *title;
@property (nonatomic) NSDate *dateParsed; @property (nonatomic) NSDate *dateParsed;
@property (nonatomic) BOOL isRDF;
@end @end
@ -155,6 +156,9 @@ static const NSInteger kFalseLength = 6;
static const char *kTrue = "true"; static const char *kTrue = "true";
static const NSInteger kTrueLength = 5; static const NSInteger kTrueLength = 5;
static const char *kUppercaseRDF = "RDF";
static const NSInteger kUppercaseRDFLength = 4;
#pragma mark - Parsing #pragma mark - Parsing
@ -317,8 +321,13 @@ static const NSInteger kTrueLength = 5;
return; return;
} }
if (RSSAXEqualTags(localName, kUppercaseRDF, kUppercaseRDFLength)) {
self.isRDF = YES;
return;
}
NSDictionary *xmlAttributes = nil; NSDictionary *xmlAttributes = nil;
if (RSSAXEqualTags(localName, kItem, kItemLength) || RSSAXEqualTags(localName, kGuid, kGuidLength)) { if ((self.isRDF && RSSAXEqualTags(localName, kItem, kItemLength)) || RSSAXEqualTags(localName, kGuid, kGuidLength)) {
xmlAttributes = [self.parser attributesDictionary:attributes numberOfAttributes:numberOfAttributes]; xmlAttributes = [self.parser attributesDictionary:attributes numberOfAttributes:numberOfAttributes];
} }
if (self.currentAttributes != xmlAttributes) { if (self.currentAttributes != xmlAttributes) {
@ -330,7 +339,7 @@ static const NSInteger kTrueLength = 5;
[self addArticle]; [self addArticle];
self.parsingArticle = YES; self.parsingArticle = YES;
if (xmlAttributes && xmlAttributes[kRDFAboutKey]) { /*RSS 1.0 guid*/ if (self.isRDF && xmlAttributes && xmlAttributes[kRDFAboutKey]) { /*RSS 1.0 guid*/
self.currentArticle.guid = xmlAttributes[kRDFAboutKey]; self.currentArticle.guid = xmlAttributes[kRDFAboutKey];
self.currentArticle.permalink = self.currentArticle.guid; self.currentArticle.permalink = self.currentArticle.guid;
} }
@ -352,7 +361,11 @@ static const NSInteger kTrueLength = 5;
return; return;
} }
if (RSSAXEqualTags(localName, kRSS, kRSSLength)) { if (self.isRDF && RSSAXEqualTags(localName, kUppercaseRDF, kUppercaseRDFLength)) {
self.endRSSFound = YES;
}
else if (RSSAXEqualTags(localName, kRSS, kRSSLength)) {
self.endRSSFound = YES; self.endRSSFound = YES;
} }

2
Frameworks/RSParser/Utilities/NSData+RSParser.m
View File

@ -60,7 +60,7 @@ static BOOL bytesStartWithRSS(const char *bytes, NSUInteger numberOfBytes);
return NO; return NO;
} }
return didFindString("<rss", self.bytes, self.length); return didFindString("<rss", self.bytes, self.length) || didFindString("<rdf:RDF", self.bytes, self.length);
} }
- (BOOL)isProbablyAtom { - (BOOL)isProbablyAtom {