Merge pull request #18 from txtr/txtr-s5-mime-types

agilshane · agilshane · commit cce016c89c15 · 2014-04-28T19:42:55.000-07:00
Txtr s5 mime types
diff --git a/Classes/PackageDataResponse.h b/Classes/PackageDataResponse.h
@@ -0,0 +1,33 @@
+//
+//  PackageDataResponse.h
+//  SDKLauncher-iOS
+//
+//  Created by Oliver Eikemeier on 04.04.14.
+//  Copyright (c) 2014 txtr GmbH.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+//
+
+#import "HTTPDataResponse.h"
+
+@interface PackageDataResponse : HTTPDataResponse
+
+@property (nonatomic, copy) NSString *contentType;
+
+@end
diff --git a/Classes/PackageDataResponse.m b/Classes/PackageDataResponse.m
@@ -0,0 +1,40 @@
+//
+//  PackageDataResponse.m
+//  SDKLauncher-iOS
+//
+//  Created by Oliver Eikemeier on 04.04.14.
+//  Copyright (c) 2014 txtr GmbH.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+//
+
+#import "PackageDataResponse.h"
+
+@implementation PackageDataResponse
+
+- (NSDictionary *)httpHeaders {
+    if (self.contentType) {
+        return @{@"Content-Type": self.contentType};
+    }
+    else {
+        return @{};
+    }
+}
+
+@end
diff --git a/Classes/PackageResourceConnection.m b/Classes/PackageResourceConnection.m
@@ -7,7 +7,7 @@
 //
 
 #import "PackageResourceConnection.h"
-#import "HTTPDataResponse.h"
+#import "PackageDataResponse.h"
 #import "PackageResourceResponse.h"
 #import "PackageResourceServer.h"
 #import "RDPackage.h"
@@ -34,6 +34,8 @@ @implementation PackageResourceConnection
 		path = [path substringFromIndex:1];
 	}
 
+    NSObject <HTTPResponse> *response = nil;
+
 	// Synchronize using a process-level lock to guard against multiple threads accessing a
 	// resource byte stream, which may lead to instability.
 
@@ -51,15 +53,20 @@ @implementation PackageResourceConnection
 			NSData *data = resource.data;
 
 			if (data != nil) {
-				return [[HTTPDataResponse alloc] initWithData:data];
+				PackageDataResponse *dataResponse = [[PackageDataResponse alloc] initWithData:data];
+                if (resource.mimeType) {
+                    dataResponse.contentType = resource.mimeType;
+                }
+                response = dataResponse;
 			}
 		}
 		else {
-			return [[PackageResourceResponse alloc] initWithResource:resource];
+			PackageResourceResponse *resourceResponse = [[PackageResourceResponse alloc] initWithResource:resource];
+            response = resourceResponse;
 		}
 	}
 
-	return nil;
+	return response;
 }
 
 
diff --git a/Classes/PackageResourceResponse.m b/Classes/PackageResourceResponse.m
@@ -66,4 +66,15 @@ - (void)setOffset:(UInt64)offset {
 }
 
 
+- (NSDictionary *)httpHeaders {
+    NSString *contentType = self->m_resource.mimeType;
+    if (contentType) {
+        return @{@"Content-Type": contentType};
+    }
+    else {
+        return @{};
+    }
+}
+
+
 @end
diff --git a/Classes/RDPackage.mm b/Classes/RDPackage.mm
@@ -270,6 +270,13 @@ - (RDPackageResource *)resourceAtRelativePath:(NSString *)relativePath {
 
 	if (resource != nil) {
 		m_byteStreamVector.push_back(std::move(byteStream));
+        
+        ePub3::ConstManifestItemPtr item = m_package->ManifestItemAtRelativePath(s);
+        
+        if (item) {
+            const ePub3::ManifestItem::MimeType &mediaType = item->MediaType();
+            resource.mimeType = [NSString stringWithUTF8String:mediaType.c_str()];
+        }
 	}
 
 	return resource;
diff --git a/Classes/RDPackageResource.h b/Classes/RDPackageResource.h
@@ -33,6 +33,8 @@
 // The relative path associated with this resource.
 @property (nonatomic, readonly) NSString *relativePath;
 
+@property (nonatomic, copy) NSString *mimeType;
+
 - (id)
 	initWithDelegate:(id <RDPackageResourceDelegate>)delegate
 	byteStream:(void *)byteStream
diff --git a/SDKLauncher-iOS-Prefix.pch b/SDKLauncher-iOS-Prefix.pch
@@ -18,35 +18,4 @@
 
 	#define IS_IPAD (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
 	#define SCREEN_SIZE ([UIScreen mainScreen].bounds.size)
-
-	// -----------------------------------------
-	// SimpleHTTPServer requires the following
-
-#define DEBUGLOG false
-
-	# define USING_MRR (!__has_feature(objc_arc))
-
-	# if defined(OS_OBJECT_USE_OBJC) && OS_OBJECT_USE_OBJC
-	#  define DISPATCH_USES_ARC !USING_MRR
-	# else
-	#  define DISPATCH_USES_ARC 0
-	# endif
-
-	#if __has_feature(objc_arc) && defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_5_0
-	# define __maybe_weak __weak
-	# define __block_weak __weak
-	# define property_weak weak
-	#elif __has_feature(objc_arc) && defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
-	# define __maybe_weak __weak
-	# define __block_weak __weak
-	# define property_weak weak
-	#else
-	# define __maybe_weak __unsafe_unretained
-	# define __block_weak __block
-	# define property_weak assign
-	#endif
-
-	// (end SimpleHTTPServer)
-	// -----------------------------------------
-
 #endif
diff --git a/SDKLauncher-iOS.xcodeproj/project.pbxproj b/SDKLauncher-iOS.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		2DC070A8190AB6070018A6F9 /* PackageDataResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DC070A7190AB6070018A6F9 /* PackageDataResponse.m */; };
 		3403516516CE93F2009E3B88 /* reader.css in Resources */ = {isa = PBXBuildFile; fileRef = 3403516116CE93F2009E3B88 /* reader.css */; };
 		3403516616CE93F2009E3B88 /* reader.html in Resources */ = {isa = PBXBuildFile; fileRef = 3403516216CE93F2009E3B88 /* reader.html */; };
 		340535AA16BC5DD100D4A802 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 340535A916BC5DD100D4A802 /* BaseViewController.m */; };
@@ -137,6 +138,8 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		2DC070A6190AB6070018A6F9 /* PackageDataResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PackageDataResponse.h; sourceTree = "<group>"; };
+		2DC070A7190AB6070018A6F9 /* PackageDataResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PackageDataResponse.m; sourceTree = "<group>"; };
 		3403516116CE93F2009E3B88 /* reader.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = reader.css; sourceTree = "<group>"; };
 		3403516216CE93F2009E3B88 /* reader.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = reader.html; sourceTree = "<group>"; };
 		340535A816BC5DD100D4A802 /* BaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseViewController.h; sourceTree = "<group>"; };
@@ -523,6 +526,8 @@
 			children = (
 				3499B0C318413C68002D8AEA /* PackageResourceConnection.h */,
 				3499B0C418413C68002D8AEA /* PackageResourceConnection.m */,
+				2DC070A6190AB6070018A6F9 /* PackageDataResponse.h */,
+				2DC070A7190AB6070018A6F9 /* PackageDataResponse.m */,
 				3434215618D4E826001D4279 /* PackageResourceResponse.h */,
 				3434215718D4E826001D4279 /* PackageResourceResponse.m */,
 				34C5534216E15D32003A7C23 /* PackageResourceServer.h */,
@@ -806,6 +811,7 @@
 				34DAC6EB18D4BB96004F926A /* DispatchQueueLogFormatter.m in Sources */,
 				34C4064817A451D100354C33 /* EPubSettings.m in Sources */,
 				34C4064317A43A1700354C33 /* EPubSettingsController.m in Sources */,
+				2DC070A8190AB6070018A6F9 /* PackageDataResponse.m in Sources */,
 				3411DF03175FACC000FCE6D9 /* EPubViewController.m in Sources */,
 				340535B216BC608900D4A802 /* LocStr.m in Sources */,
 				340535B316BC608900D4A802 /* LocStrError.m in Sources */,

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`//`
`8`	`8`
`9`	`9`	`#import "PackageResourceConnection.h"`
`10`		`-#import "HTTPDataResponse.h"`
	`10`	`+#import "PackageDataResponse.h"`
`11`	`11`	`#import "PackageResourceResponse.h"`
`12`	`12`	`#import "PackageResourceServer.h"`
`13`	`13`	`#import "RDPackage.h"`
`@@ -34,6 +34,8 @@ @implementation PackageResourceConnection`
`34`	`34`	`path = [path substringFromIndex:1];`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ NSObject <HTTPResponse> *response = nil;`
	`38`	`+`
`37`	`39`	`// Synchronize using a process-level lock to guard against multiple threads accessing a`
`38`	`40`	`// resource byte stream, which may lead to instability.`
`39`	`41`
`@@ -51,15 +53,20 @@ @implementation PackageResourceConnection`
`51`	`53`	`NSData *data = resource.data;`
`52`	`54`
`53`	`55`	`if (data != nil) {`
`54`		`- return [[HTTPDataResponse alloc] initWithData:data];`
	`56`	`+ PackageDataResponse *dataResponse = [[PackageDataResponse alloc] initWithData:data];`
	`57`	`+ if (resource.mimeType) {`
	`58`	`+ dataResponse.contentType = resource.mimeType;`
	`59`	`+ }`
	`60`	`+ response = dataResponse;`
`55`	`61`	`}`
`56`	`62`	`}`
`57`	`63`	`else {`
`58`		`- return [[PackageResourceResponse alloc] initWithResource:resource];`
	`64`	`+ PackageResourceResponse *resourceResponse = [[PackageResourceResponse alloc] initWithResource:resource];`
	`65`	`+ response = resourceResponse;`
`59`	`66`	`}`
`60`	`67`	`}`
`61`	`68`
`62`		`- return nil;`
	`69`	`+ return response;`
`63`	`70`	`}`
`64`	`71`
`65`	`72`