Changeset 27481 for gs2-extensions/parallel-building/trunk/src/perllib/FileUtils.pm

Timestamp:

2013-05-27T12:27:31+12:00 (11 years ago)

Author:

jmt12

Message:

Adding makeAllDirectories() (which I'd only implemented in LocalFS) to FileUtils (which in turn calls the Driver specific makeDirectory() recursively) and added test for this function

File:

• gs2-extensions/parallel-building/trunk/src/perllib/FileUtils.pm (modified) (2 diffs)

gs2-extensions/parallel-building/trunk/src/perllib/FileUtils.pm

@@ -398 +398 @@
 
 
+## @function makeAllDirectories()
+#
+# in case anyone cares - I did some testing (using perls Benchmark module)
+# on this subroutine against File::Path::mkpath (). mk_all_dir() is apparently
+# slightly faster (surprisingly) - Stefan.
+#
+sub makeAllDirectories
+{
+  my ($raw_dir) = @_;
+  # use / for the directory separator, remove duplicate and
+  # trailing slashes
+  &sanitizePath($raw_dir);
+  # ensure the directory doesn't already exist
+  if (&directoryExists($raw_dir))
+  {
+    return 0;
+  }
+  if ($raw_dir =~ /^(.+?:\/\/)(.*)/)
+  {
+    my $dirsofar = '';
+    if (defined $1)
+    {
+      $dirsofar = $1;
+    }
+    my $dir = $2;
+    my $first = 1;
+    foreach my $dirname (split ("/", $dir))
+    {
+      $dirsofar .= "/" unless $first;
+      $first = 0;
+      $dirsofar .= $dirname;
+      next if $dirname =~ /^(|[a-z]:)$/i;
+      if (!-e $dirsofar)
+      {
+        my $mkdir_ok = &makeDirectory($dirsofar);
+        if (!$mkdir_ok)
+        {
+          &FileUtils::printError('Could not create directory: ' . $dirsofar);
+          return 0;
+        }
+      }
+    }
+  }
+  return (&directoryExists($raw_dir));
+}
+## makeAllDirectories()
+
+
 ## @function sanitizePath()
 #
@@ -543 +591 @@
 ## isSymbolicLink()
 
-# /** @function makeAllDirectories
-#  */
-sub makeAllDirectories
-{
-  my $path = shift(@_);
-  my $driver = &FileUtils::_determineDriver($path);
-  return &FileUtils::_callFunction($driver, 'makeAllDirectories', $path);
-}
-# /** makeAllDirectories() **/
 
 # /**