Changeset 3101

Timestamp:

07/09/05 23:01:41 (3 years ago)

Author:

morris

Message:

Add a zip handler based on FHFileHandler

Files:

• Footagehead/trunk/FHController.m (modified) (6 diffs)
• Footagehead/trunk/FHFileHandler.h (modified) (2 diffs)
• Footagehead/trunk/FHFileHandler.m (modified) (5 diffs)
• Footagehead/trunk/FHHandler.h (modified) (1 diff)
• Footagehead/trunk/FHHandler.m (modified) (3 diffs)
• Footagehead/trunk/FHZipHandler.h (added)
• Footagehead/trunk/FHZipHandler.m (added)
• Footagehead/trunk/Footagehead.xcodeproj/project.pbxproj (modified) (7 diffs)
• Footagehead/trunk/Info.plist (modified) (1 diff)

Footagehead/trunk/FHController.m

@@ -193 +193 @@
-                url = [ZAURL URLWithString:[FHSettings objectForKey:FHOpenURL]];
-
-directory
+file
-                        url = [ZAURL fileURLWithPath:NSHomeDirectory()];
-
@@ -212 +212 @@
-        if(url)
-                [FHSettings setObject:[url string] forKey:FHOpenURL];
+        
+        [_handler release];
-}
-
@@ -224 +226 @@
-- (BOOL)application:(NSApplication *)application openFile:(NSString *)path {
-        NSString        *file;
-
-
-
+
+
+
+
+
+
-        } else {
-                file = [path lastPathComponent];
-                path = [path stringByDeletingLastPathComponent];
-                
-
-
+
+
+
+
-
-        return YES;
@@ -808 +815 @@
-
-- (void)loadURL:(ZAURL *)url selectRow:(int)row file:(NSString *)file {
+        NSArray                 *files;
-        FHHandler               *handler;
-        unsigned int    i, count;
@@ -831 +839 @@
-        _handler = handler;
-        [_handler setDelegate:self];
-
+files = 
-        
-        [self updateLeftStatus];
@@ -838 +846 @@
-        
-        if(file) {
-[_handler files]
-[_handler files]
+files
+files
-                                row = i;
-                                

Footagehead/trunk/FHFileHandler.h

@@ -1 @@
-: FHFileHandler.h,v 1.5 2005/01/08 22:55:46 morris Exp 
+
-
-/*
@@ -29 +29 @@
-#import "FHHandler.h"
-
-
+
+
+
+
+
+
+
+
-
-@end

Footagehead/trunk/FHFileHandler.m

@@ -30 +30 @@
-#import "FHFile.h"
-#import "FHFileHandler.h"
+#import "FHZipHandler.h"
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
-+ (BOOL)handlesURL:(ZAURL *)url isPrimary:(BOOL)primary {
@@ -43 +54 @@
-        
-        return NO;
+}
+
+
+
++ (BOOL)handlesURLAsDirectory:(ZAURL *)url {
+        if(![url isFileURL])
+                return NO;
+        
+        if([[NSFileManager defaultManager] directoryExistsAtPath:[url path]])
+                return YES;
+
+        return [FHFileHandlerFileTypes containsObject:[url pathExtension]];
+}
+
+
+
++ (NSArray *)handledFileTypes {
+        return [NSImage FHImageFileTypes];
+}
+
+
+
+#pragma mark -
+
+- (id)initHandlerWithURL:(ZAURL *)url {
+        return [self initHandlerWithURL:url rootPath:[url path]];
+}
+
+
+
+- (id)initHandlerWithURL:(ZAURL *)url rootPath:(NSString *)rootPath {
+        self = [super initHandlerWithURL:url];
+        
+        _rootPath = [rootPath retain];
+        
+        return self;
+}
+
+
+
+- (void)dealloc {
+        [_rootPath release];
+        
+        [super dealloc];
-}
-
@@ -59 +114 @@
-- (NSArray *)files {
-        NSArray                         *types, *files;
-root, *path
+path, *extension
-        FHFile                          *file;
-        ZAURL                           *url;
@@ -68 +123 @@
-
-        if(!_files) {
-
-
+
-                files   = [files sortedArrayUsingFunction:compareFile context:NULL];
-                count   = [files count];
-
-
+
-                _files  = [[NSMutableArray alloc] initWithCapacity:count];
-                
-                for(i = index = 0; i < count; i++) {
-                        name = [files objectAtIndex:i];
-root
+_rootPath
-                        
-                        if([name hasPrefix:@"."] )
@@ -95 +148 @@
-
-                        if(!isDirectory) {
-
-
+
+
+
+
+
+
+
+
-                        }
-

Footagehead/trunk/FHHandler.h

@@ -43 +43 @@
-
-+ (BOOL)handlesURL:(ZAURL *)url isPrimary:(BOOL)primary;
++ (BOOL)handlesURLAsDirectory:(ZAURL *)url;
-
-- (id)initHandlerWithURL:(ZAURL *)url;

Footagehead/trunk/FHHandler.m

@@ -35 +35 @@
-#import "FHSpotlightHandler.h"
-#import "FHURLHandler.h"
+#import "FHZipHandler.h"
-
-static NSArray                                  *FHHandlerClasses;
@@ -47 +48 @@
-                        [FHSpotlightHandler class],
-                        [FHURLHandler class],
+                        [FHZipHandler class],
-                        NULL];
-        }
@@ -55 +57 @@
-+ (BOOL)handlesURL:(ZAURL *)url isPrimary:(BOOL)primary {
-        [self doesNotRecognizeSelector:_cmd];
+        return NO;
+}
+
+
+
++ (BOOL)handlesURLAsDirectory:(ZAURL *)url {
-        return NO;
-}

Footagehead/trunk/Footagehead.xcodeproj/project.pbxproj

@@ -149 +149 @@
-                A5B1FB9F067CB90400111D0A /* FHCache.m in Sources */ = {isa = PBXBuildFile; fileRef = A5B1FB9D067CB90400111D0A /* FHCache.m */; };
-                A5B1FBC6067D01C200111D0A /* FHImageHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = A5B1FBC4067D01C200111D0A /* FHImageHandler.m */; };
+                A5B44F98087F9A2D003B1DA1 /* FHZipHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = A5B44F96087F9A2D003B1DA1 /* FHZipHandler.m */; };
-                A5DE34860567F307003E7FE9 /* URL.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A5DE34850567F307003E7FE9 /* URL.tiff */; };
-                A5DEB67005CBEFD30074DA63 /* Fullscreen.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A5DEB66F05CBEFD30074DA63 /* Fullscreen.tiff */; };
@@ -385 +386 @@
-                A5B1FBC4067D01C200111D0A /* FHImageHandler.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = FHImageHandler.m; sourceTree = "<group>"; };
-                A5B1FBC5067D01C200111D0A /* FHImageHandler.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = FHImageHandler.h; sourceTree = "<group>"; };
+                A5B44F95087F9A2D003B1DA1 /* FHZipHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FHZipHandler.h; sourceTree = "<group>"; };
+                A5B44F96087F9A2D003B1DA1 /* FHZipHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FHZipHandler.m; sourceTree = "<group>"; };
-                A5DE34850567F307003E7FE9 /* URL.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = URL.tiff; sourceTree = "<group>"; };
-                A5DEB66F05CBEFD30074DA63 /* Fullscreen.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Fullscreen.tiff; sourceTree = "<group>"; };
@@ -631 +634 @@
-                                A5B1F616067B3B7900111D0A /* FHFileHandler.m */,
-                                A5B1F614067B3B6F00111D0A /* FHFileHandler.h */,
+                                A5B44FA4087F9CAB003B1DA1 /* File Handlers */,
-                                A5B1F9BF067BDF2300111D0A /* FHRangeHandler.m */,
-                                A5B1F9C0067BDF2300111D0A /* FHRangeHandler.h */,
@@ -655 +659 @@
-                        );
-                        name = Data;
+                        sourceTree = "<group>";
+                };
+                A5B44FA4087F9CAB003B1DA1 /* File Handlers */ = {
+                        isa = PBXGroup;
+                        children = (
+                                A5B44F96087F9A2D003B1DA1 /* FHZipHandler.m */,
+                                A5B44F95087F9A2D003B1DA1 /* FHZipHandler.h */,
+                        );
+                        name = "File Handlers";
-                        sourceTree = "<group>";
-                };
@@ -957 +970 @@
-                                8D11072D0486CEB800E47090 /* main.m in Sources */,
-                                770EBFC5083C94CE0094BD6C /* NSBitmapImageRep-FHAdditions.m in Sources */,
+                                A570FD9F0863661300317D0F /* NSData-FHAdditions.m in Sources */,
-                                775BA4F2075F70ED00F0941E /* NSImage-FHAdditions.m in Sources */,
-                                A5B1FB9F067CB90400111D0A /* FHCache.m in Sources */,
@@ -964 +978 @@
-                                A599A110075F94F400A03BA5 /* FHFileCell.m in Sources */,
-                                A5B1F617067B3B7900111D0A /* FHFileHandler.m in Sources */,
+                                77EAC0D5084C6D1F006C9F69 /* FHFlickrHandler.m in Sources */,
-                                A5B1F611067B3AA100111D0A /* FHHandler.m in Sources */,
-                                A5B1F9AC067BCF0200111D0A /* FHHTMLHandler.m in Sources */,
-                                77EABF11084C61FF006C9F69 /* FHHTMLParser.m in Sources */,
+                                77494704085A57F600BA0915 /* FHImage.m in Sources */,
-                                A5B1FBC6067D01C200111D0A /* FHImageHandler.m in Sources */,
-                                77CDB023083B6B85003BE654 /* FHImageView.m in Sources */,
@@ -975 +991 @@
-                                77BD99520760B7380007D034 /* FHTableView.m in Sources */,
-                                77EAADDA084B546D006C9F69 /* FHURLHandler.m in Sources */,
-
-
-
+
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

Footagehead/trunk/Info.plist

@@ -145 +145 @@
-                        <string>Viewer</string>
-                </dict>
+                <dict>
+                        <key>CFBundleTypeExtensions</key>
+                        <array>
+                                <string>cbz</string>
+                        </array>
+                        <key>CFBundleTypeName</key>
+                        <string>Comic Book Zip File</string>
+                        <key>CFBundleTypeRole</key>
+                        <string>Viewer</string>
+                </dict>
-        </array>
-        <key>CFBundleExecutable</key>