Merge pull request #13 from Jonahss/fs-extra

upgrade fs-extra and remove fs-promise
VictorTaelin · May 25, 2018 · 4954ed0 · 4954ed0
2 parents 47f9617 + 60acf58
commit 4954ed0
Show file tree

Hide file tree

Showing 4 changed files with 2,317 additions and 943 deletions.
diff --git a/lib/files.js b/lib/files.js
@@ -6,8 +6,7 @@
 var Q = require("bluebird");
 var assert = require("assert");
 var crypto = require("crypto");
-var fs = require("fs");
-var fsp = require("fs-promise");
+var fs = require("fs-extra");
 var got = require("got");
 var mkdirp = require("mkdirp-promise");
 var path = require("path");
@@ -102,13 +101,13 @@ var extract = function extract(fromPath) {
 //   Reads a file as an UTF8 string.
 //   Returns a promise containing that string.
 var readUTF8 = function readUTF8(path) {
-  return fsp.readFile(path, { encoding: "utf8" });
+  return fs.readFile(path, { encoding: "utf8" });
 };
 
 // String ~> Promise Bool
 var isDirectory = function isDirectory(path) {
-  return fsp.exists(path).then(assert).then(function () {
-    return fsp.lstat(path);
+  return fs.exists(path).then(assert).then(function () {
+    return fs.lstat(path);
   }).then(function (stats) {
     return stats.isDirectory();
   }).catch(function () {
@@ -125,7 +124,7 @@ var directoryTree = function directoryTree(dirPath) {
         var searchOnDir = function searchOnDir(dir) {
           return search(path.join(dirPath, dir));
         };
-        return Q.all(Q.map(fsp.readdir(dirPath), searchOnDir));
+        return Q.all(Q.map(fs.readdir(dirPath), searchOnDir));
       } else {
         paths.push(dirPath);
       };
@@ -165,8 +164,8 @@ var safeDownloadArchived = function safeDownloadArchived(url) {
         }).then(function () {
           return filePath;
         }).catch(function () {
-          return fsp.exists(archiveDir).then(function (exists) {
-            return !exists ? fsp.mkdir(archiveDir) : null;
+          return fs.exists(archiveDir).then(function (exists) {
+            return !exists ? fs.mkdir(archiveDir) : null;
           }).then(function () {
             return download(url)(archivePath).onData(promise.onDataCallback);
           }).then(function () {
@@ -178,9 +177,9 @@ var safeDownloadArchived = function safeDownloadArchived(url) {
           }).then(function () {
             return search(new RegExp(fileName + "$"))(archiveDir);
           }).then(function (fp) {
-            return fsp.rename(fp[0], filePath);
+            return fs.rename(fp[0], filePath);
           }).then(function () {
-            return fsp.unlink(archivePath);
+            return fs.unlink(archivePath);
           }).then(function () {
             return fileHash ? checksum(fileHash)(filePath) : null;
           }).then(function () {
@@ -248,4 +247,4 @@ module.exports = {
   downloadArchived: downloadArchived,
   search: search,
   test: test
-};
+};