1 files changed, 22 insertions, 34 deletions

diff --git a/server/models/video.js b/server/models/video.js
index 396aa505d..14e0df6f2 100644
--- a/server/models/video.js
+++ b/server/models/video.js
@@ -1,24 +1,27 @@
 'use strict'
 
 const config = require('config')
-const eachLimit = require('async/eachLimit')
+const createTorrent = require('create-torrent')
 const ffmpeg = require('fluent-ffmpeg')
 const fs = require('fs')
 const parallel = require('async/parallel')
+const parseTorrent = require('parse-torrent')
 const pathUtils = require('path')
+const magnet = require('magnet-uri')
 const mongoose = require('mongoose')
 
 const constants = require('../initializers/constants')
 const customValidators = require('../helpers/custom-validators')
 const logger = require('../helpers/logger')
 const utils = require('../helpers/utils')
-const webtorrent = require('../lib/webtorrent')
 
 const http = config.get('webserver.https') === true ? 'https' : 'http'
 const host = config.get('webserver.host')
 const port = config.get('webserver.port')
 const uploadsDir = pathUtils.join(__dirname, '..', '..', config.get('storage.uploads'))
 const thumbnailsDir = pathUtils.join(__dirname, '..', '..', config.get('storage.thumbnails'))
+const torrentsDir = pathUtils.join(__dirname, '..', '..', config.get('storage.torrents'))
+const webseedBaseUrl = http + '://' + host + ':' + port + constants.STATIC_PATHS.WEBSEED
 
 // ---------------------------------------------------------------------------
 
@@ -66,8 +69,7 @@ VideoSchema.statics = {
   listOwned: listOwned,
   listRemotes: listRemotes,
   load: load,
-  search: search,
-  seedAllExisting: seedAllExisting
+  search: search
 }
 
 VideoSchema.pre('remove', function (next) {
@@ -103,8 +105,21 @@ VideoSchema.pre('save', function (next) {
     this.podUrl = http + '://' + host + ':' + port
 
     tasks.push(
+      // TODO: refractoring
       function (callback) {
-        seed(videoPath, callback)
+        createTorrent(videoPath, { announceList: [ [ 'ws://' + host + ':' + port + '/tracker/socket' ] ], urlList: [ webseedBaseUrl + video.filename ] }, function (err, torrent) {
+          if (err) return callback(err)
+
+          fs.writeFile(torrentsDir + video.filename + '.torrent', torrent, function (err) {
+            if (err) return callback(err)
+
+            const parsedTorrent = parseTorrent(torrent)
+            parsedTorrent.xs = video.podUrl + constants.STATIC_PATHS.TORRENTS + video.filename + '.torrent'
+            video.magnetUri = magnet.encode(parsedTorrent)
+
+            callback(null)
+          })
+        })
       },
       function (callback) {
         createThumbnail(videoPath, callback)
@@ -114,7 +129,6 @@ VideoSchema.pre('save', function (next) {
     parallel(tasks, function (err, results) {
       if (err) return next(err)
 
-      video.magnetUri = results[0].magnetURI
       video.thumbnail = results[1]
 
       return next()
@@ -149,7 +163,7 @@ function toFormatedJSON () {
     author: this.author,
     duration: this.duration,
     tags: this.tags,
-    thumbnailPath: constants.THUMBNAILS_STATIC_PATH + '/' + this.thumbnail,
+    thumbnailPath: constants.STATIC_PATHS.THUMBNAILS + '/' + this.thumbnail,
     createdDate: this.createdDate
   }
 
@@ -231,17 +245,6 @@ function search (value, field, start, count, sort, callback) {
   findWithCount.call(this, query, start, count, sort, callback)
 }
 
-function seedAllExisting (callback) {
-  listOwned.call(this, function (err, videos) {
-    if (err) return callback(err)
-
-    eachLimit(videos, constants.SEEDS_IN_PARALLEL, function (video, callbackEach) {
-      const videoPath = pathUtils.join(uploadsDir, video.filename)
-      seed(videoPath, callbackEach)
-    }, callback)
-  })
-}
-
 // ---------------------------------------------------------------------------
 
 function findWithCount (query, start, count, sort, callback) {
@@ -273,12 +276,7 @@ function removeFile (video, callback) {
 
 // Maybe the torrent is not seeded, but we catch the error to don't stop the removing process
 function removeTorrent (video, callback) {
-  try {
-    webtorrent.remove(video.magnetUri, callback)
-  } catch (err) {
-    logger.warn('Cannot remove the torrent from WebTorrent', { err: err })
-    return callback(null)
-  }
+  fs.unlink(torrentsDir + video.filename + '.torrent')
 }
 
 function createThumbnail (videoPath, callback) {
@@ -296,16 +294,6 @@ function createThumbnail (videoPath, callback) {
     })
 }
 
-function seed (path, callback) {
-  logger.info('Seeding %s...', path)
-
-  webtorrent.seed(path, function (torrent) {
-    logger.info('%s seeded (%s).', path, torrent.magnetURI)
-
-    return callback(null, torrent)
-  })
-}
-
 function generateThumbnailFromBase64 (data, callback) {
   // Creating the thumbnail for this remote video
   utils.generateRandomString(16, function (err, randomString) {