renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug detecting Macworld’s RSS feed as an RSS feed. The feed doesn’t start with the standard XML header.

Browse Source
This commit is contained in:
Brent Simmons
2017-11-28 21:29:09 -08:00
parent 7bf8d51c38
commit 1e528ee8b0
4 changed files with 3142 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Frameworks/RSParser/RSParser.xcodeproj/project.pbxproj
View File

@@ -64,6 +64,7 @@
845213281FCB4042003B6E93 /* RSHTMLTag.h in Headers */ = {isa = PBXBuildFile; fileRef = 845213261FCB4042003B6E93 /* RSHTMLTag.h */; settings = {ATTRIBUTES = (Public, ); }; };
845213291FCB4042003B6E93 /* RSHTMLTag.m in Sources */ = {isa = PBXBuildFile; fileRef = 845213271FCB4042003B6E93 /* RSHTMLTag.m */; };
84628AAD1FCA10AE00566A9B /* allthis.atom in Resources */ = {isa = PBXBuildFile; fileRef = 84628AAC1FCA10AE00566A9B /* allthis.atom */; };
848674D21FCE7BF600802D1F /* macworld.rss in Resources */ = {isa = PBXBuildFile; fileRef = 848674D11FCE7BF500802D1F /* macworld.rss */; };
849A03D01F0081EA00122600 /* DaringFireball.html in Resources */ = {isa = PBXBuildFile; fileRef = 849A03C51F0081EA00122600 /* DaringFireball.html */; };
849A03D11F0081EA00122600 /* DaringFireball.rss in Resources */ = {isa = PBXBuildFile; fileRef = 849A03C61F0081EA00122600 /* DaringFireball.rss */; };
849A03D21F0081EA00122600 /* EMarley.rss in Resources */ = {isa = PBXBuildFile; fileRef = 849A03C71F0081EA00122600 /* EMarley.rss */; };
@@ -164,6 +165,7 @@
845213261FCB4042003B6E93 /* RSHTMLTag.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RSHTMLTag.h; sourceTree = "<group>"; };
845213271FCB4042003B6E93 /* RSHTMLTag.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RSHTMLTag.m; sourceTree = "<group>"; };
84628AAC1FCA10AE00566A9B /* allthis.atom */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = allthis.atom; sourceTree = "<group>"; };
848674D11FCE7BF500802D1F /* macworld.rss */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = macworld.rss; sourceTree = "<group>"; };
849A03C51F0081EA00122600 /* DaringFireball.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = DaringFireball.html; sourceTree = "<group>"; };
849A03C61F0081EA00122600 /* DaringFireball.rss */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = DaringFireball.rss; sourceTree = "<group>"; };
849A03C71F0081EA00122600 /* EMarley.rss */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = EMarley.rss; sourceTree = "<group>"; };
@@ -352,6 +354,7 @@
849A03C91F0081EA00122600 /* inessential.html */,
849A03E91F01F92B00122600 /* inessential.json */,
849A03CA1F0081EA00122600 /* KatieFloyd.rss */,
848674D11FCE7BF500802D1F /* macworld.rss */,
849A03CB1F0081EA00122600 /* manton.rss */,
849A03CC1F0081EA00122600 /* OneFootTsunami.atom */,
849A03E71F01F88600122600 /* ScriptingNews.json */,
@@ -542,6 +545,7 @@
849A03D11F0081EA00122600 /* DaringFireball.rss in Resources */,
849A03D01F0081EA00122600 /* DaringFireball.html in Resources */,
84628AAD1FCA10AE00566A9B /* allthis.atom in Resources */,
848674D21FCE7BF600802D1F /* macworld.rss in Resources */,
849A03EA1F01F92B00122600 /* inessential.json in Resources */,
849A03D71F0081EA00122600 /* OneFootTsunami.atom in Resources */,
849A03D41F0081EA00122600 /* inessential.html in Resources */,

7
Frameworks/RSParser/RSParserTests/FeedParserTypeTests.swift
View File

@@ -78,6 +78,13 @@ class FeedParserTypeTests: XCTestCase {
XCTAssertTrue(type == .rss)
}
func testMacworldRSSType() {
let d = parserData("macworld", "rss", "https://www.macworld.com/")
let type = feedType(d)
XCTAssertTrue(type == .rss)
}
// MARK: Atom
func testDaringFireballAtomType() {

3123
Frameworks/RSParser/RSParserTests/Resources/macworld.rss Normal file
View File

File diff suppressed because it is too large Load Diff

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

@@ -14,6 +14,7 @@ static BOOL bytesAreProbablyHTML(const char *bytes, NSUInteger numberOfBytes);
static BOOL bytesAreProbablyXML(const char *bytes, NSUInteger numberOfBytes);
static BOOL bytesStartWithStringIgnoringWhitespace(const char *string, const char *bytes, NSUInteger numberOfBytes);
static BOOL didFindString(const char *string, const char *bytes, NSUInteger numberOfBytes);
static BOOL bytesStartWithRSS(const char *bytes, NSUInteger numberOfBytes);
@implementation NSData (RSParser)
@@ -52,6 +53,9 @@ static BOOL didFindString(const char *string, const char *bytes, NSUInteger numb
- (BOOL)isProbablyRSS {
if (bytesStartWithRSS(self.bytes, self.length)) { // Macworld’s RSS feed does not start with xml header.
return YES;
}
if (![self isProbablyXML]) {
return NO;
}
@@ -131,3 +135,7 @@ static BOOL bytesAreProbablyXML(const char *bytes, NSUInteger numberOfBytes) {
return bytesStartWithStringIgnoringWhitespace("<?xml", bytes, numberOfBytes);
}
static BOOL bytesStartWithRSS(const char *bytes, NSUInteger numberOfBytes) {
return bytesStartWithStringIgnoringWhitespace("<rss", bytes, numberOfBytes);
}