aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-xscripts/update-host.js4
-rw-r--r--server/models/video.js2
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/update-host.js b/scripts/update-host.js
index 91051e68b..18e35386c 100755
--- a/scripts/update-host.js
+++ b/scripts/update-host.js
@@ -26,9 +26,9 @@ db.init(true, function () {
26 if (err) throw err 26 if (err) throw err
27 27
28 videos.forEach(function (video) { 28 videos.forEach(function (video) {
29 const torrentName = video._id + '.torrent' 29 const torrentName = video.id + '.torrent'
30 const torrentPath = constants.CONFIG.STORAGE.TORRENTS_DIR + torrentName 30 const torrentPath = constants.CONFIG.STORAGE.TORRENTS_DIR + torrentName
31 const filename = video._id + video.extname 31 const filename = video.id + video.extname
32 32
33 const parsed = parseTorrent(fs.readFileSync(torrentPath)) 33 const parsed = parseTorrent(fs.readFileSync(torrentPath))
34 parsed.announce = [ constants.CONFIG.WEBSERVER.WS + '://' + constants.CONFIG.WEBSERVER.HOST + '/tracker/socket' ] 34 parsed.announce = [ constants.CONFIG.WEBSERVER.WS + '://' + constants.CONFIG.WEBSERVER.HOST + '/tracker/socket' ]
diff --git a/server/models/video.js b/server/models/video.js
index 742150d69..d0fd61eb4 100644
--- a/server/models/video.js
+++ b/server/models/video.js
@@ -414,7 +414,7 @@ function getDurationFromFile (videoPath, callback) {
414} 414}
415 415
416function list (callback) { 416function list (callback) {
417 return this.find().asCallback() 417 return this.findAll().asCallback(callback)
418} 418}
419 419
420function listForApi (start, count, sort, callback) { 420function listForApi (start, count, sort, callback) {