Server: fix update remote video

[github/Chocobozzz/PeerTube.git] / server / models / video.js

diff --git a/server/models/video.js b/server/models/video.js
index b3060705d9cd981dfd6c4ecd4bf74caa77b6516a..17eff64288ab1d4916fcd7105bf1c267b4389003 100644 (file)
--- a/server/models/video.js
+++ b/server/models/video.js
@@ -141,7 +141,8 @@ module.exports = function (sequelize, DataTypes) {
 }
 
 function beforeValidate (video, options, next) {
-  if (video.isOwned()) {
+  // Put a fake infoHash if it does not exists yet
+  if (video.isOwned() && !video.infoHash) {
     // 40 hexa length
     video.infoHash = '0123456789abcdef0123456789abcdef01234567'
   }
@@ -334,7 +335,7 @@ function toFormatedJSON () {
     author: this.Author.name,
     duration: this.duration,
     tags: map(this.Tags, 'name'),
-    thumbnailPath: constants.STATIC_PATHS.THUMBNAILS + '/' + this.getThumbnailName(),
+    thumbnailPath: pathUtils.join(constants.STATIC_PATHS.THUMBNAILS, this.getThumbnailName()),
     createdAt: this.createdAt,
     updatedAt: this.updatedAt
   }