diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 1fda36ff..9d0f22b9 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -577,6 +577,15 @@ //footer view MIT_PROTOCOL: 'The source of this project is protected by MIT open source protocol', GIT_REPO: 'Power by ©meanTottent，view on GitHub', + TOTAL_USERS: 'Total Users', + TOTAL_TORRENTS: 'Total Torrents', + TOTAL_TORRENTSSIZE: 'Total TorrentsSize', + TOTAL_SEEDERS: 'Total Seeders', + TOTAL_LEECHERS: 'Total Leechers', + TOTAL_UPLOADED: 'Total Uploaded', + TOTAL_DOWNLOADED: 'Total Downloaded', + TOTAL_FORUMTOPICS: 'Total ForumTopics', + TOTAL_FORUMREPLIES: 'Total ForumReplies', ///////////////////////the movie db fields//////////////////////////////// TMDB_FIELDS: { diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index c0101312..aeb50295 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -577,6 +577,15 @@ //footer view MIT_PROTOCOL: '本项目源码受 MIT 开源协议保护', GIT_REPO: 'Power by ©meanTottent，GitHub 源码仓库', + TOTAL_USERS: '注册会员', + TOTAL_TORRENTS: '种子数', + TOTAL_TORRENTSSIZE: '种子总体积', + TOTAL_SEEDERS: '正在做种', + TOTAL_LEECHERS: '正在下载', + TOTAL_UPLOADED: '总上传量', + TOTAL_DOWNLOADED: '总下载量', + TOTAL_FORUMTOPICS: '论坛话题', + TOTAL_FORUMREPLIES: '论坛回复', ///////////////////////the movie db fields//////////////////////////////// TMDB_FIELDS: { diff --git a/modules/core/client/controllers/header.client.controller.js b/modules/core/client/controllers/header.client.controller.js index d60cb489..9ae2fe16 100644 --- a/modules/core/client/controllers/header.client.controller.js +++ b/modules/core/client/controllers/header.client.controller.js @@ -6,10 +6,10 @@ .controller('HeaderController', HeaderController); HeaderController.$inject = ['$scope', '$state', '$stateParams', '$translate', 'Authentication', 'menuService', 'MeanTorrentConfig', 'localStorageService', - 'ScoreLevelService', 'InvitationsService', '$interval', 'MessagesService']; + 'ScoreLevelService', 'InvitationsService', '$interval', 'MessagesService', 'TorrentsService']; function HeaderController($scope, $state, $stateParams, $translate, Authentication, menuService, MeanTorrentConfig, localStorageService, ScoreLevelService, - InvitationsService, $interval, MessagesService) { + InvitationsService, $interval, MessagesService, TorrentsService) { var vm = this; vm.user = Authentication.user; vm.language = MeanTorrentConfig.meanTorrentConfig.language; @@ -103,5 +103,14 @@ //}); } }; + + /** + * getSiteInfo + */ + vm.getSiteInfo = function () { + TorrentsService.siteInfo(function (data) { + vm.siteInfo = data; + }); + }; } }()); diff --git a/modules/core/client/css/core.css b/modules/core/client/css/core.css index 0b223ef7..c540b247 100644 --- a/modules/core/client/css/core.css +++ b/modules/core/client/css/core.css @@ -93,3 +93,11 @@ a:hover .header-profile-image { margin-right: 15px; } +.site-info { + border-bottom: solid 1px #222; + margin-bottom: 20px; + padding-bottom: 20px; + padding-top: 10px; + padding-left: 60px; +} + diff --git a/modules/core/client/views/footer.client.view.html b/modules/core/client/views/footer.client.view.html index f7fdaa84..47398454 100644 --- a/modules/core/client/views/footer.client.view.html +++ b/modules/core/client/views/footer.client.view.html @@ -1,22 +1,38 @@ -
+
-
-
    -
  • - - - -
    • -
  • -
  • -
+
+
+
{{'TOTAL_USERS' | translate}}:　{{vm.siteInfo.totalUsers}}
+
{{'TOTAL_TORRENTS' | translate}}:　{{vm.siteInfo.totalTorrents}}
+
{{'TOTAL_TORRENTSSIZE' | translate}}:　{{vm.siteInfo.totalTorrentsSize | bytes}}
+
{{'TOTAL_SEEDERS' | translate}}:　{{vm.siteInfo.totalSeeders}}
+
{{'TOTAL_LEECHERS' | translate}}:　{{vm.siteInfo.totalLeechers}}
+
{{'TOTAL_UPLOADED' | translate}}:　{{vm.siteInfo.totalUploaded | bytes}}
+
{{'TOTAL_DOWNLOADED' | translate}}:　{{vm.siteInfo.totalDownloaded | bytes}}
+
{{'TOTAL_FORUMTOPICS' | translate}}:　{{vm.siteInfo.totalForumTopics}}
+
{{'TOTAL_FORUMREPLIES' | translate}}:　{{vm.siteInfo.totalForumReplies}}
+
-
- - - - +
+
+
    +
  • + + + +
    • +
  • +
  • +
+
+
+ + + + +
diff --git a/modules/torrents/client/services/torrents.client.service.js b/modules/torrents/client/services/torrents.client.service.js index ee5b3d0e..11dd06ea 100644 --- a/modules/torrents/client/services/torrents.client.service.js +++ b/modules/torrents/client/services/torrents.client.service.js @@ -60,6 +60,10 @@ params: { torrentId: '@_id' } + }, + siteInfo: { + method: 'GET', + url: '/api/torrents/siteInfo' } }); diff --git a/modules/torrents/server/controllers/torrents.server.controller.js b/modules/torrents/server/controllers/torrents.server.controller.js index 6d1c9c4e..475322e5 100644 --- a/modules/torrents/server/controllers/torrents.server.controller.js +++ b/modules/torrents/server/controllers/torrents.server.controller.js @@ -13,6 +13,8 @@ var path = require('path'), Peer = mongoose.model('Peer'), Thumb = mongoose.model('Thumb'), Torrent = mongoose.model('Torrent'), + Forum = mongoose.model('Forum'), + Topic = mongoose.model('Topic'), fs = require('fs'), nt = require('nt'), benc = require('bncode'), @@ -797,6 +799,109 @@ exports.list = function (req, res) { }); }; +/** + * siteInfo - get site torrent info, seeders/leechers/torrents count/users etc. + * @param req + * @param res + */ +exports.siteInfo = function (req, res) { + var countUsers = function (callback) { + User.count(function (err, count) { + if (err) { + callback(err, null); + } else { + callback(null, count); + } + }); + }; + + var countTorrents = function (callback) { + Torrent.count(function (err, count) { + if (err) { + callback(err, null); + } else { + callback(null, count); + } + }); + }; + + var totalUpDown = function (callback) { + User.aggregate({ + $group: { + _id: null, + uploaded: {$sum: '$uploaded'}, + downloaded: {$sum: '$downloaded'} + } + }).exec(function (err, total) { + if (err) { + callback(err, null); + } else { + callback(null, total); + } + }); + }; + + var totalTorrentsSize = function (callback) { + Torrent.aggregate({ + $group: { + _id: null, + size: {$sum: '$torrent_size'}, + seeders: {$sum: '$torrent_seeds'}, + leechers: {$sum: '$torrent_leechers'} + } + }).exec(function (err, total) { + if (err) { + callback(err, null); + } else { + callback(null, total); + } + }); + }; + + var countForumTopics = function (callback) { + Topic.count(function (err, count) { + if (err) { + callback(err, null); + } else { + callback(null, count); + } + }); + }; + + var totalForumReplies = function (callback) { + Topic.aggregate({ + $group: { + _id: null, + replies: {$sum: '$replyCount'} + } + }).exec(function (err, total) { + if (err) { + callback(err, null); + } else { + callback(null, total); + } + }); + }; + + async.parallel([countUsers, countTorrents, totalTorrentsSize, totalUpDown, countForumTopics, totalForumReplies], function (err, results) { + if (err) { + return res.status(422).send(err); + } else { + res.json({ + totalUsers: results[0], + totalTorrents: results[1], + totalTorrentsSize: results[2][0].size, + totalSeeders: results[2][0].seeders, + totalLeechers: results[2][0].leechers, + totalUploaded: results[3][0].uploaded, + totalDownloaded: results[3][0].downloaded, + totalForumTopics: results[4], + totalForumReplies: results[5][0].replies + }); + } + }); +}; + /** * Torrent middleware */ diff --git a/modules/torrents/server/policies/torrents.server.policy.js b/modules/torrents/server/policies/torrents.server.policy.js index e3301792..dab3942c 100644 --- a/modules/torrents/server/policies/torrents.server.policy.js +++ b/modules/torrents/server/policies/torrents.server.policy.js @@ -39,7 +39,8 @@ exports.invokeRolesPolicies = function () { {resources: '/api/my/seeding', permissions: '*'}, {resources: '/api/my/downloading', permissions: '*'}, {resources: '/api/:userId/seeding', permissions: '*'}, - {resources: '/api/:userId/downloading', permissions: '*'} + {resources: '/api/:userId/downloading', permissions: '*'}, + {resources: '/api/torrents/siteInfo', permissions: ['get']} ] }, { @@ -61,7 +62,8 @@ exports.invokeRolesPolicies = function () { {resources: '/api/comments/:torrentId/:commentId/:subCommentId', permissions: ['put', 'delete']}, {resources: '/api/my/seeding', permissions: ['get']}, - {resources: '/api/my/downloading', permissions: ['get']} + {resources: '/api/my/downloading', permissions: ['get']}, + {resources: '/api/torrents/siteInfo', permissions: ['get']} ] }, { @@ -70,7 +72,8 @@ exports.invokeRolesPolicies = function () { {resources: '/api/movieinfo/:tmdbid/:language', permissions: ['get']}, {resources: '/api/tvinfo/:tmdbid/:language', permissions: ['get']}, {resources: '/api/torrents', permissions: ['get']}, - {resources: '/api/torrents/:torrentId', permissions: ['get']} + {resources: '/api/torrents/:torrentId', permissions: ['get']}, + {resources: '/api/torrents/siteInfo', permissions: ['get']} ] } ] diff --git a/modules/torrents/server/routes/torrents.server.routes.js b/modules/torrents/server/routes/torrents.server.routes.js index e22edd37..3b85fb97 100644 --- a/modules/torrents/server/routes/torrents.server.routes.js +++ b/modules/torrents/server/routes/torrents.server.routes.js @@ -8,7 +8,6 @@ var torrents = require('../controllers/torrents.server.controller'), module.exports = function (app) { - // Articles collection routes app.route('/api/movieinfo/:tmdbid/:language').all(torrentsPolicy.isAllowed) .get(torrents.movieinfo); @@ -28,6 +27,9 @@ module.exports = function (app) { .get(torrents.list) .post(torrents.create); + app.route('/api/torrents/siteInfo') + .get(torrents.siteInfo); + app.route('/api/torrents/:torrentId').all(torrentsPolicy.isAllowed) .get(torrents.read) .put(torrents.update)