gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 20:40:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed last change which had broken GSFileBrowserHideDotFiles

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14767 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2002-10-14 00:31:22 +00:00
parent af70a6521a
commit ee191fcb9f
1 changed files with 57 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
Source/NSSavePanel.m
View file

@ -1171,63 +1171,65 @@ createRowsForColumn: (int)column
files = [[NSFileManager defaultManager] directoryContentsAtPath: path];
/* Remove hidden files. */
if ([files containsObject: @".hidden"] == YES)
{
NSString *h;
NSArray *hiddenFiles;
BOOL gsSavePanelHideDotFiles;
/* We need to remove files listed in the xxx/.hidden file. */
h = [path stringByAppendingPathComponent: @".hidden"];
h = [NSString stringWithContentsOfFile: h];
hiddenFiles = [h componentsSeparatedByString: @"\n"];
/* We need to remove files starting with `.' (dot), but only if
the user asked for it in the defaults. Perhaps we could add a
button turning on/off display of hidden files ? */
/* NB: GWorkspace is using this same user default to determine
whether to hide or not dot files. */
gsSavePanelHideDotFiles = [[NSUserDefaults standardUserDefaults]
boolForKey: @"GSFileBrowserHideDotFiles"];
/* Now copy the files array into a mutable array - but only if
strictly needed. */
if (hiddenFiles != nil || gsSavePanelHideDotFiles)
{
/* We must make a mutable copy of the array because the API
says that NSFileManager -directoryContentsAtPath: return a
NSArray, not a NSMutableArray, so we shouldn't expect it to
be mutable. */
NSMutableArray *mutableFiles = AUTORELEASE ([files mutableCopy]);
/* Ok - now modify the mutable array removing unwanted files. */
if (hiddenFiles != nil)
{
[mutableFiles removeObjectsInArray: hiddenFiles];
}
{
NSString *h;
NSArray *hiddenFiles = nil;
BOOL gsSavePanelHideDotFiles;
if (gsSavePanelHideDotFiles)
{
/* Don't use i which is unsigned. */
int j = [mutableFiles count] - 1;
while (j >= 0)
{
NSString *file = (NSString *)[mutableFiles objectAtIndex: j];
if ([files containsObject: @".hidden"] == YES)
{
/* We need to remove files listed in the xxx/.hidden file. */
h = [path stringByAppendingPathComponent: @".hidden"];
h = [NSString stringWithContentsOfFile: h];
hiddenFiles = [h componentsSeparatedByString: @"\n"];
}
if ([file hasPrefix: @"."])
{
/* NSLog (@"Removing dot file %@", file); */
[mutableFiles removeObjectAtIndex: j];
}
j--;
}
}
files = mutableFiles;
}
}
/* We need to remove files starting with `.' (dot), but only if
the user asked for it in the defaults. Perhaps we could add a
button turning on/off display of hidden files ? */
/* NB: GWorkspace is using this same user default to determine
whether to hide or not dot files. */
gsSavePanelHideDotFiles = [[NSUserDefaults standardUserDefaults]
boolForKey: @"GSFileBrowserHideDotFiles"];
/* Now copy the files array into a mutable array - but only if
strictly needed. */
if (hiddenFiles != nil || gsSavePanelHideDotFiles)
{
/* We must make a mutable copy of the array because the API
says that NSFileManager -directoryContentsAtPath: return a
NSArray, not a NSMutableArray, so we shouldn't expect it to
be mutable. */
NSMutableArray *mutableFiles = AUTORELEASE ([files mutableCopy]);
/* Ok - now modify the mutable array removing unwanted files. */
if (hiddenFiles != nil)
{
[mutableFiles removeObjectsInArray: hiddenFiles];
}
if (gsSavePanelHideDotFiles)
{
/* Don't use i which is unsigned. */
int j = [mutableFiles count] - 1;
while (j >= 0)
{
NSString *file = (NSString *)[mutableFiles objectAtIndex: j];
if ([file hasPrefix: @"."])
{
/* NSLog (@"Removing dot file %@", file); */
[mutableFiles removeObjectAtIndex: j];
}
j--;
}
}
files = mutableFiles;
}
}
count = [files count];