X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fdanger%2Fclean%2Fcleaner.ts;h=009f8f7a0c95d93816fed572c887b3b3c079ec27;hb=288178bf02984c7e6dc69241918b88234a0dcb91;hp=d1dba46509ef3826930be076df224ec0c8f921d9;hpb=1840c2f7c91f5f89602a3683d85b0a9df1454855;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/danger/clean/cleaner.ts b/scripts/danger/clean/cleaner.ts
index d1dba4650..009f8f7a0 100644
--- a/scripts/danger/clean/cleaner.ts
+++ b/scripts/danger/clean/cleaner.ts
@@ -1,25 +1,26 @@
-import * as eachSeries from 'async/eachSeries'
+import * as Promise from 'bluebird'
 import * as rimraf from 'rimraf'
+import { CONFIG, initDatabaseModels, sequelizeTypescript } from '../../../server/initializers'
 
-import { CONFIG } from '../../../server/initializers/constants'
-import { database as db } from '../../../server/initializers/database'
-
-db.init(true, function () {
-  db.sequelize.drop().asCallback(function (err) {
-    if (err) throw err
-
+initDatabaseModels(true)
+  .then(() => {
+    return sequelizeTypescript.drop()
+  })
+  .then(() => {
     console.info('Tables of %s deleted.', CONFIG.DATABASE.DBNAME)
 
     const STORAGE = CONFIG.STORAGE
-    eachSeries(Object.keys(STORAGE), function (storage, callbackEach) {
+    Promise.mapSeries(Object.keys(STORAGE), storage => {
       const storageDir = STORAGE[storage]
 
-      rimraf(storageDir, function (err) {
-        console.info('%s deleted.', storageDir)
-        return callbackEach(err)
+      return new Promise((res, rej) => {
+        rimraf(storageDir, err => {
+          if (err) return rej(err)
+
+          console.info('%s deleted.', storageDir)
+          return res()
+        })
       })
-    }, function () {
-      process.exit(0)
     })
+    .then(() => process.exit(0))
   })
-})