diff options
Diffstat (limited to 'server/controllers/api/videos')
-rw-r--r-- | server/controllers/api/videos/import.ts | 6 | ||||
-rw-r--r-- | server/controllers/api/videos/index.ts | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/server/controllers/api/videos/import.ts b/server/controllers/api/videos/import.ts index b2f73fa48..44f15ef74 100644 --- a/server/controllers/api/videos/import.ts +++ b/server/controllers/api/videos/import.ts | |||
@@ -27,8 +27,8 @@ import { FilteredModelAttributes } from 'sequelize-typescript/lib/models/Model' | |||
27 | import { VideoChannelModel } from '../../../models/video/video-channel' | 27 | import { VideoChannelModel } from '../../../models/video/video-channel' |
28 | import * as Bluebird from 'bluebird' | 28 | import * as Bluebird from 'bluebird' |
29 | import * as parseTorrent from 'parse-torrent' | 29 | import * as parseTorrent from 'parse-torrent' |
30 | import { readFileBufferPromise, renamePromise } from '../../../helpers/core-utils' | ||
31 | import { getSecureTorrentName } from '../../../helpers/utils' | 30 | import { getSecureTorrentName } from '../../../helpers/utils' |
31 | import { readFile, rename } from 'fs-extra' | ||
32 | 32 | ||
33 | const auditLogger = auditLoggerFactory('video-imports') | 33 | const auditLogger = auditLoggerFactory('video-imports') |
34 | const videoImportsRouter = express.Router() | 34 | const videoImportsRouter = express.Router() |
@@ -78,10 +78,10 @@ async function addTorrentImport (req: express.Request, res: express.Response, to | |||
78 | 78 | ||
79 | // Rename the torrent to a secured name | 79 | // Rename the torrent to a secured name |
80 | const newTorrentPath = join(CONFIG.STORAGE.TORRENTS_DIR, getSecureTorrentName(torrentName)) | 80 | const newTorrentPath = join(CONFIG.STORAGE.TORRENTS_DIR, getSecureTorrentName(torrentName)) |
81 | await renamePromise(torrentfile.path, newTorrentPath) | 81 | await rename(torrentfile.path, newTorrentPath) |
82 | torrentfile.path = newTorrentPath | 82 | torrentfile.path = newTorrentPath |
83 | 83 | ||
84 | const buf = await readFileBufferPromise(torrentfile.path) | 84 | const buf = await readFile(torrentfile.path) |
85 | const parsedTorrent = parseTorrent(buf) | 85 | const parsedTorrent = parseTorrent(buf) |
86 | 86 | ||
87 | videoName = isArray(parsedTorrent.name) ? parsedTorrent.name[ 0 ] : parsedTorrent.name as string | 87 | videoName = isArray(parsedTorrent.name) ? parsedTorrent.name[ 0 ] : parsedTorrent.name as string |
diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index e973aa43f..a86cf4f99 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts | |||
@@ -1,7 +1,6 @@ | |||
1 | import * as express from 'express' | 1 | import * as express from 'express' |
2 | import { extname, join } from 'path' | 2 | import { extname, join } from 'path' |
3 | import { VideoCreate, VideoPrivacy, VideoState, VideoUpdate } from '../../../../shared' | 3 | import { VideoCreate, VideoPrivacy, VideoState, VideoUpdate } from '../../../../shared' |
4 | import { renamePromise } from '../../../helpers/core-utils' | ||
5 | import { getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils' | 4 | import { getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils' |
6 | import { processImage } from '../../../helpers/image-utils' | 5 | import { processImage } from '../../../helpers/image-utils' |
7 | import { logger } from '../../../helpers/logger' | 6 | import { logger } from '../../../helpers/logger' |
@@ -56,6 +55,7 @@ import { ScheduleVideoUpdateModel } from '../../../models/video/schedule-video-u | |||
56 | import { videoCaptionsRouter } from './captions' | 55 | import { videoCaptionsRouter } from './captions' |
57 | import { videoImportsRouter } from './import' | 56 | import { videoImportsRouter } from './import' |
58 | import { resetSequelizeInstance } from '../../../helpers/database-utils' | 57 | import { resetSequelizeInstance } from '../../../helpers/database-utils' |
58 | import { rename } from 'fs-extra' | ||
59 | 59 | ||
60 | const auditLogger = auditLoggerFactory('videos') | 60 | const auditLogger = auditLoggerFactory('videos') |
61 | const videosRouter = express.Router() | 61 | const videosRouter = express.Router() |
@@ -194,7 +194,7 @@ async function addVideo (req: express.Request, res: express.Response) { | |||
194 | // Move physical file | 194 | // Move physical file |
195 | const videoDir = CONFIG.STORAGE.VIDEOS_DIR | 195 | const videoDir = CONFIG.STORAGE.VIDEOS_DIR |
196 | const destination = join(videoDir, video.getVideoFilename(videoFile)) | 196 | const destination = join(videoDir, video.getVideoFilename(videoFile)) |
197 | await renamePromise(videoPhysicalFile.path, destination) | 197 | await rename(videoPhysicalFile.path, destination) |
198 | // This is important in case if there is another attempt in the retry process | 198 | // This is important in case if there is another attempt in the retry process |
199 | videoPhysicalFile.filename = video.getVideoFilename(videoFile) | 199 | videoPhysicalFile.filename = video.getVideoFilename(videoFile) |
200 | videoPhysicalFile.path = destination | 200 | videoPhysicalFile.path = destination |