Changeset 4880

Timestamp:

08/23/07 23:57:04 (1 year ago)

Author:

morris

Message:

Moving up when standing at the root path now displays a list of mounted volumes

Files:

• Footagehead/trunk/English.lproj/ReleaseNotes.rtf (modified) (1 diff)
• Footagehead/trunk/FHApplicationController.m (modified) (3 diffs)
• Footagehead/trunk/FHBrowserController.m (modified) (6 diffs)
• Footagehead/trunk/FHFile.m (modified) (1 diff)
• Footagehead/trunk/FHFileHandler.m (modified) (3 diffs)

Footagehead/trunk/English.lproj/ReleaseNotes.rtf

@@ -217 +217 @@
-- Reverse rotate right/left so they do what they're called\
-- Rotate spreads correctly\
+- Moving up when standing at the root path now displays a list of mounted volumes\
-
-\f0\b \cf2 \

Footagehead/trunk/FHApplicationController.m

@@ -30 +30 @@
-#import "FHBrowserController.h"
-#import "FHHandler.h"
+#import "FHFileHandler.h"
-#import "FHImageView.h"
-#import "FHSettings.h"
@@ -169 +170 @@
-                items--;
-        }
+        
+        if(count == 0) {
+                i = _initialMenuItems + _menuItems - 1;
+                
+                if([[_goMenu itemAtIndex:i] isSeparatorItem]) {
+                        [_goMenu removeItemAtIndex:i];
+                        
+                        _menuItems--;
+                }
+        } else {
+                i = items - count - 1;
+                
+                if(![[_goMenu itemAtIndex:i] isSeparatorItem]) {
+                        [_goMenu insertItem:[NSMenuItem separatorItem] atIndex:i + 1];
+                        
+                        _menuItems++;
+                }
+        }
-}
-
@@ -254 +273 @@
-                url = [WIURL URLWithString:[FHSettings objectForKey:FHOpenURL]];
-                
-[NSFileManager defaultManager] fileExistsAtPath:[url path]
+FHFileHandler handlesURL:url isPrimary:YES
-                        url = [WIURL fileURLWithPath:NSHomeDirectory()];
-

Footagehead/trunk/FHBrowserController.m

@@ -55 +55 @@
-- (void)_updateRightStatus;
-
+- (NSString *)_nameOfRootVolume;
+
-@end
-
@@ -254 +256 @@
-- (void)_loadURL:(WIURL *)url selectRow:(NSInteger)row name:(NSString *)name {
-        NSArray                 *files;
+        NSString                *subtitle;
-        FHHandler               *handler;
-        FHFile                  *file;
@@ -278 +281 @@
-        [_imageLoader setFiles:files];
-        
-
+ && [[[_handler URL] path] length] > 0
-                [[WIEventQueue sharedQueue] addPath:[[_handler URL] path] forMode:WIEventFileWrite];
-        
-
+
+
+
+
+
+
-        
-        [self updateSpreads];
@@ -414 +422 @@
-        
-        [_rightStatusTextField setStringValue:string];
+}
+
+
+
+#pragma mark -
+
+- (NSString *)_nameOfRootVolume {
+        NSFileManager   *fileManager;
+        NSEnumerator    *enumerator;
+        NSString                *volume, *path;
+        
+        fileManager = [NSFileManager defaultManager];
+        enumerator = [[fileManager directoryContentsAtPath:@"/Volumes/"] objectEnumerator];
+        
+        while((volume = [enumerator nextObject])) {
+                path = [fileManager pathContentOfSymbolicLinkAtPath:[NSSWF:@"/Volumes/%@", volume]];
+                
+                if([path isEqualToString:@"/"])
+                        return volume;
+        }
+        
+        return @"/";
-}
-
@@ -1201 +1231 @@
-                        name = [[[_handler URL] path] lastPathComponent];
-                        
+                        if([url isFileURL] && [name isEqualToString:@"/"])
+                                name = [self _nameOfRootVolume];
+                        
-                        [self _loadURL:url selectName:name];
-                }
@@ -1320 +1353 @@
-
-        row = [_tableView selectedRow];
+        
+        if(row < 0)
+                return;
+        
-        file = [self fileAtIndex:row];
-        

Footagehead/trunk/FHFile.m

@@ -95 +95 @@
-#pragma mark -
-
+- (NSComparisonResult)compareName:(FHFile *)file {
+    return [[self name] compare:[file name] options:NSCaseInsensitiveSearch | NSNumericSearch];
+}
+
+
+
+#pragma mark -
+
-- (void)setImage:(FHImage *)image {
-        [image retain];

Footagehead/trunk/FHFileHandler.m

@@ -59 +59 @@
-+ (BOOL)handlesURL:(WIURL *)url isPrimary:(BOOL)primary {
-        if(primary && [url isFileURL]) {
+                if([[url path] length] == 0)
+                        return YES;
+
-                if([[NSFileManager defaultManager] directoryExistsAtPath:[url path]])
-                        return YES;
@@ -123 +126 @@
-
-- (NSArray *)files {
+        NSFileManager           *fileManager;
+        NSEnumerator            *enumerator;
-        NSSet                           *types;
-        NSArray                         *files;
-name, *path, *extension
+volume, *name, *path, *extension, *symlink
-        WIURL                           *url;
-        LSItemInfoRecord        itemInfoRecord;
-        OSStatus                        err;
-
+, isRoot
-        NSUInteger                      i, count;
-
-        if(!_files) {
-
-
-
-
-
+
-                
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                                continue;
-                                }
+                                
+                                isDirectory = (itemInfoRecord.flags & kLSItemInfoIsContainer || itemInfoRecord.flags & kLSItemInfoIsSymlink);
+                                
+                                if(!isDirectory) {
+                                        extension = [path pathExtension];
+                                        
+                                        if(![types containsObject:extension]) {
+                                                if([[[self class] _directoryHandledFileTypes] containsObject:extension])
+                                                        isDirectory = YES;
+                                                else
+                                                        continue;
+                                        }
+                                }
+                                
+                                [_files addObject:[FHFile fileWithURL:url isDirectory:isDirectory]];
+                                
+                                _numberOfFiles++;
+                                
+                                if(!isDirectory)
+                                        _numberOfImages++;
-                        }
-
-                        [_files addObject:[FHFile fileWithURL:url isDirectory:isDirectory]];
-
-                        _numberOfFiles++;
-                        
-                        if(!isDirectory)
-                                _numberOfImages++;
-                }
-        }
@@ -179 +218 @@
-        return _files;
-}
-
+
+
+
+
+
+
+
+
+
+
+
-@end
-