Changeset 513

Timestamp:

03/29/08 09:45:21 (9 months ago)

Author:

gbooker

Message:

Fixed importer so it doesn't try to download a single poster twice, making it fail in both attempts

Files:

• trunk/SapphireFrappliance/Sapphire.xcodeproj/project.pbxproj (modified) (7 diffs)
• trunk/SapphireFrappliance/SapphireMovieImporter.m (modified) (2 diffs)

trunk/SapphireFrappliance/Sapphire.xcodeproj/project.pbxproj

@@ -55 +55 @@
-                F531A5BA0C2CB43400E46F62 /* SapphireMetaData.m in Sources */ = {isa = PBXBuildFile; fileRef = F531A5B90C2CB43400E46F62 /* SapphireMetaData.m */; };
-                F531A98F0C2DACBE00E46F62 /* SapphireApplianceController.m in Sources */ = {isa = PBXBuildFile; fileRef = F531A98E0C2DACBE00E46F62 /* SapphireApplianceController.m */; };
+                F541CBF50D9C2D19002F9278 /* SapphireRadioSetting.m in Sources */ = {isa = PBXBuildFile; fileRef = F541CBF40D9C2D19002F9278 /* SapphireRadioSetting.m */; };
-                F565A1FD0C5BE81F00AE7110 /* SapphireAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = F565A1FC0C5BE81F00AE7110 /* SapphireAudioPlayer.m */; };
-                F565A34A0C5BF69D00AE7110 /* SapphireAudioMedia.m in Sources */ = {isa = PBXBuildFile; fileRef = F565A3490C5BF69D00AE7110 /* SapphireAudioMedia.m */; };
@@ -66 +67 @@
-                F56B77D70C3858B400E934AA /* DefaultPreview.png in Resources */ = {isa = PBXBuildFile; fileRef = F56B77D60C3858B400E934AA /* DefaultPreview.png */; };
-                F585A9C80D74EA870043AB22 /* SapphireTakeTwoCompatClasses.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F56895E10D6CE30D00F9D9B0 /* SapphireTakeTwoCompatClasses.framework */; };
+                F59B29D10D9E8C6E002D5DBD /* NSArray-Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = F5FB82E30D18065F0018E4C9 /* NSArray-Extensions.m */; };
-                F5B418380D0B1EA100BDD361 /* SapphireImportHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = F5B418370D0B1EA100BDD361 /* SapphireImportHelper.m */; };
-                F5B418650D0B28A200BDD361 /* main_helper.m in Sources */ = {isa = PBXBuildFile; fileRef = F5B418640D0B28A200BDD361 /* main_helper.m */; };
@@ -260 +262 @@
-                F531A98D0C2DACBE00E46F62 /* SapphireApplianceController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SapphireApplianceController.h; sourceTree = "<group>"; };
-                F531A98E0C2DACBE00E46F62 /* SapphireApplianceController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SapphireApplianceController.m; sourceTree = "<group>"; };
+                F541CBF30D9C2D19002F9278 /* SapphireRadioSetting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SapphireRadioSetting.h; sourceTree = "<group>"; };
+                F541CBF40D9C2D19002F9278 /* SapphireRadioSetting.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SapphireRadioSetting.m; sourceTree = "<group>"; };
-                F565A1FB0C5BE81F00AE7110 /* SapphireAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SapphireAudioPlayer.h; sourceTree = "<group>"; };
-                F565A1FC0C5BE81F00AE7110 /* SapphireAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SapphireAudioPlayer.m; sourceTree = "<group>"; };
@@ -494 +498 @@
-                                F5E849C50C3F008100913832 /* SapphireMetaDataScanner.h */,
-                                F5E849C60C3F008100913832 /* SapphireMetaDataScanner.m */,
-                                FE5AAF9C0C5A96EF00932075 /* SapphireMovieChooser.h */,
-                                FE5AAF9D0C5A96EF00932075 /* SapphireMovieChooser.m */,
-                                FE9339480CCD5AFA005432A5 /* SapphireMovieDirectory.m */,
-                                FE9339490CCD5AFA005432A5 /* SapphireMovieDirectory.h */,
-                                F523996D0C2DCC9100D5DA2E /* SapphirePredicates.h */,
-                                F523996E0C2DCC9100D5DA2E /* SapphirePredicates.m */,
-                                FE4BE49D0CBEAC7F00A7B24E /* SapphirePosterChooser.h */,
-                                FE4BE49E0CBEAC7F00A7B24E /* SapphirePosterChooser.m */,
-                                F56B765C0C3837CE00E934AA /* SapphireShowChooser.h */,
-                                F56B765D0C3837CE00E934AA /* SapphireShowChooser.m */,
-                                F5B8DEE70C8F85BB00489829 /* SapphireTVDirectory.h */,
-                                F5B8DEE80C8F85BB00489829 /* SapphireTVDirectory.m */,
@@ -535 +533 @@
-                                F5D0DEB40C331D76007652B2 /* SapphireTheme.h */,
-                                F5D0DEB50C331D76007652B2 /* SapphireTheme.m */,
+                                F541CBF30D9C2D19002F9278 /* SapphireRadioSetting.h */,
+                                F541CBF40D9C2D19002F9278 /* SapphireRadioSetting.m */,
-                        );
-                        name = Settings;
@@ -578 +578 @@
-                                F56B72780C3716B300E934AA /* SapphireImporterDataMenu.h */,
-                                F56B72790C3716B300E934AA /* SapphireImporterDataMenu.m */,
+                                FE5AAF9C0C5A96EF00932075 /* SapphireMovieChooser.h */,
+                                FE5AAF9D0C5A96EF00932075 /* SapphireMovieChooser.m */,
-                                FEB9DE9E0C96095A00E7788A /* SapphireMovieImporter.h */,
-                                FEB9DE9D0C96095A00E7788A /* SapphireMovieImporter.m */,
-                                F5DF24690C8636DE005C7ECB /* SapphireMultipleImporter.h */,
-                                F5DF246A0C8636DE005C7ECB /* SapphireMultipleImporter.m */,
+                                FE4BE49D0CBEAC7F00A7B24E /* SapphirePosterChooser.h */,
+                                FE4BE49E0CBEAC7F00A7B24E /* SapphirePosterChooser.m */,
+                                F56B765C0C3837CE00E934AA /* SapphireShowChooser.h */,
+                                F56B765D0C3837CE00E934AA /* SapphireShowChooser.m */,
-                                F56B72ED0C371E4B00E934AA /* SapphireTVShowImporter.h */,
-                                F56B72EE0C371E4B00E934AA /* SapphireTVShowImporter.m */,
@@ -825 +831 @@
-                                F5CE69560D45732C003C4B2D /* SapphireXMLFileDataImporter.m in Sources */,
-                                F5CE69660D4575DC003C4B2D /* SapphireAllFileDataImporter.m in Sources */,
+                                F541CBF50D9C2D19002F9278 /* SapphireRadioSetting.m in Sources */,
+                                F59B29D10D9E8C6E002D5DBD /* NSArray-Extensions.m in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

trunk/SapphireFrappliance/SapphireMovieImporter.m

@@ -28 +28 @@
-#import "SapphireShowChooser.h"
-#import "SapphireSettings.h"
+#import "NSArray-Extensions.h"
-
-#define VERSION_KEY                                     @"Version"
@@ -299 +300 @@
-                }
-        }
+        [candidatePosterLinks uniqueObjects];
-        return [[candidatePosterLinks copy] autorelease];
-}