IOS-631 Fix crash when Publication::baseURL is nil

Simplified/Reader2/ReaderPresentation/ReaderError.swift

@@ -14,15 +14,16 @@ import Foundation
 
 enum ReaderError: LocalizedError {
  case formatNotSupported
- case epubNotValid
- 
+ case epubNotValid(String)
+
  var errorDescription: String? {
  switch self {
  case .formatNotSupported:
  return NSLocalizedString("The book you were trying to read is in an unsupported format.", comment: "Error message when trying to read a publication with a unsupported format")
- case .epubNotValid:
- return NSLocalizedString("The book you were trying to read is corrupted. Please try downloading it again.", comment: "Error message when trying to read an EPUB that is invalid")
+ case .epubNotValid(let errorCause):
+ return String.localizedStringWithFormat(
+ NSLocalizedString("The book you were trying to read is corrupted (%@). Please try downloading it again.", comment: "Error message when trying to read an EPUB that is invalid"),
+ errorCause)
  }
  }
-
 }

Simplified/Reader2/ReaderPresentation/ReadingFormats/EPUBModule.swift

@@ -39,9 +39,13 @@ final class EPUBModule: ReaderFormatModule {
  initialLocation: Locator?) throws -> UIViewController {
 
  guard publication.metadata.identifier != nil else {
- throw ReaderError.epubNotValid
+ throw ReaderError.epubNotValid("nil metadata id")
  }
 
+ guard publication.baseURL != nil else {
+ throw ReaderError.epubNotValid("nil baseURL")
+ }
+
  let epubVC = NYPLEPUBViewController(publication: publication,
  book: book,
  initialLocation: initialLocation,

Simplified/Reader2/UI/NYPLEPUBViewController.swift

@@ -40,16 +40,21 @@ fileprivate protocol EPUBNavigatorViewControllerMaking {
 }
 
 fileprivate class EPUBNavigatorViewControllerFactory: EPUBNavigatorViewControllerMaking {
+ /// - Important: `publication.baseURL` MUST not be nil when invoking this
+ /// function.
  @available(*, deprecated, message: "To suppress this warning, cast to EPUBNavigatorViewControllerMaking protocol")
  fileprivate
  func make(publication: Publication,
  initialLocation: Locator?,
  resourcesServer: ResourcesServer,
  config: EPUBNavigatorViewController.Configuration) -> EPUBNavigatorViewController {
- EPUBNavigatorViewController(publication: publication,
- initialLocation: initialLocation,
- resourcesServer: resourcesServer,
- config: config)
+
+ assert(publication.baseURL != nil, "Publication.baseURL MUST not be nil")
+
+ return EPUBNavigatorViewController(publication: publication,
+ initialLocation: initialLocation,
+ resourcesServer: resourcesServer,
+ config: config)
  }
 }
 
@@ -63,6 +68,8 @@ class NYPLEPUBViewController: NYPLBaseReaderViewController {
 
  let userSettings: NYPLR1R2UserSettings
 
+ /// - Important: `publication.baseURL` MUST not be nil when invoking this
+ /// initializer.
  init(publication: Publication,
  book: NYPLBook,
  initialLocation: Locator?,
@@ -92,7 +99,8 @@ class NYPLEPUBViewController: NYPLBaseReaderViewController {
  preloadNextPositionCount: 0,
  debugState: true)
 
- // when changing the type of the navigator, also change `epubNavigator` getter
+ // create navigator
+ assert(publication.baseURL != nil, "Publication.baseURL MUST not be nil when creating a EPUBNavigatorViewController")
  let factory: EPUBNavigatorViewControllerMaking = EPUBNavigatorViewControllerFactory()
  let navigator = factory.make(publication: publication,
  initialLocation: initialLocation,

Simplified/en.lproj/Localizable.strings

@@ -196,7 +196,7 @@
 "The book you were trying to open is invalid." = "The book you were trying to open is invalid.";
 "An error was encountered while trying to open this book." = "An error was encountered while trying to open this book.";
 "The book you were trying to read is in an unsupported format." = "The book you were trying to read is in an unsupported format.";
-"The book you were trying to read is corrupted. Please try downloading it again." = "The book you were trying to read is corrupted. Please try downloading it again.";
+"The book you were trying to read is corrupted (%@). Please try downloading it again." = "The book you were trying to read is corrupted (%@). Please try downloading it again.";
 
 // MARK: - Authentication generic
 "Authentication Expired" = "Authentication Expired";

Simplified/it.lproj/Localizable.strings

@@ -192,7 +192,7 @@
 "The book you were trying to open is invalid." = "Il libro che stavi cercando di leggere è in un formato non valido.";
 "An error was encountered while trying to open this book." = "Si è verificato un errore durante l'apertura di questo libro.";
 "The book you were trying to read is in an unsupported format." = "Il libro che stavi cercando di aprire è in un formato non supportato.";
-"The book you were trying to read is corrupted. Please try downloading it again." = "Il libro che stavi cercando di leggere è danneggiato. Prova a scaricarlo di nuovo.";
+"The book you were trying to read is corrupted (%@). Please try downloading it again." = "Il libro che stavi cercando di leggere è danneggiato (%@). Prova a scaricarlo di nuovo.";
 
 // MARK: - Authentication generic
 "Authentication Expired" = "Credenziali di accesso scadute";