diff options
Diffstat (limited to 'server/tools/peertube-upload.ts')
-rw-r--r-- | server/tools/peertube-upload.ts | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/server/tools/peertube-upload.ts b/server/tools/peertube-upload.ts index c94b05857..597137e4c 100644 --- a/server/tools/peertube-upload.ts +++ b/server/tools/peertube-upload.ts | |||
@@ -4,7 +4,6 @@ registerTSPaths() | |||
4 | import { program } from 'commander' | 4 | import { program } from 'commander' |
5 | import { access, constants } from 'fs-extra' | 5 | import { access, constants } from 'fs-extra' |
6 | import { isAbsolute } from 'path' | 6 | import { isAbsolute } from 'path' |
7 | import { uploadVideo } from '../../shared/extra-utils/' | ||
8 | import { assignToken, buildCommonVideoOptions, buildServer, buildVideoAttributesFromCommander, getServerCredentials } from './cli' | 7 | import { assignToken, buildCommonVideoOptions, buildServer, buildVideoAttributesFromCommander, getServerCredentials } from './cli' |
9 | 8 | ||
10 | let command = program | 9 | let command = program |
@@ -52,16 +51,18 @@ async function run (url: string, username: string, password: string) { | |||
52 | 51 | ||
53 | console.log('Uploading %s video...', options.videoName) | 52 | console.log('Uploading %s video...', options.videoName) |
54 | 53 | ||
55 | const videoAttributes = await buildVideoAttributesFromCommander(server, program) | 54 | const baseAttributes = await buildVideoAttributesFromCommander(server, program) |
55 | |||
56 | const attributes = { | ||
57 | ...baseAttributes, | ||
56 | 58 | ||
57 | Object.assign(videoAttributes, { | ||
58 | fixture: options.file, | 59 | fixture: options.file, |
59 | thumbnailfile: options.thumbnail, | 60 | thumbnailfile: options.thumbnail, |
60 | previewfile: options.preview | 61 | previewfile: options.preview |
61 | }) | 62 | } |
62 | 63 | ||
63 | try { | 64 | try { |
64 | await uploadVideo(url, server.accessToken, videoAttributes) | 65 | await server.videosCommand.upload({ attributes }) |
65 | console.log(`Video ${options.videoName} uploaded.`) | 66 | console.log(`Video ${options.videoName} uploaded.`) |
66 | process.exit(0) | 67 | process.exit(0) |
67 | } catch (err) { | 68 | } catch (err) { |