[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[708] trunk/FuseImporter/ LibspectrumMetadataImporter.m

[<fr...@us...>]

Revision: 708
          http://sourceforge.net/p/fuse-for-macosx/code/708
Author:   fredm
Date:     2012-11-23 12:20:54 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Undo overzealous modernisation.

Modified Paths:
--------------
    trunk/FuseImporter/LibspectrumMetadataImporter.m

Modified: trunk/FuseImporter/LibspectrumMetadataImporter.m
===================================================================
--- trunk/FuseImporter/LibspectrumMetadataImporter.m	2012-11-23 11:26:32 UTC (rev 707)
+++ trunk/FuseImporter/LibspectrumMetadataImporter.m	2012-11-23 12:20:54 UTC (rev 708)
@@ -188,7 +188,8 @@
     return NO;
   }
   
-  attributes[(NSString *)kMDItemAudioChannelCount] = @1;
+  [attributes setObject:[NSNumber numberWithInt:1]
+                 forKey:(NSString *)kMDItemAudioChannelCount];
 
   block = libspectrum_tape_iterator_init( &iterator, tape );
 
@@ -256,37 +257,44 @@
 
 	switch( libspectrum_tape_block_ids( block, i ) ) {
 	case   0:
-		attributes[(NSString *)kMDItemTitle] = [NSString stringWithCString:
+		[attributes setObject:[NSString stringWithCString:
                   (const char *)libspectrum_tape_block_texts( block, i )
-                  encoding:NSWindowsCP1252StringEncoding];
+                  encoding:NSWindowsCP1252StringEncoding]
+                                forKey:(NSString *)kMDItemTitle];
 		break;
 	case   1:
 		info = [NSString stringWithCString:
                         (const char *)libspectrum_tape_block_texts( block, i )
                         encoding:NSWindowsCP1252StringEncoding];
-		attributes[(NSString *)kMDItemPublishers] = [info componentsSeparatedByString:@"\n"];
+		[attributes setObject:[info componentsSeparatedByString:@"\n"]
+                                forKey:(NSString *)kMDItemPublishers];
 		break;
 	case   2:
 		info = [NSString stringWithCString:
                         (const char *)libspectrum_tape_block_texts( block, i )
                         encoding:NSWindowsCP1252StringEncoding];
-		attributes[(NSString *)kMDItemAuthors] = [info componentsSeparatedByString:@"\n"];
+		[attributes setObject:[info componentsSeparatedByString:@"\n"]
+                                forKey:(NSString *)kMDItemAuthors];
 		break;
 	case   3:
-		attributes[(NSString *)kMDItemRecordingYear] = @([[NSString stringWithCString:
+		[attributes setObject:[NSNumber numberWithInt:
+			[[NSString stringWithCString:
                           (const char *)libspectrum_tape_block_texts( block, i )
-                          encoding:NSWindowsCP1252StringEncoding] intValue]);
+                          encoding:NSWindowsCP1252StringEncoding] intValue]]
+                               forKey:(NSString *)kMDItemRecordingYear];
 		break;
 	case   4: // We will want to translate from "English" etc.
 		info = [NSString stringWithCString:
                         (const char *)libspectrum_tape_block_texts( block, i )
                         encoding:NSWindowsCP1252StringEncoding];
-		attributes[(NSString *)kMDItemLanguages] = [info componentsSeparatedByString:@"\n"];
+		[attributes setObject:[info componentsSeparatedByString:@"\n"]
+		                        forKey:(NSString *)kMDItemLanguages];
 		break;
 	case   5:
-		attributes[@"net_sourceforge_projects_fuse_emulator_Category"] = [NSString stringWithCString:
+		[attributes setObject:[NSString stringWithCString:
                         (const char *)libspectrum_tape_block_texts( block, i )
-                        encoding:NSWindowsCP1252StringEncoding];
+                        encoding:NSWindowsCP1252StringEncoding]
+                    forKey:@"net_sourceforge_projects_fuse_emulator_Category"];
 		break;
 	case   6:
                 {
@@ -308,23 +316,27 @@
                        options:NSCaseInsensitiveSearch
                          range:NSMakeRange(0, [priceString length])];
                 // Also should consider UKP from some TZX Vault info blocks?
-		attributes[@"net_sourceforge_projects_fuse_emulator_Price"] = priceString;
+		[attributes setObject:priceString 
+                    forKey:@"net_sourceforge_projects_fuse_emulator_Price"];
                 }
 		break;
 	case   7:
-		attributes[@"net_sourceforge_projects_fuse_emulator_Loader"] = [NSString stringWithCString:
+		[attributes setObject:[NSString stringWithCString:
                   (const char *)libspectrum_tape_block_texts( block, i )
-                  encoding:NSWindowsCP1252StringEncoding];
+                  encoding:NSWindowsCP1252StringEncoding]
+                    forKey:@"net_sourceforge_projects_fuse_emulator_Loader"];
 		break;
 	case   8:
-		attributes[@"net_sourceforge_projects_fuse_emulator_Origin"] = [NSString stringWithCString:
+		[attributes setObject:[NSString stringWithCString:
                   (const char *)libspectrum_tape_block_texts( block, i )
-                  encoding:NSWindowsCP1252StringEncoding];
+                  encoding:NSWindowsCP1252StringEncoding]
+                    forKey:@"net_sourceforge_projects_fuse_emulator_Origin"];
 		break;
 	case 255:
-		attributes[(NSString *)kMDItemComment] = [NSString stringWithCString:
+		[attributes setObject:[NSString stringWithCString:
                   (const char *)libspectrum_tape_block_texts( block, i )
-                  encoding:NSWindowsCP1252StringEncoding];
+                  encoding:NSWindowsCP1252StringEncoding]
+                    forKey:(NSString *)kMDItemComment];
 		break;
 	 default: NSLog(@"(Unknown string): %s",
                         (const char *)libspectrum_tape_block_texts( block, i ));
@@ -350,10 +362,12 @@
         }
       }
       if( [machines count] ) {
-        attributes[@"net_sourceforge_projects_fuse_emulator_Machines"] = machines;
+        [attributes setObject:machines
+                  forKey:@"net_sourceforge_projects_fuse_emulator_Machines"];
       }
       if( [peripherals count] ) {
-        attributes[@"net_sourceforge_projects_fuse_emulator_Peripherals"] = peripherals;
+        [attributes setObject:peripherals
+                  forKey:@"net_sourceforge_projects_fuse_emulator_Peripherals"];
       }
       break;
 
@@ -379,7 +393,8 @@
 
   float duration = tstates_total/3500000.0;
 
-  attributes[(NSString *)kMDItemDurationSeconds] = @(duration);
+  [attributes setObject:[NSNumber numberWithFloat:duration]
+                 forKey:(NSString *)kMDItemDurationSeconds];
 
   error = libspectrum_tape_free( tape );
   if( error != LIBSPECTRUM_ERROR_NONE ) {
@@ -399,10 +414,15 @@
   if( !libspectrum_snap_issue2(snap) &&
       (libspectrum_snap_machine(snap) == LIBSPECTRUM_MACHINE_48 ||
        libspectrum_snap_machine(snap) == LIBSPECTRUM_MACHINE_16) ) {
-    attributes[@"net_sourceforge_projects_fuse_emulator_Machines"] = @[[NSString stringWithFormat:@"%s (Issue 1)",
-                     libspectrum_machine_name(libspectrum_snap_machine(snap))]];
+    [attributes setObject:[NSArray arrayWithObject:
+                    [NSString stringWithFormat:@"%s (Issue 1)",
+                     libspectrum_machine_name(libspectrum_snap_machine(snap))]]
+                    forKey:@"net_sourceforge_projects_fuse_emulator_Machines"];
   } else {
-    attributes[@"net_sourceforge_projects_fuse_emulator_Machines"] = @[@(libspectrum_machine_name(libspectrum_snap_machine(snap)))];
+    [attributes setObject:[NSArray arrayWithObject:
+       [NSString stringWithUTF8String:
+        libspectrum_machine_name(libspectrum_snap_machine(snap))]]
+            forKey:@"net_sourceforge_projects_fuse_emulator_Machines"];
   }
 
   if( libspectrum_snap_joystick_active_count( snap ) ) {
@@ -441,7 +461,8 @@
   }
   
   if( [peripherals count] ) {
-    attributes[@"net_sourceforge_projects_fuse_emulator_Peripherals"] = peripherals;
+    [attributes setObject:peripherals
+                  forKey:@"net_sourceforge_projects_fuse_emulator_Peripherals"];
   }
 
   return error ? NO : YES;
@@ -537,12 +558,16 @@
     return NO;
   }
 
-  attributes[(NSString *)kMDItemPixelWidth] = @(width);
-  attributes[(NSString *)kMDItemPixelHeight] = @192;
-  attributes[(NSString *)kMDItemOrientation] = @0;
-  attributes[(NSString *)kMDItemColorSpace] = @"RGB";
+  [attributes setObject:[NSNumber numberWithInt:width]
+                                forKey:(NSString *)kMDItemPixelWidth];
+  [attributes setObject:[NSNumber numberWithInt:192]
+                                forKey:(NSString *)kMDItemPixelHeight];
+  [attributes setObject:[NSNumber numberWithInt:0]
+                                forKey:(NSString *)kMDItemOrientation];
+  [attributes setObject:@"RGB" forKey:(NSString *)kMDItemColorSpace];
 
-  attributes[@"net_sourceforge_projects_fuse_emulator_GraphicsMode"] = mode;
+  [attributes setObject:mode
+                 forKey:@"net_sourceforge_projects_fuse_emulator_GraphicsMode"];
 
   return YES;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.