X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=File.js;h=29e0c0581e3b0805998842d0c766444e8f845790;hb=7812d93ccb36ea3d416fd38eb922b0baf1184e76;hp=e788e59432df142837b3c9474ad80b6acc3f21ea;hpb=8b882e6abb3281639eea6cb3850054af2550f6ce;p=gnome.introspection-doc-generator

diff --git a/File.js b/File.js
index e788e59..29e0c05 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;
 
+var String  = imports.String.String; 
 /**
 * @namespace File
 * 
@@ -18,30 +17,56 @@ 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);
-        return out['value'];
+        print(path);
+        var ret = GLib.file_get_contents(path, out, null, null);
+        //print(ret[1]);
+        //throw "oops";
+        return '' + ((typeof(ret) == 'object') ? ret[1] : out['value']);
     },
 
     isFile : function (path) {
@@ -57,7 +82,7 @@ var File = {
     list : function (path) {
         var listing = [];
 
-        var f = Gio.file_new_for_path(String(path));
+        var f = Gio.file_new_for_path('' +(path));
         var file_enum = f.enumerate_children(Gio.FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME, Gio.FileQueryInfoFlags.NONE, null);
 
         var next_file = null;
@@ -74,7 +99,7 @@ var File = {
     },
 
     mtime : function (path) {
-        var f = Gio.file_new_for_path(String(path));
+        var f = Gio.file_new_for_path('' +(path));
         var mtime = new GLib.TimeVal();
 
         var info = f.query_info(Gio.FILE_ATTRIBUTE_TIME_MODIFIED, Gio.FileQueryInfoFlags.NONE, null);
@@ -84,10 +109,11 @@ var File = {
     },
 
     canonical : function (path) {
-        var f = Gio.file_new_for_path(String(path));
+        var f = Gio.file_new_for_path('' +(path));
         var can = f.resolve_relative_path('');
         return can.get_path();
     },
+    
     /**
      * write
      * @arg path {String} File to write to
@@ -95,7 +121,7 @@ var File = {
      * 
      */
     write : function (path, string) {
-        var f = Gio.file_new_for_path(String(path));
+        var f = Gio.file_new_for_path('' +(path));
         var data_out = new Gio.DataOutputStream({base_stream:f.replace(null, false, Gio.FileCreateFlags.NONE, null)});
         data_out.put_string(string, null);
         data_out.close(null);
@@ -107,7 +133,7 @@ var File = {
      * 
      */
     append : function (path, string) {
-        var f = Gio.file_new_for_path(String(path));
+        var f = Gio.file_new_for_path('' +(path));
         var data_out = new Gio.DataOutputStream({
                 base_stream:f.append_to(Gio.FileCreateFlags.NONE, null)
         });
@@ -123,40 +149,77 @@ var File = {
      */
     remove : function (path)
     {
-        var f = Gio.file_new_for_path(String(path));
-        return f['delete']();
+        var f = Gio.file_new_for_path('' +(path));
+        var c = new Gio.Cancellable();
+        return f['delete'](c);
     },
-    // 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('' +(fromDir), filesToCopy[index]);
+            destPath = File.join('' +(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));
+        var dest = Gio.file_new_for_path('' +(destPath));
+        
         return dest.make_directory(null, null);
     },
-
-    copyFile : function (srcPath, destPath) {
-        var dest = Gio.file_new_for_path(String(destPath));
-        var src = Gio.file_new_for_path(String(srcPath));
+    /**
+     * copyFile
+     * @arg {String} src source path
+     * @arg {String} dest destination path
+     * @arg {Gio.FileCopyFlags} options (optional)  - use Gio.FileCopyFlags.OVERWRITE to .. overwrite..
+     * 
+     */
+    copyFile : function (srcPath, destPath, opts) {
+        if (typeof(opts) =='undefined') {
+            opts = Gio.FileCopyFlags.NONE;
+        }
+        var dest = Gio.file_new_for_path('' +(destPath));
+        var src = Gio.file_new_for_path('' +(srcPath));
 
         // a bit of a hack for the fact that Gio.File.copy arguments
         // can be nulled, but not according to the GIR file
-        return src.copy(dest, Gio.FileCopyFlags.NONE);
+        return src.copy(dest, opts);
     },
 
     recursiveListing : function (dir) {