From aaf61f3810e6d57c5130af959bd2860df32775e7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 24 Jun 2016 17:42:51 +0200 Subject: Video model refractoring -> use mongoose api --- server/controllers/api/v1/pods.js | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'server/controllers/api/v1/pods.js') 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) -- cgit v1.2.3