JSDOC/Packer.vala

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

diff --git a/JSDOC/Packer.vala b/JSDOC/Packer.vala
index 5514573..2b8ae16 100644 (file)
--- a/JSDOC/Packer.vala
+++ b/JSDOC/Packer.vala
@@ -67,7 +67,7 @@ namespace JSDOC
                /**
                 * @cfg {String} debugTarget target to write files debug version to (uncompacted)- must be full path.
                 */
-               string debugTarget;
+               string targetDebug;
        
                /**
                 * @cfg {String} tmpDir  (optional) where to put the temporary files. 
@@ -97,10 +97,10 @@ namespace JSDOC
                
                public  string out = ""; // if no target is specified - then this will contain the result
     
-               public Packer(string target, string debugTarget)
+               public Packer(string target, string targetDebug = "")
                {
                        this.target = target;
-                       this.debugTarget  = debugTarget;
+                       this.targetDebug  = targetDebug;
                
                }
                
@@ -129,7 +129,7 @@ namespace JSDOC
                                this.targetStream = File.new_for_path(this.target).replace(null, false,FileCreateFlags.NONE);
                        }
                        if (this.targetDebug.length > 0 ) {
-                               this.targetDebugStream = File.new_for_path(this.target).replace(null, false,FileCreateFlags.NONE);
+                               this.targetDebugStream = File.new_for_path(this.targetDebug).replace(null, false,FileCreateFlags.NONE);
                        }
                        this.packAll();
                }
@@ -187,30 +187,31 @@ namespace JSDOC
                    
                    //this.transOrigFile= bpath + '/../lang.en.js'; // needs better naming...
                    //File.write(this.transfile, "");
-                   if (this.target.length) {
-                       File.write(this.target, "");
+                   if (this.target.length > 0) {
+                       this.targetStream.write("");
                    }
                    
-                   if (this.debugTarget) {
-                       File.write(this.debugTarget, "");
+                   if (this.debugTarget > 0) {
+                           this.targetDebugStream.write("");
                    }
-                   if (this.debugTranslateTarget) {
-                       File.write(this.debugTarget, "");
-                   }
-                   
-                   for(var i=0; i < this.files.length; i++)  {
-                       var file = this.files[i];
+                   foreach(var file in this.files) {
+                       
+                       print("reading %s\n",file );
                        
-                       print("reading " +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!!
                        
@@ -219,17 +220,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..
                                
                            }
                            
@@ -237,11 +246,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);
                         
                      
                    }