JSDOC/Packer.vala
authorAlan Knowles <alan@roojs.com>
Wed, 28 Oct 2015 10:23:49 +0000 (18:23 +0800)
committerAlan Knowles <alan@roojs.com>
Wed, 28 Oct 2015 10:23:49 +0000 (18:23 +0800)
JSDOC/Packer.vala

index a1166f6..2b8ae16 100644 (file)
@@ -203,12 +203,15 @@ namespace JSDOC
                            continue;
                        }
                       
+                               var loaded_string = false;
+                               string file_contents;
                        // debug Target
                        
                        if (this.debugTargetStream !=null) {
-                               string str;
-                               FileUtils.get_contents(file,out str);
-                           this.debugTarget.write(str);
+                               
+                               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!!
                        
@@ -222,7 +225,7 @@ namespace JSDOC
                        
                        // let's see if we have a min file already?
                        // this might happen if tmpDir is set .. 
-                       var use_minfile = false;
+
                        
                        if (true && FileUtils.test (minfile, FileTest.EXISTS)) {
                                
@@ -243,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);
                         
                      
                    }