X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=File.js;h=ebb74cfa726d4aa29f6114efb0ebe6c4611ec764;hb=1c112ad8d5cecd0351642c79419edab08e1a9074;hp=f82bd6aa8eb502f0e4a355d34478fbe6e7fe29d9;hpb=92efc0ca5727e8a6de309ef332ed237550536173;p=gnome.introspection-doc-generator

diff --git a/File.js b/File.js
index f82bd6a..ebb74cf 100755
--- a/File.js
+++ b/File.js
@@ -1,9 +1,8 @@
 // <script type ="text/Javascript">
-GLib = imports.gi.GLib;
-Gio = imports.gi.Gio;
-
-imports['String.js'].load(String);
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
 
+const String  = imports.String.String; 
 /**
 * @namespace File
 * 
@@ -18,26 +17,49 @@ imports['String.js'].load(String);
 * 
 * 
 */
-var File = {
+const  File = {
 
     SEPARATOR : '/',
 
+ // fixme - this needs a bitter location.. 
+    // they where in a string class before, but  overriding String methods is not a good normally a good idea..
+       
+    rtrim : function (s,toTrim) {
+        if (s.substr(s.length - toTrim.length) == toTrim) {
+            return s.slice(0, s.length - toTrim.length);
+        }
+   
+        return s;
+    },
+    trim : function (s,toTrim) {
+        var out = this.ltrim(s,toTrim);
+        out = this.rtrim(out,toTrim);
+        return out;
+    },
+    
+    ltrim : function (s, toTrim) {
+        if (s.substr(0, toTrim.length) == toTrim) {
+            return s.slice(toTrim.length);
+        }
+        
+        return s;
+    },
+    
     join : function () {
         var out = "";
         for (var i = 0; i < arguments.length; i++) {
             if (i == 0) {
-              out += arguments[i].rtrim(File.SEPARATOR);
+              out += this.rtrim(arguments[i], File.SEPARATOR);
             }
             else if (i == arguments.length - 1) {
-              out += File.SEPARATOR + arguments[i].ltrim(File.SEPARATOR);
+              out += File.SEPARATOR + this.ltrim(arguments[i], File.SEPARATOR);
             }
             else {
-              out += File.SEPARATOR + arguments[i].trim(File.SEPARATOR);
+              out += File.SEPARATOR + this.trim(arguments[i], File.SEPARATOR);
             }
         }
         return out;
-    },
-
+    }, 
     read : function (path) {
         var out = {};
         GLib.file_get_contents(path, out, null, null);
@@ -138,20 +160,32 @@ var File = {
      * 
      */
     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]);
+            srcPath = File.join(String(fromDir), filesToCopy[index]);
+            destPath = File.join(String(toDir), filesToCopy[index]);
 
-          if (File.isFile(srcPath) && !File.isFile(destPath)) {
+            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);
-          }
-          else if (File.isDirectory(srcPath) && !File.isDirectory(destPath)) {
-            File.mkdir(destPath);
-          }
-
+           
         }
     },
     
@@ -162,6 +196,7 @@ var File = {
      */
     mkdir : function (destPath) {
         var dest = Gio.file_new_for_path(String(destPath));
+        
         return dest.make_directory(null, null);
     },
     /**
@@ -173,7 +208,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));