From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Wed, 2 Sep 2009 00:37:35 +0000 (-0400)
Subject: Properly detect image type, add missing datasource protocol methods.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=36b91cb3ac3fe66bf60871e1ff6f30d69ea196d5;p=horde.git

Properly detect image type, add missing datasource protocol methods.
---

diff --git a/ApertureToAnselExportPlugin/ApertureHeaders/ApertureSDKCommon.h b/ApertureToAnselExportPlugin/ApertureHeaders/ApertureSDKCommon.h
index 685977271..101c0a13d 100644
--- a/ApertureToAnselExportPlugin/ApertureHeaders/ApertureSDKCommon.h
+++ b/ApertureToAnselExportPlugin/ApertureHeaders/ApertureSDKCommon.h
@@ -135,3 +135,17 @@ typedef enum
 	kExportThumbnailSizeMini,
 	kExportThumbnailSizeTiny
 } ApertureExportThumbnailSize;
+
+/*
+ * Add the image type constants
+ */
+ typedef enum
+ {    
+ kApertureImageFormatJPG = 0,
+ kApertureImageFormatPNG = 1,
+ kApertureImageFormatTIFF8 = 2,
+ kApertureImageFormatTIFF16 = 3,
+ kApertureImageFormatPSD16 = 4,
+ kApertureImageFormatPSD8 = 5,
+ } ApertureImageFormat;
+ 
diff --git a/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.m b/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.m
index 4ba1b0b49..efbcbbca7 100644
--- a/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.m
+++ b/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.m
@@ -247,7 +247,6 @@ NSString * const TURAnselServerPasswordKey = @"password";
     [exportProgress.message autorelease];
     exportProgress.message = [[NSString stringWithFormat:@"Uploading picture %d / %d",
                                index + 1, [_exportManager imageCount]] retain];
-    exportProgress.currentValue++;
     
     [self unlockProgress];
     NSString *base64ImageData = [NSString base64StringFromData: imageData  
@@ -255,8 +254,29 @@ NSString * const TURAnselServerPasswordKey = @"password";
     NSDictionary *properties = [_exportManager propertiesWithoutThumbnailForImageAtIndex: index];
     NSArray *keys = [[NSArray alloc] initWithObjects:
                      @"filename", @"description", @"data", @"type", @"tags", nil];
+
+    /* Determine the correct filetype */
+    NSDictionary *preset = [_exportManager selectedExportPresetDictionary];
+    NSLog(@"Preset selected: %@",[_exportManager selectedExportPresetDictionary]);
+    NSString *fileType;
+    NSString *format = [preset objectForKey: @"ImageFormat"];
+    if ([format isEqual: [NSNumber numberWithInt: kApertureImageFormatJPG]]) {
+        fileType = @"image/jpg";
+    } else if ([format isEqual: [NSNumber numberWithInt: kApertureImageFormatPNG]]) {
+        fileType = @"image/png";
+    } else if ([format isEqual: [NSNumber numberWithInt: kApertureImageFormatTIFF8]] ||
+              [format isEqual: [NSNumber numberWithInt: kApertureImageFormatTIFF16]]) {
+        
+        // Ansel can handle converting the tiff - it is obviously unable to display the original TIFF file.
+        fileType = @"image/tiff";
+    } else {
+        // Not supported.
+        // @TODO: Need to notify user of failure of this image.
+        fileType = nil;
+    }
+
+    NSLog(@"Image Type: %@", fileType);
     
-    NSString *fileType = @"jpeg"; //@TODO
     NSArray *values = [[NSArray alloc] initWithObjects:
                        path,
                        [properties objectForKey: kExportKeyVersionName],
@@ -294,6 +314,9 @@ NSString * const TURAnselServerPasswordKey = @"password";
 - (void)exportManagerDidWriteImageDataToRelativePath:(NSString *)relativePath forImageAtIndex:(unsigned)index
 {
 	NSLog(@"exportManagerDidWriteImageDataToRelativePath %@", relativePath);
+    [self lockProgress];
+    exportProgress.currentValue++;
+    [self unlockProgress];
 }
 
 - (void)exportManagerDidFinishExport
@@ -631,8 +654,7 @@ NSString * const TURAnselServerPasswordKey = @"password";
     if ([_anselController state] == TURAnselStateConnected) {
         
         //albumName = [mExportMgr albumNameAtIndex: 0];
-        newGalleryController = [[TURAnselGalleryPanelController alloc] initWithController: _anselController
-                                                                          withGalleryName: nil];
+        newGalleryController = [[TURAnselGalleryPanelController alloc] initWithController: _anselController];
         [newGalleryController setDelegate: self];
         [newGalleryController showSheetForWindow: [self window]];
     }
@@ -788,4 +810,17 @@ NSString * const TURAnselServerPasswordKey = @"password";
 {
 	return [_browserData objectAtIndex:index];
 }
+#pragma mark NSTableView Datasource
+- (int)numberOfRowsInTableView:(NSTableView *)aTableView
+{
+    return [_anselServers count];
+}
+
+- (id)tableView:(NSTableView *)aTableView
+objectValueForTableColumn:(NSTableColumn *)aTableColumn
+            row:(int)rowIndex
+{
+    return [[_anselServers objectAtIndex: rowIndex] objectForKey: [aTableColumn identifier]];
+}
+
 @end
diff --git a/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/info.nib b/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/info.nib
index dba68c5db..35717405d 100644
--- a/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/info.nib
+++ b/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/info.nib
@@ -10,8 +10,9 @@
 	<integer>5</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>63</integer>
+		<integer>157</integer>
 		<integer>176</integer>
+		<integer>63</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>9L30</string>
diff --git a/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/keyedobjects.nib b/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/keyedobjects.nib
index b6e847895..2a54fd6f3 100644
Binary files a/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/keyedobjects.nib and b/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/keyedobjects.nib differ