JSDOC/Packer.vala
[gnome.introspection-doc-generator] / JSDOC / Packer.vala
index d72e973..16bd4af 100644 (file)
@@ -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 debugTarget;
-       
+               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
@@ -97,10 +100,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;
                
                }
                
@@ -117,12 +120,19 @@ namespace JSDOC
                                this.files.add(f); //?? easier way?
                        }
                }
+       
                
                public void pack()
                {
                    if (!this.files) {
                                throw new Packer.ArgumentError("No Files loaded before pack() called");
                        }
+                       if (this.target.length > 0 ) {
+                               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.targetDebug).replace(null, false,FileCreateFlags.NONE);
+                       }
                        this.packAll();
                }
                
@@ -149,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;
@@ -168,159 +178,172 @@ namespace JSDOC
                        if (_this.files.contains(add)) {
                            continue;
                        }
-                       _this.files.push( add );
+                       _this.files.add( add );
                        
-                   })
-               },
-    
-    
-    packAll : function()  // do the packing (run from constructor)
-    {
-        
-        //this.transOrigFile= bpath + '/../lang.en.js'; // needs better naming...
-        //File.write(this.transfile, "");
-        if (this.target) {
-            File.write(this.target, "");
-        }
-        
-        if (this.debugTarget) {
-            File.write(this.debugTarget, "");
-        }
-        if (this.debugTranslateTarget) {
-            File.write(this.debugTarget, "");
-        }
-        
-        for(var i=0; i < this.files.length; i++)  {
-            var file = this.files[i];
-            
-            print("reading " +file );
-            if (!File.isFile(file)) {
-                print("SKIP (is not a file) " + file);
-                continue;
-            }
-           
-            // debug Target
-            
-            if (this.debugTarget) {
-                File.append(this.debugTarget, File.read(file));
-            }
-            // it's a good idea to check with 0 compression to see if the code can parse!!
-            
-            // debug file..
-            //File.append(dout, str +"\n"); 
-            
-       
-            
-            var minfile = this.tmpDir + '/' +file.replace(/\//g, '.');
-            
-            
-            // 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;
-                    
-                }
-                
-            }
-             
-            print("COMPRESSING ");
-            //var codeComp = pack(str, 10, 0, 0);
-            if (File.exists(minfile)) {
-                File.remove(minfile);
-            }
-            var str = File.read(file);
-            var str = this.pack(str, file, minfile);
-             
-          
-        }
-        
-        
-        
-        // 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"
-            if (this.target) {
-                File.write(this.target, out);
-            } else {
-                this.out += out;
-            }
-             
-            File.write(this.translateJSON, "");
-            for(var i=0; i < this.files.length; i++)  {
-                var file = this.files[i];
-                var transfile= this.tmpDir + '/' +file.replace(/\//g, '.') +'.lang.trans';
-                var transmd5 = this.tmpDir  + '/' +file.replace(/\//g, '.') +'.lang';
-                if (File.exists(transmd5)) {
-                    var str = File.read(transmd5);
-                    if (str.length) {
-                        if (this.target) {
-                            File.append(this.target, str + "\n");
-                        } else {
-                            this.out += str + "\n";
-                        }
-                        
-                    }
-                    if (this.cleanup) {
-                        File.remove(transmd5);
-                    }
-                }
-                if (File.exists(transfile)) {
-                    var str = File.read(transfile);
-                    if (str.length) {
-                        File.append(this.translateJSON, str);
-                    }
-                    if (this.cleanup) {
-                        File.remove(transfile);
-                    }
-                }
-                
-               
-            }
-        }
-        
-        print("MERGING SOURCE");
-        
-        for(var i=0; i < this.files.length; i++)  {
-            var file = this.files[i];
-            var minfile = this.tmpDir + '/' + file.replace(/\//g, '.');
-            
-            
-            if (!File.exists(minfile)) {
-                continue;
-            }
-            var str = File.read(minfile);
-            print("using MIN FILE  "+ minfile);
-            if (str.length) {
-                if (this.target) {
-                    File.append(this.target, '//' + file + "\n");   
-                    File.append(this.target, str + "\n");   
-                } else {
-                    this.out += '//' + file + "\n";
-                    this.out += str + "\n";
-                }
-                
-            }
-            if (this.cleanup) {
-                File.remove(minfile);
-            }
-            
-        }
-        print("Output file: " + this.target);
-        if (this.debugTarget) print("Output debug file: " + this.debugTarget);
-        
-         
-    
+                   }
+               }
+               
     
-    },
+               private void packAll()  // do the packing (run from constructor)
+               {
+                   
+                   //this.transOrigFile= bpath + '/../lang.en.js'; // needs better naming...
+                   //File.write(this.transfile, "");
+                   if (this.target.length > 0) {
+                       this.targetStream.write("");
+                   }
+                   
+                   if (this.debugTarget > 0) {
+                           this.targetDebugStream.write("");
+                   }
+                   foreach(var file in this.files) {
+                       
+                       print("reading %s\n",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.targetDebugStream !=null) {
+                               
+                               FileUtils.get_contents(file,out file_contents);
+                           this.targetDebugStream.write(file_contents);
+                           loaded_string = false;
+                       }
+                       // it's a good idea to check with 0 compression to see if the code can parse!!
+                       
+                       // debug file..
+                       //File.append(dout, str +"\n"); 
+                       
+                  
+                       
+                       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 && 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..
+                               
+                           }
+                           
+                       }
+                        
+                       print("COMPRESSING ");
+                       //var codeComp = pack(str, 10, 0, 0);
+                       if (FileUtils.test (minfile, FileTest.EXISTS)) {
+                           FileUtils.remove(minfile);
+                       }
+                       if (!loaded_string) {
+                               FileUtils.get_contents(file,out file_contents);
+                       }
+
+                       var str = this.packFile(file_contents, file, minfile);
+                        
+                     
+                   }
+                   
+                   
+                   
+                   // 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";
+                       if (this.target) {
+                           File.write(this.target, out);
+                       } else {
+                           this.out += out;
+                       }
+                        
+                       File.write(this.translateJSON, "");
+                       for(var i=0; i < this.files.length; i++)  {
+                           var file = this.files[i];
+                           var transfile= this.tmpDir + '/' +file.replace(/\//g, '.') +'.lang.trans';
+                           var transmd5 = this.tmpDir  + '/' +file.replace(/\//g, '.') +'.lang';
+                           if (File.exists(transmd5)) {
+                               var str = File.read(transmd5);
+                               if (str.length) {
+                                   if (this.target) {
+                                       File.append(this.target, str + "\n");
+                                   } else {
+                                       this.out += str + "\n";
+                                   }
+                                   
+                               }
+                               if (this.cleanup) {
+                                   File.remove(transmd5);
+                               }
+                           }
+                           if (File.exists(transfile)) {
+                               var str = File.read(transfile);
+                               if (str.length) {
+                                   File.append(this.translateJSON, str);
+                               }
+                               if (this.cleanup) {
+                                   File.remove(transfile);
+                               }
+                           }
+                           
+                          
+                       }
+                   }
+                   */
+                   print("MERGING SOURCE");
+                   
+                   for(var i=0; i < this.files.length; i++)  {
+                       var file = this.files[i];
+                       var minfile = this.tmpDir + '/' + file.replace('/', '.');
+                       
+                       
+                       if (!File.exists(minfile)) {
+                           continue;
+                       }
+                       var str = File.read(minfile);
+                       print("using MIN FILE  "+ minfile);
+                       if (str.length) {
+                           if (this.targetStream != null) {
+                                       this.targetStream.write("//" + file + "\n"); 
+                                       this.targetStream.write(str + "\n"); 
+
+                           } else {
+                               this.out += "//" + file + "\n";
+                               this.out += str + "\n";
+                           }
+                           
+                       }
+                       if (this.cleanup) {
+                           FileUtils.remove(minfile);
+                       }
+                       
+                   }
+                   print("Output file: " + this.target);
+                   if (this.debugTarget) print("Output debug file: " + this.debugTarget);
+                   
+                    
+               
+               
+               }
     /**
      * Core packing routine  for a file
      * 
@@ -330,7 +353,7 @@ namespace JSDOC
      * 
      */
     
-    pack : function (str,fn,minfile)
+    packFile : function (str,fn,minfile)
     {
     
         var tr = new  TokenReader(  { 
@@ -388,172 +411,16 @@ namespace JSDOC
         
          
     },
+     
     
-    timerPrint: function (str) {
-        var ntime = new Date() * 1;
-        var tdif =  ntime -this.timer;
-        this.timer = ntime;
-        print('['+tdif+']'+str);
-    },
-    
-    /**
-     * 
-     * Translation concept...
-     * -> replace text strings with _T....
-     * -> this file will need inserting at the start of the application....
-     * -> we need to generate 2 files, 
-     * -> a reference used to do the translation, and the _T file..
-     *
-     *
-     * We store the trsum on the token...
-     * 
-     */
-    
-    writeTranslateFile : function(fn, minfile, toks) 
-    {
-        
-        var map = {};  // 'string=> md5sum'
-        var _this = this;
-        var t, last, next;
-        
-        
-        var tokfind =  function (j,dir) {
-            while (1) {
-                if ((dir < 0) && (j < 0)) {
-                    return false;
-                }
-                if ((dir > 0) && (j >= toks.length)) {
-                    return false;
-                }
-                j += dir;
-                if (toks[j].type != 'WHIT') {
-                    return toks[j];
-                }
-            }
-            return false;
-            
-        }
-        
-        
-        for (var i=0;i<toks.length;i++) {
-            
-            t = toks[i];
-            if (t.type != 'STRN') {
-                continue;
-            }
-            if (t.name != 'DOUBLE_QUOTE') {
-                continue;
-            }
-            
-            last = tokfind(i,-1);
-            next = tokfind(i,+1);
-            
-            // we have to ignore key values on objects
-            
-            // defined by
-            // last == '{' or ',' and
-            // next == ':'
-            
-            if (next &&
-                next.type == 'PUNC' &&
-                next.data == ':' && 
-                last && 
-                last.type == 'PUNC' &&
-                (last.data == ',' || last.data == '{')
-            ){
-                continue; // found object key... - we can not translate these
-            }
-                
-            var sval = t.data.substring(1,t.data.length-1);
-            var ffn = fn.substring(_this.prefix.length);
-            
-            t.trsum = _this.md5(ffn + '-' + sval);
-            map[sval] = t.trsum;
-            
-            
-            
-        }
-        
-        
-        var transfile = minfile + '.lang.trans';
-        var transmd5 = minfile + '.lang';
-        print("writeTranslateFile "  + transfile);
-        var i = 0;
-        var v = '';
-        if (File.exists(transfile)) {
-            File.remove(transfile);
-        }
-        if (File.exists(transmd5)) {
-            File.remove(transmd5);
-        }
-        for(v in map) { i++; break };
-        if (!i ) {
-            return; // no strings in file...
-        }
-        var ffn = fn.substring(this.prefix.length);
-         
-         
-        File.write(transfile, "\n'" + ffn  + "' : {");
-        var l = '';
-        var _tout = {}
-         
-        File.write(transmd5, '');
-        for(v in map) {
-            if (!v.length) {
-                continue;
-            }
-            File.append(transfile, l + "\n\t\"" + v  + "\" : \"" + v +"\"");
-            l = ',';
-            // strings are raw... - as the where encoded to start with!!!
-            // so we should not need to encode them again.. - just wrap with "
-            File.append(transmd5, '_T["' + this.md5(ffn + '-' + v) + '"]="'+v+"\";\n");
-        }
-        File.append(transfile, "\n},"); // always one trailing..
-        
-         
-    },
     md5 : function (string)
     {
         
         return GLib.compute_checksum_for_string(GLib.ChecksumType.MD5, string, string.length);
         
     },
-    stringHandler : function(tok)
-    {
-        //print("STRING HANDLER");
-       // callback when outputing compressed file, 
-       var data = tok.data;
-        if (!this.translateJSON) {
-         //   print("TURNED OFF");
-            return data;
-        }
-        if (tok.name == 'SINGLE_QUOTE') {
-            return data;
-        }
-        
-        if (typeof(tok.trsum) == 'undefined') {
-            return data;
-        }
-        
-        return '_T["' + tok.trsum + '"]';
-        
-        var sval = data.substring(1,data.length-1);
-        // we do not clean up... quoting here!??!!?!?!?!?
-        
-        
-        // blank with tabs or spaces..
-        //if (!sval.replace(new RegExp("(\\\\n|\\\\t| )+",'g'), '').length) {
-       //     return tok.outData;
-       // }
-        
-        var sval = tok.data.substring(1,data.length-1);
-        var fn = this.activeFile.substring(this.prefix.length);
-        
-        
-        return '_T["' + this.md5(fn + '-' + sval) + '"]';
-        
-        
-    }
+    
+    //stringHandler : function(tok) -- not used...
     
     
 };