diff --git a/Frameworks/RSParser/HTML/RSHTMLLinkParser.m b/Frameworks/RSParser/HTML/RSHTMLLinkParser.m index 1000356f4..c006e1e42 100755 --- a/Frameworks/RSParser/HTML/RSHTMLLinkParser.m +++ b/Frameworks/RSParser/HTML/RSHTMLLinkParser.m @@ -38,7 +38,7 @@ #pragma mark - Class Methods -+ (NSArray *)HTMLMetadataWithParserData:(ParserData *)parserData { ++ (NSArray *)htmlLinksWithParserData:(ParserData *)parserData { RSHTMLLinkParser *parser = [[self alloc] initWithParserData:parserData]; return parser.links; diff --git a/Frameworks/RSParser/OPML/RSOPMLParser.m b/Frameworks/RSParser/OPML/RSOPMLParser.m index da10f4fb6..5138a4541 100755 --- a/Frameworks/RSParser/OPML/RSOPMLParser.m +++ b/Frameworks/RSParser/OPML/RSOPMLParser.m @@ -16,29 +16,6 @@ #import "RSOPMLError.h" -void RSParseOPML(ParserData *parserData, RSParsedOPMLBlock callback) { - - NSCParameterAssert(parserData); - NSCParameterAssert(callback); - - dispatch_async(dispatch_get_global_queue(QOS_CLASS_DEFAULT, 0), ^{ - - @autoreleasepool { - - RSOPMLParser *parser = [[RSOPMLParser alloc] initWithParserData:parserData]; - - RSOPMLDocument *document = parser.OPMLDocument; - NSError *error = parser.error; - - dispatch_async(dispatch_get_main_queue(), ^{ - - callback(document, error); - }); - } - }); -} - - @interface RSOPMLParser () @property (nonatomic, readwrite) RSOPMLDocument *OPMLDocument; diff --git a/Frameworks/RSParser/RSParserError.h b/Frameworks/RSParser/RSParserError.h deleted file mode 100755 index 95b0f782a..000000000 --- a/Frameworks/RSParser/RSParserError.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// RSXMLError.h -// RSXML -// -// Created by Brent Simmons on 2/28/16. -// Copyright © 2016 Ranchero Software, LLC. All rights reserved. -// - -@import Foundation; - -extern NSString *RSXMLErrorDomain; - - -typedef NS_ENUM(NSInteger, RSXMLErrorCode) { - RSXMLErrorCodeDataIsWrongFormat = 1024 -}; - - -NSError *RSOPMLWrongFormatError(NSString *fileName); diff --git a/Frameworks/RSParser/RSParserError.m b/Frameworks/RSParser/RSParserError.m deleted file mode 100755 index c713906b9..000000000 --- a/Frameworks/RSParser/RSParserError.m +++ /dev/null @@ -1,22 +0,0 @@ -// -// RSXMLError.m -// RSXML -// -// Created by Brent Simmons on 2/28/16. -// Copyright © 2016 Ranchero Software, LLC. All rights reserved. -// - -#import "RSXMLError.h" - -NSString *RSXMLErrorDomain = @"com.ranchero.RSXML"; - -NSError *RSOPMLWrongFormatError(NSString *fileName) { - - NSString *localizedDescriptionFormatString = NSLocalizedString(@"The file ‘%@’ can’t be parsed because it’s not an OPML file.", @"OPML wrong format"); - NSString *localizedDescription = [NSString stringWithFormat:localizedDescriptionFormatString, fileName]; - - NSString *localizedFailureString = NSLocalizedString(@"The file is not an OPML file.", @"OPML wrong format"); - NSDictionary *userInfo = @{NSLocalizedDescriptionKey: localizedDescription, NSLocalizedFailureReasonErrorKey: localizedFailureString}; - - return [[NSError alloc] initWithDomain:RSXMLErrorDomain code:RSXMLErrorCodeDataIsWrongFormat userInfo:userInfo]; -}