Changeset 203

Timestamp:

09/05/07 22:25:47 (1 year ago)

Author:

gbooker

Message:

• Reverted some of [202]; it just wasn't the best way to do it and would require duplicating a lot of code.
  
• Started the tv directory, which will be much nicer when it is done (no more symlinks!).
  

Files:

• trunk/Sapphire.xcodeproj/project.pbxproj (modified) (4 diffs)
• trunk/SapphireBrowser.h (modified) (3 diffs)
• trunk/SapphireBrowser.m (modified) (2 diffs)
• trunk/SapphireMarkMenu.m (modified) (2 diffs)
• trunk/SapphireMetaData.h (modified) (3 diffs)
• trunk/SapphireMetaData.m (modified) (1 diff)
• trunk/SapphireTVDirectory.h (added)
• trunk/SapphireTVDirectory.m (added)

trunk/Sapphire.xcodeproj/project.pbxproj

@@ -42 +42 @@
-                F56B765E0C3837CE00E934AA /* SapphireShowChooser.m in Sources */ = {isa = PBXBuildFile; fileRef = F56B765D0C3837CE00E934AA /* SapphireShowChooser.m */; };
-                F56B77D70C3858B400E934AA /* DefaultPreview.png in Resources */ = {isa = PBXBuildFile; fileRef = F56B77D60C3858B400E934AA /* DefaultPreview.png */; };
+                F5B8DEE90C8F85BB00489829 /* SapphireTVDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = F5B8DEE80C8F85BB00489829 /* SapphireTVDirectory.m */; };
-                F5C4F58B0C677C4D00C99092 /* SapphireAllImporter.m in Sources */ = {isa = PBXBuildFile; fileRef = F5C4F58A0C677C4D00C99092 /* SapphireAllImporter.m */; };
-                F5D0DEB60C331D76007652B2 /* SapphireTheme.m in Sources */ = {isa = PBXBuildFile; fileRef = F5D0DEB50C331D76007652B2 /* SapphireTheme.m */; };
@@ -110 +111 @@
-                F56B77D60C3858B400E934AA /* DefaultPreview.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DefaultPreview.png; sourceTree = "<group>"; };
-                F585550E0C3D428F000C0448 /* Sapphire_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Sapphire_Prefix.pch; sourceTree = "<group>"; };
+                F5B8DEE70C8F85BB00489829 /* SapphireTVDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SapphireTVDirectory.h; sourceTree = "<group>"; };
+                F5B8DEE80C8F85BB00489829 /* SapphireTVDirectory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SapphireTVDirectory.m; sourceTree = "<group>"; };
-                F5C4F5890C677C4D00C99092 /* SapphireAllImporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SapphireAllImporter.h; sourceTree = "<group>"; };
-                F5C4F58A0C677C4D00C99092 /* SapphireAllImporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SapphireAllImporter.m; sourceTree = "<group>"; };
@@ -248 +251 @@
-                                F56B765C0C3837CE00E934AA /* SapphireShowChooser.h */,
-                                F56B765D0C3837CE00E934AA /* SapphireShowChooser.m */,
+                                F5B8DEE70C8F85BB00489829 /* SapphireTVDirectory.h */,
+                                F5B8DEE80C8F85BB00489829 /* SapphireTVDirectory.m */,
-                        );
-                        name = MetaData;
@@ -420 +425 @@
-                                F5DF246B0C8636DE005C7ECB /* SapphireMultipleImporter.m in Sources */,
-                                F51BFEFF0C8CB85D00709A5E /* SapphireCollectionSettings.m in Sources */,
+                                F5B8DEE90C8F85BB00489829 /* SapphireTVDirectory.m in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

trunk/SapphireBrowser.h

@@ -7 +7 @@
-//
-
-
-, SapphireDirectoryMetaData
+SapphireDirectoryMetaData, 
+
-
-@interface SapphireBrowser : BRMediaMenuController <SapphireMetaDataDelegate, SapphireMetaDataScannerDelegate>
@@ -14 +14 @@
-        NSMutableArray                                  *_names ;
-        NSMutableArray                                  *items ;
-id <SapphireDirectoryMetaData> 
+SapphireDirectoryMetaData              *
-        SapphirePredicate                               *predicate;
-        SapphireFileMetaData                    *currentPlayFile;
@@ -22 +22 @@
-}
-
-id <SapphireDirectoryMetaData>
+SapphireDirectoryMetaData *
-- (void) dealloc;
-

trunk/SapphireBrowser.m

@@ -159 +159 @@
- * @return The Browser
- */
-id <SapphireDirectoryMetaData>
+SapphireDirectoryMetaData *
-{
-        if ( [super initWithScene: scene] == nil ) return ( nil );
@@ -449 +449 @@
-        {
-                result = [BRAdornedMenuItemLayer adornedFolderMenuItemWithScene: scene] ;
-id <SapphireDirectoryMetaData> 
+SapphireDirectoryMetaData *
-                watched = [meta watchedForPredicate:predicate];
-                favorite = [meta favoriteForPredicate:predicate];

trunk/SapphireMarkMenu.m

@@ -33 +33 @@
-        
-        /*Check to see if it is directory or file*/
-conformsToProtocol:@protocol(SapphireDirectoryMetaData)
+isKindOfClass:[SapphireDirectoryMetaData class]
-        metaData = [meta retain];
-        commands = nil;
@@ -221 +221 @@
-        if(isDir)
-        {
-id <SapphireDirectoryMetaData> 
+SapphireDirectoryMetaData *
-                switch(row)
-                {

trunk/SapphireMetaData.h

@@ -62 +62 @@
-@end
-
-@protocol SapphireMetaData <NSObject>
-@end
-
-@protocol SapphireDirectoryMetaData <NSObject>
-- (NSString *)path;
-- (void)setDelegate:(id <SapphireMetaDataDelegate>)newDelegate;
-
-- (void)reloadDirectoryContents;
-- (NSArray *)files;
-- (NSArray *)directories;
-- (NSArray *)predicatedFiles:(SapphirePredicate *)predicate;
-- (NSArray *)predicatedDirectories:(SapphirePredicate *)predicate;
-
-- (SapphireFileMetaData *)metaDataForFile:(NSString *)file;
-- (SapphireDirectoryMetaData *)metaDataForDirectory:(NSString *)dir;
-
-- (void)cancelImport;
-- (void)resumeDelayedImport;
-
-- (void)scanForNewFilesWithDelegate:(id <SapphireMetaDataScannerDelegate>)subDelegate skipDirectories:(NSMutableSet *)skip;
-
-- (BOOL)watchedForPredicate:(SapphirePredicate *)predicate;
-- (void)setWatched:(BOOL)watched forPredicate:(SapphirePredicate *)predicate;
-- (BOOL)favoriteForPredicate:(SapphirePredicate *)predicate;
-- (void)setFavorite:(BOOL)favorite forPredicate:(SapphirePredicate *)predicate;
-- (void)setToImportFromSource:(NSString *)source forPredicate:(SapphirePredicate *)predicate;
-- (void)setFileClass:(FileClass)fileClass forPredicate:(SapphirePredicate *)predicate;
-@end
-
-@interface SapphireMetaData : NSObject {
-        NSMutableDictionary                             *metaData;
@@ -128 +99 @@
-@end
-
-<SapphireDirectoryMetaData>
+
-        /*These two are not retained*/
-        NSMutableDictionary                     *metaFiles;
@@ -147 +118 @@
-}
-
+- (void)reloadDirectoryContents;
+- (NSArray *)files;
+- (NSArray *)directories;
+- (NSArray *)predicatedFiles:(SapphirePredicate *)predicate;
+- (NSArray *)predicatedDirectories:(SapphirePredicate *)predicate;
+
+- (SapphireFileMetaData *)metaDataForFile:(NSString *)file;
+- (SapphireDirectoryMetaData *)metaDataForDirectory:(NSString *)dir;
+
-- (BOOL)pruneMetaData;
-- (BOOL)updateMetaData;
-
+- (void)cancelImport;
-- (void)resumeImport;
+- (void)resumeDelayedImport;
-
-- (SapphireMetaData *)metaDataForSubPath:(NSString *)path;
-- (void)getSubFileMetasWithDelegate:(id <SapphireMetaDataScannerDelegate>)subDelegate skipDirectories:(NSMutableSet *)skip;
+- (void)scanForNewFilesWithDelegate:(id <SapphireMetaDataScannerDelegate>)subDelegate skipDirectories:(NSMutableSet *)skip;
+
+- (BOOL)watchedForPredicate:(SapphirePredicate *)predicate;
+- (void)setWatched:(BOOL)watched forPredicate:(SapphirePredicate *)predicate;
+- (BOOL)favoriteForPredicate:(SapphirePredicate *)predicate;
+- (void)setFavorite:(BOOL)favorite forPredicate:(SapphirePredicate *)predicate;
+- (void)setToImportFromSource:(NSString *)source forPredicate:(SapphirePredicate *)predicate;
+- (void)setFileClass:(FileClass)fileClass forPredicate:(SapphirePredicate *)predicate;
+
-@end
-

trunk/SapphireMetaData.m

@@ -554 +554 @@
-{
-        /*Flush saved information*/
-
-
-
-
+
+
-        NSMutableArray *fileMetas = [NSMutableArray array];
-