fix `fs.rm` bug

History.md

@@ -1,3 +1,7 @@
+1.0.2 / 2017-11-20
+  * [fixed] Fixed remove the dir not empty call error.
+
+
 1.0.1 / 2017-04-24
   * [add] ls function can recur list child folder with second para set to be true.
 

index.js

@@ -4,27 +4,25 @@
  * @date    2015-12-28 14:28:38
  *
  */
-"use strict";
+'use strict'
 
 const fs = require('fs'),
-    path = require('path');
+  path = require('path')
 
 class Iofs {
-
+  constructor() {
-    constructor(){
     this.self = fs
   }
 
-
   /**
    * [cat 文件读取]
    * @param  {String} file [文件路径]
    * @param  {Function} cb   [回调] 可选
    */
-    cat(file){
+  cat(file) {
-        try{
+    try {
       return fs.readFileSync(file)
-        }catch(err){
+    } catch (err) {
       console.error(err)
       return null
     }
@@ -36,31 +34,31 @@ class Iofs {
    * @param  {boolean} child [是否遍历子目录]
    * @return {array}      [返回目标目录所有文件名和子目录名, 不包括'.'和'..']
    */
-    ls(dir, child){
+  ls(dir, child) {
-        try{
+    try {
       let list = fs.readdirSync(dir)
 
-            if(!child)
+      if (!child) return list
-                return list
 
       let tmp = Array.from(list)
       tmp.forEach(it => {
         let childdir = path.join(dir, it)
-                if(this.isdir(childdir)){
+        if (this.isdir(childdir)) {
-                    list = Array.prototype.concat.apply(list, this.ls(childdir, true).map(sub => {
+          list = Array.prototype.concat.apply(
+            list,
+            this.ls(childdir, true).map(sub => {
               return path.join(it, sub)
-                    }))
+            })
+          )
         }
       })
       return list
-        }catch(err){
+    } catch (err) {
       console.error(err)
       return null
     }
   }
 
-
-
   /**
    * [echo 写文件]
    * @param  {String|Buffer|Number} data   [要写入的数据]
@@ -68,66 +66,61 @@ class Iofs {
    * @param  {Boolean} append [是否在后面追加，默认否]
    * @param  {String} encode [编码, 默认utf8]
    */
-    echo(data, file, append, encode){
+  echo(data, file, append, encode) {
-        if(!file){
+    if (!file) {
-            return data;
+      return data
     }
 
     let updir = path.parse(file).dir,
-            opt = {};
+      opt = {}
-        if(!this.isdir(updir)){
+    if (!this.isdir(updir)) {
       this.mkdir(updir)
     }
 
-        if(append && typeof append === 'string'){
+    if (append && typeof append === 'string') {
-            encode = append;
+      encode = append
-            append = false;
+      append = false
-            opt.encoding = encode;
+      opt.encoding = encode
-        }else{
+    } else {
-            if(typeof encode === 'string'){
+      if (typeof encode === 'string') {
         opt.encoding = encode
       }
     }
 
-        try{
+    try {
-            if(!!append){
+      if (!!append) {
         fs.appendFileSync(file, data, opt)
-            }else{
+      } else {
         fs.writeFileSync(file, data, opt)
       }
-        }catch(err){
+    } catch (err) {
       console.error(err)
     }
   }
 
-
-
   //修改权限
-    chmod(path, mode){
+  chmod(path, mode) {
-        try{
+    try {
       fs.chmodSync(path, mode)
-        }catch(err){
+    } catch (err) {
       console.error(err)
     }
   }
 
-
   /**
    * [mv 移动文件,兼具重命名功能]
    * @param  {String} from [原路径/原名]
    * @param  {String} to   [目标路径/新名]
    */
-    mv(from, to){
+  mv(from, to) {
-
     let updir = path.parse(to).dir
-        if(!this.isdir(updir))
+    if (!this.isdir(updir)) this.mkdir(updir)
-            this.mkdir(updir)
 
-        try{
+    try {
       fs.renameSync(from, to)
-        }catch(e){
+    } catch (e) {
       let rs = fs.createReadStream(from),
-            ws = fs.createWriteStream(to);
+        ws = fs.createWriteStream(to)
 
       rs.pipe(ws)
       rs.on('end', err => {
@@ -136,84 +129,80 @@ class Iofs {
     }
   }
 
-
+  cp(from, to) {
-
-    cp(from, to){
     let updir = path.parse(to).dir
-        if(!this.isdir(updir)){
+    if (!this.isdir(updir)) {
       this.mkdir(updir)
     }
 
     let rs = fs.createReadStream(from),
-            ws = fs.createWriteStream(to);
+      ws = fs.createWriteStream(to)
 
     rs.pipe(ws)
     rs.on('end', err => console.error(err))
-
   }
 
-
   /**
    * [rm 删除文件/目录]
    * @param  {[type]} from      [源文件/目录路径]
    * @param  {[type]} recursion [是否递归删除，若删除目录，此值须为true]
    */
-    rm(from, recursion){
+  rm(from, recursion) {
-        try{
+    try {
-            if(!!recursion){
+      if (!!recursion) {
+        let list = this.ls(from)
+        list.forEach(it => {
+          it = path.resolve(from, it)
+          this.rm(it, this.isdir(it))
+        })
         fs.rmdirSync(from)
-            }else{
+      } else {
         fs.unlinkSync(from)
       }
-        }catch(err){
+    } catch (err) {
       console.error(err)
-            
     }
   }
 
-
   /**
    * [stat 返回文件/目录的状态信息]
    * @param  {[type]} path [目标路径]
    */
-    stat(path){
+  stat(path) {
-        try{
+    try {
       return fs.statSync(path)
-        }catch(err){
+    } catch (err) {
       return null
     }
   }
 
-
   /**
    * [isdir 判断目标是否为目录]
    * @param  {String} path [目标路径]
    */
-    isdir(path){
+  isdir(path) {
-        try{
+    try {
       return this.stat(path).isDirectory()
-        }catch(err){
+    } catch (err) {
       return false
     }
   }
 
-
   /**
    * [mkdir 新建目录]
    * @param  {String} dir [目标路径]
    */
-    mkdir(dir){
+  mkdir(dir) {
     let updir = path.parse(dir).dir
-        if(!updir)
+    if (!updir) return
-            return
 
-        if(!this.isdir(updir)){
+    if (!this.isdir(updir)) {
       this.mkdir(updir)
     }
 
-        try{
+    try {
       fs.mkdirSync(dir)
-        }catch(err){
+    } catch (err) {
       console.error(err)
     }
   }
@@ -222,13 +211,9 @@ class Iofs {
    * [exists 判断目标(文件/目录)是否存在]
    * @param  {String} file [目标路径]
    */
-    exists(file){
+  exists(file) {
     return fs.existsSync(file)
   }
-
-
-
 }
 
-
+module.exports = new Iofs()
-module.exports = new Iofs

package.json

@@ -1,19 +1,13 @@
 {
   "name": "iofs",
-    "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Base on native fs module, for easy using.",
   "main": "index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/yutent/iofs.git"
   },
-    "keywords": [
+  "keywords": ["dojs", "fs", "iofs", "fs.io", "file"],
-        "dojs",
-        "fs",
-        "iofs",
-        "fs.io",
-        "file"
-    ],
   "author": "yutent",
   "license": "MIT"
 }