Revert "File.js"

[app.Builder.js] / File.js

diff --git a/File.js b/File.js
index 696673f..29cc5b9 100644 (file)
--- a/File.js
+++ b/File.js
@@ -32,7 +32,7 @@ var File = {
    
         return s;
     },
-   trim : function (s,toTrim) {
+    trim : function (s,toTrim) {
         var out = s.ltrim(toTrim);
         out = out.rtrim(toTrim);
         return out;
@@ -47,28 +47,39 @@ var File = {
     },
     
     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;
     },
-
+    
+    dirname : function(s)
+    {
+        var ar = s.split(File.SEPARATOR);
+        ar.pop();
+        return ar.join(File.SEPARATOR);
+    },
+    basename : function(s)
+    {
+        var ar = s.split(File.SEPARATOR);
+        return ar.pop();
+    },
+    
     read : function (path) {
         var out = {};
         GLib.file_get_contents(path, out, null, null);
+               
+               print(JSON.stringify(out));
+               
         return out['value'];
     },
 
@@ -84,7 +95,7 @@ var File = {
 
     list : function (path) {
         var listing = [];
-
+       print(path);
         var f = Gio.file_new_for_path(String(path));
         var file_enum = f.enumerate_children(Gio.FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME, Gio.FileQueryInfoFlags.NONE, null);