diff --git a/config/env/torrents.js b/config/env/torrents.js index 493d0030..4ce080b8 100644 --- a/config/env/torrents.js +++ b/config/env/torrents.js @@ -323,16 +323,16 @@ module.exports = { additionSize: 1024 * 1024 * 1024 * 10, //10G perlSize: 1024 * 1024 * 1024, //1G - uploadValue: 5, + uploadValue: 2, uploadEnable: true, - downloadValue: 2, + downloadValue: 1, downloadEnable: true, - vipRatio: 2, + vipRatio: 1.5, seederBasicRatio: 1, seederCoefficient: 0.1, lifeBasicRatio: 1, - lifeCoefficientOfDay: 0.01, + lifeCoefficientOfDay: 0.005, enable: true }, @@ -341,12 +341,12 @@ module.exports = { name: 'seedTimed', additionTime: 60 * 1000 * 5, timedValue: 1, - vipRatio: 2, + vipRatio: 1.5, seederBasicRatio: 1, seederCoefficient: 0.1, lifeBasicRatio: 1, - lifeCoefficientOfDay: 0.01, + lifeCoefficientOfDay: 0.005, enable: true } diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js index 09fe291d..c685a321 100644 --- a/modules/announce/server/controllers/announces.server.controller.js +++ b/modules/announce/server/controllers/announces.server.controller.js @@ -552,6 +552,7 @@ exports.announce = function (req, res) { if (action.enable) { var uploadScore = 0; var downloadScore = 0; + if (curru > 0 && action.uploadEnable) { var upUnitScore = 1; if (req.torrent.torrent_size > action.additionSize) { @@ -560,12 +561,13 @@ exports.announce = function (req, res) { var upScore = Math.round((curru / action.perlSize) * 100) / 100; uploadScore = upUnitScore * action.uploadValue * upScore; } + if (currd > 0 && action.downloadEnable) { var downUnitScore = 1; if (req.torrent.torrent_size > action.additionSize) { downUnitScore = Math.round(Math.sqrt(req.torrent.torrent_size / action.additionSize) * 100) / 100; } - var downScore = Math.round((curru / action.perlSize) * 100) / 100; + var downScore = Math.round((currd / action.perlSize) * 100) / 100; downloadScore = downUnitScore * action.downloadValue * downScore; }