JSDOC/Packer.vala

[gnome.introspection-doc-generator] / JSDOC / Packer.vala

diff --git a/JSDOC/Packer.vala b/JSDOC/Packer.vala
index a119bd3..11f36fd 100644 (file)
--- a/JSDOC/Packer.vala
+++ b/JSDOC/Packer.vala
@@ -64,11 +64,14 @@ namespace JSDOC
                * @cfg {String} target to write files to - must be full path.
                */
                string target;
+               FileOutputStream targetStream = null;
                /**
                 * @cfg {String} debugTarget target to write files debug version to (uncompacted)- must be full path.
                 */
                string targetDebug;
-       
+               
+
+               FileOutputStream targetDebugStream  = null;
                /**
                 * @cfg {String} tmpDir  (optional) where to put the temporary files. 
                 *      if you set this, then files will not be cleaned up
@@ -117,8 +120,7 @@ namespace JSDOC
                                this.files.add(f); //?? easier way?
                        }
                }
-               FileOutputStream targetStream = null;
-               FileOutputStream targetDebugStream  = null;
+       
                
                public void pack()
                {
@@ -157,13 +159,13 @@ namespace JSDOC
  
                            var f = lines[i].strip();
                        if (f.length < 1 ||
-                               Regex.match_simple ("^\/", f) ||
+                               Regex.match_simple ("^/", f) ||
                                !Regex.match_simple ("[a-zA-Z]+", f) 
                        ){
                                continue; // blank comment or not starting with a-z
                        }
                        
-                       if (Regex.match_simple ("\.js$", f)) {
+                       if (Regex.match_simple ("\\.js$", f)) {
                            this.files.add( f);
                            // js file..
                            continue;
@@ -197,15 +199,21 @@ namespace JSDOC
                    foreach(var file in this.files) {
                        
                        print("reading %s\n",file );
-                       if (!File.isFile(file)) {
-                           print("SKIP (is not a file) " + file);
+                       
+                       if (FileUtils.test (file, FileTest.EXISTS) && ! FileUtils.test (file, FileTest.IS_DIR)) {
+                           print("SKIP (is not a file) %s\n ", file);
                            continue;
                        }
                       
+                               var loaded_string = false;
+                               string file_contents;
                        // debug Target
                        
-                       if (this.debugTarget) {
-                           File.append(this.debugTarget, File.read(file));
+                       if (this.debugTargetStream !=null) {
+                               
+                               FileUtils.get_contents(file,out file_contents);
+                           this.debugTarget.write(file_contents);
+                           loaded_string = false;
                        }
                        // it's a good idea to check with 0 compression to see if the code can parse!!
                        
@@ -214,17 +222,25 @@ namespace JSDOC
                        
                   
                        
-                       var minfile = this.tmpDir + '/' +file.replace(/\//g, '.');
+                       var minfile = this.tmpDir + '/' + file.replace("/", '.');
                        
                        
                        // let's see if we have a min file already?
                        // this might happen if tmpDir is set .. 
-                       if (true && File.exists(minfile)) {
-                           var mt = File.mtime(minfile);
-                           var ot = File.mtime(file);
-                           print("compare : " + mt + "=>" + ot);
-                           if (mt >= ot) {
-                               continue;
+
+                       
+                       if (true && FileUtils.test (minfile, FileTest.EXISTS)) {
+                               
+                               var otv = File.new_for_path(file).query_info (FileAttribute.TIME_MODIFIED, 0).get_modification_time();
+                               var mtv = File.new_for_path(minfile).query_info (FileAttribute.TIME_MODIFIED, 0).get_modification_time();
+                                       
+                                       var ot = new Date();
+                                       ot.set_time_val(otv);
+                                       var mt = new Date();
+                                       mt.set_time_val(mtv);
+                           //print("compare : " + mt + "=>" + ot);
+                           if (mt.compare(ot) >= 0) {
+                               continue; // file is newer or the same time..
                                
                            }
                            
@@ -232,11 +248,14 @@ namespace JSDOC
                         
                        print("COMPRESSING ");
                        //var codeComp = pack(str, 10, 0, 0);
-                       if (File.exists(minfile)) {
-                           File.remove(minfile);
+                       if (FileUtils.test (minfile, FileTest.EXISTS)) {
+                           FileUtils.remove(minfile);
                        }
-                       var str = File.read(file);
-                       var str = this.packFile(str, file, minfile);
+                       if (!loaded_string) {
+                               FileUtils.get_contents(file,out file_contents);
+                       }
+
+                       var str = this.packFile(file_contents, file, minfile);
                         
                      
                    }
@@ -245,12 +264,12 @@ namespace JSDOC
                    
                    // if we are translating, write the translations strings at the top
                    // of the file..
-                   
+                   /*
                    if (this.translateJSON) {
                        
                           
                        print("MERGING LANGUAGE");
-                       var out = "if (typeof(_T) == 'undefined') { _T={};}\n"
+                       var out = "if (typeof(_T) == 'undefined') { _T={};}\n";
                        if (this.target) {
                            File.write(this.target, out);
                        } else {
@@ -289,12 +308,12 @@ namespace JSDOC
                           
                        }
                    }
-                   
+                   */
                    print("MERGING SOURCE");
                    
                    for(var i=0; i < this.files.length; i++)  {
                        var file = this.files[i];
-                       var minfile = this.tmpDir + '/' + file.replace(/\//g, '.');
+                       var minfile = this.tmpDir + '/' + file.replace('/', '.');
                        
                        
                        if (!File.exists(minfile)) {
@@ -304,6 +323,8 @@ namespace JSDOC
                        print("using MIN FILE  "+ minfile);
                        if (str.length) {
                            if (this.target) {
+                                       this.debugTarget.write(file_contents); 
+                           
                                File.append(this.target, '//' + file + "\n");   
                                File.append(this.target, str + "\n");   
                            } else {