Txtr s5 mime types

LauncherOSX/LOXPackage.mm

@@ -129,6 +129,13 @@ - (RDPackageResource *)resourceAtRelativePath:(NSString *)relativePath {
             initWithByteStream:byteStream.release()
                 relativePath:relativePath
                           pack: self];
+
+    ePub3::ConstManifestItemPtr item = _sdkPackage->ManifestItemAtRelativePath(s);
+
+    if (item) {
+        const ePub3::ManifestItem::MimeType &mediaType = item->MediaType();
+        resource.mimeType = [NSString stringWithUTF8String:mediaType.c_str()];
+    }
 
     return resource;
 }

LauncherOSX/PackageResourceServer.h

@@ -13,13 +13,21 @@
 @class RDPackageResource;
 
 #import "HTTPConnection.h"
+#import "HTTPResponse.h"
+#import "HTTPDataResponse.h"
 
 @interface PackageResourceConnection : HTTPConnection
 
 + (void)setPackage:(LOXPackage *)package;
 
 @end
 
+@interface PackageDataResponse : HTTPDataResponse
+
+@property (nonatomic, copy) NSString *contentType;
+
+@end
+
 @interface PackageResourceResponse : NSObject <HTTPResponse> {
 @private UInt64 m_offset;
 @private RDPackageResource *m_resource;

LauncherOSX/PackageResourceServer.mm

@@ -44,6 +44,8 @@ @implementation PackageResourceConnection
         return nil;
     }
 
+    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.
 
@@ -61,15 +63,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;
 }
 
 
@@ -78,6 +85,19 @@ + (void)setPackage:(LOXPackage *)package {
 }
 
 
+@end
+
+@implementation PackageDataResponse
+
+- (NSDictionary *)httpHeaders {
+    if (self.contentType) {
+        return @{@"Content-Type": self.contentType};
+    }
+    else {
+        return @{};
+    }
+}
+
 @end
 
 @implementation PackageResourceResponse
@@ -135,6 +155,17 @@ - (void)setOffset:(UInt64)offset {
 }
 
 
+- (NSDictionary *)httpHeaders {
+    NSString *contentType = self->m_resource.mimeType;
+    if (contentType) {
+        return @{@"Content-Type": contentType};
+    }
+    else {
+        return @{};
+    }
+}
+
+
 @end
 
 @interface PackageResourceServer()

LauncherOSX/RDPackageResource.h

@@ -30,6 +30,8 @@
 
 @property (nonatomic, readonly) NSString *relativePath;
 
+@property (nonatomic, copy) NSString *mimeType;
+
 - (NSData *)readDataOfLength:(NSUInteger)length;
 - (void)setOffset:(UInt64)offset;