Changeset 19288 for ext

Timestamp:

12/29/07 21:30:36 (13 months ago)

Author:

lwall

Message:

[File-Util] patch from Mark A. Hershberger++

Location:

ext/File-Util

Files:

• lib/File/Util.pm (modified) (2 diffs)
• t/03.dirs.t (modified) (1 diff)

ext/File-Util/lib/File/Util.pm

@@ -160 +160 @@
 }
 
-method list_dir (Str $dirname, %options?){
-    
+method list_dir (Str $dirname, *@options){
     # my $maxd = $.maxdives;
     my $maxd = 12;
@@ -197 +196 @@
     my @shadow = @dirs;
     @dirs = ();
+    my @files = ();
+    my @others = ();
     while @shadow {
         my $f = @shadow.shift;
+        if(@options.grep:{$_ eqv '--no-fsdots'}) {
         next if $f eq '.';
         next if $f eq '..';
-        next if $f ~~ /^\./;
-
-        my $pathname = $path ~ "/" ~ $f;
-        if $pathname ~~ :d {
-            @dirs.push($path ~ "/" ~ $f);
         }
-    }
-    
-    for @dirs -> $dir {
-        self.list_dir($dir);
-    }
+
+        my $fullpath = $path ~ "/" ~ $f;
+        my $pathname;
+
+        if(@options.grep:{$_ eqv '--with-paths'}) {
+          $pathname = $fullpath;
+        } else {
+          $pathname = $f;
+        }
+
+        given $fullpath {
+                         when :d {
+                           @dirs.push($pathname);
+        }
+                         when :f {
+                           @files.push($pathname);
+    }
+                         default {
+                           @others.push($pathname);
+                         }
+                        };
+      };
+
+    my @ret;
+    
+    if(@options.grep:{$_ eqv '--files-only'}) {
+      @ret.push(@files);
+    }
+    elsif(@options.grep:{$_ eqv '--dirs-only'}) {
+      @ret.push(@dirs);
+    }
+    else {
+      @ret.push(@dirs, @files, @others);
+    }
+
     # for @options -> $option {
     # }
-    return @dirs.sort;
+    return @ret.sort;
 }
 

ext/File-Util/t/03.dirs.t

@@ -8 +8 @@
 
 my $f = File::Util.new;
+my $d = 'ext/File-Util/t';
 
-my @files = $f.list_dir('ext/File-Util/t');
+my @files = $f.list_dir($d);
+ok( @files );
 
-ok( @files );
+@files = $f.list_dir($d, '--no-fsdots');
+ok( @files.grep:{/^\.\.$/} == 0 ); # only .svn
+
+@files = $f.list_dir($d, '--dirs-only');
+ok( @files.grep:{$_ ~~ :d} == @files && @files > 1 );
+
+@files = $f.list_dir($d, '--dirs-only', '--no-fsdots');
+ok( @files == 1 && @files.grep:{$_ ~~ :d} == 1 ); # only .svn
+
+@files = $f.list_dir($d, '--files-only');
+ok( @files.grep:{"$d/$_" ~~ :f} == @files );
+
+@files = $f.list_dir($d, '--with-paths');
+ok( @files.grep:{$_.substr(0, $d.chars) eqv $d} > 0 &&
+    @files.grep:{$_.substr(0, $d.chars) !eqv $d} == 0 );