3 files changed, 51 insertions, 135 deletions

diff --git a/server/controllers/api/v1/pods.js b/server/controllers/api/v1/pods.js
index 881b2090d..9dd9197b3 100644
--- a/server/controllers/api/v1/pods.js
+++ b/server/controllers/api/v1/pods.js
@@ -2,6 +2,7 @@
 
 const async = require('async')
 const express = require('express')
+const mongoose = require('mongoose')
 
 const logger = require('../../../helpers/logger')
 const friends = require('../../../lib/friends')
@@ -10,10 +11,9 @@ const Pods = require('../../../models/pods')
 const oAuth2 = middlewares.oauth2
 const reqValidator = middlewares.reqValidators.pods
 const signatureValidator = middlewares.reqValidators.remote.signature
-const videos = require('../../../lib/videos')
-const Videos = require('../../../models/videos')
 
 const router = express.Router()
+const Video = mongoose.model('Video')
 
 router.get('/', listPodsUrl)
 router.post('/', reqValidator.podsAdd, addPods)
@@ -86,7 +86,7 @@ function removePods (req, res, next) {
     },
 
     function (callback) {
-      Videos.listFromUrl(url, function (err, videosList) {
+      Video.listByUrls([ url ], function (err, videosList) {
         if (err) {
           logger.error('Cannot list videos from url.', { error: err })
           return callback(err)
@@ -97,14 +97,9 @@ function removePods (req, res, next) {
     },
 
     function removeTheRemoteVideos (videosList, callback) {
-      videos.removeRemoteVideos(videosList, function (err) {
-        if (err) {
-          logger.error('Cannot remove remote videos.', { error: err })
-          return callback(err)
-        }
-
-        return callback(null)
-      })
+      async.each(videosList, function (video, callbackEach) {
+        video.remove(callbackEach)
+      }, callback)
     }
   ], function (err) {
     if (err) return next(err)
diff --git a/server/controllers/api/v1/remote.js b/server/controllers/api/v1/remote.js
index ced8470d7..2d71c605d 100644
--- a/server/controllers/api/v1/remote.js
+++ b/server/controllers/api/v1/remote.js
@@ -2,15 +2,15 @@
 
 const async = require('async')
 const express = require('express')
+const mongoose = require('mongoose')
 
 const middlewares = require('../../../middlewares')
 const secureMiddleware = middlewares.secure
 const reqValidator = middlewares.reqValidators.remote
 const logger = require('../../../helpers/logger')
-const Videos = require('../../../models/videos')
-const videos = require('../../../lib/videos')
 
 const router = express.Router()
+const Video = mongoose.model('Video')
 
 router.post('/videos',
   reqValidator.signature,
@@ -33,48 +33,39 @@ function remoteVideos (req, res, next) {
   // We need to process in the same order to keep consistency
   // TODO: optimization
   async.eachSeries(requests, function (request, callbackEach) {
-    const video = request.data
+    const videoData = request.data
 
     if (request.type === 'add') {
-      addRemoteVideo(video, callbackEach)
+      addRemoteVideo(videoData, callbackEach)
     } else if (request.type === 'remove') {
-      removeRemoteVideo(video, fromUrl, callbackEach)
+      removeRemoteVideo(videoData, fromUrl, callbackEach)
     }
+  }, function (err) {
+    if (err) logger.error('Error managing remote videos.', { error: err })
   })
 
   // We don't need to keep the other pod waiting
   return res.type('json').status(204).end()
 }
 
-function addRemoteVideo (videoToCreate, callback) {
-  videos.createRemoteVideos([ videoToCreate ], function (err, remoteVideos) {
-    if (err) {
-      logger.error('Cannot create remote videos.', { error: err })
-      // Don't break the process
-    }
+function addRemoteVideo (videoToCreateData, callback) {
+  // Mongoose pre hook will automatically create the thumbnail on disk
+  videoToCreateData.thumbnail = videoToCreateData.thumbnailBase64
 
-    return callback()
-  })
+  const video = new Video(videoToCreateData)
+  video.save(callback)
 }
 
-function removeRemoteVideo (videoToRemove, fromUrl, callback) {
-  const magnetUris = [ videoToRemove.magnetUri ]
-
+function removeRemoteVideo (videoToRemoveData, fromUrl, callback) {
   // We need the list because we have to remove some other stuffs (thumbnail etc)
-  Videos.listFromUrlAndMagnets(fromUrl, magnetUris, function (err, videosList) {
+  Video.listByUrlAndMagnet(fromUrl, videoToRemoveData.magnetUri, function (err, videosList) {
     if (err) {
       logger.error('Cannot list videos from url and magnets.', { error: err })
-      // Don't break the process
-      return callback()
+      return callback(err)
     }
 
-    videos.removeRemoteVideos(videosList, function (err) {
-      if (err) {
-        logger.error('Cannot remove remote videos.', { error: err })
-        // Don't break the process
-      }
-
-      return callback()
-    })
+    async.each(videosList, function (video, callbackEach) {
+      video.remove(callbackEach)
+    }, callback)
   })
 }
diff --git a/server/controllers/api/v1/videos.js b/server/controllers/api/v1/videos.js
index 2edb31122..83734b35e 100644
--- a/server/controllers/api/v1/videos.js
+++ b/server/controllers/api/v1/videos.js
@@ -3,9 +3,9 @@
 const async = require('async')
 const config = require('config')
 const express = require('express')
+const mongoose = require('mongoose')
 const multer = require('multer')
 
-const constants = require('../../../initializers/constants')
 const logger = require('../../../helpers/logger')
 const friends = require('../../../lib/friends')
 const middlewares = require('../../../middlewares')
@@ -18,12 +18,10 @@ const reqValidatorVideos = reqValidator.videos
 const search = middlewares.search
 const sort = middlewares.sort
 const utils = require('../../../helpers/utils')
-const Videos = require('../../../models/videos') // model
-const videos = require('../../../lib/videos')
-const webtorrent = require('../../../lib/webtorrent')
 
 const router = express.Router()
 const uploads = config.get('storage.uploads')
+const Video = mongoose.model('Video')
 
 // multer configuration
 const storage = multer.diskStorage({
@@ -88,55 +86,27 @@ function addVideo (req, res, next) {
   const videoInfos = req.body
 
   async.waterfall([
-    function seedTheVideo (callback) {
-      videos.seed(videoFile.path, callback)
-    },
-
-    function createThumbnail (torrent, callback) {
-      videos.createVideoThumbnail(videoFile.path, function (err, thumbnailName) {
-        if (err) {
-          // TODO: unseed the video
-          logger.error('Cannot make a thumbnail of the video file.')
-          return callback(err)
-        }
-
-        callback(null, torrent, thumbnailName)
-      })
-    },
 
-    function insertIntoDB (torrent, thumbnailName, callback) {
+    function insertIntoDB (callback) {
       const videoData = {
         name: videoInfos.name,
         namePath: videoFile.filename,
         description: videoInfos.description,
-        magnetUri: torrent.magnetURI,
         author: res.locals.oauth.token.user.username,
         duration: videoFile.duration,
-        thumbnail: thumbnailName,
         tags: videoInfos.tags
       }
 
-      Videos.add(videoData, function (err, insertedVideo) {
-        if (err) {
-          // TODO unseed the video
-          // TODO remove thumbnail
-          logger.error('Cannot insert this video in the database.')
-          return callback(err)
-        }
-
-        return callback(null, insertedVideo)
+      const video = new Video(videoData)
+      video.save(function (err, video) {
+        // Assert there are only one argument sent to the next function (video)
+        return callback(err, video)
       })
     },
 
-    function sendToFriends (insertedVideo, callback) {
-      videos.convertVideoToRemote(insertedVideo, function (err, remoteVideo) {
-        if (err) {
-          // TODO unseed the video
-          // TODO remove thumbnail
-          // TODO delete from DB
-          logger.error('Cannot convert video to remote.')
-          return callback(err)
-        }
+    function sendToFriends (video, callback) {
+      video.toRemoteJSON(function (err, remoteVideo) {
+        if (err) return callback(err)
 
         // Now we'll add the video's meta data to our friends
         friends.addVideoToFriends(remoteVideo)
@@ -147,6 +117,9 @@ function addVideo (req, res, next) {
 
   ], function andFinally (err) {
     if (err) {
+      // TODO unseed the video
+      // TODO remove thumbnail
+      // TODO delete from DB
       logger.error('Cannot insert the video.')
       return next(err)
     }
@@ -157,23 +130,22 @@ function addVideo (req, res, next) {
 }
 
 function getVideo (req, res, next) {
-  Videos.get(req.params.id, function (err, videoObj) {
+  Video.load(req.params.id, function (err, video) {
     if (err) return next(err)
 
-    const state = videos.getVideoState(videoObj)
-    if (state.exist === false) {
+    if (!video) {
       return res.type('json').status(204).end()
     }
 
-    res.json(getFormatedVideo(videoObj))
+    res.json(video.toFormatedJSON())
   })
 }
 
 function listVideos (req, res, next) {
-  Videos.list(req.query.start, req.query.count, req.query.sort, function (err, videosList, totalVideos) {
+  Video.list(req.query.start, req.query.count, req.query.sort, function (err, videosList, videosTotal) {
     if (err) return next(err)
 
-    res.json(getFormatedVideos(videosList, totalVideos))
+    res.json(getFormatedVideos(videosList, videosTotal))
   })
 }
 
@@ -182,31 +154,17 @@ function removeVideo (req, res, next) {
 
   async.waterfall([
     function getVideo (callback) {
-      Videos.get(videoId, callback)
-    },
-
-    function removeVideoTorrent (video, callback) {
-      removeTorrent(video.magnetUri, function () {
-        return callback(null, video)
-      })
+      Video.load(videoId, callback)
     },
 
     function removeFromDB (video, callback) {
-      Videos.removeOwned(req.params.id, function (err) {
+      video.remove(function (err) {
         if (err) return callback(err)
 
         return callback(null, video)
       })
     },
 
-    function removeVideoData (video, callback) {
-      videos.removeVideosDataFromDisk([ video ], function (err) {
-        if (err) logger.error('Cannot remove video data from disk.', { video: video })
-
-        return callback(null, video)
-      })
-    },
-
     function sendInformationToFriends (video, callback) {
       const params = {
         name: video.name,
@@ -228,53 +186,25 @@ function removeVideo (req, res, next) {
 }
 
 function searchVideos (req, res, next) {
-  Videos.search(req.params.value, req.query.field, req.query.start, req.query.count, req.query.sort,
-  function (err, videosList, totalVideos) {
+  Video.search(req.params.value, req.query.field, req.query.start, req.query.count, req.query.sort,
+  function (err, videosList, videosTotal) {
     if (err) return next(err)
 
-    res.json(getFormatedVideos(videosList, totalVideos))
+    res.json(getFormatedVideos(videosList, videosTotal))
   })
 }
 
 // ---------------------------------------------------------------------------
 
-function getFormatedVideo (videoObj) {
-  const formatedVideo = {
-    id: videoObj._id,
-    name: videoObj.name,
-    description: videoObj.description,
-    podUrl: videoObj.podUrl.replace(/^https?:\/\//, ''),
-    isLocal: videos.getVideoState(videoObj).owned,
-    magnetUri: videoObj.magnetUri,
-    author: videoObj.author,
-    duration: videoObj.duration,
-    tags: videoObj.tags,
-    thumbnailPath: constants.THUMBNAILS_STATIC_PATH + '/' + videoObj.thumbnail,
-    createdDate: videoObj.createdDate
-  }
-
-  return formatedVideo
-}
-
-function getFormatedVideos (videosObj, totalVideos) {
+function getFormatedVideos (videos, videosTotal) {
   const formatedVideos = []
 
-  videosObj.forEach(function (videoObj) {
-    formatedVideos.push(getFormatedVideo(videoObj))
+  videos.forEach(function (video) {
+    formatedVideos.push(video.toFormatedJSON())
   })
 
   return {
-    total: totalVideos,
+    total: videosTotal,
     data: formatedVideos
   }
 }
-
-// Maybe the torrent is not seeded, but we catch the error to don't stop the removing process
-function removeTorrent (magnetUri, callback) {
-  try {
-    webtorrent.remove(magnetUri, callback)
-  } catch (err) {
-    logger.warn('Cannot remove the torrent from WebTorrent', { err: err })
-    return callback(null)
-  }
-}