yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-05 19:42:24 +02:00
Code Issues Releases Wiki Activity

Server: fix update remote video infohash

Browse source
This commit is contained in:
Chocobozzz 2017-01-12 09:47:21 +01:00
parent 63d00f5ded
commit 7f4e7c3637
5 changed files with 55 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
server/controllers/api/videos.js
View file

@ -259,6 +259,7 @@ function updateVideoRetryWrapper (req, res, next) {
function updateVideo (req, res, finalCallback) {
const videoInstance = res.locals.video
const videoFieldsSave = videoInstance.toJSON()
const videoInfosToUpdate = req.body
waterfall([
@ -280,12 +281,13 @@ function updateVideo (req, res, finalCallback) {
},
function updateVideoIntoDB (t, tagInstances, callback) {
const options = { transaction: t }
const options = {
transaction: t
}
if (videoInfosToUpdate.name) videoInstance.set('name', videoInfosToUpdate.name)
if (videoInfosToUpdate.description) videoInstance.set('description', videoInfosToUpdate.description)
// Add tags association
videoInstance.save(options).asCallback(function (err) {
return callback(err, t, tagInstances)
})
@ -321,6 +323,14 @@ function updateVideo (req, res, finalCallback) {
// Abort transaction?
if (t) t.rollback()
// Force fields we want to update
// If the transaction is retried, sequelize will think the object has not changed
// So it will skip the SQL request, even if the last one was ROLLBACKed!
Object.keys(videoFieldsSave).forEach(function (key) {
const value = videoFieldsSave[key]
videoInstance.set(key, value)
})
return finalCallback(err)
}