Correctly migrate to fs-extra

2 files changed, 4 insertions, 9 deletions

diff --git a/server/tools/import-videos.ts b/server/tools/import-videos.ts
index e49fbb2f5..812600f8b 100644
--- a/server/tools/import-videos.ts
+++ b/server/tools/import-videos.ts
@@ -5,12 +5,12 @@ import * as program from 'commander'
 import { join } from 'path'
 import * as youtubeDL from 'youtube-dl'
 import { VideoPrivacy } from '../../shared/models/videos'
-import { unlinkPromise } from '../helpers/core-utils'
 import { doRequestAndSaveToFile } from '../helpers/requests'
 import { CONSTRAINTS_FIELDS } from '../initializers'
 import { getClient, getVideoCategories, login, searchVideo, uploadVideo } from '../tests/utils'
 import { truncate } from 'lodash'
 import * as prompt from 'prompt'
+import { remove } from 'fs-extra'
 
 program
   .option('-u, --url <url>', 'Server url')
@@ -204,10 +204,8 @@ async function uploadVideoOnPeerTube (videoInfo: any, videoPath: string, languag
     }
   }
 
-  await unlinkPromise(videoPath)
-  if (thumbnailfile) {
-    await unlinkPromise(thumbnailfile)
-  }
+  await remove(videoPath)
+  if (thumbnailfile) await remove(thumbnailfile)
 
   console.log('Uploaded video "%s"!\n', videoAttributes.name)
 }
diff --git a/server/tools/upload.ts b/server/tools/upload.ts
index b5630bb9c..796a0f723 100644
--- a/server/tools/upload.ts
+++ b/server/tools/upload.ts
@@ -1,13 +1,10 @@
 import * as program from 'commander'
 import { access, constants } from 'fs-extra'
 import { isAbsolute } from 'path'
-import { promisify } from 'util'
 import { getClient, login } from '../tests/utils'
 import { uploadVideo } from '../tests/utils/index'
 import { VideoPrivacy } from '../../shared/models/videos'
 
-const accessPromise = promisify(access)
-
 program
   .option('-u, --url <url>', 'Server url')
   .option('-U, --username <username>', 'Username')
@@ -68,7 +65,7 @@ async function run () {
   const res2 = await login(program[ 'url' ], client, user)
   const accessToken = res2.body.access_token
 
-  await accessPromise(program[ 'file' ], constants.F_OK)
+  await access(program[ 'file' ], constants.F_OK)
 
   console.log('Uploading %s video...', program[ 'videoName' ])