Merge pull request #57 from readium/develop

1.0.10

Author: aferditamuriqi

opds/Cartfile

@@ -1,2 +1,2 @@
-github "readium/r2-shared-swift" == 1.2.11
+github "readium/r2-shared-swift" == 1.2.13
 github "edrlab/Fuzi" == 2.2.2

opds/Cartfile.resolved

@@ -1,2 +1,2 @@
 github "edrlab/Fuzi" "2.2.2"
-github "readium/r2-shared-swift" "1.2.11"
+github "readium/r2-shared-swift" "1.2.13"

opds/readium-opds/OPDS1Parser.swift

@@ -13,31 +13,17 @@ import Fuzi
 import R2Shared
 
 public enum OPDS1ParserError: Error {
+    // The title is missing from the feed.
     case missingTitle
+    // Root is not found
     case rootNotFound
-    
-    var localizedDescription: String {
-        switch self {
-        case .missingTitle:
-            return "The title is missing from the feed."
-        case .rootNotFound:
-            return "Root is not found"
-        }
-    }
 }
 
 public enum OPDSParserOpenSearchHelperError: Error {
+    // Search link not found in feed
     case searchLinkNotFound
+    // OpenSearch document is invalid
     case searchDocumentIsInvalid
-
-    var localizedDescription: String {
-        switch self {
-        case .searchLinkNotFound:
-            return "Search link not found in feed"
-        case .searchDocumentIsInvalid:
-            return "OpenSearch document is invalid"
-        }
-    }
 }
 
 struct MimeTypeParameters {

opds/readium-opds/OPDS2Parser.swift

@@ -22,27 +22,6 @@ public enum OPDS2ParserError: Error {
     case invalidGroup
     case invalidPublication
     case invalidNavigation
-
-    var localizedDescription: String {
-        switch self {
-        case .invalidJSON:
-            return "OPDS 2 manifest is not valid JSON"
-        case .metadataNotFound:
-            return "Metadata not found"
-        case .missingTitle:
-            return "Missing title"
-        case .invalidLink:
-            return "Invalid link"
-        case .invalidFacet:
-            return "Invalid facet"
-        case .invalidGroup:
-            return "Invalid group"
-        case .invalidPublication:
-            return "Invalid publication"
-        case .invalidNavigation:
-            return "Invalid navigation"
-        }
-    }
 }
 
 public class OPDS2Parser: Loggable {

opds/readium-opds/OPDSParser.swift

@@ -13,19 +13,8 @@ import Foundation
 import R2Shared
 
 public enum OPDSParserError: Error {
-    
     case documentNotFound
     case documentNotValid
-    
-    var localizedDescription: String {
-        switch self {
-        case .documentNotFound:
-            return "Document is not found"
-        case .documentNotValid:
-            return "Document is not valid"
-        }
-    }
-    
 }
 
 public class OPDSParser {