forks/peertube
1
0
Fork 0
Code Releases Activity

Change name of fields for add video api

Browse source
This commit is contained in:
Chocobozzz 2016-03-18 16:44:54 +01:00
parent a4c1575197
commit 8c9c1942f6
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/angular/videos/components/add/videos-add.component.html
View file

@ -15,7 +15,7 @@
<div class="form-group"> <div class="form-group">
<div class="btn btn-default btn-file"> <div class="btn btn-default btn-file">
<span>Select the video...</span> <span>Select the video...</span>
<input type="file" name="input_video" id="input_video"> <input type="file" name="videofile" id="videofile">
</div> </div>
<span *ngIf="fileToUpload">{{ fileToUpload.name }}</span> <span *ngIf="fileToUpload">{{ fileToUpload.name }}</span>

2
client/angular/videos/components/add/videos-add.component.ts
View file

@ -22,7 +22,7 @@ export class VideosAddComponent implements OnInit {
constructor(private _router: Router, private _elementRef: ElementRef) {} constructor(private _router: Router, private _elementRef: ElementRef) {}
ngOnInit() { ngOnInit() {
jQuery(this._elementRef.nativeElement).find('#input_video').fileupload({ jQuery(this._elementRef.nativeElement).find('#videofile').fileupload({
url: '/api/v1/videos', url: '/api/v1/videos',
dataType: 'json', dataType: 'json',
singleFileUploads: true, singleFileUploads: true,

4
server/controllers/api/v1/videos.js
View file

@ -35,7 +35,7 @@ const storage = multer.diskStorage({
} }
}) })
const reqFiles = multer({ storage: storage }).fields([{ name: 'input_video', maxCount: 1 }]) const reqFiles = multer({ storage: storage }).fields([{ name: 'videofile', maxCount: 1 }])
router.get('/', cacheMiddleware.cache(false), listVideos) router.get('/', cacheMiddleware.cache(false), listVideos)
router.post('/', reqFiles, reqValidator.videosAdd, cacheMiddleware.cache(false), addVideo) router.post('/', reqFiles, reqValidator.videosAdd, cacheMiddleware.cache(false), addVideo)
@ -50,7 +50,7 @@ module.exports = router
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function addVideo (req, res, next) { function addVideo (req, res, next) {
const video_file = req.files.input_video[0] const video_file = req.files.videofile[0]
const video_infos = req.body const video_infos = req.body
videos.seed(video_file.path, function (err, torrent) { videos.seed(video_file.path, function (err, torrent) {

16
server/tests/api/checkParams.js
View file

@ -137,7 +137,7 @@ describe('Test parameters validator', function () {
description: 'my super description' description: 'my super description'
} }
const attach = { const attach = {
'input_video': pathUtils.join(__dirname, 'fixtures', 'video_short.webm') 'videofile': pathUtils.join(__dirname, 'fixtures', 'video_short.webm')
} }
makePostRequest(path, data, attach, done) makePostRequest(path, data, attach, done)
}) })
@ -148,7 +148,7 @@ describe('Test parameters validator', function () {
description: 'my super description' description: 'my super description'
} }
const attach = { const attach = {
'input_video': pathUtils.join(__dirname, 'fixtures', 'video_short.webm') 'videofile': pathUtils.join(__dirname, 'fixtures', 'video_short.webm')
} }
makePostRequest(path, data, attach, done) makePostRequest(path, data, attach, done)
}) })
@ -158,7 +158,7 @@ describe('Test parameters validator', function () {
name: 'my super name' name: 'my super name'
} }
const attach = { const attach = {
'input_video': pathUtils.join(__dirname, 'fixtures', 'video_short.webm') 'videofile': pathUtils.join(__dirname, 'fixtures', 'video_short.webm')
} }
makePostRequest(path, data, attach, done) makePostRequest(path, data, attach, done)
}) })
@ -171,7 +171,7 @@ describe('Test parameters validator', function () {
'very very very very very very very very very very very very very very very long' 'very very very very very very very very very very very very very very very long'
} }
const attach = { const attach = {
'input_video': pathUtils.join(__dirname, 'fixtures', 'video_short.webm') 'videofile': pathUtils.join(__dirname, 'fixtures', 'video_short.webm')
} }
makePostRequest(path, data, attach, done) makePostRequest(path, data, attach, done)
}) })
@ -191,7 +191,7 @@ describe('Test parameters validator', function () {
description: 'my super description' description: 'my super description'
} }
const attach = { const attach = {
'input_video': pathUtils.join(__dirname, '..', 'fixtures', 'video_short_fake.webm') 'videofile': pathUtils.join(__dirname, '..', 'fixtures', 'video_short_fake.webm')
} }
makePostRequest(path, data, attach, done) makePostRequest(path, data, attach, done)
}) })
@ -202,12 +202,12 @@ describe('Test parameters validator', function () {
description: 'my super description' description: 'my super description'
} }
const attach = { const attach = {
'input_video': pathUtils.join(__dirname, 'fixtures', 'video_short.webm') 'videofile': pathUtils.join(__dirname, 'fixtures', 'video_short.webm')
} }
makePostRequest(path, data, attach, function () { makePostRequest(path, data, attach, function () {
attach.input_video = pathUtils.join(__dirname, 'fixtures', 'video_short.mp4') attach.videofile = pathUtils.join(__dirname, 'fixtures', 'video_short.mp4')
makePostRequest(path, data, attach, function () { makePostRequest(path, data, attach, function () {
attach.input_video = pathUtils.join(__dirname, 'fixtures', 'video_short.ogv') attach.videofile = pathUtils.join(__dirname, 'fixtures', 'video_short.ogv')
makePostRequest(path, data, attach, done, true) makePostRequest(path, data, attach, done, true)
}, true) }, true)
}, true) }, true)

2
server/tests/api/utils.js
View file

@ -185,7 +185,7 @@ function uploadVideo (url, name, description, fixture, end) {
.set('Accept', 'application/json') .set('Accept', 'application/json')
.field('name', name) .field('name', name)
.field('description', description) .field('description', description)
.attach('input_video', pathUtils.join(__dirname, 'fixtures', fixture)) .attach('videofile', pathUtils.join(__dirname, 'fixtures', fixture))
.expect(204) .expect(204)
.end(end) .end(end)
} }