Server: use binary data instead of base64 to send thumbnails

[github/Chocobozzz/PeerTube.git] / server / helpers / custom-validators / videos.js

diff --git a/server/helpers/custom-validators/videos.js b/server/helpers/custom-validators/videos.js
index ebe927208b75166061b0c367e47266c79d4be75a..4aaa6aaa99c37454457309b3e8651cc8ecef3117 100644 (file)
--- a/server/helpers/custom-validators/videos.js
+++ b/server/helpers/custom-validators/videos.js
@@ -8,17 +8,16 @@ const miscValidators = require('./misc')
 const VIDEOS_CONSTRAINTS_FIELDS = constants.CONSTRAINTS_FIELDS.VIDEOS
 
 const videosValidators = {
-  isEachRemoteVideosValid: isEachRemoteVideosValid,
-  isVideoAuthorValid: isVideoAuthorValid,
-  isVideoDateValid: isVideoDateValid,
-  isVideoDescriptionValid: isVideoDescriptionValid,
-  isVideoDurationValid: isVideoDurationValid,
-  isVideoMagnetUriValid: isVideoMagnetUriValid,
-  isVideoNameValid: isVideoNameValid,
-  isVideoPodUrlValid: isVideoPodUrlValid,
-  isVideoTagsValid: isVideoTagsValid,
-  isVideoThumbnailValid: isVideoThumbnailValid,
-  isVideoThumbnail64Valid: isVideoThumbnail64Valid
+  isEachRemoteVideosValid,
+  isVideoAuthorValid,
+  isVideoDateValid,
+  isVideoDescriptionValid,
+  isVideoDurationValid,
+  isVideoInfoHashValid,
+  isVideoNameValid,
+  isVideoTagsValid,
+  isVideoThumbnailValid,
+  isVideoThumbnailDataValid
 }
 
 function isEachRemoteVideosValid (requests) {
@@ -28,19 +27,20 @@ function isEachRemoteVideosValid (requests) {
       return (
         isRequestTypeAddValid(request.type) &&
         isVideoAuthorValid(video.author) &&
-        isVideoDateValid(video.createdDate) &&
+        isVideoDateValid(video.createdAt) &&
         isVideoDescriptionValid(video.description) &&
         isVideoDurationValid(video.duration) &&
-        isVideoMagnetUriValid(video.magnetUri) &&
+        isVideoInfoHashValid(video.infoHash) &&
         isVideoNameValid(video.name) &&
-        isVideoPodUrlValid(video.podUrl) &&
         isVideoTagsValid(video.tags) &&
-        isVideoThumbnail64Valid(video.thumbnailBase64)
+        isVideoThumbnailDataValid(video.thumbnailData) &&
+        isVideoRemoteIdValid(video.remoteId) &&
+        isVideoExtnameValid(video.extname)
       ) ||
       (
         isRequestTypeRemoveValid(request.type) &&
         isVideoNameValid(video.name) &&
-        isVideoMagnetUriValid(video.magnetUri)
+        isVideoRemoteIdValid(video.remoteId)
       )
     })
 }
@@ -61,17 +61,16 @@ function isVideoDurationValid (value) {
   return validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.DURATION)
 }
 
-function isVideoMagnetUriValid (value) {
-  return validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.MAGNET_URI)
+function isVideoExtnameValid (value) {
+  return VIDEOS_CONSTRAINTS_FIELDS.EXTNAME.indexOf(value) !== -1
 }
 
-function isVideoNameValid (value) {
-  return validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.NAME)
+function isVideoInfoHashValid (value) {
+  return validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.INFO_HASH)
 }
 
-function isVideoPodUrlValid (value) {
-  // TODO: set options (TLD...)
-  return validator.isURL(value)
+function isVideoNameValid (value) {
+  return validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.NAME)
 }
 
 function isVideoTagsValid (tags) {
@@ -87,9 +86,12 @@ function isVideoThumbnailValid (value) {
   return validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.THUMBNAIL)
 }
 
-function isVideoThumbnail64Valid (value) {
-  return validator.isBase64(value) &&
-         validator.isByteLength(value, VIDEOS_CONSTRAINTS_FIELDS.THUMBNAIL64)
+function isVideoThumbnailDataValid (value) {
+  return validator.isByteLength(value, VIDEOS_CONSTRAINTS_FIELDS.THUMBNAIL_DATA)
+}
+
+function isVideoRemoteIdValid (value) {
+  return validator.isUUID(value, 4)
 }
 
 // ---------------------------------------------------------------------------