Merge pull request #73 from readium/develop

1.2.3

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @aferditamuriqi

Cartfile

@@ -1,4 +1,4 @@
-github "readium/r2-shared-swift" == 1.4.2
+github "readium/r2-shared-swift" == 1.4.3
 github "stephencelis/SQLite.swift" == 0.12.2
 github "krzyzanowskim/CryptoSwift" == 1.2.0
 github "weichsel/ZIPFoundation" == 0.9.9

Cartfile.resolved

@@ -1,4 +1,4 @@
 github "krzyzanowskim/CryptoSwift" "1.2.0"
-github "readium/r2-shared-swift" "1.4.2"
+github "readium/r2-shared-swift" "1.4.3"
 github "stephencelis/SQLite.swift" "0.12.2"
 github "weichsel/ZIPFoundation" "0.9.9"

ReadiumLCP.podspec

@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
 
   s.name          = "ReadiumLCP"
-  s.version       = "1.2.2"
+  s.version       = "1.2.3"
   s.license       = "BSD 3-Clause License"
   s.summary       = "Readium LCP"
   s.homepage      = "http://readium.github.io"
   s.author        = { "Aferdita Muriqi" => "[email protected]" }
-  s.source        = { :git => "https://github.com/readium/r2-lcp-swift.git", :tag => "1.2.2" }
+  s.source        = { :git => "https://github.com/readium/r2-lcp-swift.git", :tag => "1.2.3" }
   s.exclude_files = ["**/Info*.plist"]
   s.requires_arc  = true
   s.resources     = ['readium-lcp-swift/Resources/**']

r2-lcp-swift.xcodeproj/project.pbxproj

@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		03C3CC66222DBD5B00A01731 /* R2LCPClient.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03C3CC65222DBD5B00A01731 /* R2LCPClient.framework */; };
 		CA26EF7C2280331E0011653E /* Connection.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA26EF7B2280331E0011653E /* Connection.swift */; };
 		CA2AE328221C3CFB008BD18F /* Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA2AE327221C3CFB008BD18F /* Deprecated.swift */; };
 		CA4A38742208647400599297 /* PassphrasesRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA4A38732208647400599297 /* PassphrasesRepository.swift */; };
@@ -51,7 +50,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		03C3CC65222DBD5B00A01731 /* R2LCPClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = R2LCPClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		03A5DB9F23B78AD500D5FCBD /* R2LCPClient.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = R2LCPClient.framework; path = Carthage/Build/iOS/R2LCPClient.framework; sourceTree = "<group>"; };
 		CA26EF7B2280331E0011653E /* Connection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Connection.swift; sourceTree = "<group>"; };
 		CA2AE327221C3CFB008BD18F /* Deprecated.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Deprecated.swift; sourceTree = "<group>"; };
 		CA4A38732208647400599297 /* PassphrasesRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PassphrasesRepository.swift; sourceTree = "<group>"; };
@@ -103,7 +102,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				03C3CC66222DBD5B00A01731 /* R2LCPClient.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -276,7 +274,7 @@
 		F3B2C8AD1F6672E1007601E4 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				03C3CC65222DBD5B00A01731 /* R2LCPClient.framework */,
+				03A5DB9F23B78AD500D5FCBD /* R2LCPClient.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";

readium-lcp-swift/Resources/en.lproj/Localizable.strings

@@ -32,11 +32,11 @@
 "ReadiumLCP.LCPClientError.unknown" = "Unknown error.";
 
 /* StatusError: Errors while checking the status of the License, using the Status Document. */
-"ReadiumLCP.StatusError.cancelled" = "You have cancelled this license on %@.";
+"ReadiumLCP.StatusError.cancelled" = "This license was cancelled on %@.";
 "ReadiumLCP.StatusError.returned" = "This license has been returned on %@.";
 "ReadiumLCP.StatusError.expired.start" = "This license starts on %@.";
 "ReadiumLCP.StatusError.expired.end" = "This license expired on %@.";
-"ReadiumLCP.StatusError.revoked" = "This license has been revoked by its provider on %1$@.\nThe license was registered by %2$d device(s)";
+"ReadiumLCP.StatusError.revoked" = "This license was revoked by its provider on %1$@.\nIt was registered by %2$d device(s)";
 
 /* RenewError: Errors while renewing a loan. */
 "ReadiumLCP.RenewError.renewFailed" = "Your publication could not be renewed properly.";

readium-lcp-swift/Services/LicensesService.swift

@@ -79,7 +79,8 @@ extension LicensesService: LCPService {
                 let downloadProgress = license.fetchPublication { result, error in
                     progress.value = .infinite
                     if let result = result {
-                        let publication = LCPImportedPublication(localURL: result.0, downloadTask: result.1, suggestedFilename: "\(license.license.id).epub")
+                        let filename = self.suggestedFilename(for: result.0, license: license)
+                        let publication = LCPImportedPublication(localURL: result.0, downloadTask: result.1, suggestedFilename: filename)
                         completion(publication, nil)
                     } else {
                         completion(nil, error)
@@ -103,4 +104,15 @@ extension LicensesService: LCPService {
         }
     }
 
+    /// Returns the suggested filename to be used when importing a publication.
+    private func suggestedFilename(for file: URL, license: License) -> String {
+        var mimetypes: [String] = []
+        if let mimetype = license.license.link(for: .publication)?.type {
+            mimetypes.append(mimetype)
+        }
+        let format = Publication.Format(file: file, mimetypes: mimetypes)
+        let fileExtension = (format == .pdf) ? "lcpdf" : "epub"
+        return "\(license.license.id).\(fileExtension)"
+    }
+
 }