Merge pull request #7 from mz2/master

Adds an error domain and codes for some error scenarios
newzealandpaul · Oct 5, 2014 · f759059 · f759059
2 parents b02bcfe + 75df3a1
commit f759059
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/KBWebArchiver.h b/KBWebArchiver.h
@@ -10,6 +10,15 @@
 #import <Foundation/Foundation.h>
 #import <WebKit/WebKit.h>
 
+extern NSString *const KBWebArchiverErrorDomain;
+
+typedef NS_ENUM(NSUInteger, KBWebArchiverErrorCode) {
+    KBWebArchiverErrorCodeUnknown = 0,
+    KBWebArchiverErrorCodeInvalidURL = 1,
+    KBWebArchiverErrorCodeLoadFailed = 2,
+    KBWebArchiverErrorCodeArchiveCreationFailed = 3
+};
+
 @interface KBWebArchiver : NSObject
 {
 	NSURL *_URL;

diff --git a/KBWebArchiver.m b/KBWebArchiver.m
@@ -13,6 +13,8 @@
 #import "NSURL+ValidityChecking.h"
 
 
+NSString *const KBWebArchiverErrorDomain = @"KBWebArchiverErrorDomain";
+
 @interface KBWebArchiver (Private)
 - (void)getWebPage;
 @end
@@ -153,7 +155,9 @@ - (void)getWebPage
 		NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
 		userInfo[NSLocalizedDescriptionKey] = NSLocalizedString(@"Invalid URL", @"");
 		userInfo[NSLocalizedRecoverySuggestionErrorKey] = NSLocalizedString(@"The URL was invalid and so could not be converted to a web archive.",nil);
-		_archiveInformation[@"Error"] = [NSError errorWithDomain:@"" code:0 userInfo:userInfo];
+		_archiveInformation[@"Error"] = [NSError errorWithDomain:KBWebArchiverErrorDomain
+                                                            code:KBWebArchiverErrorCodeInvalidURL
+                                                        userInfo:userInfo];
 
 		return;
 	}
@@ -249,7 +253,9 @@ - (void)getWebPage
 			NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
 			userInfo[NSLocalizedDescriptionKey] = NSLocalizedString(@"Web Page Failed to Load", @"");
 			userInfo[NSLocalizedRecoverySuggestionErrorKey] = NSLocalizedString(@"The web page at the given URL failed to load and so could not be converted to a WebArchive.",nil);
-			_archiveInformation[@"Error"] = [NSError errorWithDomain:@"" code:0 userInfo:userInfo];
+			_archiveInformation[@"Error"] = [NSError errorWithDomain:KBWebArchiverErrorDomain
+                                                                code:KBWebArchiverErrorCodeLoadFailed
+                                                            userInfo:userInfo];
 		}
 
 		return;
@@ -276,7 +282,9 @@ - (void)getWebPage
 		NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
 		userInfo[NSLocalizedDescriptionKey] = NSLocalizedString(@"Web Archive Creation Failed", @"");
 		userInfo[NSLocalizedRecoverySuggestionErrorKey] = NSLocalizedString(@"A web archive could not be created from the page at the given URL.",nil);
-		_archiveInformation[@"Error"] = [NSError errorWithDomain:@"" code:0 userInfo:userInfo];
+		_archiveInformation[@"Error"] = [NSError errorWithDomain:KBWebArchiverErrorDomain
+                                                            code:KBWebArchiverErrorCodeArchiveCreationFailed
+                                                        userInfo:userInfo];
 	}