Update file.js

lib/file.js

@@ -7,7 +7,8 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-var LIB = require('lib/std');
+var LIB = require("lib/std");
+var SHELL = require("lib/shell");
 
 /////////////////////////////////////////////////////////////////////////////////
 // Private APIs / Utility functions
@@ -18,43 +19,43 @@ exports.global = global;
 exports.require = global.require;
 
 /////////////////////////////////////////////////////////////////////////////////
-// exports.fileExists
+// fileExists
 /////////////////////////////////////////////////////////////////////////////////
 
-exports.fileExists = function(FN) {
+function fileExists(FN) {
     var FSO = CreateObject("Scripting.FileSystemObject");
     var exists = FSO.FileExists(FN);
     FSO = null;
     return exists;
-};
+}
 
 /////////////////////////////////////////////////////////////////////////////////
-// exports.folderExists
+// folderExists
 /////////////////////////////////////////////////////////////////////////////////
 
-exports.folderExists = function(FN) {
+function folderExists(FN) {
     var FSO = CreateObject("Scripting.FileSystemObject");
     var exists = FSO.FolderExists(FN);
     FSO = null;
     return exists;
-};
+}
 
 /////////////////////////////////////////////////////////////////////////////////
-// exports.fileGet
+// fileGet
 /////////////////////////////////////////////////////////////////////////////////
 
-exports.fileGet = function(FN) {
+function fileGet(FN) {
     var FSO = CreateObject("Scripting.FileSystemObject");
     var file = FSO.GetFile(FN);
     FSO = null;
     return file;
-};
+}
 /////////////////////////////////////////////////////////////////////////////////
-// exports.readFile
+// readFile
 //    Read the conents of the pass filename and return as a string
 /////////////////////////////////////////////////////////////////////////////////
 
-exports.readFile = function(FN, charset) {
+function readFile(FN, charset) {
     if(typeof(charset) === "undefined") {
         var FSO = CreateObject("Scripting.FileSystemObject");
         var T = null;
@@ -78,14 +79,14 @@ exports.readFile = function(FN, charset) {
         fsT = null;
         return T;
     }
-};
+}
 
 /////////////////////////////////////////////////////////////////////////////////
-// exports.writeFile
+// writeFile
 //    Write the passed content to named disk file
 /////////////////////////////////////////////////////////////////////////////////
 
-exports.writeFile = function(FN, content, charset) {
+function writeFile(FN, content, charset) {
     var Stream_No_UTF8_BOM = function(objStream) {
         var _objStream = CreateObject("ADODB.Stream");
         _objStream.Type = 1;
@@ -94,11 +95,16 @@ exports.writeFile = function(FN, content, charset) {
         objStream.Position = 3;
         objStream.CopyTo(_objStream);
         objStream.Flush();
-        objStream.Close();
+        //objStream.Close();
         return _objStream;
     };
-    var ok;
+    var ok = false;
 
+    while (!ok) {
+        // [lib/file] Can not overwrite a file with ADODB.Stream SaveToFile() #32
+        SHELL.exec(["del", FN]);
+
+        // ascii:Scripting.FileSystemObject, unicode:ADODB.Stream
         if (charset) {
             console.log("WRITE TO DISK USING ADODB.Stream CHARSET " + charset);
             try {
@@ -112,6 +118,8 @@ exports.writeFile = function(FN, content, charset) {
                 } else {
                     fsT.SaveToFile(FN, 2); // save as binary to disk
                 }
+                fsT.Close();
+                fsT = null;
                 ok = true;
             } catch (e) {
                 console.log("ADODB.Stream: ERROR! " + e.number + ", " + e.description + ", FN=" + FN);
@@ -130,10 +138,16 @@ exports.writeFile = function(FN, content, charset) {
             }
             FSO = null;
         }
-    return ok;
+    }
-};
 
-exports.writeBinaryFile = function(FN, DATA) {
+    return ok;
+}
+
+/////////////////////////////////////////////////////////////////////////////////
+// writeBinaryFile
+/////////////////////////////////////////////////////////////////////////////////
+
+function writeBinaryFile(FN, DATA) {
     var adTypeText = 1;
     var adSaveCreateOverWrite = 2;
     var BinaryStream = CreateObject("ADODB.Stream");
@@ -142,58 +156,72 @@ exports.writeBinaryFile = function(FN, DATA) {
     BinaryStream.Write(DATA);
     BinaryStream.SaveToFile(FN, adSaveCreateOverWrite);
     BinaryStream.Close();
-};
+}
 
 /////////////////////////////////////////////////////////////////////////////////
-// exports.moveFile
+// moveFile
 /////////////////////////////////////////////////////////////////////////////////
 
-exports.moveFile = function(FROM, TO) {
+function moveFile(FROM, TO) {
     var FSO = CreateObject("Scripting.FileSystemObject");
     var result = FSO.MoveFile(FROM, TO);
     FSO = null;
     return result;
-};
+}
 
 /////////////////////////////////////////////////////////////////////////////////
-// exports.createFolder
+// createFolder
 /////////////////////////////////////////////////////////////////////////////////
 
-exports.createFolder = function(FN) {
+function createFolder(FN) {
     var FSO = CreateObject("Scripting.FileSystemObject");
     var result = FSO.CreateFolder(FN);
     FSO = null;
     return result;
-};
+}
 
 /////////////////////////////////////////////////////////////////////////////////
-// exports.deleteFolder
+// deleteFolder
 /////////////////////////////////////////////////////////////////////////////////
 
-exports.deleteFolder = function(FN) {
+function deleteFolder(FN) {
     var FSO = CreateObject("Scripting.FileSystemObject");
     var result = FSO.DeleteFolder(FN);
     FSO = null;
     return result;
-};
+}
 
 /////////////////////////////////////////////////////////////////////////////////
-// exports.deleteFile
+// deleteFile
 /////////////////////////////////////////////////////////////////////////////////
 
-exports.deleteFile = function(FN) {
+function deleteFile(FN) {
     var FSO = CreateObject("Scripting.FileSystemObject");
     var result = FSO.DeleteFile(FN);
     FSO = null;
     return result;
-};
+}
 
+/////////////////////////////////////////////////////////////////////////////////
+// includeFile
 /////////////////////////////////////////////////////////////////////////////////
 
-exports.includeFile = function(FN) {
+function includeFile(FN) {
     var fso = CreateObject("Scripting.FileSystemObject");
     var fileStream = fso.openTextFile(FN);
     var fileData = fileStream.readAll();
     fileStream.Close();
     eval(fileData);
-};
+}
+
+exports.fileExists = fileExists;
+exports.folderExists = folderExists;
+exports.fileGet = fileGet;
+exports.readFile = readFile;
+exports.writeFile = writeFile;
+exports.writeBinaryFile = writeBinaryFile;
+exports.moveFile = moveFile;
+exports.createFolder = createFolder;
+exports.deleteFolder = deleteFolder;
+exports.deleteFile = deleteFile;
+exports.includeFile = includeFile;