Преглед изворни кода

delete directory with rimraf

Brian Gough пре 12 година
родитељ
комит
8744cf94a5

+ 5 - 4
services/filestore/app/coffee/FSPersistorManager.coffee

@@ -1,6 +1,7 @@
 logger = require("logger-sharelatex")
 fs = require("fs")
 LocalFileWriter = require("./LocalFileWriter")
+rimraf = require("rimraf")
 
 filterName = (key) ->
   return key.replace /\//g, "_"
@@ -57,10 +58,10 @@ module.exports =
       callback err
 
   deleteDirectory: (location, name, callback = (err)->)->
-    filteredName = filterName name
-    fs.rmdir "#{location}/#{filteredName}", (err) ->
-      logger.err err:err, location:location, name:filteredName, "Error on rmdir."
-      if err and err.code != 'ENOENT' 
+    filteredName = filterName name.replace(/\/$/,'')
+    rimraf "#{location}/#{filteredName}", (err) ->
+      if err
+        logger.err err:err, location:location, name:filteredName, "Error on rimraf rmdir."
         callback err
       else
         callback()

+ 1 - 0
services/filestore/package.json

@@ -21,6 +21,7 @@
     "node-uuid": "~1.4.1",
     "pngcrush": "0.0.3",
     "request": "2.14.0",
+    "rimraf": "2.2.8",
     "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#master",
     "stream-buffers": "~0.2.5",
     "underscore": "~1.5.2"