X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=File.js;h=77777ba32653bbf87a032ea3a8c9b0f696d16a3c;hp=29cff4aa295dfd22db0f66c66d27c4035567bb7d;hb=63ccc43e703a5a61980832c9f91ae92c62949c58;hpb=6d14bc86faa68599bb5c2c6568ab738077b864dd

diff --git a/File.js b/File.js
index 29cff4a..77777ba 100755
--- a/File.js
+++ b/File.js
@@ -2,8 +2,7 @@
 GLib = imports.gi.GLib;
 Gio = imports.gi.Gio;
 
-imports['String.js'].load(String);
-
+String  = imports.String.String; 
 /**
 * @namespace File
 * 
@@ -88,6 +87,7 @@ var File = {
         var can = f.resolve_relative_path('');
         return can.get_path();
     },
+    
     /**
      * write
      * @arg path {String} File to write to
@@ -126,27 +126,54 @@ var File = {
         var f = Gio.file_new_for_path(String(path));
         return f['delete']();
     },
-    // copy files recursively from fromDir, silently ignore them if they already exist in toDir
-    silentRecursiveCopy : function (fromDir, toDir) {
+    /**
+     * silentRecursiveCopy
+     * copy files recursively from fromDir, silently ignore them if they already exist in toDir
+     *        unless you select overwrite..
+     * @arg {String} src source path
+     * @arg {String} dest destination path
+     * @arg {Gio.FileCopyFlags} options (optional)  - use Gio.FileCopyFlags.OVERWRITE to 
+     *      otherwise they will not be copied
+     * 
+     */
+    silentRecursiveCopy : function (fromDir, toDir, opts) {
+        
         var filesToCopy = File.recursiveListing(fromDir);
         var srcPath, destPath, src, dest;
-
+        if (typeof(opts) =='undefined') {
+            opts = Gio.FileCopyFlags.NONE;
+        }
+        
         for (var index in filesToCopy) {
-          srcPath = File.join(String(fromDir), filesToCopy[index]);
-          destPath = File.join(String(toDir), filesToCopy[index]);
-
-          if (File.isFile(srcPath) && !File.isFile(destPath)) {
-            File.copyFile(srcPath, destPath);
-          }
-          else if (File.isDirectory(srcPath) && !File.isDirectory(destPath)) {
-            File.mkdir(destPath);
-          }
+            srcPath = File.join(String(fromDir), filesToCopy[index]);
+            destPath = File.join(String(toDir), filesToCopy[index]);
 
+            if (File.isDirectory(srcPath) && !File.isDirectory(destPath)) {
+                File.mkdir(destPath);
+                continue;
+            }
+            // source is not file..?!?!?
+            if (!File.isFile(srcPath)) {
+                continue;
+            }
+            if (File.isFile(destPath) && opts == Gio.FileCopyFlags.NONE) {
+                // do not overwrite.. - if file exists and we are not flaged to overwrite.
+                continue;
+            }
+            
+            File.copyFile(srcPath, destPath, opts);
+           
         }
     },
-
+    
+    /**
+     * mkdir
+     * make a directory..
+     * @arg {String} dstPath directory to make
+     */
     mkdir : function (destPath) {
         var dest = Gio.file_new_for_path(String(destPath));
+        
         return dest.make_directory(null, null);
     },
     /**
@@ -158,7 +185,7 @@ var File = {
      */
     copyFile : function (srcPath, destPath, opts) {
         if (typeof(opts) =='undefined') {
-            opts = Gio.FileCopyFlags.NONE
+            opts = Gio.FileCopyFlags.NONE;
         }
         var dest = Gio.file_new_for_path(String(destPath));
         var src = Gio.file_new_for_path(String(srcPath));