node-sword-interface 1.0.89 → 1.0.91

package/binding.gyp

@@ -88,13 +88,13 @@
             "src/sword_backend/module_installer.cpp",
             "src/sword_backend/sword_status_reporter.cpp",
             "src/sword_backend/text_processor.cpp",
+            "src/sword_backend/unzip/unzip.c",
+            "src/sword_backend/unzip/ioapi.c",
             "src/napi_module/install_module_worker.cpp",
             "src/napi_module/module_search_worker.cpp",
             "src/napi_module/napi_sword_helper.cpp",
             "src/napi_module/node_sword_interface.cpp",
             "src/napi_module/api_lock.cpp",
-            "src/sword_backend/unzip/unzip.c",
-            "src/sword_backend/unzip/ioapi.c",
             "src/napi_module/binding.cpp"
         ],
         "conditions":[

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-sword-interface",
-  "version": "1.0.89",
+  "version": "1.0.91",
   "description": "Javascript (N-API) interface to SWORD library",
   "keywords": [
     "C++",

package/scripts/build_sword.sh

@@ -117,10 +117,19 @@ else
   # macOS & Linux
 
   cd sword_build
-  cmake -DLIBSWORD_LIBRARY_TYPE=Static -DCMAKE_CXX_STANDARD=11 \
-  -DCMAKE_BUILD_TYPE=$SWORD_BUILD_TYPE \
-  -DCMAKE_DISABLE_FIND_PACKAGE_ICU=TRUE \
-  ../sword
+
+  if [ "$(uname -s)" = "Darwin" ]; then
+    cmake -DLIBSWORD_LIBRARY_TYPE=Static -DCMAKE_CXX_STANDARD=11 \
+    -DCMAKE_BUILD_TYPE=$SWORD_BUILD_TYPE \
+    -DCMAKE_DISABLE_FIND_PACKAGE_ICU=TRUE \
+    -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
+    ../sword
+  else
+    cmake -DLIBSWORD_LIBRARY_TYPE=Static -DCMAKE_CXX_STANDARD=11 \
+    -DCMAKE_BUILD_TYPE=$SWORD_BUILD_TYPE \
+    -DCMAKE_DISABLE_FIND_PACKAGE_ICU=TRUE \
+    ../sword
+  fi
 fi
 
 make -j4 sword_static

package/src/napi_module/node_sword_interface.cpp

@@ -39,11 +39,6 @@
 #include "module_search.hpp"
 #include "mutex.hpp"
 
-#include <zipcomprs.h>
-#include "unzip/unzip.h"
-#include <filemgr.h>
-#include <fcntl.h>
-
 using namespace std;
 using namespace sword;
 
@@ -1041,17 +1036,11 @@ Napi::Value NodeSwordInterface::unTarGZ(const Napi::CallbackInfo& info)
     string filePath = info[0].As<Napi::String>().Utf8Value();
     string destPath = info[1].As<Napi::String>().Utf8Value();
 
-    sword::FileDesc* fd = FileMgr::getSystemFileMgr()->open(filePath.c_str(), FileMgr::RDONLY);
-    if (!fd) {
-        unlockApi();
-        return Napi::Boolean::New(env, false);
-    }
-
-    char ret = ZipCompress::unTarGZ(fd->getFd(), destPath.c_str());
-    FileMgr::getSystemFileMgr()->close(fd);
+    FileSystemHelper fsHelper;
+    bool ret = fsHelper.unTarGZ(filePath, destPath);
 
     unlockApi();
-    return Napi::Boolean::New(env, ret == 0);
+    return Napi::Boolean::New(env, ret);
 }
 
 Napi::Value NodeSwordInterface::unZip(const Napi::CallbackInfo& info)
@@ -1063,56 +1052,9 @@ Napi::Value NodeSwordInterface::unZip(const Napi::CallbackInfo& info)
     string filePath = info[0].As<Napi::String>().Utf8Value();
     string destPath = info[1].As<Napi::String>().Utf8Value();
 
-    unzFile uf = unzOpen(filePath.c_str());
-    if (uf == NULL) {
-        unlockApi();
-        return Napi::Boolean::New(env, false);
-    }
-
-    int err = unzGoToFirstFile(uf);
-    while (err == UNZ_OK) {
-        char filename[256];
-        unz_file_info file_info;
-        err = unzGetCurrentFileInfo(uf, &file_info, filename, sizeof(filename), NULL, 0, NULL, 0);
-
-        if (err != UNZ_OK) break;
-
-        string fullPath = destPath;
-        if (fullPath.back() != '/' && fullPath.back() != '\\') {
-            fullPath += '/';
-        }
-        fullPath += filename;
-
-        // Check if directory
-        size_t filenameLen = strlen(filename);
-        if (filename[filenameLen - 1] == '/') {
-            // Create directory
-            string dummy = fullPath + "dummy";
-            FileMgr::createParent(dummy.c_str());
-        } else {
-            // It's a file
-            FileMgr::createParent(fullPath.c_str());
-            
-            err = unzOpenCurrentFile(uf);
-            if (err == UNZ_OK) {
-                sword::FileDesc* fd = FileMgr::getSystemFileMgr()->open(fullPath.c_str(), FileMgr::WRONLY | FileMgr::CREAT | FileMgr::TRUNC);
-                if (fd) {
-                    char buf[4096];
-                    int readBytes;
-                    while ((readBytes = unzReadCurrentFile(uf, buf, sizeof(buf))) > 0) {
-                        FileMgr::write(fd->getFd(), buf, readBytes);
-                    }
-                    FileMgr::getSystemFileMgr()->close(fd);
-                }
-                unzCloseCurrentFile(uf);
-            }
-        }
-
-        err = unzGoToNextFile(uf);
-    }
-
-    unzClose(uf);
+    FileSystemHelper fsHelper;
+    bool ret = fsHelper.unZip(filePath, destPath);
 
     unlockApi();
-    return Napi::Boolean::New(env, true);
+    return Napi::Boolean::New(env, ret);
 }

package/src/sword_backend/file_system_helper.cpp

@@ -42,6 +42,11 @@
 #include <sstream>
 #include <vector>
 
+#include <zipcomprs.h>
+#include "unzip/unzip.h"
+#include <filemgr.h>
+#include <fcntl.h>
+
 #include "file_system_helper.hpp"
 
 using namespace std;
@@ -402,4 +407,71 @@ void FileSystemHelper::removeDir(std::string dirName)
     remove(path);
 }
 #endif
-#endif
+#endif
+
+bool FileSystemHelper::unTarGZ(std::string filePath, std::string destPath)
+{
+    sword::FileDesc* fd = sword::FileMgr::getSystemFileMgr()->open(filePath.c_str(), sword::FileMgr::RDONLY);
+    if (!fd) {
+        return false;
+    }
+
+    char ret = sword::ZipCompress::unTarGZ(fd->getFd(), destPath.c_str());
+    sword::FileMgr::getSystemFileMgr()->close(fd);
+
+    return (ret == 0);
+}
+
+bool FileSystemHelper::unZip(std::string filePath, std::string destPath)
+{
+    unzFile uf = unzOpen(filePath.c_str());
+    if (uf == NULL) {
+        return false;
+    }
+
+    int err = unzGoToFirstFile(uf);
+    while (err == UNZ_OK) {
+        char filename[256];
+        unz_file_info file_info;
+        err = unzGetCurrentFileInfo(uf, &file_info, filename, sizeof(filename), NULL, 0, NULL, 0);
+
+        if (err != UNZ_OK) break;
+
+        string fullPath = destPath;
+        if (fullPath.back() != '/' && fullPath.back() != '\\') {
+            fullPath += '/';
+        }
+        fullPath += filename;
+
+        // Check if directory
+        size_t filenameLen = strlen(filename);
+        if (filename[filenameLen - 1] == '/') {
+            // Create directory
+            string dummy = fullPath + "dummy";
+            sword::FileMgr::createParent(dummy.c_str());
+        } else {
+            // It's a file
+            sword::FileMgr::createParent(fullPath.c_str());
+            
+            err = unzOpenCurrentFile(uf);
+            if (err == UNZ_OK) {
+                sword::FileDesc* fd = sword::FileMgr::getSystemFileMgr()->open(fullPath.c_str(), sword::FileMgr::WRONLY | sword::FileMgr::CREAT | sword::FileMgr::TRUNC);
+                if (fd) {
+                    char buf[4096];
+                    int readBytes;
+                    while ((readBytes = unzReadCurrentFile(uf, buf, sizeof(buf))) > 0) {
+                        sword::FileMgr::write(fd->getFd(), buf, readBytes);
+                    }
+                    sword::FileMgr::getSystemFileMgr()->close(fd);
+                }
+                unzCloseCurrentFile(uf);
+            }
+        }
+
+        err = unzGoToNextFile(uf);
+    }
+
+    unzClose(uf);
+
+    return true;
+}

package/src/sword_backend/file_system_helper.hpp

@@ -48,6 +48,8 @@ public:
     std::string getUserSwordDir();
     std::string getSystemSwordDir();
     std::vector<std::string> getFilesInDir(std::string dirName);
+    bool unTarGZ(std::string filePath, std::string destPath);
+    bool unZip(std::string filePath, std::string destPath);
     std::string getPathSeparator();
     
     bool fileExists(std::string fileName);