From dd91f6b57fe165797e832a5074ad7440af522822 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Thu, 10 May 2018 11:08:09 +0800
Subject: [PATCH 01/96] fix(torrents): css of genres-item

---
 modules/core/client/less/mt.less | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less
index 258b2f7a..fd1f355b 100644
--- a/modules/core/client/less/mt.less
+++ b/modules/core/client/less/mt.less
@@ -1093,6 +1093,10 @@ body {
         .media-heading {
             margin-bottom: 5px;
         }
+        .genres-item {
+            font-size: 12px;
+            color: @gray-light;
+        }
     }
     .td-imdb {
         min-width: 90px;
@@ -1133,10 +1137,7 @@ body {
 }
 
 .list-all-genres {
-    font-size: 12px;
     .genres-item {
-        color: @gray-light;
-        font-size: 12px;
         &:not(:first-child) {
             &::before {
                 content: " | ";

From 3190624d643073592715b071c4a4728c97f453f2 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Fri, 11 May 2018 23:04:44 +0800
Subject: [PATCH 02/96] fix(requests): check request post condition of score
 number

---
 .../controllers/requests-add.client.controller.js  | 12 ++++++++++++
 .../client/views/requests-add.client.view.html     | 14 ++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/modules/requests/client/controllers/requests-add.client.controller.js b/modules/requests/client/controllers/requests-add.client.controller.js
index b8086d82..8e4fe191 100644
--- a/modules/requests/client/controllers/requests-add.client.controller.js
+++ b/modules/requests/client/controllers/requests-add.client.controller.js
@@ -36,6 +36,18 @@
       return marked(ts, {sanitize: true});
     };
 
+    /**
+     * getCanNotAddDesc
+     * @returns {*}
+     */
+    vm.getCanNotAddDesc = function () {
+      var ts = $translate.instant('REQUESTS.CAN_NTO_TO_ADD', {
+        add_score: vm.requestsConfig.scoreForAddRequest
+      });
+
+      return marked(ts, {sanitize: true});
+    };
+
     /**
      * create
      * @param isValid
diff --git a/modules/requests/client/views/requests-add.client.view.html b/modules/requests/client/views/requests-add.client.view.html
index 0104b0fc..76cf7124 100644
--- a/modules/requests/client/views/requests-add.client.view.html
+++ b/modules/requests/client/views/requests-add.client.view.html
@@ -40,7 +40,17 @@
         </div>
     </div>
 
-    <div class="container">
+    <div class="container margin-top-30" ng-if="vm.user.score <= vm.requestsConfig.scoreForAddRequest">
+        <div class="row">
+            <div class="col-md-10 col-md-offset-1">
+                <div class="alert alert-warning text-center" role="alert">
+                    <div class="add-warning" ng-bind-html="vm.getCanNotAddDesc();"></div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="container" ng-if="vm.user.score > vm.requestsConfig.scoreForAddRequest">
         <div class="row">
             <div class="col-sm-9 col-sm-offset-1">
                 <form name="vm.requestForm" class="form-horizontal request-form" ng-submit="vm.create(vm.requestForm.$valid)" novalidate>
@@ -70,7 +80,7 @@
                             <textarea id="requestDesc" name="requestDesc" ng-model="vm.request.desc"
                                       mt-markdown-editor="requestDesc" maxlength="{{vm.inputLengthConfig.requestDescLength}}"
                                       required></textarea>
-                            <div ng-messages="vm.requestForm.desc.$error" role="alert">
+                            <div ng-messages="vm.requestForm.requestDesc.$error" role="alert">
                                 <p class="help-block error-text" ng-message="required">{{ 'REQUESTS.FORM_DESC_REQUIRED' | translate}}</p>
                             </div>
                         </div>

From 8ae849779e53fde7564b548c3088e0cca52ad34c Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Fri, 11 May 2018 23:46:10 +0800
Subject: [PATCH 03/96] fix(peers): recount user download percent of torrent

---
 modules/torrents/server/models/peer.server.model.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/torrents/server/models/peer.server.model.js b/modules/torrents/server/models/peer.server.model.js
index 87a5ace6..445e9225 100644
--- a/modules/torrents/server/models/peer.server.model.js
+++ b/modules/torrents/server/models/peer.server.model.js
@@ -135,7 +135,8 @@ function countPercent(p) {
   if (p.peer_status === 'seeder') {
     p.peer_percent = 100;
   } else {
-    p.peer_percent = (Math.round((p.peer_downloaded / (p.peer_downloaded + p.peer_left)) * 10000) / 100) || 0;
+    // p.peer_percent = (Math.round((p.peer_downloaded / (p.peer_downloaded + p.peer_left)) * 10000) / 100) || 0;
+    p.peer_percent = Math.round((p.torrent.torrent_size - p.peer_left) / p.torrent.torrent_size * 10000) / 100;
   }
 }
 

From e21127b2990ddb1398ceb013b41f3461f81acc6c Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Fri, 11 May 2018 23:49:01 +0800
Subject: [PATCH 04/96] fix(announce): find announced torrent to populate out
 peers info

---
 .../server/controllers/announces.server.controller.js         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js
index 2d4de6c2..3729f962 100644
--- a/modules/announce/server/controllers/announces.server.controller.js
+++ b/modules/announce/server/controllers/announces.server.controller.js
@@ -282,7 +282,8 @@ exports.announce = function (req, res) {
       })
         .populate('user')
         .populate({
-          path: '_peers'
+          path: '_peers',
+          match: { user: req.passkeyuser._id}
         })
         .exec(function (err, t) {
           if (err) {
@@ -940,6 +941,7 @@ exports.announce = function (req, res) {
     req.selfpeer.every(function (p) {
       if (p.peer_id === query.peer_id) {
         req.currentPeer = p;
+        req.currentPeer.torrent = req.torrent;
         req.currentPeer.isNewCreated = false;
 
         if (req.seeder && req.currentPeer.peer_status !== PEERSTATE_SEEDER && event(query.event) !== EVENT_COMPLETED) {

From 50a0c0d6f62d736a93dc93fdb8d92a1228931b2c Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 12 May 2018 02:59:18 +0800
Subject: [PATCH 05/96] feat(torrents): resource title and subtitle support

---
 config/env/torrents.js                        |  35 +-
 config/lib/multer.js                          |  11 +-
 .../controllers/about.client.controller.js    |  13 +-
 .../client/views/maker-view.client.view.html  | 112 +-----
 .../views/collection-view.client.view.html    | 116 +------
 modules/core/client/app/trans-string-en.js    |  25 +-
 modules/core/client/app/trans-string-zh.js    |  23 +-
 .../torrent-list-item.client.directive.js     | 322 ++++++++++++++++++
 modules/core/client/less/btn-size.less        |  40 +++
 modules/core/client/less/media-margin.less    |   7 +
 modules/core/client/less/mt.less              |  76 ++++-
 modules/requests/client/less/requests.less    |  27 +-
 .../views/requests-view.client.view.html      | 132 +------
 .../admin/admin-list.client.controller.js     | 168 +--------
 .../torrent-info.client.controller.js         |   3 +
 .../controllers/uploads.client.controller.js  |  33 ++
 .../torrent-file-link.client.directive.js     |  53 +++
 modules/torrents/client/less/torrents.less    |   1 +
 .../torrent-get-info.client.service.js        |  53 +++
 .../templates/torrent-item.client.view.html   | 281 +++++++++++++++
 .../views/admin/admin-list.client.view.html   | 171 +---------
 .../views/list-torrents.client.view.html      | 116 +------
 .../views/search-torrents.client.view.html    | 154 +++------
 .../views/uploads-torrents.client.view.html   |  70 ++--
 .../controllers/torrents.server.controller.js |   6 +-
 .../server/models/complete.server.model.js    |   2 +-
 .../admin/user-uploaded.client.controller.js  |  47 ++-
 .../status/uploaded.client.controller.js      |  50 ++-
 .../admin/user-leeching.client.view.html      | 123 +------
 .../views/admin/user-seeding.client.view.html | 119 +------
 .../views/admin/user-uplist.client.view.html  | 113 +-----
 .../views/admin/user-warning.client.view.html | 124 +------
 .../views/status/downloading.client.view.html | 120 +------
 .../views/status/seeding.client.view.html     | 116 +------
 .../views/status/uploaded.client.view.html    | 111 +-----
 .../views/status/warning.client.view.html     | 120 +------
 .../controllers/vip.client.controller.js      |   2 +
 modules/vip/client/views/vip.client.view.html | 116 +------
 38 files changed, 1182 insertions(+), 2029 deletions(-)
 create mode 100644 modules/core/client/directives/torrent-list-item.client.directive.js
 create mode 100644 modules/core/client/less/media-margin.less
 create mode 100644 modules/torrents/client/templates/torrent-item.client.view.html

diff --git a/config/env/torrents.js b/config/env/torrents.js
index fc8591d0..5db83830 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -524,24 +524,29 @@ module.exports = {
     },
 
     /**
-     *  @inputLength
+     * @inputLength
      *
-     *  input string length limit settings
+     * input string length limit settings
      *
-     *  @userSignatureLength:         user signature of forum string length limit
-     *  @chatMessageMaxLength:        chat room send message string length limit
-     *  @messageTitleLength:          user message send title length limit
-     *  @messageBoxContentLength:     user message send content length limit
-     *  @messageBoxReplyLength:       user message send reply content length limit
-     *  @ticketContentLength:         ticket content length limit
-     *  @torrentCommentLength:        torrent comment send content length limit
-     *  @forumTopicTitleLength:       forum topic title length limit
-     *  @forumTopicContentLength:     forum topic content length limit
-     *  @forumReplyContentLength:     forum reply content length limit
-     *  @makerGroupDescLength:        resources group desc content length limit
-     *  @collectionsOverviewLength:   movie collections overview content length limit
+     * @uploadTorrentTitleLength:     torrent title length on upload page
+     * @uploadTorrentSubTitleLength:  torrent sub title length on upload page
+     * @userSignatureLength:          user signature of forum string length limit
+     * @chatMessageMaxLength:         chat room send message string length limit
+     * @messageTitleLength:           user message send title length limit
+     * @messageBoxContentLength:      user message send content length limit
+     * @messageBoxReplyLength:        user message send reply content length limit
+     * @ticketContentLength:          ticket content length limit
+     * @torrentCommentLength:         torrent comment send content length limit
+     * @forumTopicTitleLength:        forum topic title length limit
+     * @forumTopicContentLength:      forum topic content length limit
+     * @forumReplyContentLength:      forum reply content length limit
+     * @makerGroupDescLength:         resources group desc content length limit
+     * @collectionsOverviewLength:    movie collections overview content length limit
      */
     inputLength: {
+      uploadTorrentTitleLength: 128,
+      uploadTorrentSubTitleLength: 128,
+
       userSignatureLength: 512,
       chatMessageMaxLength: 512,
 
@@ -1181,7 +1186,7 @@ module.exports = {
      * @resourcesLanguage:        settings for language of dropdown resource info
      */
     tmdbConfig: {
-      key: 'this is access key from tmdb',
+      key: '7888f0042a366f63289ff571b68b7ce0',
       tmdbHome: 'https://www.themoviedb.org',
       tmdbMovieLinkUrl: 'https://www.themoviedb.org/movie/',
       tmdbTvserialLinkUrl: 'https://www.themoviedb.org/tv/',
diff --git a/config/lib/multer.js b/config/lib/multer.js
index 6f539bd7..c02e0988 100644
--- a/config/lib/multer.js
+++ b/config/lib/multer.js
@@ -59,7 +59,10 @@ module.exports.createUploadFilename = function (req, file, cb) {
   }
 
   //replace other pt site prefix
-  filename = filename.replace(/^\{([^}]+)\}[\.\s]|^\{([^}]+)\}/, '');
+  var reg = /^\{([^}]+)\}[\.\s]|^\{([^}]+)\}/i;
+  while (reg.test(filename)) {
+    filename = filename.replace(reg, '');
+  }
 
   if (fs.existsSync(config.uploads.torrent.file.dest + filename)) {
     var err = new Error();
@@ -98,7 +101,11 @@ module.exports.createUploadAttachFilename = function (req, file, cb) {
   }
 
   //replace other pt site prefix
-  filename = filename.replace(/^\{([^}]+)\}[\.\s]|^\{([^}]+)\}/, '');
+  var reg = /^\{([^}]+)\}[\.\s]|^\{([^}]+)\}/i;
+  while (reg.test(filename)) {
+    filename = filename.replace(reg, '');
+  }
+
 
   if (fs.existsSync(config.uploads.attach.file.dest + filename)) {
     var ext = file.originalname.replace(/^.+\./, '');
diff --git a/modules/about/client/controllers/about.client.controller.js b/modules/about/client/controllers/about.client.controller.js
index ba035bef..a9156b46 100644
--- a/modules/about/client/controllers/about.client.controller.js
+++ b/modules/about/client/controllers/about.client.controller.js
@@ -43,6 +43,11 @@
 
     vm.groupTorrentType = localStorageService.get('maker_last_selected_type') || 'movie';
     vm.searchTags = [];
+    vm.searchKey = '';
+    vm.releaseYear = undefined;
+    vm.filterHnR = false;
+    vm.filterSale = false;
+    vm.torrentRLevel = 'level0';
 
     uibButtonConfig.activeClass = 'btn-success';
 
@@ -275,7 +280,13 @@
         torrent_status: 'reviewed',
         maker: vm.maker._id,
         torrent_vip: false,
-        keys: vm.search
+        keys: vm.search,
+
+        torrent_rlevel: vm.torrentRLevel,
+        torrent_release: vm.releaseYear,
+        torrent_tags: vm.searchTags,
+        torrent_hnr: vm.filterHnR,
+        torrent_sale: vm.filterSale
       }, function (data) {
         mtDebug.info(data);
         callback(data);
diff --git a/modules/about/client/views/maker-view.client.view.html b/modules/about/client/views/maker-view.client.view.html
index a153ab4f..90cea3ac 100644
--- a/modules/about/client/views/maker-view.client.view.html
+++ b/modules/about/client/views/maker-view.client.view.html
@@ -174,120 +174,16 @@
                                 <th class="text-center">{{ 'TABLE_FIELDS.PUBLISHER' | translate}}</th>
                             </tr>
                         </thead>
-                        <tbody>
-                            <tr ng-if="vm.tooltipMsg">
+                        <tbody ng-if="vm.tooltipMsg">
+                            <tr>
                                 <td colspan="7">
                                     <div class="text-center margin-top-50 margin-bottom-30 padding-top-20 padding-bottom-50">
-                                        <h2>{{vm.tooltipMsg | translate}}</h2>
+                                        <h3>{{vm.tooltipMsg | translate}}</h3>
                                     </div>
                                 </td>
                             </tr>
-                            <tr class="torrent-list-info"
-                                ng-if="!vm.tooltipMsg" ng-repeat-start="item in vm.pagedItems" ng-click="vm.TGI.openTorrentDetailInfo(item._id);">
-                                <td class="td-width-0" rowspan="2"></td>
-                                <td class="col-md-7 td-text-overflow">
-                                    <div class="media">
-                                        <div class="media-left">
-                                            <img class="media-object" torrent-logo="item"
-                                                 ng-src="{{vm.TGI.getTorrentListImage(item)}}"
-                                                 alt="{{vm.TGI.getTorrentTitle(item)}}">
-
-                                            <div class="layer-download" ng-class="{'music': item.torrent_type=='music'}">
-                                                <i class="fa fa-arrow-circle-o-down fa-3x" aria-hidden="true"
-                                                   title="{{ 'TITLE_ALT.DOWNLOAD_TORRENT' | translate}}"
-                                                   ng-click="vm.DLS.downloadTorrent(item._id); $event.stopPropagation();"
-                                                   ng-class="{'fa-arrow-circle-down': vm.hover}"
-                                                   ng-mouseover="vm.hover = true;" ng-mouseleave="vm.hover = false;"></i>
-                                            </div>
-                                        </div>
-                                        <div class="media-body">
-                                            <h5 class="media-heading">
-                                                <a ui-sref="torrents.view({torrentId: item._id})">{{vm.TGI.getTorrentDoubleTitle(item)}}</a>
-                                                <span torrent-file-link="item" torrent-user="vm.user" info-class="color-mt-base"></span>
-                                            </h5>
-
-                                            <div class="torrent-filename text-long">{{item.torrent_filename | filename}}</div>
-                                            <div class="torrent-filename text-long">{{item.resource_detail_info.subtitle}}</div>
-
-                                            <div class="list-all-genres">
-                                                <span class="genres-item" ng-repeat="t in item.resource_detail_info.genres">{{t.name}}</span>
-                                            </div>
-
-                                            <div class="list-all-tags">
-                                                <span class="label label-release label-warning" ng-show="item.resource_detail_info.release_date"
-                                                      ng-click="$event.stopPropagation();">
-                                                    {{ item.resource_detail_info.release_date}}
-                                                </span>
-                                                <span title="{{ 'TORRENT_STATUS_TOP_TITLE' | translate}}" ng-if="item.isTop"
-                                                      class="torrent-votes"><kbd>{{'STATUS_TOP_KEY' | translate}}</kbd></span>
-                                                <span class="label label-rlevel label-info"
-                                                      ng-show="item.torrent_recommended != 'level0'"
-                                                      ng-click="$event.stopPropagation();">
-                                                    {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent_recommended.toUpperCase() | translate}}
-                                                </span>
-                                                <span class="label label-sale" ng-if="item.isSaling"
-                                                      title="{{vm.TGI.getTorrentSaleTypeDesc(item);}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{item.torrent_sale_expires | date: 'MM-dd HH:mm'}}"
-                                                      ng-click="$event.stopPropagation();"
-                                                      ng-class="{'label-default': !item.isSaling, 'label-success': item.isSaling}">
-                                                        {{item.torrent_sale_status}} {{item.torrent_sale_expires | unlife}}
-                                                </span>
-                                                <span class="label label-se-info" ng-if="item.torrent_type == 'tvserial'"
-                                                      ng-click="$event.stopPropagation();">S{{item.torrent_seasons}}E{{item.torrent_episodes}}</span>
-
-                                                <span class="label label-hnr-info" ng-if="item.torrent_hnr"
-                                                      ng-click="$event.stopPropagation();">H&R</span>
-
-                                                <span class="label label-vip-info" ng-if="item.torrent_vip"
-                                                      ng-click="$event.stopPropagation();">VIP</span>
-
-                                                <span ng-repeat="t in item.torrent_tags">
-                                                    <span class="label label-tag" ng-class="{'used': vm.searchTags.indexOf(t) !== -1}"
-                                                          ng-click="$event.stopPropagation();"
-                                                          ng-if="vm.RTS.tagInList(t);">
-                                                        {{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
-                                                    </span>
-                                                </span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </td>
-                                <td class="col-md-1 td-v-middle td-imdb">
-                                    <span title="{{ 'TITLE_ALT.IMDB_VOTES' | translate}}"
-                                          class="torrent-votes"><kbd>{{vm.TGI.getVoteTitle(item)}}</kbd> {{item.resource_detail_info.vote_average | number : 1}}</span>
-                                </td>
-                                <td class="col-md-1 td-v-middle text-center td-life">{{item.createdat | life}}</td>
-                                <td class="col-md-1 td-v-middle text-center td-size">{{item.torrent_size | bytes:2}}</td>
-                                <td class="col-md-1 td-v-middle list-user-info td-user-info">
-                                    <p class="no-margin-p" title="{{ 'TITLE_ALT.SEEDS' | translate}}">
-                                        <span class="glyphicon glyphicon-arrow-up torrent-up"></span>
-                                        {{item.torrent_seeds}}
-                                    </p>
-
-                                    <p class="no-margin-p" title="{{ 'TITLE_ALT.LEECHERS' | translate}}">
-                                        <span class="glyphicon glyphicon-arrow-down torrent-down"></span>
-                                        {{item.torrent_leechers}}
-                                    </p>
-
-                                    <p class="no-margin-p" title="{{ 'TITLE_ALT.FINISHED' | translate}}">
-                                        <span class="glyphicon glyphicon-ok torrent-finished"></span>
-                                        {{item.torrent_finished}}
-                                    </p>
-                                </td>
-                                <td class="col-md-1 td-v-middle text-center td-uploader">
-                                    <span ng-if="!item.isAnonymous" user-info="item.user" info-name></span>
-                                    <span ng-if="item.isAnonymous">{{ 'ANONYMOUS' | translate }}</span>
-
-                                    <div maker-info="item.maker"></div>
-                                    <!--<span vip-flag="item.user"></span>-->
-                                    <!--<span message-to="item.user" to-class="message-to-icon"></span>-->
-                                </td>
-                            </tr>
-                            <tr ng-repeat-end>
-                                <td class="td-progress" colspan="6">
-                                    <div torrent-progress="item.my_peers"></div>
-                                </td>
-                            </tr>
                         </tbody>
+                        <tbody ng-if="!vm.tooltipMsg" torrent-list-item parent="vm" item="item" list="vm.pagedItems" ng-repeat="item in vm.pagedItems"></tbody>
                     </table>
                 </div>
 
diff --git a/modules/collections/client/views/collection-view.client.view.html b/modules/collections/client/views/collection-view.client.view.html
index a48ce0ab..e331929f 100644
--- a/modules/collections/client/views/collection-view.client.view.html
+++ b/modules/collections/client/views/collection-view.client.view.html
@@ -95,121 +95,7 @@
                                 <th class="text-center">{{ 'TABLE_FIELDS.PUBLISHER' | translate}}</th>
                             </tr>
                         </thead>
-                        <tbody>
-                            <tr class="torrent-list-info"
-                                ng-repeat-start="item in vm.collection.torrents" ng-click="vm.TGI.openTorrentDetailInfo(item._id);">
-                                <td class="td-width-0" rowspan="2"></td>
-                                <td class="col-md-7 td-text-overflow">
-                                    <div class="media">
-                                        <div class="media-left">
-                                            <img class="media-object" torrent-logo="item"
-                                                 ng-src="{{vm.TGI.getTorrentListImage(item)}}"
-                                                 alt="{{vm.TGI.getTorrentTitle(item)}}">
-
-                                            <div class="layer-download">
-                                                <i class="fa fa-arrow-circle-o-down fa-3x" aria-hidden="true"
-                                                   title="{{ 'TITLE_ALT.DOWNLOAD_TORRENT' | translate}}"
-                                                   ng-click="vm.DLS.downloadTorrent(item._id); $event.stopPropagation();"
-                                                   ng-class="{'fa-arrow-circle-down': vm.hover}"
-                                                   ng-mouseover="vm.hover = true;" ng-mouseleave="vm.hover = false;"></i>
-                                            </div>
-                                        </div>
-                                        <div class="media-body">
-                                            <h5 class="media-heading">
-                                                <a ui-sref="torrents.view({torrentId: item._id})">{{vm.TGI.getTorrentDoubleTitle(item)}}</a>
-                                                <span torrent-file-link="item" torrent-user="vm.user" info-class="color-mt-base"></span>
-                                            </h5>
-
-                                            <div class="torrent-filename text-long">{{item.torrent_filename | filename}}</div>
-                                            <div class="torrent-filename text-long">{{item.resource_detail_info.subtitle}}</div>
-
-                                            <div class="list-all-genres">
-                                                <span class="genres-item" ng-repeat="t in item.resource_detail_info.genres">{{t.name}}</span>
-                                            </div>
-
-                                            <div class="list-all-tags">
-                                                <span class="label label-release label-warning" ng-show="item.resource_detail_info.release_date"
-                                                      ng-click="$event.stopPropagation();">
-                                                    {{ item.resource_detail_info.release_date}}
-                                                </span>
-                                                <span title="{{ 'TORRENT_STATUS_TOP_TITLE' | translate}}" ng-if="item.isTop"
-                                                      class="torrent-votes"><kbd>{{'STATUS_TOP_KEY' | translate}}</kbd></span>
-                                                <span class="label label-rlevel label-info"
-                                                      ng-show="item.torrent_recommended != 'level0'"
-                                                      ng-click="$event.stopPropagation();">
-                                                    {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent_recommended.toUpperCase() | translate}}
-                                                </span>
-                                                <span class="label label-sale" ng-if="item.isSaling"
-                                                      title="{{vm.TGI.getTorrentSaleTypeDesc(item);}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{item.torrent_sale_expires | date: 'MM-dd HH:mm'}}"
-                                                      ng-click="$event.stopPropagation();"
-                                                      ng-class="{'label-default': !item.isSaling, 'label-success': item.isSaling}">
-                                                        {{item.torrent_sale_status}} {{item.torrent_sale_expires | unlife}}
-                                                </span>
-                                                <span class="label label-se-info" ng-if="item.torrent_type == 'tvserial'"
-                                                      ng-click="$event.stopPropagation();">S{{item.torrent_seasons}}E{{item.torrent_episodes}}</span>
-
-                                                <span class="label label-hnr-info" ng-if="item.torrent_hnr"
-                                                      ng-click="$event.stopPropagation();">H&R</span>
-
-                                                <span class="label label-vip-info" ng-if="item.torrent_vip"
-                                                      ng-click="$event.stopPropagation();">VIP</span>
-
-                                                <span ng-repeat="t in item.torrent_tags">
-                                                    <span class="label label-tag" ng-class="{'used': vm.searchTags.indexOf(t) !== -1}"
-                                                          ng-click="$event.stopPropagation();"
-                                                          ng-if="vm.RTS.tagInList(t);">
-                                                        {{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
-                                                    </span>
-                                                </span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </td>
-                                <td class="col-md-1 td-v-middle td-imdb">
-                                    <span title="{{ 'TITLE_ALT.IMDB_VOTES' | translate}}"
-                                          class="torrent-votes"><kbd>{{vm.TGI.getVoteTitle(item)}}</kbd> {{item.resource_detail_info.vote_average | number : 1}}</span>
-                                </td>
-                                <td class="col-md-1 td-v-middle text-center td-life">{{item.createdat | life}}</td>
-                                <td class="col-md-1 td-v-middle text-center td-size">{{item.torrent_size | bytes:2}}</td>
-                                <td class="col-md-1 td-v-middle list-user-info td-user-info">
-                                    <p class="no-margin-p" title="{{ 'TITLE_ALT.SEEDS' | translate}}">
-                                        <span class="glyphicon glyphicon-arrow-up torrent-up"></span>
-                                        {{item.torrent_seeds}}
-                                    </p>
-
-                                    <p class="no-margin-p" title="{{ 'TITLE_ALT.LEECHERS' | translate}}">
-                                        <span class="glyphicon glyphicon-arrow-down torrent-down"></span>
-                                        {{item.torrent_leechers}}
-                                    </p>
-
-                                    <p class="no-margin-p" title="{{ 'TITLE_ALT.FINISHED' | translate}}">
-                                        <span class="glyphicon glyphicon-ok torrent-finished"></span>
-                                        {{item.torrent_finished}}
-                                    </p>
-                                </td>
-                                <td class="col-md-1 td-v-middle text-center td-uploader">
-                                    <div class="coll-item-uploader">
-                                        <span ng-if="!item.isAnonymous" user-info="item.user" info-name></span>
-                                        <span ng-if="item.isAnonymous">{{ 'ANONYMOUS' | translate }}</span>
-
-                                        <div maker-info="item.maker"></div>
-                                        <!--<span vip-flag="item.user"></span>-->
-                                        <!--<span message-to="item.user" to-class="message-to-icon"></span>-->
-                                    </div>
-                                    <div class="coll-item-remove">
-                                        <button class="btn btn-default" uib-tooltip="{{ 'COLLECTIONS.BTN_REMOVE_TITLE' | translate}}"
-                                                ng-click="vm.removeFromCollections(item); $event.stopPropagation();">
-                                            {{'COLLECTIONS.BTN_REMOVE_FROM_COLLECTION' | translate}}
-                                        </button>
-                                    </div>
-                                </td>
-                            </tr>
-                            <tr ng-repeat-end>
-                                <td class="td-progress" colspan="6">
-                                    <div torrent-progress="item.my_peers"></div>
-                                </td>
-                            </tr>
-                        </tbody>
+                        <tbody torrent-list-item parent="vm" item="item" list="vm.collection.torrents" ng-repeat="item in vm.collection.torrents"></tbody>
                     </table>
                 </div>
             </div>
diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index 920a609d..2dba28d7 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -23,6 +23,7 @@
     VALUE_CUSTOM: 'CUSTOM',
     VALUE_SELECT_ALL: 'Select All',
     BTN_REMOVE: 'Remove',
+    BTN_CONTINUE: 'Continue',
 
     //Support
     SUPPORT_GROUP_NAME_DESC: 'Management group',
@@ -162,16 +163,12 @@
       TITLE_LIFE: 'orderBy life',
 
       //status
-      UPLOADED_SPEED: 'U/S',
-      DOWNLOADED_RATIO: 'D/R',
-      DOWNLOADED_SPEED: 'D/S',
-      UPLOADED_RATIO_PERCENT: 'U/R/P',
+      UPLOADED_SPEED: 'U/S/R',
+      DOWNLOADED_SPEED: 'D/S/P',
       UP_DOWN_RATIO_TIME: 'U/D/R/T',
 
-      ABBR_UPLOADED_SPEED: 'uploaded/speed',
-      ABBR_DOWNLOADED_RATIO: 'downloaded/ratio',
-      ABBR_DOWNLOADED_SPEED: 'downloaded/speed',
-      ABBR_UPLOADED_RATIO_PERCENT: 'uploaded/ratio/percent',
+      ABBR_UPLOADED_SPEED: 'uploaded/speed/ratio',
+      ABBR_DOWNLOADED_SPEED: 'downloaded/speed/percent',
       ABBR_UP_DOWN_RATIO_TIME: 'uploaded/downloaded/ratio/seeding time',
 
       //peer
@@ -347,6 +344,7 @@
     COPY_LINK_TO_CLIPBOARD: 'Copy torrent file download link to clipboard',
     COPY_LINK_TEXT: 'Copy torrent file link',
     COPY_TO_CLIPBOARD_SUCCESSFULLY: 'Copy data to clipboard successfully!',
+    TORRENT_LABEL_LINK: 'Torrent Link',
     PH_KEYWORD: 'Search keyword',
     CLEAR_ALL_CONDITION: 'Clear All Condition',
     MORE_TAGS: 'More Tags',
@@ -510,7 +508,7 @@
     SELECT_TORRENT_FILE: '1. Please select the torrent file',
     SELECT_FILE: 'Select file',
     DO_UPLOAD: 'Upload',
-    ENTER_TMDB_ID: '3. Please enter theMovieDB id',
+    ENTER_TMDB_ID: '3 Please enter theMovieDB id',
     LOAD_TMDB_INFO: 'Load info',
     SEARCH_FROM_TMDB: 'Search From TMDB',
     TMDB_ID: 'TMDB ID',
@@ -553,8 +551,8 @@
     ERROR_ONLY_IMAGE: 'Only image files support(gif, png, bmp, jpg, jpeg)',
     FILE_TYPE_ERROR: 'File type that is not accepted',
 
-    ENTER_RESOURCE_TITLE: '3. Please enter the resource title and desc',
-    RESOURCE_TITLE: 'resource title',
+    ENTER_RESOURCE_TITLE: '4.1 Please enter the resource main title and sub title',
+    RESOURCE_TITLE: 'resource main title',
     RESOURCE_SUB_TITLE: 'resource sub title',
     SELECT_RESOURCE_IMAGE: '3.1 Please select resource cover image',
     ENTER_RESOURCE_DETAIL_INFO: '4. Please enter the resource detail info',
@@ -848,9 +846,10 @@
       COMMENT_REMOVE_ERROR: 'Comment removed failed!',
       DESC_LIST: '### NOTE: \n - The list contains only the last `{{days}}` days of the requests. \n - If your response is accepted, the requestor\'s reward score will be automatically transferred to your account. \n - Only the torrents reviewed by the administrator can be accepted by the requestor. \n - The requester can only accept one of the responses. \n - If your response is complains, your account may be punished, Please respond to the user\'s request carefully.',
       DESC_MY: '### NOTE: \n - If you accept a response, your reward score will be transferred to the respondent\'s account that you accept. \n - Only the torrents reviewed by the administrator can be accepted by you. \n - You can only accept one of the responses. \n - The request over `{{days}}` days has expired and cannot accept the response,  you can only post the request again. \n - If your score is maliciously damaged, Please contact our {{sNameDesc | translate}} by **[Message](/messages/send?to={{sName}})** or **[Email](mailto:{{sMail}})** to complaints.',
-      DESC_ADD: '### NOTE: \n - Each request will be automatically deducted from `{{add_score}}` points, but your reward score will only be transferred to the responder\'s account that you eventually accept. \n - Only the torrents reviewed by the administrator can be accepted by you. \n - Each request is only valid for `{{days}}` days. After expiry, you can only post the request again. \n - Please give a clear resources description of your request when you post the request.',
+      DESC_ADD: '### NOTE: \n - Each request will be automatically deducted from `{{add_score}}` points, and your reward score will only be transferred to the responder\'s account that you eventually accept. \n - Only the torrents reviewed by the administrator can be accepted by you. \n - Each request is only valid for `{{days}}` days. After expiry, you can only post the request again. \n - Please give a clear resources description of your request when you post the request.',
       DESC_RES: '### NOTE: \n - If requestor accept your response, the reward score will be transferred to your account. \n - Only the torrents reviewed by the administrator can be accepted by requestor. \n - Requestor can only accept one of the responses.',
-      DESC_VIEW: '### NOTE: \n - If you want to response a request, please upload the torrent file and seed, Please respond to the user\'s request carefully. \n - If you are a requestor, you can choose a responder and accept it, and only the torrents reviewed by the administrator can be accepted. \n - If you accept a response, your reward score will be transferred to the respondent\'s account that you accept. \n - The request over `{{days}}` days has expired and cannot accept or response(upload).'
+      DESC_VIEW: '### NOTE: \n - If you want to response a request, please upload the torrent file and seed, Please respond to the user\'s request carefully. \n - If you are a requestor, you can choose a responder and accept it, and only the torrents reviewed by the administrator can be accepted. \n - If you accept a response, your reward score will be transferred to the respondent\'s account that you accept. \n - The request over `{{days}}` days has expired and cannot accept or response(upload).',
+      CAN_NTO_TO_ADD: 'Each request will be automatically deducted from `{{add_score}}` points，your scores are too small, please try again later ...'
     },
 
     //user status
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index 1e73dee7..8a8d2bcf 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -23,6 +23,7 @@
     VALUE_CUSTOM: '自定义',
     VALUE_SELECT_ALL: '全选',
     BTN_REMOVE: '删除',
+    BTN_CONTINUE: '继续',
 
     //Support
     SUPPORT_GROUP_NAME_DESC: '管理组',
@@ -162,16 +163,12 @@
       TITLE_LIFE: '按上传时间排序',
 
       //status
-      UPLOADED_SPEED: '上/速',
-      DOWNLOADED_RATIO: '下/比',
-      DOWNLOADED_SPEED: '下/速',
-      UPLOADED_RATIO_PERCENT: '上/比/进度',
+      UPLOADED_SPEED: '上/速/分享',
+      DOWNLOADED_SPEED: '下/速/进度',
       UP_DOWN_RATIO_TIME: '上/下/比/时',
 
-      ABBR_UPLOADED_SPEED: '上传量/速度',
-      ABBR_DOWNLOADED_RATIO: '下载量/分享率',
-      ABBR_DOWNLOADED_SPEED: '下载量/速度',
-      ABBR_UPLOADED_RATIO_PERCENT: '上传量/分享率/完成百分比',
+      ABBR_UPLOADED_SPEED: '上传量/速度/分享率',
+      ABBR_DOWNLOADED_SPEED: '下载量/速度/完成进度',
       ABBR_UP_DOWN_RATIO_TIME: '上传量/下载量/分享率/做种时间',
 
       //peer
@@ -347,6 +344,7 @@
     COPY_LINK_TO_CLIPBOARD: '复制种子文件下载连接到剪切板',
     COPY_LINK_TEXT: '复制种子文件地址',
     COPY_TO_CLIPBOARD_SUCCESSFULLY: '内容已复制到剪切板!',
+    TORRENT_LABEL_LINK: '种子连接',
     PH_KEYWORD: '搜索关键字',
     CLEAR_ALL_CONDITION: '清空所有条件',
     MORE_TAGS: '显示更多标签',
@@ -510,7 +508,7 @@
     SELECT_TORRENT_FILE: '1. 请选择种子文件',
     SELECT_FILE: '选择文件',
     DO_UPLOAD: '上传',
-    ENTER_TMDB_ID: '3. 请输入TMDB_ID',
+    ENTER_TMDB_ID: '3 请输入TMDB_ID',
     LOAD_TMDB_INFO: '检索信息',
     TMDB_ID: 'TMDB ID',
     SEARCH_FROM_TMDB: '从 TMDB 搜索',
@@ -553,8 +551,8 @@
     ERROR_ONLY_IMAGE: '此处只支持图片文件上传(gif, png, bmp, jpg, jpeg)',
     FILE_TYPE_ERROR: '文件类型不被接受',
 
-    ENTER_RESOURCE_TITLE: '3. 请输入资源标题与描述',
-    RESOURCE_TITLE: '资源标题',
+    ENTER_RESOURCE_TITLE: '4.1 请输入资源主副标题',
+    RESOURCE_TITLE: '资源主标题',
     RESOURCE_SUB_TITLE: '资源副标题',
     SELECT_RESOURCE_IMAGE: '3.1 请选择资源封面图片',
     ENTER_RESOURCE_DETAIL_INFO: '4. 请输入资源详细信息',
@@ -850,7 +848,8 @@
       DESC_MY: '### 提示: \n - 如果您接受一个响应, 您的悬赏积分就会转入您接受的响应者的帐户. \n - 只有被管理员审核通过的种子才能被您接受. \n - 您只能接受多个响应中的一个. \n - 超过 `{{days}}` 天的请求已经过期且不能接受响应, 如果需要您只能再次发起请求. \n - 如果您的积分受到恶意损害, 请给{{sNameDesc | translate}}发送 **[消息](/messages/send?to={{sName}})** 或 **[邮件](mailto:{{sMail}})** 进行投诉.',
       DESC_ADD: '### 提示: \n - 每发布一个请求会被自动扣除 `{{add_score}}` 积分, 而您的悬赏积分会转入您最终接受的响应者的帐户. \n - 只有被管理员审核通过的种子才能被您接受. \n - 每一个发布的请求只有 `{{days}}` 天的有效期, 过期后您只能再次发起请求. \n - 请在发布请求时明确描述您对资源的要求.',
       DESC_RES: '### NOTE: \n - 如果请求者接受了您的响应, 悬赏积分将自动转入您的帐户. \n - 只有被管理员审核通过的种子才能被请求者接受. \n - 请求者只会接受多个响应中的一个.',
-      DESC_VIEW: '### NOTE: \n - 如果您是一个响应者, 请上传您的种子文件并开始做种, 请认真响应用户的请求. \n - 如果您是一个请求者, 您可以选择一个响应并接受它, 只有被管理员审核通过的种子才能被您接受. \n - 如果您接受一个响应, 您的悬赏积分就会转入您接受的响应者的帐户. \n - 超过 `{{days}}` 天的请求已经过期且不能接受响应或上传种子.'
+      DESC_VIEW: '### NOTE: \n - 如果您是一个响应者, 请上传您的种子文件并开始做种, 请认真响应用户的请求. \n - 如果您是一个请求者, 您可以选择一个响应并接受它, 只有被管理员审核通过的种子才能被您接受. \n - 如果您接受一个响应, 您的悬赏积分就会转入您接受的响应者的帐户. \n - 超过 `{{days}}` 天的请求已经过期且不能接受响应或上传种子.',
+      CAN_NTO_TO_ADD: '每发布一个请求会被自动扣除 `{{add_score}}` 积分，您的积分太少，请稍候再试 ...'
     },
 
     //user status
diff --git a/modules/core/client/directives/torrent-list-item.client.directive.js b/modules/core/client/directives/torrent-list-item.client.directive.js
new file mode 100644
index 00000000..7755ad5b
--- /dev/null
+++ b/modules/core/client/directives/torrent-list-item.client.directive.js
@@ -0,0 +1,322 @@
+(function () {
+  'use strict';
+
+  angular.module('core')
+    .directive('torrentListItem', torrentListItem);
+
+  function torrentListItem() {
+    var TorrentsItemController = ['$scope', '$state', 'TorrentGetInfoServices', 'ResourcesTagsServices', '$timeout', 'DownloadService', 'MeanTorrentConfig',
+      'TorrentsService', 'Authentication', 'NotifycationService', 'ModalConfirmService', '$translate',
+      function ($scope, $state, TorrentGetInfoServices, ResourcesTagsServices, $timeout, DownloadService, MeanTorrentConfig, TorrentsService, Authentication,
+                NotifycationService, ModalConfirmService, $translate) {
+        var vm = this;
+
+        vm.user = Authentication.user;
+        vm.state = $state;
+        vm.TGI = TorrentGetInfoServices;
+        vm.RTS = ResourcesTagsServices;
+        vm.DLS = DownloadService;
+        vm.torrentSalesType = MeanTorrentConfig.meanTorrentConfig.torrentSalesType;
+        vm.torrentRLevels = MeanTorrentConfig.meanTorrentConfig.torrentRecommendLevel;
+
+        /**
+         * buildPager
+         */
+        function buildPager() {
+          if (typeof $scope.parent.torrentBuildPager === 'function') {
+            $scope.parent.torrentBuildPager();
+          } else if (typeof $scope.parent.buildPager === 'function') {
+            $scope.parent.buildPager();
+          }
+        }
+
+        /**
+         * getTagUsedStatus
+         * @param t
+         * @returns {boolean}
+         */
+        vm.getTagUsedStatus = function (t) {
+          return $scope.parent.searchTags.indexOf(t) !== -1;
+        };
+
+        /**
+         * onTagClicked
+         * @param tag: tag name
+         */
+        vm.onTagClicked = function (tag) {
+          if ($('#tag_' + tag) && $('#tag_' + tag).val()) {
+            $timeout(function () {
+              angular.element('#tag_' + tag).trigger('click');
+            }, 10);
+          } else {
+            if ($scope.parent.searchTags.includes(tag)) {
+              $scope.parent.searchTags.splice($scope.parent.searchTags.indexOf(tag), 1);
+            } else {
+              $scope.parent.searchTags.push(tag);
+            }
+            buildPager();
+          }
+        };
+
+        /**
+         * onReleaseClicked
+         * @param y
+         */
+        vm.onReleaseClicked = function (y) {
+          if ($scope.parent.releaseYear === y) {
+            $scope.parent.releaseYear = undefined;
+          } else {
+            $scope.parent.releaseYear = y;
+          }
+
+          buildPager();
+        };
+
+        /**
+         * onTorrentTypeClicked
+         * @param t
+         */
+        vm.onTorrentTypeClicked = function (t) {
+          if ($scope.parent.filterType === t) {
+            $scope.parent.filterType = undefined;
+          } else {
+            $scope.parent.filterType = t;
+          }
+
+          buildPager();
+        };
+
+        /**
+         * onRLevelClicked
+         * @param y
+         */
+        vm.onRLevelClicked = function (l) {
+          if ($scope.parent.torrentRLevel === l) {
+            $scope.parent.torrentRLevel = 'level0';
+          } else {
+            $scope.parent.torrentRLevel = l;
+          }
+
+          buildPager();
+        };
+
+        /**
+         * onHnRClicked
+         */
+        vm.onHnRClicked = function () {
+          $scope.parent.filterHnR = !$scope.parent.filterHnR;
+
+          buildPager();
+        };
+
+        /**
+         * onSaleChanged
+         */
+        vm.onSaleClicked = function () {
+          $scope.parent.filterSale = !$scope.parent.filterSale;
+
+          buildPager();
+        };
+
+        /**
+         * onVIPClicked, onVIPChanged
+         */
+        vm.onVIPClicked = function () {
+          $scope.parent.filterVIP = !$scope.parent.filterVIP;
+
+          buildPager();
+        };
+
+        /**
+         * toggleTop
+         */
+        vm.toggleTop = function (item) {
+          var dt = new TorrentsService(item);
+          dt.$toggleTopStatus(function (res) {
+            $scope.list[$scope.list.indexOf(item)] = res;
+            NotifycationService.showSuccessNotify('TORRENT_TOGGLE_TOP_SUCCESSFULLY');
+          }, function (res) {
+            NotifycationService.showErrorNotify(res.data.message, 'TORRENT_TOGGLE_TOP_FAILED');
+          });
+        };
+
+        /**
+         * toggleHnR
+         */
+        vm.toggleHnR = function (item) {
+          var dt = new TorrentsService(item);
+          dt.$toggleHnRStatus(function (res) {
+            $scope.list[$scope.list.indexOf(item)] = res;
+            NotifycationService.showSuccessNotify('TORRENT_TOGGLE_HNR_SUCCESSFULLY');
+          }, function (res) {
+            NotifycationService.showErrorNotify(res.data.message, 'TORRENT_TOGGLE_HNR_FAILED');
+          });
+        };
+
+        /**
+         * toggleVIP
+         */
+        vm.toggleVIP = function (item) {
+          var dt = new TorrentsService(item);
+          dt.$toggleVIPStatus(function (res) {
+            $scope.list[$scope.list.indexOf(item)] = res;
+            NotifycationService.showSuccessNotify('TORRENT_TOGGLE_VIP_SUCCESSFULLY');
+          }, function (res) {
+            NotifycationService.showErrorNotify(res.data.message, 'TORRENT_TOGGLE_VIP_FAILED');
+          });
+        };
+
+        /**
+         * vm.setRecommendLevel
+         */
+        vm.setRecommendLevel = function (item, rl) {
+          TorrentsService.setRecommendLevel({
+            _torrentId: item._id,
+            _rlevel: rl.value
+          }, function (res) {
+            $scope.list[$scope.list.indexOf(item)] = res;
+            NotifycationService.showSuccessNotify('TORRENT_SETRLEVEL_SUCCESSFULLY');
+          }, function (res) {
+            NotifycationService.showErrorNotify(res.data.message, 'TORRENT_SETRLEVEL_ERROR');
+          });
+        };
+
+        /**
+         * setSaleType
+         */
+        vm.setSaleType = function (item, st) {
+          TorrentsService.setSaleType({
+            _torrentId: item._id,
+            _saleType: st.name
+          }, function (res) {
+            $scope.list[$scope.list.indexOf(item)] = res;
+            NotifycationService.showSuccessNotify('TORRENT_SETSALETYPE_SUCCESSFULLY');
+          }, function (res) {
+            NotifycationService.showErrorNotify(res.data.message, 'TORRENT_SETSALETYPE_ERROR');
+          });
+        };
+
+        /**
+         * deleteTorrent
+         */
+        vm.deleteTorrent = function (item) {
+          var modalOptions = {
+            closeButtonText: $translate.instant('TORRENT_DELETE_CONFIRM_CANCEL'),
+            actionButtonText: $translate.instant('TORRENT_DELETE_CONFIRM_OK'),
+            headerText: $translate.instant('TORRENT_DELETE_CONFIRM_HEADER_TEXT'),
+            bodyText: $translate.instant('TORRENT_DELETE_CONFIRM_BODY_TEXT'),
+            bodyParams: item.torrent_filename,
+
+            selectOptions: {
+              enable: true,
+              title: 'TORRENT_DELETE_REASON',
+              options: [
+                'TORRENT_DELETE_REASON_OVERVIEW',
+                'TORRENT_DELETE_REASON_NFO',
+                'TORRENT_DELETE_REASON_QUALITY',
+                'TORRENT_DELETE_REASON_ILLEGAL'
+              ]
+            }
+          };
+
+          ModalConfirmService.showModal({}, modalOptions)
+            .then(function (result) {
+              var reason = result.reason;
+              if (reason === 'CUSTOM') reason = result.custom;
+
+              var dt = new TorrentsService(item);
+              dt.$remove({
+                reason: reason
+              }, function (response) {
+                successCallback(response);
+              }, function (errorResponse) {
+                errorCallback(errorResponse);
+              });
+
+              function successCallback(res) {
+                $scope.list.splice($scope.list.indexOf(item), 1);
+                NotifycationService.showSuccessNotify('TORRENT_DELETE_SUCCESSFULLY');
+              }
+
+              function errorCallback(res) {
+                NotifycationService.showErrorNotify(res.data.message, 'TORRENT_DELETE_ERROR');
+              }
+            });
+        };
+
+        /**
+         * reviewedTorrentStatus
+         * @param item
+         */
+        vm.reviewedTorrentStatus = function (item) {
+          TorrentsService.setReviewedStatus({
+            _torrentId: item._id
+          }, function (res) {
+            $scope.list[$scope.list.indexOf(item)] = res;
+            NotifycationService.showSuccessNotify('TORRENT_SETREVIEWED_SUCCESSFULLY');
+          }, function (res) {
+            NotifycationService.showErrorNotify(res.data.message, 'TORRENT_SETREVIEWED_ERROR');
+          });
+        };
+
+        /**
+         * showByLabel
+         * @returns {boolean}
+         */
+        vm.showByLabel = function () {
+          if (vm.state.current.name.startsWith('admin.torrents')) {
+            return true;
+          } else if (vm.state.current.name.indexOf('seeding') > 0) {
+            return true;
+          } else if (vm.state.current.name.indexOf('leeching') > 0) {
+            return true;
+          } else if (vm.state.current.name.indexOf('warning') > 0) {
+            return true;
+          } else if (vm.state.current.name.indexOf('downloading') > 0) {
+            return true;
+          } else {
+            return false;
+          }
+        };
+
+        /**
+         * showByUser
+         * @returns {boolean}
+         */
+        vm.showByUser = function () {
+          if (vm.state.current.name.startsWith('admin.torrents')) {
+            return false;
+          } else if (vm.state.current.name.indexOf('seeding') > 0) {
+            return false;
+          } else if (vm.state.current.name.indexOf('leeching') > 0) {
+            return false;
+          } else if (vm.state.current.name.indexOf('warning') > 0) {
+            return false;
+          } else if (vm.state.current.name.indexOf('downloading') > 0) {
+            return false;
+          } else if (vm.state.current.name.startsWith('collections')) {
+            return false;
+          } else if (vm.state.current.name.startsWith('requests')) {
+            return false;
+          } else {
+            return true;
+          }
+        };
+
+      }];
+
+    return {
+      restrict: 'AE',
+      templateUrl: '/modules/torrents/client/templates/torrent-item.client.view.html',
+      controller: TorrentsItemController,
+      controllerAs: 'vm',
+      scope: {
+        item: '=',
+        list: '=',
+        peer: '=',
+        warning: '=',
+        parent: '='
+      }
+    };
+  }
+}());
diff --git a/modules/core/client/less/btn-size.less b/modules/core/client/less/btn-size.less
index 1de14495..1226af3f 100644
--- a/modules/core/client/less/btn-size.less
+++ b/modules/core/client/less/btn-size.less
@@ -108,6 +108,46 @@
     min-width: 500px !important;
 }
 
+.max-width-10 {
+    max-width: 10px !important;
+}
+
+.max-width-20 {
+    max-width: 20px !important;
+}
+
+.max-width-30 {
+    max-width: 30px !important;
+}
+
+.max-width-40 {
+    max-width: 40px !important;
+}
+
+.max-width-50 {
+    max-width: 50px !important;
+}
+
+.max-width-60 {
+    max-width: 60px !important;
+}
+
+.max-width-70 {
+    max-width: 70px !important;
+}
+
+.max-width-80 {
+    max-width: 80px !important;
+}
+
+.max-width-90 {
+    max-width: 90px !important;
+}
+
+.max-width-100 {
+    max-width: 100px !important;
+}
+
 .max-width-300 {
     max-width: 300px !important;
 }
diff --git a/modules/core/client/less/media-margin.less b/modules/core/client/less/media-margin.less
new file mode 100644
index 00000000..5ba962dc
--- /dev/null
+++ b/modules/core/client/less/media-margin.less
@@ -0,0 +1,7 @@
+@import (reference) "../../../core/client/less/mt-var.less";
+
+.xs-margin-top-10 {
+    @media (max-width: @screen-xs-max) {
+        margin-top: 10px;
+    }
+}
diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less
index fd1f355b..23fdf247 100644
--- a/modules/core/client/less/mt.less
+++ b/modules/core/client/less/mt.less
@@ -438,6 +438,7 @@ body {
     color: #FF6600;
     > kbd {
         background-color: #FF6600;
+        font-size: 12px;
     }
 }
 
@@ -908,6 +909,12 @@ body {
                 .coll-item-remove {
                     display: block;
                 }
+                .warning-btn {
+                    display: block;
+                }
+                .warning-data {
+                    display: none;
+                }
             }
             .media-left {
                 position: relative;
@@ -918,8 +925,8 @@ body {
             > .td-text-overflow {
                 .text-long {
                     @media (min-width: @screen-lg-min) {
-                        max-width: 570px;
-                        min-width: 560px;
+                        max-width: 550px;
+                        min-width: 540px;
                     }
                     @media (max-width: @screen-md-max) {
                         max-width: 420px;
@@ -1064,14 +1071,15 @@ body {
         position: relative;
         .torrent-filename {
             margin-top: 2px;
-            font-size: 12px;
+            font-size: 13px;
             color: @gray-light;
         }
         .list-all-tags {
-            position: absolute;
-            bottom: 1px;
+            min-height: 52px;
+            margin-top: 10px;
+            width: 100%;
             .label {
-                margin-top: 3px;
+                margin-top: 5px;
             }
             span {
                 position: relative;
@@ -1089,13 +1097,23 @@ body {
                     border: solid 1px #fff;
                 }
             }
+            .label-torrent-link {
+                color: #8a8a8a;
+                border: solid 1px #dedede;
+                background-color: #fafafa;
+                &:hover {
+                    color: #f00;
+                }
+            }
         }
         .media-heading {
             margin-bottom: 5px;
         }
-        .genres-item {
+        .list-all-genres {
             font-size: 12px;
-            color: @gray-light;
+            .genres-item {
+                color: @gray-light;
+            }
         }
     }
     .td-imdb {
@@ -1115,7 +1133,10 @@ body {
     }
     .td-admin-cmd {
         min-width: 143px;
-        padding: 0 !important;
+        padding: 5px !important;
+    }
+    .warning-btn {
+        display: none;
     }
 }
 
@@ -1216,6 +1237,7 @@ body {
 .label-tag {
     color: #0366d6;
     background-color: #f1f8ff;
+    border: solid 1px #ddeeff;
     &:hover {
         cursor: pointer;
         color: #f00;
@@ -1226,6 +1248,7 @@ body {
 }
 
 .label-rlevel {
+    border: solid 1px darken(@brand-info, 2%);
     &:hover {
         cursor: pointer;
         color: #f00;
@@ -1235,6 +1258,7 @@ body {
 .label-hnr-info {
     color: #eee;
     background-color: #333;
+    border: solid 1px #000;
     &:hover {
         cursor: pointer;
         color: #f00;
@@ -1243,9 +1267,9 @@ body {
 }
 
 .label-vip-info {
-    color: @mt-base-color;
-    font-weight: bold;
-    background-color: #f1f8ff;
+    color: #fff;
+    background-color: @mt-base-color;
+    border: solid 1px darken(@mt-base-color, 2%);
     &:hover {
         cursor: pointer;
         color: #f00;
@@ -1255,9 +1279,16 @@ body {
     }
 }
 
+.upload-by {
+    color: #888;
+    background-color: #dedede;
+    border: solid 1px #8a8a8a;
+}
+
 .label-se-info {
     color: @mt-base-color;
     background-color: #f1f8ff;
+    border: solid 1px #ddeeff;
     &:hover {
         cursor: pointer;
         color: #f00;
@@ -1265,6 +1296,7 @@ body {
 }
 
 .label-ttype {
+    border: solid 1px darken(@brand-primary, 2%);
     &:hover {
         cursor: pointer;
         color: #f00;
@@ -1279,6 +1311,7 @@ body {
 }
 
 .label-sale {
+    border: solid 1px darken(@brand-success, 2%);
     &:hover {
         cursor: pointer;
         color: #f00;
@@ -1286,6 +1319,17 @@ body {
 }
 
 .label-release {
+    border: solid 1px darken(@brand-warning, 2%);
+    &:hover {
+        cursor: pointer;
+        color: #f00;
+    }
+}
+
+.torrent-top {
+    color: @mt-base-color;
+    border: solid 1px darken(@mt-base-color, 2%);
+    background-color: #fafafa;
     &:hover {
         cursor: pointer;
         color: #f00;
@@ -1659,6 +1703,9 @@ body {
                     padding: 15px 8px;
                 }
             }
+            + tbody {
+                border-top: none;
+            }
         }
     }
 }
@@ -1761,11 +1808,6 @@ body {
     padding-top: 5px;
 }
 
-.upload-by {
-    color: #888;
-    font-size: 12px;
-}
-
 .status-avatar {
     border-radius: 3px;
     height: 44px;
diff --git a/modules/requests/client/less/requests.less b/modules/requests/client/less/requests.less
index 0868c70d..f479392c 100644
--- a/modules/requests/client/less/requests.less
+++ b/modules/requests/client/less/requests.less
@@ -84,6 +84,10 @@
         margin-bottom: 0;
         tbody {
             tr {
+                td {
+                    padding: 15px 8px;
+                }
+
                 .td-text-overflow {
                     .text-long {
                         @media (min-width: @screen-lg-min) {
@@ -102,6 +106,9 @@
                     }
                 }
             }
+            + tbody {
+                border-top: none;
+            }
         }
     }
 }
@@ -162,16 +169,22 @@
     }
 }
 
+.add-warning {
+    font-size: 16px;
+    font-weight: 500;
+    margin-top: 10px;
+}
+
 .response-wrapper {
     margin-bottom: 30px;
     .response-list {
         .fa-accept {
             position: absolute;
-            top: -60px;
-            left: -100px;
-            font-size: 150px;
+            top: -10px;
+            left: 300px;
+            font-size: 120px;
             color: #d9534f;
-            opacity: 0.25;
+            opacity: 0.5;
             overflow: hidden;
         }
         .div-overlay-accept {
@@ -180,7 +193,7 @@
             background-color: rgba(128, 128, 128, 0.5);
             left: 95px;
             right: 15px;
-            height: 116px;
+            height: 130px;
             z-index: 5;
             font-size: 24px;
             font-weight: 500;
@@ -191,8 +204,8 @@
                 background-color: #444 !important;
                 background-color: rgba(128, 128, 128, 0.5) !important;
             }
-            span {
-                margin-top: 50%;
+            p {
+                margin-top: 15px;
             }
         }
         .btn-response-accept {
diff --git a/modules/requests/client/views/requests-view.client.view.html b/modules/requests/client/views/requests-view.client.view.html
index ca17cdf5..d66bc5b4 100644
--- a/modules/requests/client/views/requests-view.client.view.html
+++ b/modules/requests/client/views/requests-view.client.view.html
@@ -153,6 +153,7 @@
                                     <table class="table table-hover tb-v-middle top-border">
                                         <thead>
                                             <tr>
+                                                <th class="td-width-0"></th>
                                                 <th>{{ 'TABLE_FIELDS.INFO' | translate}}</th>
                                                 <th>{{ 'TABLE_FIELDS.VOTES' | translate}}</th>
                                                 <th class="text-center">{{ 'TABLE_FIELDS.LIFETIME' | translate}}</th>
@@ -165,136 +166,7 @@
                                                 <th class="text-center">{{ 'TABLE_FIELDS.PUBLISHER' | translate}}</th>
                                             </tr>
                                         </thead>
-                                        <tbody>
-                                            <tr class="torrent-list-info" ng-repeat="item in vm.request.torrents"
-                                                ng-click="vm.TGI.openTorrentDetailInfo(item._id);"
-                                                ng-class="{'accepted-item': vm.request.accept == item._id}" ng-disabled="true">
-                                                <td class="col-md-7 td-v-middle td-text-overflow">
-                                                    <div class="media">
-                                                        <div class="media-left">
-                                                            <img class="media-object" torrent-logo="item"
-                                                                 ng-src="{{vm.TGI.getTorrentListImage(item)}}"
-                                                                 alt="{{vm.TGI.getTorrentTitle(item)}}">
-
-                                                            <div class="layer-download" ng-class="{'music': item.torrent_type=='music'}">
-                                                                <i class="fa fa-arrow-circle-o-down fa-3x" aria-hidden="true"
-                                                                   title="{{ 'TITLE_ALT.DOWNLOAD_TORRENT' | translate}}"
-                                                                   ng-click="vm.DLS.downloadTorrent(item._id); $event.stopPropagation();"
-                                                                   ng-class="{'fa-arrow-circle-down': vm.hover}"
-                                                                   ng-mouseover="vm.hover = true;" ng-mouseleave="vm.hover = false;"></i>
-                                                            </div>
-                                                        </div>
-                                                        <div class="media-body">
-                                                            <h5 class="media-heading">
-                                                                <a ui-sref="torrents.view({torrentId: item._id})">{{vm.TGI.getTorrentDoubleTitle(item)}}</a>
-                                                                <span torrent-file-link="item" torrent-user="vm.user" info-class="color-mt-base"></span>
-                                                            </h5>
-
-                                                            <div class="torrent-filename text-long">{{item.torrent_filename | filename}}</div>
-                                                            <div class="torrent-filename text-long">{{item.resource_detail_info.subtitle}}</div>
-
-                                                            <div class="list-all-genres">
-                                                                <span class="genres-item"
-                                                                      ng-repeat="t in item.resource_detail_info.genres">{{t.name}}</span>
-                                                            </div>
-
-                                                            <div class="list-all-tags">
-                                                                <!--<span class="label label-success text-uppercase">{{ item.torrent_type}}</span>-->
-                                                                <span class="label label-ttype label-primary" ng-click="$event.stopPropagation();">
-                                                                    {{'TORRENT_TYPE_LABEL.' + item.torrent_type.toUpperCase() | translate}}
-                                                                </span>
-                                                                <span class="label label-tstatus label-danger" ng-show="item.torrent_status == 'new'"
-                                                                      ng-click="$event.stopPropagation();">
-                                                                    {{'TORRENT_STATUS_LABEL.' + item.torrent_status.toUpperCase() | translate}}
-                                                                </span>
-                                                                <span class="label label-release label-warning"
-                                                                      ng-show="item.resource_detail_info.release_date"
-                                                                      ng-click="$event.stopPropagation();">
-                                                                    {{ item.resource_detail_info.release_date}}
-                                                                </span>
-                                                                <span title="{{ 'TORRENT_STATUS_TOP_TITLE' | translate}}" ng-if="item.isTop"
-                                                                      class="torrent-votes"><kbd>{{'STATUS_TOP_KEY' | translate}}</kbd></span>
-                                                                <span class="label label-rlevel label-info"
-                                                                      ng-show="item.torrent_recommended != 'level0'"
-                                                                      ng-click="$event.stopPropagation();">
-                                                                    {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent_recommended.toUpperCase() | translate}}
-                                                                </span>
-                                                                <span class="label label-sale" ng-if="item.isSaling"
-                                                                      title="{{vm.TGI.getTorrentSaleTypeDesc(item);}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{item.torrent_sale_expires | date: 'MM-dd HH:mm'}}"
-                                                                      ng-click="$event.stopPropagation();"
-                                                                      ng-class="{'label-default': !item.isSaling, 'label-success': item.isSaling}">
-                                                                        {{item.torrent_sale_status}} {{item.torrent_sale_expires | unlife}}
-                                                                </span>
-                                                                <span class="label label-se-info" ng-if="item.torrent_type == 'tvserial'"
-                                                                      ng-click="$event.stopPropagation();">S{{item.torrent_seasons}}E{{item.torrent_episodes}}</span>
-
-                                                                <span class="label label-hnr-info" ng-if="item.torrent_hnr"
-                                                                      ng-click="$event.stopPropagation();">H&R</span>
-
-                                                                <span class="label label-vip-info" ng-if="item.torrent_vip"
-                                                                      ng-click="$event.stopPropagation();">VIP</span>
-
-                                                                <span ng-repeat="t in item.torrent_tags">
-                                                                    <span class="label label-tag" ng-class="{'used': vm.searchTags.indexOf(t) !== -1}"
-                                                                          ng-click="$event.stopPropagation();"
-                                                                          ng-if="vm.RTS.tagInList(t);">
-                                                                        {{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
-                                                                    </span>
-                                                                </span>
-                                                            </div>
-                                                            <i class="fa fa-check fa-stack-1x fa-accept" ng-if="vm.request.accept == item._id"></i>
-                                                        </div>
-                                                    </div>
-                                                </td>
-                                                <td class="col-md-1 td-v-middle td-imdb">
-                                                    <span title="{{ 'TITLE_ALT.IMDB_VOTES' | translate}}"
-                                                          class="torrent-votes"><kbd>{{vm.TGI.getVoteTitle(item)}}</kbd> {{item.resource_detail_info.vote_average | number : 1}}</span>
-                                                </td>
-                                                <td class="col-md-1 td-v-middle text-center width-80">{{item.createdat | life}}</td>
-                                                <td class="col-md-1 td-v-middle text-center td-size">{{item.torrent_size | bytes:2}}</td>
-                                                <td class="col-md-1 td-v-middle list-user-info td-user-info">
-                                                    <p class="no-margin-p" title="{{ 'TITLE_ALT.SEEDS' | translate}}">
-                                                        <span class="glyphicon glyphicon-arrow-up torrent-up"></span>
-                                                        {{item.torrent_seeds}}
-                                                    </p>
-
-                                                    <p class="no-margin-p" title="{{ 'TITLE_ALT.LEECHERS' | translate}}">
-                                                        <span class="glyphicon glyphicon-arrow-down torrent-down"></span>
-                                                        {{item.torrent_leechers}}
-                                                    </p>
-
-                                                    <p class="no-margin-p" title="{{ 'TITLE_ALT.FINISHED' | translate}}">
-                                                        <span class="glyphicon glyphicon-ok torrent-finished"></span>
-                                                        {{item.torrent_finished}}
-                                                    </p>
-                                                </td>
-                                                <td class="col-md-1 td-v-middle text-center td-uploader">
-                                                    <div ng-if="!vm.isCurrentUserOwner()">
-                                                        <span ng-if="!item.isAnonymous" user-info="item.user" info-name></span>
-                                                        <span ng-if="item.isAnonymous">{{ 'ANONYMOUS' | translate }}</span>
-                                                        <div maker-info="item.maker"></div>
-                                                    </div>
-
-                                                    <div ng-if="vm.isCurrentUserOwner()">
-                                                        <span user-info="item.user" info-name></span>
-                                                        <div maker-info="item.maker"></div>
-                                                    </div>
-
-                                                    <button class="btn btn-success btn-block btn-response-accept margin-top-10"
-                                                            ng-click="vm.acceptResponse(item); $event.stopPropagation();"
-                                                            ng-if="!vm.request.accept && !vm.isExpired(vm.request) && item.torrent_status == 'reviewed' && vm.isCurrentUserOwner()">
-                                                        {{ 'REQUESTS.BTN_ACCEPT' | translate}}
-                                                    </button>
-                                                </td>
-
-                                                <td class="td-v-middle text-center"
-                                                    ng-class="{'div-overlay-accept': item.torrent_status != 'reviewed'}"
-                                                    ng-click="$event.stopPropagation();"
-                                                    ng-if="item.torrent_status != 'reviewed'">
-                                                    <p>{{ 'REQUESTS.WAITING_REVIEW' | translate}}</p>
-                                                </td>
-                                            </tr>
-                                        </tbody>
+                                        <tbody torrent-list-item parent="vm" item="item" list="vm.request.torrents" ng-repeat="item in vm.request.torrents"></tbody>
                                     </table>
                                 </div>
                             </div>
diff --git a/modules/torrents/client/controllers/admin/admin-list.client.controller.js b/modules/torrents/client/controllers/admin/admin-list.client.controller.js
index a31cd6f3..908f48ee 100644
--- a/modules/torrents/client/controllers/admin/admin-list.client.controller.js
+++ b/modules/torrents/client/controllers/admin/admin-list.client.controller.js
@@ -22,7 +22,7 @@
     vm.resourcesTags = MeanTorrentConfig.meanTorrentConfig.resourcesTags;
     vm.torrentSalesType = MeanTorrentConfig.meanTorrentConfig.torrentSalesType;
     vm.torrentRLevels = MeanTorrentConfig.meanTorrentConfig.torrentRecommendLevel;
-    vm.torrentType = MeanTorrentConfig.meanTorrentConfig.torrentType;
+    vm.torrentTypeConfig = MeanTorrentConfig.meanTorrentConfig.torrentType;
 
     vm.selectedType = localStorageService.get('admin_last_selected_type') || 'movie';
     vm.filterVIP = isSelectedVipType(vm.selectedType);
@@ -31,9 +31,12 @@
     vm.releaseYear = undefined;
     vm.filterHnR = false;
     vm.filterSale = false;
+    vm.filterType = undefined;
     vm.torrentStatus = 'reviewed';
     vm.torrentRLevel = 'level0';
 
+    vm.torrentType = vm.selectedType === 'newest' ? 'all' : vm.selectedType;
+
     /**
      * commentBuildPager
      * pagination init
@@ -52,6 +55,8 @@
       vm.searchTags = [];
       vm.filterVIP = isSelectedVipType(vm.selectedType);
 
+      vm.torrentType = vm.selectedType === 'newest' ? 'all' : vm.selectedType;
+
       vm.torrentBuildPager();
       localStorageService.set('admin_last_selected_type', vm.selectedType);
     };
@@ -63,7 +68,7 @@
      */
     function isSelectedVipType(type) {
       var v = false;
-      angular.forEach(vm.torrentType.value, function (t) {
+      angular.forEach(vm.torrentTypeConfig.value, function (t) {
         if (t.value === type) {
           if (t.role === 'vip') {
             v = true;
@@ -204,7 +209,7 @@
         keys: vm.searchKey.trim(),
         torrent_status: vm.selectedType === 'newest' ? 'new' : vm.torrentStatus,
         torrent_rlevel: vm.torrentRLevel,
-        torrent_type: vm.selectedType === 'newest' ? 'all' : vm.selectedType,
+        torrent_type: vm.filterType ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
         torrent_release: vm.releaseYear,
         torrent_tags: vm.searchTags,
         torrent_hnr: vm.filterHnR,
@@ -343,162 +348,5 @@
         i.removeClass('glyphicon-chevron-down').addClass('glyphicon-chevron-up');
       }
     };
-
-    /**
-     * toggleHnR
-     */
-    vm.toggleHnR = function (item) {
-      var dt = new TorrentsService(item);
-      dt.$toggleHnRStatus(function (res) {
-        vm.torrentPagedItems[vm.torrentPagedItems.indexOf(item)] = res;
-        NotifycationService.showSuccessNotify('TORRENT_TOGGLE_HNR_SUCCESSFULLY');
-      }, function (res) {
-        NotifycationService.showErrorNotify(res.data.message, 'TORRENT_TOGGLE_HNR_FAILED');
-      });
-    };
-
-    /**
-     * toggleVIP
-     */
-    vm.toggleVIP = function (item) {
-      var dt = new TorrentsService(item);
-      dt.$toggleVIPStatus(function (res) {
-        vm.torrentPagedItems[vm.torrentPagedItems.indexOf(item)] = res;
-        NotifycationService.showSuccessNotify('TORRENT_TOGGLE_VIP_SUCCESSFULLY');
-      }, function (res) {
-        NotifycationService.showErrorNotify(res.data.message, 'TORRENT_TOGGLE_VIP_FAILED');
-      });
-    };
-
-    /**
-     * toggleTop
-     */
-    vm.toggleTop = function (item) {
-      var dt = new TorrentsService(item);
-      dt.$toggleTopStatus(function (res) {
-        vm.torrentPagedItems[vm.torrentPagedItems.indexOf(item)] = res;
-        NotifycationService.showSuccessNotify('TORRENT_TOGGLE_TOP_SUCCESSFULLY');
-      }, function (res) {
-        NotifycationService.showErrorNotify(res.data.message, 'TORRENT_TOGGLE_TOP_FAILED');
-      });
-    };
-
-    /**
-     * deleteTorrent
-     */
-    vm.deleteTorrent = function (item) {
-      var modalOptions = {
-        closeButtonText: $translate.instant('TORRENT_DELETE_CONFIRM_CANCEL'),
-        actionButtonText: $translate.instant('TORRENT_DELETE_CONFIRM_OK'),
-        headerText: $translate.instant('TORRENT_DELETE_CONFIRM_HEADER_TEXT'),
-        bodyText: $translate.instant('TORRENT_DELETE_CONFIRM_BODY_TEXT'),
-        bodyParams: item.torrent_filename,
-
-        selectOptions: {
-          enable: true,
-          title: 'TORRENT_DELETE_REASON',
-          options: [
-            'TORRENT_DELETE_REASON_OVERVIEW',
-            'TORRENT_DELETE_REASON_NFO',
-            'TORRENT_DELETE_REASON_QUALITY',
-            'TORRENT_DELETE_REASON_ILLEGAL'
-          ]
-        }
-      };
-
-      ModalConfirmService.showModal({}, modalOptions)
-        .then(function (result) {
-          var reason = result.reason;
-          if (reason === 'CUSTOM') reason = result.custom;
-
-          var dt = new TorrentsService(item);
-          dt.$remove({
-            reason: reason
-          }, function (response) {
-            successCallback(response);
-          }, function (errorResponse) {
-            errorCallback(errorResponse);
-          });
-
-          function successCallback(res) {
-            vm.torrentPagedItems.splice(vm.torrentPagedItems.indexOf(item), 1);
-            Notification.success({
-              message: '<i class="glyphicon glyphicon-ok"></i> ' + $translate.instant('TORRENT_DELETE_SUCCESSFULLY')
-            });
-          }
-
-          function errorCallback(res) {
-            vm.error_msg = res.data.message;
-            Notification.error({
-              message: res.data.message,
-              title: '<i class="glyphicon glyphicon-remove"></i> ' + $translate.instant('TORRENT_DELETE_ERROR')
-            });
-          }
-        });
-    };
-
-
-    /**
-     * setSaleType
-     */
-    vm.setSaleType = function (item, st) {
-      TorrentsService.setSaleType({
-        _torrentId: item._id,
-        _saleType: st.name
-      }, function (res) {
-        Notification.success({
-          message: '<i class="glyphicon glyphicon-ok"></i> ' + $translate.instant('TORRENT_SETSALETYPE_SUCCESSFULLY')
-        });
-
-        vm.torrentPagedItems[vm.torrentPagedItems.indexOf(item)] = res;
-      }, function (res) {
-        Notification.error({
-          message: res.data.message,
-          title: '<i class="glyphicon glyphicon-remove"></i> ' + $translate.instant('TORRENT_SETSALETYPE_ERROR')
-        });
-      });
-    };
-
-    /**
-     * vm.setRecommendLevel
-     */
-    vm.setRecommendLevel = function (item, rl) {
-      TorrentsService.setRecommendLevel({
-        _torrentId: item._id,
-        _rlevel: rl.value
-      }, function (res) {
-        Notification.success({
-          message: '<i class="glyphicon glyphicon-ok"></i> ' + $translate.instant('TORRENT_SETRLEVEL_SUCCESSFULLY')
-        });
-
-        vm.torrentPagedItems[vm.torrentPagedItems.indexOf(item)] = res;
-      }, function (res) {
-        Notification.error({
-          message: res.data.message,
-          title: '<i class="glyphicon glyphicon-remove"></i> ' + $translate.instant('TORRENT_SETRLEVEL_ERROR')
-        });
-      });
-    };
-
-    /**
-     * reviewedTorrentStatus
-     * @param item
-     */
-    vm.reviewedTorrentStatus = function (item) {
-      TorrentsService.setReviewedStatus({
-        _torrentId: item._id
-      }, function (res) {
-        Notification.success({
-          message: '<i class="glyphicon glyphicon-ok"></i> ' + $translate.instant('TORRENT_SETREVIEWED_SUCCESSFULLY')
-        });
-
-        vm.torrentPagedItems[vm.torrentPagedItems.indexOf(item)] = res;
-      }, function (res) {
-        Notification.error({
-          message: res.data.message,
-          title: '<i class="glyphicon glyphicon-remove"></i> ' + $translate.instant('TORRENT_SETREVIEWED_ERROR')
-        });
-      });
-    };
   }
 }());
diff --git a/modules/torrents/client/controllers/torrent-info.client.controller.js b/modules/torrents/client/controllers/torrent-info.client.controller.js
index 7c7076a7..c14100e4 100644
--- a/modules/torrents/client/controllers/torrent-info.client.controller.js
+++ b/modules/torrents/client/controllers/torrent-info.client.controller.js
@@ -1000,6 +1000,9 @@
      * @param minfo
      */
     vm.doUpdateTorrentInfo = function (resinfo) {
+      resinfo.custom_title = vm.torrentLocalInfo.resource_detail_info.custom_title;
+      resinfo.custom_subtitle = vm.torrentLocalInfo.resource_detail_info.custom_subtitle;
+
       vm.torrentLocalInfo.resource_detail_info = resinfo;
 
       vm.torrentLocalInfo.$update(function (response) {
diff --git a/modules/torrents/client/controllers/uploads.client.controller.js b/modules/torrents/client/controllers/uploads.client.controller.js
index e70a1dc8..4110e4af 100644
--- a/modules/torrents/client/controllers/uploads.client.controller.js
+++ b/modules/torrents/client/controllers/uploads.client.controller.js
@@ -320,6 +320,7 @@
 
       vm.inputedEpisodesError = undefined;
       vm.inputedEpisodesOK = false;
+      vm.showResourceTitleInput = false;
       vm.showResourcesTag = false;
 
       vm.movieinfo = undefined;
@@ -334,6 +335,22 @@
       vm.showAgreeAndSubmit = false;
     };
 
+    /**
+     * getTitleFromResourceFileName
+     * @param fname
+     * @returns {*}
+     */
+    function getTitleFromResourceFileName(fname) {
+      if (fname) {
+        //replace other pt site prefix
+        fname = fname.replace(/^\{([^}]+)\}[\.\s]|^\{([^}]+)\}/, '');
+        fname = fname.replace(/.torrent/g, '');
+        return fname;
+      } else {
+        return '';
+      }
+    }
+
     /**
      * isSelectedVipType
      * @param type
@@ -386,8 +403,12 @@
         tmdbid: tmdbid,
         language: getStorageLangService.getLang()
       }, function (res) {
+        vm.customTorrent.title = getTitleFromResourceFileName(vm.torrentInfo.filename);
+        vm.customTorrent.subtitle = res.title;
+
         vm.tmdb_info_ok = true;
         vm.tmdb_isloading = false;
+        vm.showResourceTitleInput = true;
         vm.showResourcesTag = true;
         vm.showVideoNfo = true;
         vm.showAgreeAndSubmit = true;
@@ -428,6 +449,9 @@
         tmdbid: tmdbid,
         language: getStorageLangService.getLang()
       }, function (res) {
+        vm.customTorrent.title = getTitleFromResourceFileName(vm.torrentInfo.filename);
+        vm.customTorrent.subtitle = res.name;
+
         vm.tmdb_info_ok = true;
         vm.tmdb_isloading = false;
         Notification.success({
@@ -464,6 +488,7 @@
         vm.inputedEpisodesError = false;
         vm.inputedEpisodesOK = true;
         vm.showResourcesTag = true;
+        vm.showResourceTitleInput = true;
         vm.showVideoNfo = true;
         vm.showAgreeAndSubmit = true;
       }
@@ -496,6 +521,9 @@
       var l = vm.getTorrentSize();
       var t = vm.getResourceTag();
 
+      vm.movieinfo.custom_title = vm.customTorrent.title;
+      vm.movieinfo.custom_subtitle = vm.customTorrent.subtitle;
+
       var torrent = new TorrentsService({
         info_hash: vm.torrentInfo.info_hash,
         maker: vm.maker === 'NULL' ? undefined : vm.maker,
@@ -539,6 +567,9 @@
       var l = vm.getTorrentSize();
       var t = vm.getResourceTag();
 
+      vm.tvinfo.custom_title = vm.customTorrent.title;
+      vm.tvinfo.custom_subtitle = vm.customTorrent.subtitle;
+
       var torrent = new TorrentsService({
         info_hash: vm.torrentInfo.info_hash,
         maker: vm.maker === 'NULL' ? undefined : vm.maker,
@@ -588,6 +619,8 @@
         artist: vm.customTorrent.artist || undefined,
         title: vm.customTorrent.title,
         subtitle: vm.customTorrent.subtitle,
+        custom_title: vm.customTorrent.title,
+        custom_subtitle: vm.customTorrent.subtitle,
         cover: vm.customTorrent.coverFileName,
         overview: vm.customTorrent.detail,
 
diff --git a/modules/torrents/client/directives/torrent-file-link.client.directive.js b/modules/torrents/client/directives/torrent-file-link.client.directive.js
index 73249799..6187b187 100644
--- a/modules/torrents/client/directives/torrent-file-link.client.directive.js
+++ b/modules/torrents/client/directives/torrent-file-link.client.directive.js
@@ -50,6 +50,59 @@
     }
   }
 
+  //==============================================================
+
+  angular.module('users')
+    .directive('torrentFileLinkLabel', torrentFileLinkLabel);
+
+  torrentFileLinkLabel.$inject = ['$compile', '$translate', 'MeanTorrentConfig'];
+
+  function torrentFileLinkLabel($compile, $translate, MeanTorrentConfig) {
+    var appConfig = MeanTorrentConfig.meanTorrentConfig.app;
+
+    var directive = {
+      restrict: 'A',
+      link: link
+    };
+
+    return directive;
+
+    function link(scope, element, attrs) {
+      scope.$watch(attrs.torrentFileLinkLabel, function (s) {
+        if (s) {
+          var torrent = s;
+          var user = scope.$eval(attrs.torrentUser);
+
+          if (user && torrent) {
+            var link = makeTorrentFileLink(torrent, user);
+            var txt = $translate.instant('TORRENT_LABEL_LINK');
+            var title = $translate.instant('COPY_LINK_TO_CLIPBOARD');
+            var cls = attrs.infoClass;
+            var e = angular.element('<span class="label" ng-click="$event.stopPropagation();" mt-copy-to-clipboard="' + link + '">' + txt + '</span>');
+
+            if (e) {
+              e.addClass(cls ? cls : '');
+              e.attr('title', title);
+
+              element.html(e);
+              $compile(element.contents())(scope);
+            }
+          }
+        }
+      });
+    }
+
+    function makeTorrentFileLink(t, u) {
+      var link = appConfig.domain;
+      link += '/api/torrents/download';
+      link += '/' + t._id;
+      link += '/' + u.passkey;
+
+      return link;
+    }
+  }
+
+  //================================================================
 
   angular.module('users')
     .directive('torrentFileLinkButton', torrentFileLinkButton);
diff --git a/modules/torrents/client/less/torrents.less b/modules/torrents/client/less/torrents.less
index 1d042a0d..05542481 100644
--- a/modules/torrents/client/less/torrents.less
+++ b/modules/torrents/client/less/torrents.less
@@ -10,6 +10,7 @@
         margin-bottom: 5px;
         color: #0366d6;
         background-color: #c9e4ff;
+        border: solid 1px #aad4ff;
         border-radius: 4px;
         padding: 5px 10px;
         position: relative;
diff --git a/modules/torrents/client/services/torrent-get-info.client.service.js b/modules/torrents/client/services/torrent-get-info.client.service.js
index b7559919..2bea4f45 100644
--- a/modules/torrents/client/services/torrent-get-info.client.service.js
+++ b/modules/torrents/client/services/torrent-get-info.client.service.js
@@ -18,6 +18,9 @@
       getTorrentTitle: getTorrentTitle,
       getTorrentOriginalTitle: getTorrentOriginalTitle,
       getTorrentDoubleTitle: getTorrentDoubleTitle,
+      getTorrentCustomTitle: getTorrentCustomTitle,
+      getTorrentCustomSubTitle: getTorrentCustomSubTitle,
+      getTitleFromResourceFileName: getTitleFromResourceFileName,
       getTorrentListImage: getTorrentListImage,
       getTorrentListTopImage: getTorrentListTopImage,
       getTorrentTopOneImage: getTorrentTopOneImage,
@@ -95,6 +98,56 @@
       }
     }
 
+    /**
+     * getTorrentCustomTitle
+     * @param item
+     * @returns {*}
+     */
+    function getTorrentCustomTitle(item) {
+      if (item.resource_detail_info.custom_title) {
+        return item.resource_detail_info.custom_title;
+      } else {
+        return getTitleFromResourceFileName(item.torrent_filename);
+      }
+    }
+
+    /**
+     * getTorrentCustomSubTitle
+     * @param item
+     * @returns {*}
+     */
+    function getTorrentCustomSubTitle(item) {
+      console.log(item);
+      if (item.resource_detail_info.custom_subtitle) {
+        return item.resource_detail_info.custom_subtitle;
+      } else if (item.resource_detail_info.subtitle) {
+        return item.resource_detail_info.subtitle;
+      } else {
+        return getTorrentDoubleTitle(item);
+      }
+    }
+
+    /**
+     * getTitleFromResourceFileName
+     * @param fname
+     * @returns {*}
+     */
+    function getTitleFromResourceFileName(fname) {
+      if (fname) {
+        var reg = /^\{([^}]+)\}[\.\s]|^\{([^}]+)\}/i;
+        //replace other pt site prefix
+        while (reg.test(fname)) {
+          fname = fname.replace(reg, '');
+        }
+
+        fname = fname.replace(/.torrent/g, '');
+
+        return fname;
+      } else {
+        return '';
+      }
+    }
+
     /**
      * getTorrentListImage
      * @param item
diff --git a/modules/torrents/client/templates/torrent-item.client.view.html b/modules/torrents/client/templates/torrent-item.client.view.html
new file mode 100644
index 00000000..268cda58
--- /dev/null
+++ b/modules/torrents/client/templates/torrent-item.client.view.html
@@ -0,0 +1,281 @@
+<tr class="torrent-list-info"
+    ng-class="{'accepted-item': parent.request.accept == item._id}"
+    ng-click="vm.TGI.openTorrentDetailInfo(item._id);">
+    <td class="td-width-0" rowspan="3"></td>
+    <td class="col-md-7 td-text-overflow">
+        <div class="media">
+            <div class="media-left">
+                <img class="media-object" torrent-logo="item"
+                     ng-src="{{vm.TGI.getTorrentListImage(item)}}"
+                     alt="{{vm.TGI.getTorrentTitle(item)}}">
+
+                <div class="layer-download" ng-class="{'music': item.torrent_type=='music'}">
+                    <i class="fa fa-arrow-circle-o-down fa-3x" aria-hidden="true"
+                       title="{{ 'TITLE_ALT.DOWNLOAD_TORRENT' | translate}}"
+                       ng-click="vm.DLS.downloadTorrent(item._id); $event.stopPropagation();"
+                       ng-class="{'fa-arrow-circle-down': vm.hover}"
+                       ng-mouseover="vm.hover = true;" ng-mouseleave="vm.hover = false;"></i>
+                </div>
+            </div>
+            <div class="media-body">
+                <h5 class="media-heading">
+                    <div class="text-long">
+                        <a ui-sref="torrents.view({torrentId: item._id})">{{vm.TGI.getTorrentCustomTitle(item)}}</a>
+                    </div>
+                </h5>
+
+                <div class="torrent-filename text-long">{{vm.TGI.getTorrentCustomSubTitle(item)}}</div>
+
+                <!--<div class="list-all-genres">-->
+                <!--<span class="genres-item" ng-repeat="t in item.resource_detail_info.genres">{{t.name}}</span>-->
+                <!--</div>-->
+
+                <div class="list-all-tags">
+                    <div>
+                        <span ng-repeat="t in item.torrent_tags">
+                            <span class="label label-tag" ng-class="{'used': vm.getTagUsedStatus(t)}"
+                                  ng-click="vm.onTagClicked(t); $event.stopPropagation();"
+                                  ng-if="vm.RTS.tagInList(t);">
+                                {{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
+                            </span>
+                        </span>
+                    </div>
+                    <!--<span class="label label-success text-uppercase">{{ item.torrent_type}}</span>-->
+                    <span class="label label-ttype label-primary" ng-class="{'used': parent.filterType == item.torrent_type}"
+                          ng-click="vm.onTorrentTypeClicked(item.torrent_type); $event.stopPropagation();"
+                          ng-if="parent.torrentType=='aggregate' || parent.torrentType=='all'">
+                        {{'TORRENT_TYPE_LABEL.' + item.torrent_type.toUpperCase() | translate}}
+                    </span>
+
+                    <span class="label label-release label-warning" ng-show="item.resource_detail_info.release_date"
+                          ng-class="{'used': item.resource_detail_info.release_date == parent.releaseYear}"
+                          ng-click="vm.onReleaseClicked(item.resource_detail_info.release_date); $event.stopPropagation();">
+                        {{ item.resource_detail_info.release_date}}
+                    </span>
+
+                    <span class="label label-rlevel label-info"
+                          ng-show="item.torrent_recommended != 'level0'"
+                          ng-class="{'used': parent.torrentRLevel == item.torrent_recommended}"
+                          ng-click="vm.onRLevelClicked(item.torrent_recommended); $event.stopPropagation();">
+                        {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent_recommended.toUpperCase() | translate}}
+                    </span>
+
+                    <span class="label label-sale" ng-if="item.isSaling"
+                          title="{{vm.TGI.getTorrentSaleTypeDesc(item);}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{item.torrent_sale_expires | date: 'MM-dd HH:mm'}}"
+                          ng-click="vm.onSaleClicked(); $event.stopPropagation();"
+                          ng-class="{'label-default': !item.isSaling, 'label-success': item.isSaling, 'used': parent.filterSale}">
+                        {{item.torrent_sale_status}} {{item.torrent_sale_expires | unlife}}
+                    </span>
+
+                    <span class="label label-se-info" ng-if="vm.torrentType == 'tvserial'"
+                          ng-click="$event.stopPropagation();">S{{item.torrent_seasons}}E{{item.torrent_episodes}}</span>
+
+                    <span class="label label-hnr-info" ng-if="item.torrent_hnr" ng-class="{'used': parent.filterHnR}"
+                          ng-click="vm.onHnRClicked(); $event.stopPropagation();">H&R</span>
+
+                    <span class="label label-vip-info" ng-if="item.torrent_vip" ng-class="{'used': parent.filterVIP}"
+                          ng-click="vm.onVIPClicked(); $event.stopPropagation();">VIP</span>
+
+                    <span title="{{ 'TORRENT_STATUS_TOP_TITLE' | translate}}" ng-if="item.isTop"
+                          ng-click="$event.stopPropagation();"
+                          class="label torrent-top">{{'STATUS_TOP_KEY' | translate}}
+                    </span>
+
+                    <span torrent-file-link-label="item" torrent-user="vm.user" info-class="label label-torrent-link"></span>
+
+                    <span class="label upload-by" ng-if="vm.showByLabel()">by:
+                        <span ng-show="item.user.displayName">
+                            <span user-info="item.user" info-name></span> <span maker-info="item.maker"></span>
+                        </span>
+                    </span>
+                </div>
+                <i class="fa fa-check fa-accept" ng-if="parent.request.accept == item._id"></i>
+            </div>
+        </div>
+    </td>
+    <td class="col-md-1 td-v-middle td-imdb">
+        <span title="{{ 'TITLE_ALT.IMDB_VOTES' | translate}}"
+              class="torrent-votes"><kbd>{{vm.TGI.getVoteTitle(item)}}</kbd> {{item.resource_detail_info.vote_average | number : 1}}
+        </span>
+    </td>
+    <td class="col-md-1 td-v-middle text-center td-life">{{item.createdat | life}}</td>
+    <td class="col-md-1 td-v-middle text-center td-size">{{item.torrent_size | bytes:2}}</td>
+    <td class="col-md-1 td-v-middle list-user-info td-user-info">
+        <p class="no-margin-p" title="{{ 'TITLE_ALT.SEEDS' | translate}}">
+            <span class="glyphicon glyphicon-arrow-up torrent-up"></span>
+            {{item.torrent_seeds}}
+        </p>
+
+        <p class="no-margin-p" title="{{ 'TITLE_ALT.LEECHERS' | translate}}">
+            <span class="glyphicon glyphicon-arrow-down torrent-down"></span>
+            {{item.torrent_leechers}}
+        </p>
+
+        <p class="no-margin-p" title="{{ 'TITLE_ALT.FINISHED' | translate}}">
+            <span class="glyphicon glyphicon-ok torrent-finished"></span>
+            {{item.torrent_finished}}
+        </p>
+    </td>
+    <td class="col-md-1 td-v-middle text-center" ng-class="vm.state.current.name.startsWith('admin.torrents') ? 'td-admin-cmd' : 'td-uploader'">
+        <div ng-if="vm.showByUser()">
+            <span ng-if="!item.isAnonymous" user-info="item.user" info-name></span>
+            <span ng-if="item.isAnonymous">{{ 'ANONYMOUS' | translate }}</span>
+
+            <div maker-info="item.maker"></div>
+            <!--<span vip-flag="item.user"></span>-->
+            <!--<span message-to="item.user" to-class="message-to-icon"></span>-->
+        </div>
+        <div ng-if="vm.state.current.name.indexOf('seeding')>0">
+            <p class="no-margin-p">
+                {{peer.peer_uploaded | bytes:2}}
+            </p>
+
+            <p class="no-margin-p">
+                {{peer.peer_uspeed | bytes:2}}/s
+            </p>
+
+            <p class="no-margin-p">
+                {{peer.peer_ratio | ratio}}
+            </p>
+        </div>
+        <div ng-if="vm.state.current.name.indexOf('.downloading')>0 || vm.state.current.name.indexOf('leeching')>0">
+            <p class="no-margin-p">
+                {{peer.peer_downloaded | bytes:2}}
+            </p>
+
+            <p class="no-margin-p">
+                {{peer.peer_dspeed | bytes:2}}/s
+            </p>
+
+            <p class="no-margin-p">
+                {{peer.peer_percent | ratio}}%
+            </p>
+        </div>
+        <div ng-if="vm.state.current.name.indexOf('warning')>0">
+            <div class="warning-data">
+                <p class="no-margin-p">
+                    {{warning.total_uploaded | bytes:2}}
+                </p>
+
+                <p class="no-margin-p">
+                    {{warning.total_downloaded | bytes:2}}
+                </p>
+
+                <p class="no-margin-p">
+                    {{warning.total_ratio | ratio}}
+                </p>
+
+                <p class="no-margin-p">
+                    {{warning.total_seed_time | seedlife}}
+                </p>
+            </div>
+            <button class="btn btn-default btn-sm warning-btn"
+                    ng-click="parent.removeWarning(warning); $event.stopPropagation();">{{'BTN_REMOVE_WARNING' | translate}}
+            </button>
+        </div>
+        <div ng-if="vm.state.current.name.startsWith('collections')">
+            <div class="coll-item-uploader">
+                <span ng-if="!item.isAnonymous" user-info="item.user" info-name></span>
+                <span ng-if="item.isAnonymous">{{ 'ANONYMOUS' | translate }}</span>
+                <div maker-info="item.maker"></div>
+            </div>
+            <div class="coll-item-remove">
+                <button class="btn btn-sm btn-default" uib-tooltip="{{ 'COLLECTIONS.BTN_REMOVE_TITLE' | translate}}"
+                        ng-click="parent.removeFromCollections(item); $event.stopPropagation();">
+                    {{'COLLECTIONS.BTN_REMOVE_FROM_COLLECTION' | translate}}
+                </button>
+            </div>
+        </div>
+        <div ng-if="vm.state.current.name.startsWith('requests')">
+            <div ng-if="!parent.isCurrentUserOwner()">
+                <span ng-if="!item.isAnonymous" user-info="item.user" info-name></span>
+                <span ng-if="item.isAnonymous">{{ 'ANONYMOUS' | translate }}</span>
+                <div maker-info="item.maker"></div>
+            </div>
+
+            <div ng-if="parent.isCurrentUserOwner()">
+                <span user-info="item.user" info-name></span>
+                <div maker-info="item.maker"></div>
+            </div>
+
+            <button class="btn btn-sm btn-success btn-block btn-response-accept margin-top-10"
+                    ng-click="parent.acceptResponse(item); $event.stopPropagation();"
+                    ng-if="!parent.request.accept && !parent.isExpired(parent.request) && item.torrent_status == 'reviewed' && parent.isCurrentUserOwner()">
+                {{ 'REQUESTS.BTN_ACCEPT' | translate}}
+            </button>
+        </div>
+        <div ng-if="vm.state.current.name.startsWith('admin.torrents')">
+            <div>
+                <button class="btn btn-xs btn-default btn-block"
+                        ng-show="item.torrent_status == 'new'"
+                        ng-click="vm.reviewedTorrentStatus(item); $event.stopPropagation();">
+                    {{ 'ADMIN_BASIC_REVIEWED' | translate}}
+                </button>
+            </div>
+            <div class="margin-top-2">
+                <button class="btn btn-xs btn-default btn-block" ng-click="vm.deleteTorrent(item); $event.stopPropagation();">
+                    {{ 'ADMIN_BASIC_DELETE' | translate}}
+                </button>
+            </div>
+            <div class="margin-top-2">
+                <button class="btn col-xs-6 btn-xs btn-default" ng-click="vm.toggleHnR(item); $event.stopPropagation();">
+                    {{ (item.torrent_hnr ? 'ADMIN_BASIC_UNSET_HNR' : 'ADMIN_BASIC_SET_HNR') | translate}}
+                </button>
+                <button class="btn col-xs-6 btn-xs btn-default" ng-click="vm.toggleVIP(item); $event.stopPropagation();">
+                    {{ (item.torrent_vip ? 'ADMIN_BASIC_UNSET_VIP' : 'ADMIN_BASIC_SET_VIP') | translate}}
+                </button>
+            </div>
+            <div class="margin-top-2">
+                <div class="admin-tools-btn-list btn-group margin-top-2" uib-dropdown dropdown-append-to-body>
+                    <button id="btn-append-to-body" type="button"
+                            class="btn btn-xs btn-default btn-block"
+                            ng-click="$event.stopPropagation();"
+                            uib-dropdown-toggle>
+                        {{'ADMIN_BASIC_TYPE_SET' | translate }} <span class="caret"></span>
+                    </button>
+                    <ul class="dropdown-menu-right" uib-dropdown-menu role="menu"
+                        aria-labelledby="btn-append-to-body">
+                        <li role="menuitem" ng-repeat="st in vm.torrentSalesType.value"
+                            ng-class="{'active': item.torrent_sale_status == st.name, 'divider-item': $index != 0 && $index % 5 == 0}">
+                            <a href="#" class="small" ng-click="vm.setSaleType(item, st);">{{st.name}}</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <div class="margin-top-2">
+                <div class="admin-tools-btn-list btn-group" uib-dropdown dropdown-append-to-body>
+                    <button id="btn-append-to-body1" type="button"
+                            class="btn btn-xs btn-default btn-block"
+                            ng-click="$event.stopPropagation();"
+                            uib-dropdown-toggle>
+                        {{'ADMIN_BASIC_RLEVEL_SET' | translate }} <span class="caret"></span>
+                    </button>
+                    <ul class="dropdown-menu-right" uib-dropdown-menu role="menu"
+                        aria-labelledby="btn-append-to-body1">
+                        <li role="menuitem" ng-repeat="l in vm.torrentRLevels.value"
+                            ng-class="{'active': item.torrent_recommended == l.value}">
+                            <a href="#" class="small"
+                               ng-click="vm.setRecommendLevel(item, l);">{{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + l.name | translate}}</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <div class="margin-top-2">
+                <button class="btn btn-xs btn-default btn-block" ng-click="vm.toggleTop(item); $event.stopPropagation();">
+                    {{ (item.isTop ? 'ADMIN_BASIC_UNSET_TOP' : 'ADMIN_BASIC_SET_TOP') | translate}}
+                </button>
+            </div>
+        </div>
+    </td>
+    <td class="td-v-middle text-center"
+        ng-class="{'div-overlay-accept': item.torrent_status != 'reviewed'}"
+        ng-click="$event.stopPropagation();"
+        ng-if="vm.state.current.name.startsWith('requests') && item.torrent_status != 'reviewed'">
+        <p>{{ 'REQUESTS.WAITING_REVIEW' | translate}}</p>
+    </td>
+</tr>
+<tr>
+    <td class="td-progress" colspan="6">
+        <div torrent-progress="item.my_peers"></div>
+    </td>
+</tr>
diff --git a/modules/torrents/client/views/admin/admin-list.client.view.html b/modules/torrents/client/views/admin/admin-list.client.view.html
index cdbe3ae5..b0c16fb5 100644
--- a/modules/torrents/client/views/admin/admin-list.client.view.html
+++ b/modules/torrents/client/views/admin/admin-list.client.view.html
@@ -55,7 +55,7 @@
                                 <select class="form-control" ng-model="vm.selectedType" ng-change="vm.onTorrentTypeChanged();">
                                     <option value="newest">{{'TORRENT_TYPE_OPTION_NEWEST' | translate}}
                                     </option>
-                                    <option ng-repeat="t in vm.torrentType.value | filter:{enable: true}"
+                                    <option ng-repeat="t in vm.torrentTypeConfig.value | filter:{enable: true}"
                                             value="{{t.value}}">{{'MENU_TORRENTS_SUB.'+t.name | translate}}
                                     </option>
                                 </select>
@@ -198,6 +198,7 @@
             <table class="table table-hover tb-v-middle">
                 <thead>
                     <tr>
+                        <th class="td-width-0"></th>
                         <th>{{ 'TABLE_FIELDS.INFO' | translate}}</th>
                         <th>{{ 'TABLE_FIELDS.VOTES' | translate}}</th>
                         <th class="text-center">{{ 'TABLE_FIELDS.LIFETIME' | translate}}</th>
@@ -210,173 +211,7 @@
                         <th class="text-center">{{ 'TABLE_FIELDS.ADMIN_TOOLS' | translate}}</th>
                     </tr>
                 </thead>
-                <tbody>
-                    <tr class="torrent-list-info" ng-repeat="item in vm.torrentPagedItems" ng-click="vm.TGI.openTorrentDetailInfo(item._id);">
-                        <td class="col-md-7 td-text-overflow-admin">
-                            <div class="media">
-                                <div class="media-left">
-                                    <img class="media-object" torrent-logo="item"
-                                         ng-src="{{vm.TGI.getTorrentListImage(item)}}"
-                                         alt="{{vm.TGI.getTorrentTitle(item)}}">
-
-                                    <div class="layer-download" ng-class="{'music': vm.selectedType=='music'}">
-                                        <i class="fa fa-arrow-circle-o-down fa-3x" aria-hidden="true"
-                                           title="{{ 'TITLE_ALT.DOWNLOAD_TORRENT' | translate}}"
-                                           ng-click="vm.DLS.downloadTorrent(item._id); $event.stopPropagation();"
-                                           ng-class="{'fa-arrow-circle-down': vm.hover}"
-                                           ng-mouseover="vm.hover = true;" ng-mouseleave="vm.hover = false;"></i>
-                                    </div>
-                                </div>
-                                <div class="media-body">
-                                    <h5 class="media-heading">
-                                        <a ui-sref="torrents.view({torrentId: item._id})">{{vm.TGI.getTorrentDoubleTitle(item)}}</a>
-                                        <span class="upload-by" ng-show="item.user.displayName"> (By:
-                                            <span user-info="item.user" info-name></span> <span maker-info="item.maker"></span>)</span>
-                                        <span torrent-file-link="item" torrent-user="vm.user" info-class="color-mt-base"></span>
-                                    </h5>
-
-                                    <div class="torrent-filename text-long">{{item.torrent_filename | filename}}</div>
-                                    <div class="torrent-filename text-long">{{item.resource_detail_info.subtitle}}</div>
-
-                                    <div class="list-all-genres">
-                                        <span class="genres-item" ng-repeat="t in item.resource_detail_info.genres">{{t.name}}</span>
-                                    </div>
-
-                                    <div class="list-all-tags">
-                                        <!--<span class="label label-success text-uppercase">{{ item.torrent_type}}</span>-->
-                                        <span class="label label-ttype label-primary" ng-click="$event.stopPropagation();"
-                                              ng-if="vm.selectedType=='newest'">
-                                            {{'TORRENT_TYPE_LABEL.' + item.torrent_type.toUpperCase() | translate}}
-                                        </span>
-                                        <span class="label label-tstatus label-danger" ng-show="item.torrent_status == 'new'"
-                                              ng-click="$event.stopPropagation();">
-                                            {{'TORRENT_STATUS_LABEL.' + item.torrent_status.toUpperCase() | translate}}
-                                        </span>
-                                        <span class="label label-release label-warning" ng-show="item.resource_detail_info.release_date"
-                                              ng-class="{'used': item.resource_detail_info.release_date == vm.releaseYear}"
-                                              ng-click="vm.onReleaseClicked(item.resource_detail_info.release_date); $event.stopPropagation();">
-                                            {{ item.resource_detail_info.release_date}}
-                                        </span>
-                                        <span title="{{ 'TORRENT_STATUS_TOP_TITLE' | translate}}" ng-if="item.isTop"
-                                              class="torrent-votes"><kbd>{{'STATUS_TOP_KEY' | translate}}</kbd></span>
-                                        <span class="label label-rlevel label-info"
-                                              ng-click="vm.onRLevelClicked(item.torrent_recommended); $event.stopPropagation();"
-                                              ng-class="{'used': vm.torrentRLevel == item.torrent_recommended}"
-                                              ng-show="item.torrent_recommended != 'level0'">
-                                            {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent_recommended.toUpperCase() | translate}}
-                                        </span>
-                                        <span class="label label-sale" ng-if="item.isSaling"
-                                              title="{{vm.TGI.getTorrentSaleTypeDesc(item);}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{item.torrent_sale_expires | date: 'MM-dd HH:mm'}}"
-                                              ng-click="vm.onSaleClicked(); $event.stopPropagation();"
-                                              ng-class="{'label-default': !item.isSaling, 'label-success': item.isSaling, 'used': vm.filterSale}">
-                                                {{item.torrent_sale_status}} {{item.torrent_sale_expires | unlife}}
-                                        </span>
-                                        <span class="label label-se-info" ng-if="vm.selectedType == 'tvserial'"
-                                              ng-click="$event.stopPropagation();">S{{item.torrent_seasons}}E{{item.torrent_episodes}}</span>
-
-                                        <span class="label label-hnr-info" ng-if="item.torrent_hnr" ng-class="{'used': vm.filterHnR}"
-                                              ng-click="vm.onHnRClicked(); $event.stopPropagation();">H&R</span>
-
-                                        <span class="label label-vip-info" ng-if="item.torrent_vip" ng-class="{'used': vm.filterVIP}"
-                                              ng-click="vm.onVIPClicked(); $event.stopPropagation();">VIP</span>
-
-                                        <span ng-repeat="t in item.torrent_tags">
-                                            <span class="label label-tag" ng-class="{'used': vm.searchTags.indexOf(t) !== -1}"
-                                                  ng-click="vm.onTagClicked(t); $event.stopPropagation();"
-                                                  ng-if="vm.RTS.tagInList(t);">
-                                                {{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
-                                            </span>
-                                        </span>
-                                    </div>
-                                </div>
-                            </div>
-                        </td>
-                        <td class="col-md-1 td-v-middle td-imdb">
-                            <span title="{{ 'TITLE_ALT.IMDB_VOTES' | translate}}"
-                                  class="torrent-votes"><kbd>{{vm.TGI.getVoteTitle(item)}}</kbd> {{item.resource_detail_info.vote_average | number : 1}}</span>
-                        </td>
-                        <td class="col-md-1 td-v-middle text-center td-life">{{item.createdat | life}}</td>
-                        <td class="col-md-1 td-v-middle text-center td-size">{{item.torrent_size | bytes:2}}</td>
-                        <td class="col-md-1 td-v-middle list-user-info td-user-info">
-                            <p class="no-margin-p" title="{{ 'TITLE_ALT.SEEDS' | translate}}">
-                                <span class="glyphicon glyphicon-arrow-up torrent-up"></span>
-                                {{item.torrent_seeds}}
-                            </p>
-
-                            <p class="no-margin-p" title="{{ 'TITLE_ALT.LEECHERS' | translate}}">
-                                <span class="glyphicon glyphicon-arrow-down torrent-down"></span>
-                                {{item.torrent_leechers}}
-                            </p>
-
-                            <p class="no-margin-p" title="{{ 'TITLE_ALT.FINISHED' | translate}}">
-                                <span class="glyphicon glyphicon-ok torrent-finished"></span>
-                                {{item.torrent_finished}}
-                            </p>
-                        </td>
-                        <td class="col-md-1 td-v-middle text-center td-admin-cmd">
-                            <div>
-                                <button class="btn btn-xs btn-default btn-block"
-                                        ng-show="item.torrent_status == 'new'"
-                                        ng-click="vm.reviewedTorrentStatus(item); $event.stopPropagation();">
-                                    {{ 'ADMIN_BASIC_REVIEWED' | translate}}
-                                </button>
-                            </div>
-                            <div class="margin-top-2">
-                                <button class="btn btn-xs btn-default btn-block" ng-click="vm.deleteTorrent(item); $event.stopPropagation();">
-                                    {{ 'ADMIN_BASIC_DELETE' | translate}}
-                                </button>
-                            </div>
-                            <div class="margin-top-2">
-                                <button class="btn col-xs-6 btn-xs btn-default" ng-click="vm.toggleHnR(item); $event.stopPropagation();">
-                                    {{ (item.torrent_hnr ? 'ADMIN_BASIC_UNSET_HNR' : 'ADMIN_BASIC_SET_HNR') | translate}}
-                                </button>
-                                <button class="btn col-xs-6 btn-xs btn-default" ng-click="vm.toggleVIP(item); $event.stopPropagation();">
-                                    {{ (item.torrent_vip ? 'ADMIN_BASIC_UNSET_VIP' : 'ADMIN_BASIC_SET_VIP') | translate}}
-                                </button>
-                            </div>
-                            <div class="margin-top-2">
-                                <div class="admin-tools-btn-list btn-group margin-top-2" uib-dropdown dropdown-append-to-body>
-                                    <button id="btn-append-to-body" type="button"
-                                            class="btn btn-xs btn-default btn-block"
-                                            ng-click="$event.stopPropagation();"
-                                            uib-dropdown-toggle>
-                                        {{'ADMIN_BASIC_TYPE_SET' | translate }} <span class="caret"></span>
-                                    </button>
-                                    <ul class="dropdown-menu-right" uib-dropdown-menu role="menu"
-                                        aria-labelledby="btn-append-to-body">
-                                        <li role="menuitem" ng-repeat="st in vm.torrentSalesType.value"
-                                            ng-class="{'active': item.torrent_sale_status == st.name, 'divider-item': $index != 0 && $index % 5 == 0}">
-                                            <a href="#" class="small" ng-click="vm.setSaleType(item, st);">{{st.name}}</a>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </div>
-                            <div class="margin-top-2">
-                                <div class="admin-tools-btn-list btn-group" uib-dropdown dropdown-append-to-body>
-                                    <button id="btn-append-to-body1" type="button"
-                                            class="btn btn-xs btn-default btn-block"
-                                            ng-click="$event.stopPropagation();"
-                                            uib-dropdown-toggle>
-                                        {{'ADMIN_BASIC_RLEVEL_SET' | translate }} <span class="caret"></span>
-                                    </button>
-                                    <ul class="dropdown-menu-right" uib-dropdown-menu role="menu"
-                                        aria-labelledby="btn-append-to-body1">
-                                        <li role="menuitem" ng-repeat="l in vm.torrentRLevels.value"
-                                            ng-class="{'active': item.torrent_recommended == l.value}">
-                                            <a href="#" class="small"
-                                               ng-click="vm.setRecommendLevel(item, l);">{{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + l.name | translate}}</a>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </div>
-                            <div class="margin-top-2">
-                                <button class="btn btn-xs btn-default btn-block" ng-click="vm.toggleTop(item); $event.stopPropagation();">
-                                    {{ (item.isTop ? 'ADMIN_BASIC_UNSET_TOP' : 'ADMIN_BASIC_SET_TOP') | translate}}
-                                </button>
-                            </div>
-                        </td>
-                    </tr>
-                </tbody>
+                <tbody torrent-list-item parent="vm" item="item" list="vm.torrentPagedItems" ng-repeat="item in vm.torrentPagedItems"></tbody>
             </table>
         </div>
 
diff --git a/modules/torrents/client/views/list-torrents.client.view.html b/modules/torrents/client/views/list-torrents.client.view.html
index 9e00f2c1..e3d39890 100644
--- a/modules/torrents/client/views/list-torrents.client.view.html
+++ b/modules/torrents/client/views/list-torrents.client.view.html
@@ -243,121 +243,7 @@
                         <th class="text-center">{{ 'TABLE_FIELDS.PUBLISHER' | translate}}</th>
                     </tr>
                 </thead>
-                <tbody>
-                    <tr class="torrent-list-info" ng-repeat-start="item in vm.torrentPagedItems" ng-click="vm.TGI.openTorrentDetailInfo(item._id);">
-                        <td class="td-width-0" rowspan="2"></td>
-                        <td class="col-md-7 td-text-overflow">
-                            <div class="media">
-                                <div class="media-left">
-                                    <img class="media-object" torrent-logo="item"
-                                         ng-src="{{vm.TGI.getTorrentListImage(item)}}"
-                                         alt="{{vm.TGI.getTorrentTitle(item)}}">
-
-                                    <div class="layer-download" ng-class="{'music': item.torrent_type=='music'}">
-                                        <i class="fa fa-arrow-circle-o-down fa-3x" aria-hidden="true"
-                                           title="{{ 'TITLE_ALT.DOWNLOAD_TORRENT' | translate}}"
-                                           ng-click="vm.DLS.downloadTorrent(item._id); $event.stopPropagation();"
-                                           ng-class="{'fa-arrow-circle-down': vm.hover}"
-                                           ng-mouseover="vm.hover = true;" ng-mouseleave="vm.hover = false;"></i>
-                                    </div>
-                                </div>
-                                <div class="media-body">
-                                    <h5 class="media-heading">
-                                        <a ui-sref="torrents.view({torrentId: item._id})">{{vm.TGI.getTorrentDoubleTitle(item)}}</a>
-                                        <span torrent-file-link="item" torrent-user="vm.user" info-class="color-mt-base"></span>
-                                    </h5>
-
-                                    <div class="torrent-filename text-long">{{item.torrent_filename | filename}}</div>
-                                    <div class="torrent-filename text-long">{{item.resource_detail_info.subtitle}}</div>
-
-                                    <div class="list-all-genres">
-                                        <span class="genres-item" ng-repeat="t in item.resource_detail_info.genres">{{t.name}}</span>
-                                    </div>
-
-                                    <div class="list-all-tags">
-                                        <!--<span class="label label-success text-uppercase">{{ item.torrent_type}}</span>-->
-                                        <span class="label label-ttype label-primary" ng-class="{'used': vm.filterType == item.torrent_type}"
-                                              ng-click="vm.onTorrentTypeClicked(item.torrent_type); $event.stopPropagation();"
-                                              ng-if="vm.torrentType=='aggregate'">
-                                            {{'TORRENT_TYPE_LABEL.' + item.torrent_type.toUpperCase() | translate}}
-                                        </span>
-                                        <span class="label label-release label-warning" ng-show="item.resource_detail_info.release_date"
-                                              ng-class="{'used': item.resource_detail_info.release_date == vm.releaseYear}"
-                                              ng-click="vm.onReleaseClicked(item.resource_detail_info.release_date); $event.stopPropagation();">
-                                            {{ item.resource_detail_info.release_date}}
-                                        </span>
-                                        <span title="{{ 'TORRENT_STATUS_TOP_TITLE' | translate}}" ng-if="item.isTop"
-                                              class="torrent-votes"><kbd>{{'STATUS_TOP_KEY' | translate}}</kbd></span>
-                                        <span class="label label-rlevel label-info"
-                                              ng-show="item.torrent_recommended != 'level0'"
-                                              ng-class="{'used': vm.torrentRLevel == item.torrent_recommended}"
-                                              ng-click="vm.onRLevelClicked(item.torrent_recommended); $event.stopPropagation();">
-                                            {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent_recommended.toUpperCase() | translate}}
-                                        </span>
-                                        <span class="label label-sale" ng-if="item.isSaling"
-                                              title="{{vm.TGI.getTorrentSaleTypeDesc(item);}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{item.torrent_sale_expires | date: 'MM-dd HH:mm'}}"
-                                              ng-click="vm.onSaleClicked(); $event.stopPropagation();"
-                                              ng-class="{'label-default': !item.isSaling, 'label-success': item.isSaling, 'used': vm.filterSale}">
-                                                {{item.torrent_sale_status}} {{item.torrent_sale_expires | unlife}}
-                                        </span>
-
-                                        <span class="label label-se-info" ng-if="vm.torrentType == 'tvserial'"
-                                              ng-click="$event.stopPropagation();">S{{item.torrent_seasons}}E{{item.torrent_episodes}}</span>
-
-                                        <span class="label label-hnr-info" ng-if="item.torrent_hnr" ng-class="{'used': vm.filterHnR}"
-                                              ng-click="vm.onHnRClicked(); $event.stopPropagation();">H&R</span>
-
-                                        <span class="label label-vip-info" ng-if="item.torrent_vip" ng-class="{'used': vm.filterVIP}"
-                                              ng-click="vm.onVIPClicked(); $event.stopPropagation();">VIP</span>
-
-                                        <span ng-repeat="t in item.torrent_tags">
-                                            <span class="label label-tag" ng-class="{'used': vm.searchTags.indexOf(t) !== -1}"
-                                                  ng-click="vm.onTagClicked(t); $event.stopPropagation();"
-                                                  ng-if="vm.RTS.tagInList(t);">
-                                                {{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
-                                            </span>
-                                        </span>
-                                    </div>
-                                </div>
-                            </div>
-                        </td>
-                        <td class="col-md-1 td-v-middle td-imdb">
-                            <span title="{{ 'TITLE_ALT.IMDB_VOTES' | translate}}"
-                                  class="torrent-votes"><kbd>{{vm.TGI.getVoteTitle(item)}}</kbd> {{item.resource_detail_info.vote_average | number : 1}}</span>
-                        </td>
-                        <td class="col-md-1 td-v-middle text-center td-life">{{item.createdat | life}}</td>
-                        <td class="col-md-1 td-v-middle text-center td-size">{{item.torrent_size | bytes:2}}</td>
-                        <td class="col-md-1 td-v-middle list-user-info td-user-info">
-                            <p class="no-margin-p" title="{{ 'TITLE_ALT.SEEDS' | translate}}">
-                                <span class="glyphicon glyphicon-arrow-up torrent-up"></span>
-                                {{item.torrent_seeds}}
-                            </p>
-
-                            <p class="no-margin-p" title="{{ 'TITLE_ALT.LEECHERS' | translate}}">
-                                <span class="glyphicon glyphicon-arrow-down torrent-down"></span>
-                                {{item.torrent_leechers}}
-                            </p>
-
-                            <p class="no-margin-p" title="{{ 'TITLE_ALT.FINISHED' | translate}}">
-                                <span class="glyphicon glyphicon-ok torrent-finished"></span>
-                                {{item.torrent_finished}}
-                            </p>
-                        </td>
-                        <td class="col-md-1 td-v-middle text-center td-uploader">
-                            <span ng-if="!item.isAnonymous" user-info="item.user" info-name></span>
-                            <span ng-if="item.isAnonymous">{{ 'ANONYMOUS' | translate }}</span>
-
-                            <div maker-info="item.maker"></div>
-                            <!--<span vip-flag="item.user"></span>-->
-                            <!--<span message-to="item.user" to-class="message-to-icon"></span>-->
-                        </td>
-                    </tr>
-                    <tr ng-repeat-end>
-                        <td class="td-progress" colspan="6">
-                            <div torrent-progress="item.my_peers"></div>
-                        </td>
-                    </tr>
-                </tbody>
+                <tbody torrent-list-item parent="vm" item="item" list="vm.torrentPagedItems" ng-repeat="item in vm.torrentPagedItems"></tbody>
             </table>
         </div>
 
diff --git a/modules/torrents/client/views/search-torrents.client.view.html b/modules/torrents/client/views/search-torrents.client.view.html
index 2124201f..af271cdf 100644
--- a/modules/torrents/client/views/search-torrents.client.view.html
+++ b/modules/torrents/client/views/search-torrents.client.view.html
@@ -4,6 +4,48 @@
             <h3 class="panel-title">{{'TAGS_SEARCH_GLOBAL' | translate}}</h3>
         </div>
         <div class="panel-body">
+            <div class="row filter-tags text-center"
+                 ng-if="vm.filterType || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.searchTags.length>0 || vm.filterVIP">
+                <div class="col-md-6 col-md-offset-3">
+                    <span class="filter-tag-item label-tag" ng-if="vm.filterType">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
+                        <i class="fa fa-times-circle-o"
+                           ng-click="vm.onTorrentTypeClicked(vm.filterType);">
+                        </i>
+                    </span>
+                    <span class="filter-tag-item label-tag" ng-if="vm.releaseYear">{{vm.releaseYear}}
+                        <i class="fa fa-times-circle-o"
+                           ng-click="vm.onReleaseClicked(vm.releaseYear);">
+                        </i>
+                    </span>
+                    <span class="filter-tag-item label-tag" ng-if="vm.torrentRLevel != 'level0'">{{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + vm.torrentRLevel.toUpperCase() | translate}}
+                        <i class="fa fa-times-circle-o"
+                           ng-click="vm.onRLevelClicked(vm.torrentRLevel);">
+                        </i>
+                    </span>
+                    <span class="filter-tag-item label-tag" ng-if="vm.filterSale">{{ 'CA_TORRENT_SALE_NOW' | translate}}
+                        <i class="fa fa-times-circle-o"
+                           ng-click="vm.onSaleClicked();">
+                        </i>
+                    </span>
+                    <span class="filter-tag-item label-tag" ng-if="vm.filterHnR">H&R
+                        <i class="fa fa-times-circle-o"
+                           ng-click="vm.onHnRClicked();">
+                        </i>
+                    </span>
+                    <span class="filter-tag-item label-tag" ng-if="vm.filterVIP">VIP
+                        <i class="fa fa-times-circle-o"
+                           ng-click="vm.onVIPClicked();">
+                        </i>
+                    </span>
+                    <span ng-repeat="t in vm.searchTags" ng-if="vm.searchTags.length>0">
+                        <span class="filter-tag-item label-tag">{{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
+                            <i class="fa fa-times-circle-o"
+                               ng-click="vm.onTagClicked(t);">
+                            </i>
+                        </span>
+                    </span>
+                </div>
+            </div>
             <div class="col-md-10 col-md-offset-1">
                 <dl class="dl-horizontal">
                     <dt class="h-line">{{'CA_RESOURCE_TYPE' | translate}}</dt>
@@ -154,118 +196,8 @@
                         <th class="text-center">{{ 'TABLE_FIELDS.PUBLISHER' | translate}}</th>
                     </tr>
                 </thead>
+                <tbody torrent-list-item parent="vm" item="item" list="vm.torrentPagedItems" ng-repeat="item in vm.torrentPagedItems"></tbody>
                 <tbody>
-                    <tr class="torrent-list-info" ng-repeat-start="item in vm.torrentPagedItems" ng-click="vm.TGI.openTorrentDetailInfo(item._id);">
-                        <td class="td-width-0" rowspan="2"></td>
-                        <td class="col-md-7 td-text-overflow">
-                            <div class="media">
-                                <div class="media-left">
-                                    <img class="media-object" torrent-logo="item"
-                                         ng-src="{{vm.TGI.getTorrentListImage(item)}}"
-                                         alt="{{vm.TGI.getTorrentTitle(item)}}">
-
-                                    <div class="layer-download" ng-class="{'music': item.torrent_type=='music'}">
-                                        <i class="fa fa-arrow-circle-o-down fa-3x" aria-hidden="true"
-                                           title="{{ 'TITLE_ALT.DOWNLOAD_TORRENT' | translate}}"
-                                           ng-click="vm.DLS.downloadTorrent(item._id); $event.stopPropagation();"
-                                           ng-class="{'fa-arrow-circle-down': vm.hover}"
-                                           ng-mouseover="vm.hover = true;" ng-mouseleave="vm.hover = false;"></i>
-                                    </div>
-                                </div>
-                                <div class="media-body">
-                                    <h5 class="media-heading">
-                                        <a ui-sref="torrents.view({torrentId: item._id})">{{vm.TGI.getTorrentDoubleTitle(item)}}</a>
-                                        <span torrent-file-link="item" torrent-user="vm.user" info-class="color-mt-base"></span>
-                                    </h5>
-
-                                    <div class="torrent-filename text-long">{{item.torrent_filename | filename}}</div>
-                                    <div class="torrent-filename text-long">{{item.resource_detail_info.subtitle}}</div>
-
-                                    <div class="list-all-genres">
-                                        <span class="genres-item" ng-repeat="t in item.resource_detail_info.genres">{{t.name}}</span>
-                                    </div>
-
-                                    <div class="list-all-tags">
-                                        <!--<span class="label label-success text-uppercase">{{ item.torrent_type}}</span>-->
-                                        <span class="label label-ttype label-primary" ng-click="$event.stopPropagation();"
-                                              ng-if="vm.torrentType=='all'">
-                                            {{'TORRENT_TYPE_LABEL.' + item.torrent_type.toUpperCase() | translate}}
-                                        </span>
-                                        <span class="label label-release label-warning" ng-show="item.resource_detail_info.release_date"
-                                              ng-click="vm.onReleaseClicked(item.resource_detail_info.release_date); $event.stopPropagation();">
-                                            {{ item.resource_detail_info.release_date}}
-                                        </span>
-                                        <span title="{{ 'TORRENT_STATUS_TOP_TITLE' | translate}}" ng-if="item.isTop"
-                                              class="torrent-votes"><kbd>{{'STATUS_TOP_KEY' | translate}}</kbd></span>
-                                        <span class="label label-rlevel label-info"
-                                              ng-show="item.torrent_recommended != 'level0'"
-                                              ng-click="$event.stopPropagation();">
-                                            {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent_recommended.toUpperCase() | translate}}
-                                        </span>
-                                        <span class="label label-sale" ng-if="item.isSaling"
-                                              title="{{vm.TGI.getTorrentSaleTypeDesc(item);}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{item.torrent_sale_expires | date: 'MM-dd HH:mm'}}"
-                                              ng-click="vm.onSaleClicked(); $event.stopPropagation();"
-                                              ng-class="{'label-default': !item.isSaling, 'label-success': item.isSaling}">
-                                                {{item.torrent_sale_status}} {{item.torrent_sale_expires | unlife}}
-                                        </span>
-
-                                        <span class="label label-se-info" ng-if="vm.torrentType == 'tvserial'"
-                                              ng-click="$event.stopPropagation();">S{{item.torrent_seasons}}E{{item.torrent_episodes}}</span>
-
-                                        <span class="label label-hnr-info" ng-if="item.torrent_hnr"
-                                              ng-click="vm.onHnRClicked(); $event.stopPropagation();">H&R</span>
-
-                                        <span class="label label-vip-info" ng-if="item.torrent_vip" ng-class="{'used': vm.filterVIP}"
-                                              ng-click="vm.onVIPClicked(); $event.stopPropagation();">VIP</span>
-
-                                        <span ng-repeat="t in item.torrent_tags">
-                                            <span class="label label-tag" ng-class="{'used': vm.searchTags.indexOf(t) !== -1}"
-                                                  ng-click="vm.onTagClicked(t); $event.stopPropagation();"
-                                                  ng-if="vm.RTS.tagInList(t);">
-                                                {{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
-                                            </span>
-                                        </span>
-                                    </div>
-                                </div>
-                            </div>
-                        </td>
-                        <td class="col-md-1 td-v-middle td-imdb">
-                            <span title="{{ 'TITLE_ALT.IMDB_VOTES' | translate}}"
-                                  class="torrent-votes"><kbd>{{vm.TGI.getVoteTitle(item)}}</kbd> {{item.resource_detail_info.vote_average | number : 1}}</span>
-                        </td>
-                        <td class="col-md-1 td-v-middle text-center td-life">{{item.createdat | life}}</td>
-                        <td class="col-md-1 td-v-middle text-center td-size">{{item.torrent_size | bytes:2}}</td>
-                        <td class="col-md-1 td-v-middle list-user-info td-user-info">
-                            <p class="no-margin-p" title="{{ 'TITLE_ALT.SEEDS' | translate}}">
-                                <span class="glyphicon glyphicon-arrow-up torrent-up"></span>
-                                {{item.torrent_seeds}}
-                            </p>
-
-                            <p class="no-margin-p" title="{{ 'TITLE_ALT.LEECHERS' | translate}}">
-                                <span class="glyphicon glyphicon-arrow-down torrent-down"></span>
-                                {{item.torrent_leechers}}
-                            </p>
-
-                            <p class="no-margin-p" title="{{ 'TITLE_ALT.FINISHED' | translate}}">
-                                <span class="glyphicon glyphicon-ok torrent-finished"></span>
-                                {{item.torrent_finished}}
-                            </p>
-                        </td>
-                        <td class="col-md-1 td-v-middle text-center td-uploader">
-                            <span ng-if="!item.isAnonymous" user-info="item.user" info-name></span>
-                            <span ng-if="item.isAnonymous">{{ 'ANONYMOUS' | translate }}</span>
-
-                            <div maker-info="item.maker"></div>
-                            <!--<span vip-flag="item.user"></span>-->
-                            <!--<span message-to="item.user" to-class="message-to-icon"></span>-->
-                        </td>
-                    </tr>
-                    <tr ng-repeat-end>
-                        <td class="td-progress" colspan="6">
-                            <div torrent-progress="item.my_peers"></div>
-                        </td>
-                    </tr>
-                </tbody>
             </table>
         </div>
 
diff --git a/modules/torrents/client/views/uploads-torrents.client.view.html b/modules/torrents/client/views/uploads-torrents.client.view.html
index 8660770e..b13e7acd 100644
--- a/modules/torrents/client/views/uploads-torrents.client.view.html
+++ b/modules/torrents/client/views/uploads-torrents.client.view.html
@@ -18,7 +18,7 @@
         <div class="row margin-bottom-40">
             <div class="col-xs-12">
                 <legend class="small-legend" translate="SELECT_TORRENT_FILE"></legend>
-                <div class="col-sm-7">
+                <div class="col-sm-10 col-md-8">
                     <div class="input-group">
                         <input type="text" class="form-control" ng-model="vm.tFile.name" disabled>
 
@@ -32,13 +32,14 @@
                         </div>
                     </div>
                 </div>
-                <div ng-show="vm.fileSelected" class="col-sm-5">
-                    <button class="btn btn-success" ng-click="vm.upload(vm.tFile)">{{ 'DO_UPLOAD' | translate}} ({{vm.progress}}%)</button>
+                <div ng-show="vm.fileSelected" class="col-sm-2 col-md-4">
+                    <button class="btn btn-success xs-margin-top-10" ng-click="vm.upload(vm.tFile)">{{ 'DO_UPLOAD' | translate}} ({{vm.progress}}%)
+                    </button>
                 </div>
-                <div ng-show="vm.successfully == true" class="col-sm-5" style="margin-top: 7px">
+                <div ng-show="vm.successfully == true" class="col-sm-12 margin-top-10">
                     <label class="text-success control-label" translate="TORRENTS_UPLOAD_SUCCESSFULLY"></label>
                 </div>
-                <div ng-show="vm.successfully == false" class="col-sm-5" style="margin-top: 7px">
+                <div ng-show="vm.successfully == false" class="col-sm-12 margin-top-10">
                     <label class="text-danger control-label" translate="TORRENTS_UPLOAD_FAILED"></label>
                 </div>
             </div>
@@ -294,6 +295,20 @@
             </div>
         </div>
 
+        <div class="row margin-bottom-40" ng-show="vm.showResourceTitleInput">
+            <div class="col-md-12 col-sm-12 col-xs-12">
+                <legend class="small-legend" translate="ENTER_RESOURCE_TITLE"></legend>
+                <div class="col-md-10 col-sm-10">
+                    <input type="text" class="form-control" ng-model="vm.customTorrent.title" placeholder="{{ 'RESOURCE_TITLE' | translate}}"
+                           maxlength="{{vm.inputLengthConfig.uploadTorrentTitleLength}}" autofocus>
+                </div>
+                <div class="col-md-10 col-sm-10 margin-top-10">
+                    <input type="text" class="form-control" ng-model="vm.customTorrent.subtitle" placeholder="{{ 'RESOURCE_SUB_TITLE' | translate}}"
+                           maxlength="{{vm.inputLengthConfig.uploadTorrentSubTitleLength}}">
+                </div>
+            </div>
+        </div>
+
         <div class="row margin-bottom-40" ng-show="vm.showResourcesTag">
             <div class="col-md-12 col-sm-12 col-xs-12">
                 <legend class="small-legend" translate="SELECT_TAGS"></legend>
@@ -480,8 +495,8 @@
                                                    ng-pattern="/(^[0-9]{1,4}$)|(^[0-9]{1,2}[\-]{1}[0-9]{1,4}$)/"
                                                    ng-model="vm.inputedEpisodes" ng-disabled="vm.inputedEpisodesOK" required>
                                         </div>
-                                        <div class="col-sm-4 col-md-3">
-                                            <button type="submit" class="btn btn-primary">continue</button>
+                                        <div class="col-sm-4 col-md-3 margin-left-20">
+                                            <button type="submit" class="btn btn-success btn-width-80">{{'BTN_CONTINUE' | translate}}</button>
                                         </div>
                                         <div class="col-xs-12" ng-messages="vm.episodesForm.inputedEpisodes.$error" role="alert">
                                             <p class="help-block error-text"
@@ -501,6 +516,20 @@
             </div>
         </div>
 
+        <div class="row margin-bottom-40" ng-show="vm.showResourceTitleInput">
+            <div class="col-md-12 col-sm-12 col-xs-12">
+                <legend class="small-legend" translate="ENTER_RESOURCE_TITLE"></legend>
+                <div class="col-md-10 col-sm-10">
+                    <input type="text" class="form-control" ng-model="vm.customTorrent.title" placeholder="{{ 'RESOURCE_TITLE' | translate}}"
+                           maxlength="{{vm.inputLengthConfig.uploadTorrentTitleLength}}" autofocus>
+                </div>
+                <div class="col-md-10 col-sm-10 margin-top-10">
+                    <input type="text" class="form-control" ng-model="vm.customTorrent.subtitle" placeholder="{{ 'RESOURCE_SUB_TITLE' | translate}}"
+                           maxlength="{{vm.inputLengthConfig.uploadTorrentSubTitleLength}}">
+                </div>
+            </div>
+        </div>
+
         <div class="row margin-bottom-40" ng-show="vm.showResourcesTag">
             <div class="col-md-12 col-sm-12 col-xs-12">
                 <legend class="small-legend" translate="SELECT_TAGS"></legend>
@@ -557,17 +586,17 @@
         <div class="row margin-bottom-40">
             <div class="col-md-12 col-sm-12 col-xs-12">
                 <legend class="small-legend" translate="ENTER_MUSIC_TITLE"></legend>
-                <div class="col-md-6 col-sm-8">
+                <div class="col-md-7 col-sm-8">
                     <input type="text" class="form-control" ng-model="vm.customTorrent.artist" placeholder="{{ 'MUSIC_ARTIST' | translate}}"
-                           autofocus>
+                           maxlength="{{vm.inputLengthConfig.uploadTorrentTitleLength}}" autofocus>
                 </div>
-                <div class="col-md-6 col-md-offset-2"></div>
-                <div class="col-md-6 col-sm-8 margin-top-10">
-                    <input type="text" class="form-control" ng-model="vm.customTorrent.title" placeholder="{{ 'MUSIC_TITLE' | translate}}">
+                <div class="col-md-10 col-sm-10 margin-top-10">
+                    <input type="text" class="form-control" ng-model="vm.customTorrent.title" placeholder="{{ 'MUSIC_TITLE' | translate}}"
+                           maxlength="{{vm.inputLengthConfig.uploadTorrentTitleLength}}">
                 </div>
-                <div class="col-md-6 col-md-offset-2"></div>
-                <div class="col-md-8 col-sm-10 margin-top-10">
-                    <input type="text" class="form-control" ng-model="vm.customTorrent.subtitle" placeholder="{{ 'MUSIC_SUB_TITLE' | translate}}">
+                <div class="col-md-10 col-sm-10 margin-top-10">
+                    <input type="text" class="form-control" ng-model="vm.customTorrent.subtitle" placeholder="{{ 'MUSIC_SUB_TITLE' | translate}}"
+                           maxlength="{{vm.inputLengthConfig.uploadTorrentSubTitleLength}}">
                 </div>
             </div>
         </div>
@@ -676,12 +705,13 @@
         <div class="row margin-bottom-40">
             <div class="col-md-12 col-sm-12 col-xs-12">
                 <legend class="small-legend" translate="ENTER_RESOURCE_TITLE"></legend>
-                <div class="col-md-6 col-sm-8 margin-top-10">
-                    <input type="text" class="form-control" ng-model="vm.customTorrent.title" placeholder="{{ 'RESOURCE_TITLE' | translate}}">
+                <div class="col-md-10 col-sm-10 ">
+                    <input type="text" class="form-control" ng-model="vm.customTorrent.title" placeholder="{{ 'RESOURCE_TITLE' | translate}}"
+                           maxlength="{{vm.inputLengthConfig.uploadTorrentTitleLength}}" autofocus>
                 </div>
-                <div class="col-md-6 col-md-offset-2"></div>
-                <div class="col-md-8 col-sm-10 margin-top-10">
-                    <input type="text" class="form-control" ng-model="vm.customTorrent.subtitle" placeholder="{{ 'RESOURCE_SUB_TITLE' | translate}}">
+                <div class="col-md-10 col-sm-10  margin-top-10">
+                    <input type="text" class="form-control" ng-model="vm.customTorrent.subtitle" placeholder="{{ 'RESOURCE_SUB_TITLE' | translate}}"
+                           maxlength="{{vm.inputLengthConfig.uploadTorrentSubTitleLength}}">
                 </div>
             </div>
         </div>
diff --git a/modules/torrents/server/controllers/torrents.server.controller.js b/modules/torrents/server/controllers/torrents.server.controller.js
index 3982760f..2de7082e 100644
--- a/modules/torrents/server/controllers/torrents.server.controller.js
+++ b/modules/torrents/server/controllers/torrents.server.controller.js
@@ -551,7 +551,7 @@ exports.download = function (req, res) {
   var user = req.user || req.passkeyuser || undefined;
 
   if (user) {
-    if (req.torrent.torrent_vip && !user.isVip) {
+    if (req.torrent.torrent_vip && !user.isVip && !user.isOper) {
       return res.status(701).send({
         message: 'SERVER.ONLY_VIP_CAN_DOWNLOAD'
       });
@@ -563,7 +563,7 @@ exports.download = function (req, res) {
       return res.status(703).send({
         message: 'SERVER.CAN_NOT_DOWNLOAD_IDLE'
       });
-    } else if (req.torrent.torrent_status !== 'reviewed') {
+    } else if (req.torrent.torrent_status !== 'reviewed' && !user._id.equals(req.torrent.user._id)) {
       return res.status(704).send({
         message: 'SERVER.TORRENT_STATUS_ERROR'
       });
@@ -1617,6 +1617,8 @@ exports.list = function (req, res) {
         {info_hash: {'$all': keysA}},
         {'resource_detail_info.title': {'$all': keysA}},
         {'resource_detail_info.subtitle': {'$all': keysA}},
+        {'resource_detail_info.custom_title': {'$all': keysA}},
+        {'resource_detail_info.custom_subtitle': {'$all': keysA}},
         {'resource_detail_info.name': {'$all': keysA}},
         {'resource_detail_info.original_title': {'$all': keysA}},
         {'resource_detail_info.original_name': {'$all': keysA}}
diff --git a/modules/torrents/server/models/complete.server.model.js b/modules/torrents/server/models/complete.server.model.js
index e51514c4..8ccf5750 100644
--- a/modules/torrents/server/models/complete.server.model.js
+++ b/modules/torrents/server/models/complete.server.model.js
@@ -108,7 +108,7 @@ CompleteSchema.methods.globalUpdateMethod = function (callback) {
  */
 CompleteSchema.methods.countHnRWarning = function (countAdd = true, countRemove = true) {
   if (this.complete) {
-    if (this.user.isVip || this.total_seed_time >= hnrConfig.condition.seedTime || this.total_downloaded === 0 || this.total_ratio >= hnrConfig.condition.ratio) {
+    if (this.user.isOper || this.user.isVip || this.total_seed_time >= hnrConfig.condition.seedTime || this.total_downloaded === 0 || this.total_ratio >= hnrConfig.condition.ratio) {
       if (countRemove) {
         if (this.hnr_warning) {
           this.update({
diff --git a/modules/users/client/controllers/admin/user-uploaded.client.controller.js b/modules/users/client/controllers/admin/user-uploaded.client.controller.js
index ff15d076..b7036fdf 100644
--- a/modules/users/client/controllers/admin/user-uploaded.client.controller.js
+++ b/modules/users/client/controllers/admin/user-uploaded.client.controller.js
@@ -18,6 +18,12 @@
     vm.itemsPerPageConfig = MeanTorrentConfig.meanTorrentConfig.itemsPerPage;
 
     vm.searchTags = [];
+    vm.releaseYear = undefined;
+    vm.filterType = undefined;
+    vm.filterHnR = false;
+    vm.filterSale = false;
+    vm.torrentRLevel = 'level0';
+    vm.torrentType = 'aggregate';
 
     /**
      * buildPager
@@ -33,15 +39,18 @@
      * figureOutItemsToDisplay
      */
     vm.figureOutItemsToDisplay = function (callback) {
-      vm.filteredItems = $filter('filter')(vm.userUploadedList, {
-        $: vm.search
-      });
-      vm.filterLength = vm.filteredItems.length;
-      var begin = ((vm.currentPage - 1) * vm.itemsPerPage);
-      var end = begin + vm.itemsPerPage;
-      vm.pagedItems = vm.filteredItems.slice(begin, end);
+      vm.tooltipMsg = 'VIP.VIP_TORRENTS_IS_LOADING';
+      vm.getUserUploadedTorrent(vm.currentPage, function (items) {
+        vm.filterLength = items.total;
+        vm.pagedItems = items.rows;
 
-      if (callback) callback();
+        if (vm.pagedItems.length === 0) {
+          vm.tooltipMsg = 'VIP.VIP_TORRENTS_IS_EMPTY';
+        } else {
+          vm.tooltipMsg = undefined;
+        }
+        if (callback) callback();
+      });
     };
 
     /**
@@ -64,15 +73,25 @@
 
     /**
      * getUserUploadedTorrent
+     * @param p
+     * @param callback
      */
-    vm.getUserUploadedTorrent = function () {
+    vm.getUserUploadedTorrent = function (p, callback) {
       TorrentsService.get({
+        skip: (p - 1) * vm.itemsPerPage,
+        limit: vm.itemsPerPage,
         userid: $state.params.userId,
-        torrent_type: 'all',
-        torrent_status: 'all'
-      }, function (items) {
-        vm.userUploadedList = items.rows;
-        vm.buildPager();
+        torrent_type: vm.filterType ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
+        torrent_status: 'all',
+        torrent_vip: vm.filterVIP ? vm.filterVIP : undefined,
+        torrent_rlevel: vm.torrentRLevel,
+        torrent_release: vm.releaseYear,
+        torrent_tags: vm.searchTags,
+        torrent_hnr: vm.filterHnR,
+        torrent_sale: vm.filterSale
+      }, function (data) {
+        mtDebug.info(data);
+        callback(data);
       }, function (err) {
         Notification.error({
           message: '<i class="glyphicon glyphicon-remove"></i> ' + $translate.instant('UPLOADED_LIST_ERROR')
diff --git a/modules/users/client/controllers/status/uploaded.client.controller.js b/modules/users/client/controllers/status/uploaded.client.controller.js
index ac11e959..37e021b0 100644
--- a/modules/users/client/controllers/status/uploaded.client.controller.js
+++ b/modules/users/client/controllers/status/uploaded.client.controller.js
@@ -9,7 +9,7 @@
     'MeanTorrentConfig', '$window', '$filter', 'DownloadService', 'DebugConsoleService', 'TorrentGetInfoServices', 'ResourcesTagsServices'];
 
   function UploadedController($scope, $state, $translate, $timeout, Authentication, Notification, TorrentsService, MeanTorrentConfig,
-                            $window, $filter, DownloadService, mtDebug, TorrentGetInfoServices, ResourcesTagsServices) {
+                              $window, $filter, DownloadService, mtDebug, TorrentGetInfoServices, ResourcesTagsServices) {
     var vm = this;
     vm.DLS = DownloadService;
     vm.TGI = TorrentGetInfoServices;
@@ -18,6 +18,12 @@
     vm.itemsPerPageConfig = MeanTorrentConfig.meanTorrentConfig.itemsPerPage;
 
     vm.searchTags = [];
+    vm.releaseYear = undefined;
+    vm.filterType = undefined;
+    vm.filterHnR = false;
+    vm.filterSale = false;
+    vm.torrentRLevel = 'level0';
+    vm.torrentType = 'aggregate';
 
     /**
      * buildPager
@@ -33,15 +39,18 @@
      * figureOutItemsToDisplay
      */
     vm.figureOutItemsToDisplay = function (callback) {
-      vm.filteredItems = $filter('filter')(vm.uploadedList, {
-        $: vm.search
-      });
-      vm.filterLength = vm.filteredItems.length;
-      var begin = ((vm.currentPage - 1) * vm.itemsPerPage);
-      var end = begin + vm.itemsPerPage;
-      vm.pagedItems = vm.filteredItems.slice(begin, end);
+      vm.tooltipMsg = 'VIP.VIP_TORRENTS_IS_LOADING';
+      vm.getUploadedTorrent(vm.currentPage, function (items) {
+        vm.filterLength = items.total;
+        vm.pagedItems = items.rows;
 
-      if (callback) callback();
+        if (vm.pagedItems.length === 0) {
+          vm.tooltipMsg = 'VIP.VIP_TORRENTS_IS_EMPTY';
+        } else {
+          vm.tooltipMsg = undefined;
+        }
+        if (callback) callback();
+      });
     };
 
     /**
@@ -64,16 +73,25 @@
 
     /**
      * getUploadedTorrent
+     * @param p
+     * @param callback
      */
-    vm.getUploadedTorrent = function () {
+    vm.getUploadedTorrent = function (p, callback) {
       TorrentsService.get({
+        skip: (p - 1) * vm.itemsPerPage,
+        limit: vm.itemsPerPage,
         userid: vm.user._id,
-        torrent_type: 'all',
-        torrent_status: 'all'
-      }, function (items) {
-        vm.uploadedList = items.rows;
-        mtDebug.info(items);
-        vm.buildPager();
+        torrent_type: vm.filterType ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
+        torrent_status: 'all',
+        torrent_vip: vm.filterVIP ? vm.filterVIP : undefined,
+        torrent_rlevel: vm.torrentRLevel,
+        torrent_release: vm.releaseYear,
+        torrent_tags: vm.searchTags,
+        torrent_hnr: vm.filterHnR,
+        torrent_sale: vm.filterSale
+      }, function (data) {
+        mtDebug.info(data);
+        callback(data);
       }, function (err) {
         Notification.error({
           message: '<i class="glyphicon glyphicon-remove"></i> ' + $translate.instant('UPLOADED_LIST_ERROR')
diff --git a/modules/users/client/views/admin/user-leeching.client.view.html b/modules/users/client/views/admin/user-leeching.client.view.html
index cce0654f..5941840c 100644
--- a/modules/users/client/views/admin/user-leeching.client.view.html
+++ b/modules/users/client/views/admin/user-leeching.client.view.html
@@ -3,7 +3,7 @@
         <div class="col-md-12 torrent-list" id="top_of_torrent_list" ng-show="vm.pagedItems">
             <span>
                 <h3 class="margin-bottom-30">
-                    {{vm.user.displayName}} - {{'PAGETITLE.STATUS_DOWNLOADING' | translate}}
+                    {{vm.user.displayName}} - {{'PAGETITLE.ADMIN_USER_LEECHING' | translate}}
                 </h3>
             </span>
 
@@ -28,131 +28,24 @@
                 <table class="table table-hover tb-v-middle">
                     <thead>
                         <tr>
+                            <th class="td-width-0"></th>
                             <th>{{ 'TABLE_FIELDS.INFO' | translate}}</th>
                             <th>{{ 'TABLE_FIELDS.VOTES' | translate}}</th>
                             <th class="text-center">{{ 'TABLE_FIELDS.LIFETIME' | translate}}</th>
                             <th class="text-center">{{ 'TABLE_FIELDS.SIZE' | translate}}</th>
+                            <th>
+                                <abbr title="{{ 'TABLE_FIELDS.ABBR_SEEDS_LEECHERS_FINISHED' | translate}}" class="initialism">
+                                    {{ 'TABLE_FIELDS.SEEDS_LEECHERS_FINISHED' | translate}}
+                                </abbr>
+                            </th>
                             <th class="text-center">
                                 <abbr title="{{ 'TABLE_FIELDS.ABBR_DOWNLOADED_SPEED' | translate}}" class="initialism">
                                     {{ 'TABLE_FIELDS.DOWNLOADED_SPEED' | translate}}
                                 </abbr>
                             </th>
-                            <th class="text-center">
-                                <abbr title="{{ 'TABLE_FIELDS.ABBR_UPLOADED_RATIO_PERCENT' | translate}}" class="initialism">
-                                    {{ 'TABLE_FIELDS.UPLOADED_RATIO_PERCENT' | translate}}
-                                </abbr>
-                            </th>
                         </tr>
                     </thead>
-                    <tbody>
-                        <tr class="torrent-list-info" ng-repeat="item in vm.pagedItems" ng-click="vm.TGI.openTorrentDetailInfo(item.torrent._id);">
-                            <td class="col-md-7 td-text-overflow">
-                                <div class="media">
-                                    <div class="media-left">
-                                        <img class="media-object" torrent-logo="item.torrent"
-                                             ng-src="{{vm.TGI.getTorrentListImage(item.torrent)}}"
-                                             alt="{{vm.TGI.getTorrentTitle(item.torrent)}}">
-
-                                        <div class="layer-download" ng-class="{'music': item.torrent.torrent_type=='music'}">
-                                            <i class="fa fa-arrow-circle-o-down fa-3x" aria-hidden="true"
-                                               title="{{ 'TITLE_ALT.DOWNLOAD_TORRENT' | translate}}"
-                                               ng-click="vm.DLS.downloadTorrent(item.torrent._id); $event.stopPropagation();"
-                                               ng-class="{'fa-arrow-circle-down': vm.hover}"
-                                               ng-mouseover="vm.hover = true;" ng-mouseleave="vm.hover = false;"></i>
-                                        </div>
-                                    </div>
-                                    <div class="media-body">
-                                        <h5 class="media-heading">
-                                            <a ui-sref="torrents.view({torrentId: item.torrent._id})">{{vm.TGI.getTorrentDoubleTitle(item.torrent)}}</a>
-                                            <span class="upload-by" ng-show="item.torrent.user.displayName"> (By:
-                                                <span user-info="item.torrent.user" info-name></span> <span
-                                                        maker-info="item.torrent.maker"></span>)</span>
-                                            <span torrent-file-link="item.torrent" torrent-user="vm.authUser" info-class="color-mt-base"></span>
-                                        </h5>
-
-                                        <div class="torrent-filename text-long">{{item.torrent.torrent_filename | filename}}</div>
-                                        <div class="torrent-filename text-long">{{item.torrent.resource_detail_info.subtitle}}</div>
-
-                                        <div class="list-all-genres">
-                                            <span class="genres-item" ng-repeat="t in item.torrent.resource_detail_info.genres">{{t.name}}</span>
-                                        </div>
-
-                                        <div class="list-all-tags">
-                                            <!--<span class="label label-success text-uppercase">{{ item.torrent.torrent_type}}</span>-->
-                                            <span class="label label-ttype label-primary" ng-click="$event.stopPropagation();">
-                                                {{'TORRENT_TYPE_LABEL.' + item.torrent.torrent_type.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-tstatus label-danger" ng-show="item.torrent.torrent_status == 'new'"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{'TORRENT_STATUS_LABEL.' + item.torrent.torrent_status.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-release label-warning" ng-show="item.torrent.resource_detail_info.release_date"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{ item.torrent.resource_detail_info.release_date}}
-                                            </span>
-                                            <span title="{{ 'TORRENT_STATUS_TOP_TITLE' | translate}}" ng-if="item.torrent.isTop"
-                                                  class="torrent-votes"><kbd>{{'STATUS_TOP_KEY' | translate}}</kbd></span>
-                                            <span class="label label-rlevel label-info"
-                                                  ng-show="item.torrent.torrent_recommended != 'level0'"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent.torrent_recommended.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-sale" ng-if="item.torrent.isSaling"
-                                                  title="{{vm.TGI.getTorrentSaleTypeDesc(item.torrent);}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{item.torrent.torrent_sale_expires | date: 'MM-dd HH:mm'}}"
-                                                  ng-click="$event.stopPropagation();"
-                                                  ng-class="{'label-default': !item.torrent.isSaling, 'label-success': item.torrent.isSaling}">
-                                                    {{item.torrent.torrent_sale_status}} {{item.torrent.torrent_sale_expires | unlife}}
-                                            </span>
-                                            <span class="label label-se-info" ng-if="item.torrent.torrent_type == 'tvserial'"
-                                                  ng-click="$event.stopPropagation();">S{{item.torrent.torrent_seasons}}E{{item.torrent.torrent_episodes}}</span>
-
-                                            <span class="label label-hnr-info" ng-if="item.torrent.torrent_hnr"
-                                                  ng-click="$event.stopPropagation();">H&R</span>
-
-                                            <span class="label label-vip-info" ng-if="item.torrent.torrent_vip"
-                                                  ng-click="$event.stopPropagation();">VIP</span>
-
-                                            <span ng-repeat="t in item.torrent.torrent_tags">
-                                                <span class="label label-tag" ng-class="{'used': vm.searchTags.indexOf(t) !== -1}"
-                                                      ng-click="$event.stopPropagation();"
-                                                      ng-if="vm.RTS.tagInList(t);">
-                                                    {{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
-                                                </span>
-                                            </span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </td>
-                            <td class="col-md-1 td-v-middle td-imdb">
-                                <span title="{{ 'TITLE_ALT.IMDB_VOTES' | translate}}"
-                                      class="torrent-votes"><kbd>{{vm.TGI.getVoteTitle(item.torrent)}}</kbd> {{item.torrent.resource_detail_info.vote_average | number : 1}}</span>
-                            </td>
-                            <td class="col-md-1 td-v-middle text-center td-life">{{item.torrent.createdat | life}}</td>
-                            <td class="col-md-1 td-v-middle text-center td-size">{{item.torrent.torrent_size | bytes:2}}</td>
-                            <td class="col-md-1 td-v-middle text-center list-user-info td-user-info">
-                                <p class="no-margin-p">
-                                    {{item.peer_downloaded | bytes:2}}
-                                </p>
-
-                                <p class="no-margin-p">
-                                    {{item.peer_dspeed | bytes:2}}/s
-                                </p>
-                            </td>
-                            <td class="col-md-1 td-v-middle text-center td-uploader">
-                                <p class="no-margin-p">
-                                    {{item.peer_uploaded | bytes:2}}
-                                </p>
-
-                                <p class="no-margin-p">
-                                    {{item.peer_ratio | ratio}}
-                                </p>
-
-                                <p class="no-margin-p">
-                                    {{item.peer_percent}}%
-                                </p>
-                            </td>
-                        </tr>
-                    </tbody>
+                    <tbody torrent-list-item parent="vm" item="item.torrent" peer="item" list="vm.pagedItems" ng-repeat="item in vm.pagedItems"></tbody>
                 </table>
             </div>
 
diff --git a/modules/users/client/views/admin/user-seeding.client.view.html b/modules/users/client/views/admin/user-seeding.client.view.html
index 1031d7b5..733dc556 100644
--- a/modules/users/client/views/admin/user-seeding.client.view.html
+++ b/modules/users/client/views/admin/user-seeding.client.view.html
@@ -3,7 +3,7 @@
         <div class="col-md-12 torrent-list" id="top_of_torrent_list" ng-show="vm.pagedItems">
             <span>
                 <h3 class="margin-bottom-30">
-                    {{vm.user.displayName}} - {{'PAGETITLE.STATUS_SEEDING' | translate}}
+                    {{vm.user.displayName}} - {{'PAGETITLE.ADMIN_USER_SEEDING' | translate}}
                 </h3>
             </span>
 
@@ -28,127 +28,24 @@
                 <table class="table table-hover tb-v-middle">
                     <thead>
                         <tr>
+                            <th class="td-width-0"></th>
                             <th>{{ 'TABLE_FIELDS.INFO' | translate}}</th>
                             <th>{{ 'TABLE_FIELDS.VOTES' | translate}}</th>
                             <th class="text-center">{{ 'TABLE_FIELDS.LIFETIME' | translate}}</th>
                             <th class="text-center">{{ 'TABLE_FIELDS.SIZE' | translate}}</th>
+                            <th>
+                                <abbr title="{{ 'TABLE_FIELDS.ABBR_SEEDS_LEECHERS_FINISHED' | translate}}" class="initialism">
+                                    {{ 'TABLE_FIELDS.SEEDS_LEECHERS_FINISHED' | translate}}
+                                </abbr>
+                            </th>
                             <th class="text-center">
                                 <abbr title="{{ 'TABLE_FIELDS.ABBR_UPLOADED_SPEED' | translate}}" class="initialism">
                                     {{ 'TABLE_FIELDS.UPLOADED_SPEED' | translate}}
                                 </abbr>
                             </th>
-                            <th class="text-center">
-                                <abbr title="{{ 'TABLE_FIELDS.ABBR_DOWNLOADED_RATIO' | translate}}" class="initialism">
-                                    {{ 'TABLE_FIELDS.DOWNLOADED_RATIO' | translate}}
-                                </abbr>
-                            </th>
                         </tr>
                     </thead>
-                    <tbody>
-                        <tr class="torrent-list-info" ng-repeat="item in vm.pagedItems" ng-click="vm.TGI.openTorrentDetailInfo(item.torrent._id);">
-                            <td class="col-md-7 td-text-overflow">
-                                <div class="media">
-                                    <div class="media-left">
-                                        <img class="media-object" torrent-logo="item.torrent"
-                                             ng-src="{{vm.TGI.getTorrentListImage(item.torrent)}}"
-                                             alt="{{vm.TGI.getTorrentTitle(item.torrent)}}">
-
-                                        <div class="layer-download" ng-class="{'music': item.torrent.torrent_type=='music'}">
-                                            <i class="fa fa-arrow-circle-o-down fa-3x" aria-hidden="true"
-                                               title="{{ 'TITLE_ALT.DOWNLOAD_TORRENT' | translate}}"
-                                               ng-click="vm.DLS.downloadTorrent(item.torrent._id); $event.stopPropagation();"
-                                               ng-class="{'fa-arrow-circle-down': vm.hover}"
-                                               ng-mouseover="vm.hover = true;" ng-mouseleave="vm.hover = false;"></i>
-                                        </div>
-                                    </div>
-                                    <div class="media-body">
-                                        <h5 class="media-heading">
-                                            <a ui-sref="torrents.view({torrentId: item.torrent._id})">{{vm.TGI.getTorrentDoubleTitle(item.torrent)}}</a>
-                                            <span class="upload-by" ng-show="item.torrent.user.displayName"> (By:
-                                                <span user-info="item.torrent.user" info-name></span> <span
-                                                        maker-info="item.torrent.maker"></span>)</span>
-                                            <span torrent-file-link="item.torrent" torrent-user="vm.authUser" info-class="color-mt-base"></span>
-                                        </h5>
-
-                                        <div class="torrent-filename text-long">{{item.torrent.torrent_filename | filename}}</div>
-                                        <div class="torrent-filename text-long">{{item.torrent.resource_detail_info.subtitle}}</div>
-
-                                        <div class="list-all-genres">
-                                            <span class="genres-item" ng-repeat="t in item.torrent.resource_detail_info.genres">{{t.name}}</span>
-                                        </div>
-
-                                        <div class="list-all-tags">
-                                            <!--<span class="label label-success text-uppercase">{{ item.torrent.torrent_type}}</span>-->
-                                            <span class="label label-ttype label-primary" ng-click="$event.stopPropagation();">
-                                                {{'TORRENT_TYPE_LABEL.' + item.torrent.torrent_type.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-tstatus label-danger" ng-show="item.torrent.torrent_status == 'new'"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{'TORRENT_STATUS_LABEL.' + item.torrent.torrent_status.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-release label-warning" ng-show="item.torrent.resource_detail_info.release_date"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{ item.torrent.resource_detail_info.release_date}}
-                                            </span>
-                                            <span title="{{ 'TORRENT_STATUS_TOP_TITLE' | translate}}" ng-if="item.torrent.isTop"
-                                                  class="torrent-votes"><kbd>{{'STATUS_TOP_KEY' | translate}}</kbd></span>
-                                            <span class="label label-rlevel label-info"
-                                                  ng-show="item.torrent.torrent_recommended != 'level0'"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent.torrent_recommended.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-sale" ng-if="item.torrent.isSaling"
-                                                  title="{{vm.TGI.getTorrentSaleTypeDesc(item.torrent);}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{item.torrent.torrent_sale_expires | date: 'MM-dd HH:mm'}}"
-                                                  ng-click="$event.stopPropagation();"
-                                                  ng-class="{'label-default': !item.torrent.isSaling, 'label-success': item.torrent.isSaling}">
-                                                    {{item.torrent.torrent_sale_status}} {{item.torrent.torrent_sale_expires | unlife}}
-                                            </span>
-                                            <span class="label label-se-info" ng-if="item.torrent.torrent_type == 'tvserial'"
-                                                  ng-click="$event.stopPropagation();">S{{item.torrent.torrent_seasons}}E{{item.torrent.torrent_episodes}}</span>
-
-                                            <span class="label label-hnr-info" ng-if="item.torrent.torrent_hnr"
-                                                  ng-click="$event.stopPropagation();">H&R</span>
-
-                                            <span class="label label-vip-info" ng-if="item.torrent.torrent_vip"
-                                                  ng-click="$event.stopPropagation();">VIP</span>
-
-                                            <span ng-repeat="t in item.torrent.torrent_tags">
-                                                <span class="label label-tag" ng-class="{'used': vm.searchTags.indexOf(t) !== -1}"
-                                                      ng-click="$event.stopPropagation();"
-                                                      ng-if="vm.RTS.tagInList(t);">
-                                                    {{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
-                                                </span>
-                                            </span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </td>
-                            <td class="col-md-1 td-v-middle td-imdb">
-                            <span title="{{ 'TITLE_ALT.IMDB_VOTES' | translate}}"
-                                  class="torrent-votes"><kbd>{{vm.TGI.getVoteTitle(item.torrent)}}</kbd> {{item.torrent.resource_detail_info.vote_average | number : 1}}</span>
-                            </td>
-                            <td class="col-md-1 td-v-middle text-center td-life">{{item.torrent.createdat | life}}</td>
-                            <td class="col-md-1 td-v-middle text-center td-size">{{item.torrent.torrent_size | bytes:2}}</td>
-                            <td class="col-md-1 td-v-middle text-center list-user-info td-user-info">
-                                <p class="no-margin-p">
-                                    {{item.peer_uploaded | bytes:2}}
-                                </p>
-
-                                <p class="no-margin-p">
-                                    {{item.peer_uspeed | bytes:2}}/s
-                                </p>
-                            </td>
-                            <td class="col-md-1 td-v-middle text-center td-uploader">
-                                <p class="no-margin-p">
-                                    {{item.peer_downloaded | bytes:2}}
-                                </p>
-
-                                <p class="no-margin-p">
-                                    {{item.peer_ratio | ratio}}
-                                </p>
-                            </td>
-                        </tr>
-                    </tbody>
+                    <tbody torrent-list-item parent="vm" item="item.torrent" peer="item" list="vm.pagedItems" ng-repeat="item in vm.pagedItems"></tbody>
                 </table>
             </div>
 
diff --git a/modules/users/client/views/admin/user-uplist.client.view.html b/modules/users/client/views/admin/user-uplist.client.view.html
index d8849686..e87ada73 100644
--- a/modules/users/client/views/admin/user-uplist.client.view.html
+++ b/modules/users/client/views/admin/user-uplist.client.view.html
@@ -1,9 +1,9 @@
-<section class="container" ng-init="vm.getUserUploadedTorrent();">
+<section class="container" ng-init="vm.buildPager();">
     <div class="row margin-top-50">
         <div class="col-md-12 torrent-list" id="top_of_torrent_list" ng-show="vm.pagedItems">
             <span>
                 <h3 class="margin-bottom-30">
-                    {{vm.user.displayName}} - {{'PAGETITLE.STATUS_UPLOADED' | translate}}
+                    {{vm.user.displayName}} - {{'PAGETITLE.ADMIN_USER_UPLIST' | translate}}
                 </h3>
             </span>
 
@@ -28,6 +28,7 @@
                 <table class="table table-hover tb-v-middle">
                     <thead>
                         <tr>
+                            <th class="td-width-0"></th>
                             <th>{{ 'TABLE_FIELDS.INFO' | translate}}</th>
                             <th>{{ 'TABLE_FIELDS.VOTES' | translate}}</th>
                             <th class="text-center">{{ 'TABLE_FIELDS.LIFETIME' | translate}}</th>
@@ -40,113 +41,7 @@
                             <th class="text-center">{{ 'TABLE_FIELDS.PUBLISHER' | translate}}</th>
                         </tr>
                     </thead>
-                    <tbody>
-                        <tr class="torrent-list-info" ng-repeat="item in vm.pagedItems" ng-click="vm.TGI.openTorrentDetailInfo(item._id);">
-                            <td class="col-md-7 td-text-overflow">
-                                <div class="media">
-                                    <div class="media-left">
-                                        <img class="media-object" torrent-logo="item"
-                                             ng-src="{{vm.TGI.getTorrentListImage(item)}}"
-                                             alt="{{vm.TGI.getTorrentTitle(item)}}">
-
-                                        <div class="layer-download" ng-class="{'music': item.torrent_type=='music'}">
-                                            <i class="fa fa-arrow-circle-o-down fa-3x" aria-hidden="true"
-                                               title="{{ 'TITLE_ALT.DOWNLOAD_TORRENT' | translate}}"
-                                               ng-click="vm.DLS.downloadTorrent(item._id); $event.stopPropagation();"
-                                               ng-class="{'fa-arrow-circle-down': vm.hover}"
-                                               ng-mouseover="vm.hover = true;" ng-mouseleave="vm.hover = false;"></i>
-                                        </div>
-                                    </div>
-                                    <div class="media-body">
-                                        <h5 class="media-heading">
-                                            <a ui-sref="torrents.view({torrentId: item._id})">{{vm.TGI.getTorrentDoubleTitle(item)}}</a>
-                                            <span torrent-file-link="item" torrent-user="vm.user" info-class="color-mt-base"></span>
-                                        </h5>
-
-                                        <div class="torrent-filename text-long">{{item.torrent_filename | filename}}</div>
-                                        <div class="torrent-filename text-long">{{item.resource_detail_info.subtitle}}</div>
-
-                                        <div class="list-all-genres">
-                                            <span class="genres-item" ng-repeat="t in item.resource_detail_info.genres">{{t.name}}</span>
-                                        </div>
-
-                                        <div class="list-all-tags">
-                                            <!--<span class="label label-success text-uppercase">{{ item.torrent_type}}</span>-->
-                                            <span class="label label-ttype label-primary" ng-click="$event.stopPropagation();">
-                                                {{'TORRENT_TYPE_LABEL.' + item.torrent_type.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-tstatus label-danger" ng-show="item.torrent_status == 'new'"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{'TORRENT_STATUS_LABEL.' + item.torrent_status.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-release label-warning" ng-show="item.resource_detail_info.release_date"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{ item.resource_detail_info.release_date}}
-                                            </span>
-                                            <span title="{{ 'TORRENT_STATUS_TOP_TITLE' | translate}}" ng-if="item.isTop"
-                                                  class="torrent-votes"><kbd>{{'STATUS_TOP_KEY' | translate}}</kbd></span>
-                                            <span class="label label-rlevel label-info"
-                                                  ng-show="item.torrent_recommended != 'level0'"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent_recommended.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-sale" ng-if="item.isSaling"
-                                                  title="{{vm.TGI.getTorrentSaleTypeDesc(item);}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{item.torrent_sale_expires | date: 'MM-dd HH:mm'}}"
-                                                  ng-click="$event.stopPropagation();"
-                                                  ng-class="{'label-default': !item.isSaling, 'label-success': item.isSaling}">
-                                                    {{item.torrent_sale_status}} {{item.torrent_sale_expires | unlife}}
-                                            </span>
-                                            <span class="label label-se-info" ng-if="item.torrent_type == 'tvserial'"
-                                                  ng-click="$event.stopPropagation();">S{{item.torrent_seasons}}E{{item.torrent_episodes}}</span>
-
-                                            <span class="label label-hnr-info" ng-if="item.torrent_hnr"
-                                                  ng-click="$event.stopPropagation();">H&R</span>
-
-                                            <span class="label label-vip-info" ng-if="item.torrent_vip"
-                                                  ng-click="$event.stopPropagation();">VIP</span>
-
-                                            <span ng-repeat="t in item.torrent_tags">
-                                                <span class="label label-tag" ng-class="{'used': vm.searchTags.indexOf(t) !== -1}"
-                                                      ng-click="$event.stopPropagation();"
-                                                      ng-if="vm.RTS.tagInList(t);">
-                                                    {{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
-                                                </span>
-                                            </span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </td>
-                            <td class="col-md-1 td-v-middle td-imdb">
-                            <span title="{{ 'TITLE_ALT.IMDB_VOTES' | translate}}"
-                                  class="torrent-votes"><kbd>{{vm.TGI.getVoteTitle(item)}}</kbd> {{item.resource_detail_info.vote_average | number : 1}}</span>
-                            </td>
-                            <td class="col-md-1 td-v-middle text-center td-life">{{item.createdat | life}}</td>
-                            <td class="col-md-1 td-v-middle text-center td-size">{{item.torrent_size | bytes:2}}</td>
-                            <td class="col-md-1 td-v-middle list-user-info td-user-info">
-                                <p class="no-margin-p" title="{{ 'TITLE_ALT.SEEDS' | translate}}">
-                                    <span class="glyphicon glyphicon-arrow-up torrent-up"></span>
-                                    {{item.torrent_seeds}}
-                                </p>
-
-                                <p class="no-margin-p" title="{{ 'TITLE_ALT.LEECHERS' | translate}}">
-                                    <span class="glyphicon glyphicon-arrow-down torrent-down"></span>
-                                    {{item.torrent_leechers}}
-                                </p>
-
-                                <p class="no-margin-p" title="{{ 'TITLE_ALT.FINISHED' | translate}}">
-                                    <span class="glyphicon glyphicon-ok torrent-finished"></span>
-                                    {{item.torrent_finished}}
-                                </p>
-                            </td>
-                            <td class="col-md-1 td-v-middle text-center td-uploader">
-                                <span user-info="item.user" info-name></span>
-
-                                <div maker-info="item.maker"></div>
-                                <!--<span vip-flag="item.user"></span>-->
-                                <!--<span message-to="item.user" to-class="message-to-icon"></span>-->
-                            </td>
-                        </tr>
-                    </tbody>
+                    <tbody torrent-list-item parent="vm" item="item" list="vm.pagedItems" ng-repeat="item in vm.pagedItems"></tbody>
                 </table>
             </div>
 
diff --git a/modules/users/client/views/admin/user-warning.client.view.html b/modules/users/client/views/admin/user-warning.client.view.html
index 9c79b6e9..702cb9a6 100644
--- a/modules/users/client/views/admin/user-warning.client.view.html
+++ b/modules/users/client/views/admin/user-warning.client.view.html
@@ -3,7 +3,7 @@
         <div class="col-md-12 torrent-list" id="top_of_torrent_list" ng-show="vm.userWarningList">
             <span>
                 <h3 class="margin-bottom-30">
-                    {{vm.user.displayName}} - {{'PAGETITLE.STATUS_WARNING' | translate}}
+                    {{vm.user.displayName}} - {{'PAGETITLE.ADMIN_USER_WARNING' | translate}}
                 </h3>
             </span>
 
@@ -28,131 +28,25 @@
                 <table class="table table-hover tb-v-middle">
                     <thead>
                         <tr>
+                            <th class="td-width-0"></th>
                             <th>{{ 'TABLE_FIELDS.INFO' | translate}}</th>
                             <th>{{ 'TABLE_FIELDS.VOTES' | translate}}</th>
                             <th class="text-center">{{ 'TABLE_FIELDS.LIFETIME' | translate}}</th>
                             <th class="text-center">{{ 'TABLE_FIELDS.SIZE' | translate}}</th>
+                            <th>
+                                <abbr title="{{ 'TABLE_FIELDS.ABBR_SEEDS_LEECHERS_FINISHED' | translate}}" class="initialism">
+                                    {{ 'TABLE_FIELDS.SEEDS_LEECHERS_FINISHED' | translate}}
+                                </abbr>
+                            </th>
                             <th class="text-center">
                                 <abbr title="{{ 'TABLE_FIELDS.ABBR_UP_DOWN_RATIO_TIME' | translate}}" class="initialism">
                                     {{ 'TABLE_FIELDS.UP_DOWN_RATIO_TIME' | translate}}
                                 </abbr>
                             </th>
-                            <th class="text-center">
-                                CMD
-                            </th>
                         </tr>
                     </thead>
-                    <tbody>
-                        <tr class="torrent-list-info" ng-repeat="item in vm.userWarningList"
-                            ng-click="vm.TGI.openTorrentDetailInfo(item.torrent._id);">
-                            <td class="col-md-7 td-text-overflow">
-                                <div class="media">
-                                    <div class="media-left">
-                                        <img class="media-object" torrent-logo="item.torrent"
-                                             ng-src="{{vm.TGI.getTorrentListImage(item.torrent)}}"
-                                             alt="{{vm.TGI.getTorrentTitle(item.torrent)}}">
-
-                                        <div class="layer-download" ng-class="{'music': item.torrent.torrent_type=='music'}">
-                                            <i class="fa fa-arrow-circle-o-down fa-3x" aria-hidden="true"
-                                               title="{{ 'TITLE_ALT.DOWNLOAD_TORRENT' | translate}}"
-                                               ng-click="vm.DLS.downloadTorrent(item.torrent._id); $event.stopPropagation();"
-                                               ng-class="{'fa-arrow-circle-down': vm.hover}"
-                                               ng-mouseover="vm.hover = true;" ng-mouseleave="vm.hover = false;"></i>
-                                        </div>
-                                    </div>
-                                    <div class="media-body">
-                                        <h5 class="media-heading">
-                                            <a ui-sref="torrents.view({torrentId: item.torrent._id})">{{vm.TGI.getTorrentDoubleTitle(item.torrent)}}</a>
-                                            <span class="upload-by" ng-show="item.torrent.user.displayName"> (By:
-                                                <span user-info="item.torrent.user" info-name></span> <span
-                                                        maker-info="item.torrent.maker"></span>)</span>
-                                            <span torrent-file-link="item.torrent" torrent-user="vm.authUser" info-class="color-mt-base"></span>
-                                        </h5>
-
-                                        <div class="torrent-filename text-long">{{item.torrent.torrent_filename | filename}}</div>
-                                        <div class="torrent-filename text-long">{{item.torrent.resource_detail_info.subtitle}}</div>
-
-                                        <div class="list-all-genres">
-                                            <span class="genres-item" ng-repeat="t in item.torrent.resource_detail_info.genres">{{t.name}}</span>
-                                        </div>
-
-                                        <div class="list-all-tags">
-                                            <!--<span class="label label-success text-uppercase">{{ item.torrent.torrent_type}}</span>-->
-                                            <span class="label label-ttype label-primary" ng-click="$event.stopPropagation();">
-                                                {{'TORRENT_TYPE_LABEL.' + item.torrent.torrent_type.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-tstatus label-danger" ng-show="item.torrent.torrent_status == 'new'"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{'TORRENT_STATUS_LABEL.' + item.torrent.torrent_status.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-release label-warning" ng-show="item.torrent.resource_detail_info.release_date"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{ item.torrent.resource_detail_info.release_date}}
-                                            </span>
-                                            <span title="{{ 'TORRENT_STATUS_TOP_TITLE' | translate}}" ng-if="item.torrent.isTop"
-                                                  class="torrent-votes"><kbd>{{'STATUS_TOP_KEY' | translate}}</kbd></span>
-                                            <span class="label label-rlevel label-info"
-                                                  ng-show="item.torrent.torrent_recommended != 'level0'"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent.torrent_recommended.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-sale" ng-if="item.torrent.isSaling"
-                                                  title="{{vm.TGI.getTorrentSaleTypeDesc(item.torrent);}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{item.torrent.torrent_sale_expires | date: 'MM-dd HH:mm'}}"
-                                                  ng-click="$event.stopPropagation();"
-                                                  ng-class="{'label-default': !item.torrent.isSaling, 'label-success': item.torrent.isSaling}">
-                                                    {{item.torrent.torrent_sale_status}} {{item.torrent.torrent_sale_expires | unlife}}
-                                            </span>
-                                            <span class="label label-se-info" ng-if="item.torrent.torrent_type == 'tvserial'"
-                                                  ng-click="$event.stopPropagation();">S{{item.torrent.torrent_seasons}}E{{item.torrent.torrent_episodes}}</span>
-
-                                            <span class="label label-hnr-info" ng-if="item.torrent.torrent_hnr"
-                                                  ng-click="$event.stopPropagation();">H&R</span>
-
-                                            <span class="label label-vip-info" ng-if="item.torrent.torrent_vip"
-                                                  ng-click="$event.stopPropagation();">VIP</span>
-
-                                            <span ng-repeat="t in item.torrent.torrent_tags">
-                                                <span class="label label-tag" ng-class="{'used': vm.searchTags.indexOf(t) !== -1}"
-                                                      ng-click="$event.stopPropagation();"
-                                                      ng-if="vm.RTS.tagInList(t);">
-                                                    {{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
-                                                </span>
-                                            </span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </td>
-                            <td class="col-md-1 td-v-middle td-imdb">
-                            <span title="{{ 'TITLE_ALT.IMDB_VOTES' | translate}}"
-                                  class="torrent-votes"><kbd>{{vm.TGI.getVoteTitle(item.torrent)}}</kbd> {{item.torrent.resource_detail_info.vote_average | number : 1}}</span>
-                            </td>
-                            <td class="col-md-1 td-v-middle text-center td-life">{{item.torrent.createdat | life}}</td>
-                            <td class="col-md-1 td-v-middle text-center td-size">{{item.torrent.torrent_size | bytes:2}}</td>
-                            <td class="col-md-1 td-v-middle text-center list-user-info td-user-info">
-                                <p class="no-margin-p">
-                                    {{item.total_uploaded | bytes:2}}
-                                </p>
-
-                                <p class="no-margin-p">
-                                    {{item.total_downloaded | bytes:2}}
-                                </p>
-
-                                <p class="no-margin-p">
-                                    {{item.total_ratio | ratio}}
-                                </p>
-
-                                <p class="no-margin-p">
-                                    {{item.total_seed_time | seedlife}}
-                                </p>
-                            </td>
-                            <td class="col-md-1 td-v-middle text-center td-uploader">
-                                <button class="btn btn-default btn-sm"
-                                        ng-click="vm.removeWarning(item); $event.stopPropagation();">{{'BTN_REMOVE_WARNING' | translate}}
-                                </button>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
+                    <tbody torrent-list-item parent="vm" item="item.torrent" warning="item" list="vm.userWarningList" ng-repeat="item in vm.userWarningList"></tbody>
+               </table>
             </div>
 
             <div class="pagination-div-bottom">
diff --git a/modules/users/client/views/status/downloading.client.view.html b/modules/users/client/views/status/downloading.client.view.html
index 568a50a4..e2d7e80c 100644
--- a/modules/users/client/views/status/downloading.client.view.html
+++ b/modules/users/client/views/status/downloading.client.view.html
@@ -28,130 +28,24 @@
                 <table class="table table-hover tb-v-middle">
                     <thead>
                         <tr>
+                            <th class="td-width-0"></th>
                             <th>{{ 'TABLE_FIELDS.INFO' | translate}}</th>
                             <th>{{ 'TABLE_FIELDS.VOTES' | translate}}</th>
                             <th class="text-center">{{ 'TABLE_FIELDS.LIFETIME' | translate}}</th>
                             <th class="text-center">{{ 'TABLE_FIELDS.SIZE' | translate}}</th>
+                            <th>
+                                <abbr title="{{ 'TABLE_FIELDS.ABBR_SEEDS_LEECHERS_FINISHED' | translate}}" class="initialism">
+                                    {{ 'TABLE_FIELDS.SEEDS_LEECHERS_FINISHED' | translate}}
+                                </abbr>
+                            </th>
                             <th class="text-center">
                                 <abbr title="{{ 'TABLE_FIELDS.ABBR_DOWNLOADED_SPEED' | translate}}" class="initialism">
                                     {{ 'TABLE_FIELDS.DOWNLOADED_SPEED' | translate}}
                                 </abbr>
                             </th>
-                            <th class="text-center">
-                                <abbr title="{{ 'TABLE_FIELDS.ABBR_UPLOADED_RATIO_PERCENT' | translate}}" class="initialism">
-                                    {{ 'TABLE_FIELDS.UPLOADED_RATIO_PERCENT' | translate}}
-                                </abbr>
-                            </th>
                         </tr>
                     </thead>
-                    <tbody>
-                        <tr class="torrent-list-info" ng-repeat="item in vm.pagedItems" ng-click="vm.TGI.openTorrentDetailInfo(item.torrent._id);">
-                            <td class="col-md-7 td-text-overflow">
-                                <div class="media">
-                                    <div class="media-left">
-                                        <img class="media-object" torrent-logo="item.torrent"
-                                             ng-src="{{vm.TGI.getTorrentListImage(item.torrent)}}"
-                                             alt="{{vm.TGI.getTorrentTitle(item.torrent)}}">
-
-                                        <div class="layer-download" ng-class="{'music': item.torrent.torrent_type=='music'}">
-                                            <i class="fa fa-arrow-circle-o-down fa-3x" aria-hidden="true"
-                                               title="{{ 'TITLE_ALT.DOWNLOAD_TORRENT' | translate}}"
-                                               ng-click="vm.DLS.downloadTorrent(item.torrent._id); $event.stopPropagation();"
-                                               ng-class="{'fa-arrow-circle-down': vm.hover}"
-                                               ng-mouseover="vm.hover = true;" ng-mouseleave="vm.hover = false;"></i>
-                                        </div>
-                                    </div>
-                                    <div class="media-body">
-                                        <h5 class="media-heading">
-                                            <a ui-sref="torrents.view({torrentId: item.torrent._id})">{{vm.TGI.getTorrentDoubleTitle(item.torrent)}}</a>
-                                            <span class="upload-by" ng-show="item.torrent.user.displayName"> (By:
-                                                <span user-info="item.torrent.user" info-name></span>  <span maker-info="item.torrent.maker"></span>)</span>
-                                            <span torrent-file-link="item.torrent" torrent-user="vm.user" info-class="color-mt-base"></span>
-                                        </h5>
-
-                                        <div class="torrent-filename text-long">{{item.torrent.torrent_filename | filename}}</div>
-                                        <div class="torrent-filename text-long">{{item.torrent.resource_detail_info.subtitle}}</div>
-
-                                        <div class="list-all-genres">
-                                            <span class="genres-item" ng-repeat="t in item.torrent.resource_detail_info.genres">{{t.name}}</span>
-                                        </div>
-
-                                        <div class="list-all-tags">
-                                            <!--<span class="label label-success text-uppercase">{{ item.torrent.torrent_type}}</span>-->
-                                            <span class="label label-ttype label-primary" ng-click="$event.stopPropagation();">
-                                                {{'TORRENT_TYPE_LABEL.' + item.torrent.torrent_type.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-tstatus label-danger" ng-show="item.torrent.torrent_status == 'new'"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{'TORRENT_STATUS_LABEL.' + item.torrent.torrent_status.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-release label-warning" ng-show="item.torrent.resource_detail_info.release_date"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{ item.torrent.resource_detail_info.release_date}}
-                                            </span>
-                                            <span title="{{ 'TORRENT_STATUS_TOP_TITLE' | translate}}" ng-if="item.torrent.isTop"
-                                                  class="torrent-votes"><kbd>{{'STATUS_TOP_KEY' | translate}}</kbd></span>
-                                            <span class="label label-rlevel label-info"
-                                                  ng-show="item.torrent.torrent_recommended != 'level0'"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent.torrent_recommended.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-sale" ng-if="item.torrent.isSaling"
-                                                  title="{{vm.TGI.getTorrentSaleTypeDesc(item.torrent);}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{item.torrent.torrent_sale_expires | date: 'MM-dd HH:mm'}}"
-                                                  ng-click="$event.stopPropagation();"
-                                                  ng-class="{'label-default': !item.torrent.isSaling, 'label-success': item.torrent.isSaling}">
-                                                    {{item.torrent.torrent_sale_status}} {{item.torrent.torrent_sale_expires | unlife}}
-                                            </span>
-                                            <span class="label label-se-info" ng-if="item.torrent_type == 'tvserial'"
-                                                  ng-click="$event.stopPropagation();">S{{item.torrent.torrent_seasons}}E{{item.torrent.torrent_episodes}}</span>
-
-                                            <span class="label label-hnr-info" ng-if="item.torrent.torrent_hnr"
-                                                  ng-click="$event.stopPropagation();">H&R</span>
-
-                                            <span class="label label-vip-info" ng-if="item.torrent.torrent_vip"
-                                                  ng-click="$event.stopPropagation();">VIP</span>
-
-                                            <span ng-repeat="t in item.torrent.torrent_tags">
-                                                <span class="label label-tag" ng-class="{'used': vm.searchTags.indexOf(t) !== -1}"
-                                                      ng-click="$event.stopPropagation();"
-                                                      ng-if="vm.RTS.tagInList(t);">
-                                                    {{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
-                                                </span>
-                                            </span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </td>
-                            <td class="col-md-1 td-v-middle td-imdb">
-                                <span title="{{ 'TITLE_ALT.IMDB_VOTES' | translate}}"
-                                      class="torrent-votes"><kbd>{{vm.TGI.getVoteTitle(item.torrent)}}</kbd> {{item.torrent.resource_detail_info.vote_average | number : 1}}</span>
-                            </td>
-                            <td class="col-md-1 td-v-middle text-center td-life">{{item.torrent.createdat | life}}</td>
-                            <td class="col-md-1 td-v-middle text-center td-size">{{item.torrent.torrent_size | bytes:2}}</td>
-                            <td class="col-md-1 td-v-middle text-center list-user-info td-user-info">
-                                <p class="no-margin-p">
-                                    {{item.peer_downloaded | bytes:2}}
-                                </p>
-
-                                <p class="no-margin-p">
-                                    {{item.peer_dspeed | bytes:2}}/s
-                                </p>
-                            </td>
-                            <td class="col-md-1 td-v-middle text-center td-uploader">
-                                <p class="no-margin-p">
-                                    {{item.peer_uploaded | bytes:2}}
-                                </p>
-
-                                <p class="no-margin-p">
-                                    {{item.peer_ratio | ratio}}
-                                </p>
-
-                                <p class="no-margin-p">
-                                    {{item.peer_percent}}%
-                                </p>
-                            </td>
-                        </tr>
-                    </tbody>
+                    <tbody torrent-list-item parent="vm" item="item.torrent" peer="item" list="vm.pagedItems" ng-repeat="item in vm.pagedItems"></tbody>
                 </table>
             </div>
 
diff --git a/modules/users/client/views/status/seeding.client.view.html b/modules/users/client/views/status/seeding.client.view.html
index ac008f6a..411dfa53 100644
--- a/modules/users/client/views/status/seeding.client.view.html
+++ b/modules/users/client/views/status/seeding.client.view.html
@@ -28,126 +28,24 @@
                 <table class="table table-hover tb-v-middle">
                     <thead>
                         <tr>
+                            <th class="td-width-0"></th>
                             <th>{{ 'TABLE_FIELDS.INFO' | translate}}</th>
                             <th>{{ 'TABLE_FIELDS.VOTES' | translate}}</th>
                             <th class="text-center">{{ 'TABLE_FIELDS.LIFETIME' | translate}}</th>
                             <th class="text-center">{{ 'TABLE_FIELDS.SIZE' | translate}}</th>
+                            <th>
+                                <abbr title="{{ 'TABLE_FIELDS.ABBR_SEEDS_LEECHERS_FINISHED' | translate}}" class="initialism">
+                                    {{ 'TABLE_FIELDS.SEEDS_LEECHERS_FINISHED' | translate}}
+                                </abbr>
+                            </th>
                             <th class="text-center">
                                 <abbr title="{{ 'TABLE_FIELDS.ABBR_UPLOADED_SPEED' | translate}}" class="initialism">
                                     {{ 'TABLE_FIELDS.UPLOADED_SPEED' | translate}}
                                 </abbr>
                             </th>
-                            <th class="text-center">
-                                <abbr title="{{ 'TABLE_FIELDS.ABBR_DOWNLOADED_RATIO' | translate}}" class="initialism">
-                                    {{ 'TABLE_FIELDS.DOWNLOADED_RATIO' | translate}}
-                                </abbr>
-                            </th>
                         </tr>
                     </thead>
-                    <tbody>
-                        <tr class="torrent-list-info" ng-repeat="item in vm.pagedItems" ng-click="vm.TGI.openTorrentDetailInfo(item.torrent._id);">
-                            <td class="col-md-7 td-text-overflow">
-                                <div class="media">
-                                    <div class="media-left">
-                                        <img class="media-object" torrent-logo="item.torrent"
-                                             ng-src="{{vm.TGI.getTorrentListImage(item.torrent)}}"
-                                             alt="{{vm.TGI.getTorrentTitle(item.torrent)}}">
-
-                                        <div class="layer-download" ng-class="{'music': item.torrent.torrent_type=='music'}">
-                                            <i class="fa fa-arrow-circle-o-down fa-3x" aria-hidden="true"
-                                               title="{{ 'TITLE_ALT.DOWNLOAD_TORRENT' | translate}}"
-                                               ng-click="vm.DLS.downloadTorrent(item.torrent._id); $event.stopPropagation();"
-                                               ng-class="{'fa-arrow-circle-down': vm.hover}"
-                                               ng-mouseover="vm.hover = true;" ng-mouseleave="vm.hover = false;"></i>
-                                        </div>
-                                    </div>
-                                    <div class="media-body">
-                                        <h5 class="media-heading">
-                                            <a ui-sref="torrents.view({torrentId: item.torrent._id})">{{vm.TGI.getTorrentDoubleTitle(item.torrent)}}</a>
-                                            <span class="upload-by" ng-show="item.torrent.user.displayName"> (By:
-                                                <span user-info="item.torrent.user" info-name></span>  <span maker-info="item.torrent.maker"></span>)</span>
-                                            <span torrent-file-link="item.torrent" torrent-user="vm.user" info-class="color-mt-base"></span>
-                                        </h5>
-
-                                        <div class="torrent-filename text-long">{{item.torrent.torrent_filename | filename}}</div>
-                                        <div class="torrent-filename text-long">{{item.torrent.resource_detail_info.subtitle}}</div>
-
-                                        <div class="list-all-genres">
-                                            <span class="genres-item" ng-repeat="t in item.torrent.resource_detail_info.genres">{{t.name}}</span>
-                                        </div>
-
-                                        <div class="list-all-tags">
-                                            <!--<span class="label label-success text-uppercase">{{ item.torrent.torrent_type}}</span>-->
-                                            <span class="label label-ttype label-primary" ng-click="$event.stopPropagation();">
-                                                {{'TORRENT_TYPE_LABEL.' + item.torrent.torrent_type.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-tstatus label-danger" ng-show="item.torrent.torrent_status == 'new'"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{'TORRENT_STATUS_LABEL.' + item.torrent.torrent_status.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-release label-warning" ng-show="item.torrent.resource_detail_info.release_date"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{ item.torrent.resource_detail_info.release_date}}
-                                            </span>
-                                            <span title="{{ 'TORRENT_STATUS_TOP_TITLE' | translate}}" ng-if="item.torrent.isTop"
-                                                  class="torrent-votes"><kbd>{{'STATUS_TOP_KEY' | translate}}</kbd></span>
-                                            <span class="label label-rlevel label-info"
-                                                  ng-show="item.torrent.torrent_recommended != 'level0'"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent.torrent_recommended.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-sale" ng-if="item.torrent.isSaling"
-                                                  title="{{vm.TGI.getTorrentSaleTypeDesc(item.torrent);}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{item.torrent.torrent_sale_expires | date: 'MM-dd HH:mm'}}"
-                                                  ng-click="$event.stopPropagation();"
-                                                  ng-class="{'label-default': !item.torrent.isSaling, 'label-success': item.torrent.isSaling}">
-                                                    {{item.torrent.torrent_sale_status}} {{item.torrent.torrent_sale_expires | unlife}}
-                                            </span>
-                                            <span class="label label-se-info" ng-if="item.torrent_type == 'tvserial'"
-                                                  ng-click="$event.stopPropagation();">S{{item.torrent.torrent_seasons}}E{{item.torrent.torrent_episodes}}</span>
-
-                                            <span class="label label-hnr-info" ng-if="item.torrent.torrent_hnr"
-                                                  ng-click="$event.stopPropagation();">H&R</span>
-
-                                            <span class="label label-vip-info" ng-if="item.torrent.torrent_vip"
-                                                  ng-click="$event.stopPropagation();">VIP</span>
-
-                                            <span ng-repeat="t in item.torrent.torrent_tags">
-                                                <span class="label label-tag" ng-class="{'used': vm.searchTags.indexOf(t) !== -1}"
-                                                      ng-click="$event.stopPropagation();"
-                                                      ng-if="vm.RTS.tagInList(t);">
-                                                    {{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
-                                                </span>
-                                            </span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </td>
-                            <td class="col-md-1 td-v-middle td-imdb">
-                            <span title="{{ 'TITLE_ALT.IMDB_VOTES' | translate}}"
-                                  class="torrent-votes"><kbd>{{vm.TGI.getVoteTitle(item.torrent)}}</kbd> {{item.torrent.resource_detail_info.vote_average | number : 1}}</span>
-                            </td>
-                            <td class="col-md-1 td-v-middle text-center td-life">{{item.torrent.createdat | life}}</td>
-                            <td class="col-md-1 td-v-middle text-center td-size">{{item.torrent.torrent_size | bytes:2}}</td>
-                            <td class="col-md-1 td-v-middle text-center list-user-info td-user-info">
-                                <p class="no-margin-p">
-                                    {{item.peer_uploaded | bytes:2}}
-                                </p>
-
-                                <p class="no-margin-p">
-                                    {{item.peer_uspeed | bytes:2}}/s
-                                </p>
-                            </td>
-                            <td class="col-md-1 td-v-middle text-center td-uploader">
-                                <p class="no-margin-p">
-                                    {{item.peer_downloaded | bytes:2}}
-                                </p>
-
-                                <p class="no-margin-p">
-                                    {{item.peer_ratio | ratio}}
-                                </p>
-                            </td>
-                        </tr>
-                    </tbody>
+                    <tbody torrent-list-item parent="vm" item="item.torrent" peer="item" list="vm.pagedItems" ng-repeat="item in vm.pagedItems"></tbody>
                 </table>
             </div>
 
diff --git a/modules/users/client/views/status/uploaded.client.view.html b/modules/users/client/views/status/uploaded.client.view.html
index 65288575..2c50443c 100644
--- a/modules/users/client/views/status/uploaded.client.view.html
+++ b/modules/users/client/views/status/uploaded.client.view.html
@@ -1,4 +1,4 @@
-<section ng-controller="UploadedController as vm" ng-init="vm.getUploadedTorrent();">
+<section ng-controller="UploadedController as vm" ng-init="vm.buildPager();">
     <div class="row margin-top-20">
         <div class="col-md-12 torrent-list" id="top_of_torrent_list" ng-show="vm.pagedItems">
             <span class="sm-show">
@@ -28,6 +28,7 @@
                 <table class="table table-hover tb-v-middle">
                     <thead>
                         <tr>
+                            <th class="td-width-0"></th>
                             <th>{{ 'TABLE_FIELDS.INFO' | translate}}</th>
                             <th>{{ 'TABLE_FIELDS.VOTES' | translate}}</th>
                             <th class="text-center">{{ 'TABLE_FIELDS.LIFETIME' | translate}}</th>
@@ -40,113 +41,7 @@
                             <th class="text-center">{{ 'TABLE_FIELDS.PUBLISHER' | translate}}</th>
                         </tr>
                     </thead>
-                    <tbody>
-                        <tr class="torrent-list-info" ng-repeat="item in vm.pagedItems" ng-click="vm.TGI.openTorrentDetailInfo(item._id);">
-                            <td class="col-md-7 td-text-overflow">
-                                <div class="media">
-                                    <div class="media-left">
-                                        <img class="media-object" torrent-logo="item"
-                                             ng-src="{{vm.TGI.getTorrentListImage(item)}}"
-                                             alt="{{vm.TGI.getTorrentTitle(item)}}">
-
-                                        <div class="layer-download" ng-class="{'music': item.torrent_type=='music'}">
-                                            <i class="fa fa-arrow-circle-o-down fa-3x" aria-hidden="true"
-                                               title="{{ 'TITLE_ALT.DOWNLOAD_TORRENT' | translate}}"
-                                               ng-click="vm.DLS.downloadTorrent(item._id); $event.stopPropagation();"
-                                               ng-class="{'fa-arrow-circle-down': vm.hover}"
-                                               ng-mouseover="vm.hover = true;" ng-mouseleave="vm.hover = false;"></i>
-                                        </div>
-                                    </div>
-                                    <div class="media-body">
-                                        <h5 class="media-heading">
-                                            <a ui-sref="torrents.view({torrentId: item._id})">{{vm.TGI.getTorrentDoubleTitle(item)}}</a>
-                                            <span torrent-file-link="item" torrent-user="vm.user" info-class="color-mt-base"></span>
-                                        </h5>
-
-                                        <div class="torrent-filename text-long">{{item.torrent_filename | filename}}</div>
-                                        <div class="torrent-filename text-long">{{item.resource_detail_info.subtitle}}</div>
-
-                                        <div class="list-all-genres">
-                                            <span class="genres-item" ng-repeat="t in item.resource_detail_info.genres">{{t.name}}</span>
-                                        </div>
-
-                                        <div class="list-all-tags">
-                                            <!--<span class="label label-success text-uppercase">{{ item.torrent_type}}</span>-->
-                                            <span class="label label-ttype label-primary" ng-click="$event.stopPropagation();">
-                                                {{'TORRENT_TYPE_LABEL.' + item.torrent_type.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-tstatus label-danger" ng-show="item.torrent_status == 'new'"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{'TORRENT_STATUS_LABEL.' + item.torrent_status.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-release label-warning" ng-show="item.resource_detail_info.release_date"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{ item.resource_detail_info.release_date}}
-                                            </span>
-                                            <span title="{{ 'TORRENT_STATUS_TOP_TITLE' | translate}}" ng-if="item.isTop"
-                                                  class="torrent-votes"><kbd>{{'STATUS_TOP_KEY' | translate}}</kbd></span>
-                                            <span class="label label-rlevel label-info"
-                                                  ng-show="item.torrent_recommended != 'level0'"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent_recommended.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-sale" ng-if="item.isSaling"
-                                                  title="{{vm.TGI.getTorrentSaleTypeDesc(item);}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{item.torrent_sale_expires | date: 'MM-dd HH:mm'}}"
-                                                  ng-click="$event.stopPropagation();"
-                                                  ng-class="{'label-default': !item.isSaling, 'label-success': item.isSaling}">
-                                                    {{item.torrent_sale_status}} {{item.torrent_sale_expires | unlife}}
-                                            </span>
-                                            <span class="label label-se-info" ng-if="item.torrent_type == 'tvserial'"
-                                                  ng-click="$event.stopPropagation();">S{{item.torrent_seasons}}E{{item.torrent_episodes}}</span>
-
-                                            <span class="label label-hnr-info" ng-if="item.torrent_hnr"
-                                                  ng-click="$event.stopPropagation();">H&R</span>
-
-                                            <span class="label label-vip-info" ng-if="item.torrent_vip"
-                                                  ng-click="$event.stopPropagation();">VIP</span>
-
-                                            <span ng-repeat="t in item.torrent_tags">
-                                                <span class="label label-tag" ng-class="{'used': vm.searchTags.indexOf(t) !== -1}"
-                                                      ng-click="$event.stopPropagation();"
-                                                      ng-if="vm.RTS.tagInList(t);">
-                                                    {{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
-                                                </span>
-                                            </span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </td>
-                            <td class="col-md-1 td-v-middle td-imdb">
-                            <span title="{{ 'TITLE_ALT.IMDB_VOTES' | translate}}"
-                                  class="torrent-votes"><kbd>{{vm.TGI.getVoteTitle(item)}}</kbd> {{item.resource_detail_info.vote_average | number : 1}}</span>
-                            </td>
-                            <td class="col-md-1 td-v-middle text-center td-life">{{item.createdat | life}}</td>
-                            <td class="col-md-1 td-v-middle text-center td-size">{{item.torrent_size | bytes:2}}</td>
-                            <td class="col-md-1 td-v-middle list-user-info td-user-info">
-                                <p class="no-margin-p" title="{{ 'TITLE_ALT.SEEDS' | translate}}">
-                                    <span class="glyphicon glyphicon-arrow-up torrent-up"></span>
-                                    {{item.torrent_seeds}}
-                                </p>
-
-                                <p class="no-margin-p" title="{{ 'TITLE_ALT.LEECHERS' | translate}}">
-                                    <span class="glyphicon glyphicon-arrow-down torrent-down"></span>
-                                    {{item.torrent_leechers}}
-                                </p>
-
-                                <p class="no-margin-p" title="{{ 'TITLE_ALT.FINISHED' | translate}}">
-                                    <span class="glyphicon glyphicon-ok torrent-finished"></span>
-                                    {{item.torrent_finished}}
-                                </p>
-                            </td>
-                            <td class="col-md-1 td-v-middle text-center td-uploader">
-                                <span user-info="item.user" info-name></span>
-
-                                <div maker-info="item.maker"></div>
-                                <!--<span vip-flag="item.user"></span>-->
-                                <!--<span message-to="item.user" to-class="message-to-icon"></span>-->
-                            </td>
-                        </tr>
-                    </tbody>
+                    <tbody torrent-list-item parent="vm" item="item" list="vm.pagedItems" ng-repeat="item in vm.pagedItems"></tbody>
                 </table>
             </div>
 
diff --git a/modules/users/client/views/status/warning.client.view.html b/modules/users/client/views/status/warning.client.view.html
index e2e4dd23..93bec93f 100644
--- a/modules/users/client/views/status/warning.client.view.html
+++ b/modules/users/client/views/status/warning.client.view.html
@@ -18,131 +18,27 @@
             </div>
 
             <div class="table-responsive margin-top-50" ng-if="vm.warningList.length>0">
-                <table class="table table-hover tb-v-middle">
+                <table class="table table-hover tb-v-middle top-border">
                     <thead>
                         <tr>
+                            <th class="td-width-0"></th>
                             <th>{{ 'TABLE_FIELDS.INFO' | translate}}</th>
                             <th>{{ 'TABLE_FIELDS.VOTES' | translate}}</th>
                             <th class="text-center">{{ 'TABLE_FIELDS.LIFETIME' | translate}}</th>
                             <th class="text-center">{{ 'TABLE_FIELDS.SIZE' | translate}}</th>
+                            <th>
+                                <abbr title="{{ 'TABLE_FIELDS.ABBR_SEEDS_LEECHERS_FINISHED' | translate}}" class="initialism">
+                                    {{ 'TABLE_FIELDS.SEEDS_LEECHERS_FINISHED' | translate}}
+                                </abbr>
+                            </th>
                             <th class="text-center">
                                 <abbr title="{{ 'TABLE_FIELDS.ABBR_UP_DOWN_RATIO_TIME' | translate}}" class="initialism">
                                     {{ 'TABLE_FIELDS.UP_DOWN_RATIO_TIME' | translate}}
                                 </abbr>
                             </th>
-                            <th class="text-center">
-                                CMD
-                            </th>
                         </tr>
                     </thead>
-                    <tbody>
-                        <tr class="torrent-list-info" ng-repeat="item in vm.warningList" ng-click="vm.TGI.openTorrentDetailInfo(item.torrent._id);">
-                            <td class="col-md-7 td-text-overflow">
-                                <div class="media">
-                                    <div class="media-left">
-                                        <img class="media-object" torrent-logo="item.torrent"
-                                             ng-src="{{vm.TGI.getTorrentListImage(item.torrent)}}"
-                                             alt="{{vm.TGI.getTorrentTitle(item.torrent)}}">
-
-                                        <div class="layer-download" ng-class="{'music': item.torrent.torrent_type=='music'}">
-                                            <i class="fa fa-arrow-circle-o-down fa-3x" aria-hidden="true"
-                                               title="{{ 'TITLE_ALT.DOWNLOAD_TORRENT' | translate}}"
-                                               ng-click="vm.DLS.downloadTorrent(item.torrent._id); $event.stopPropagation();"
-                                               ng-class="{'fa-arrow-circle-down': vm.hover}"
-                                               ng-mouseover="vm.hover = true;" ng-mouseleave="vm.hover = false;"></i>
-                                        </div>
-                                    </div>
-                                    <div class="media-body">
-                                        <h5 class="media-heading">
-                                            <a ui-sref="torrents.view({torrentId: item.torrent._id})">{{vm.TGI.getTorrentDoubleTitle(item.torrent)}}</a>
-                                            <span class="upload-by" ng-show="item.torrent.user.displayName"> (By:
-                                                <span user-info="item.torrent.user" info-name></span>  <span maker-info="item.torrent.maker"></span>)</span>
-                                            <span torrent-file-link="item.torrent" torrent-user="vm.user" info-class="color-mt-base"></span>
-                                        </h5>
-
-                                        <div class="torrent-filename text-long">{{item.torrent.torrent_filename | filename}}</div>
-                                        <div class="torrent-filename text-long">{{item.torrent.resource_detail_info.subtitle}}</div>
-
-                                        <div class="list-all-genres">
-                                            <span class="genres-item" ng-repeat="t in item.torrent.resource_detail_info.genres">{{t.name}}</span>
-                                        </div>
-
-                                        <div class="list-all-tags">
-                                            <!--<span class="label label-success text-uppercase">{{ item.torrent.torrent_type}}</span>-->
-                                            <span class="label label-ttype label-primary" ng-click="$event.stopPropagation();">
-                                                {{'TORRENT_TYPE_LABEL.' + item.torrent.torrent_type.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-tstatus label-danger" ng-show="item.torrent.torrent_status == 'new'"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{'TORRENT_STATUS_LABEL.' + item.torrent.torrent_status.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-release label-warning" ng-show="item.torrent.resource_detail_info.release_date"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{ item.torrent.resource_detail_info.release_date}}
-                                            </span>
-                                            <span title="{{ 'TORRENT_STATUS_TOP_TITLE' | translate}}" ng-if="item.torrent.isTop"
-                                                  class="torrent-votes"><kbd>{{'STATUS_TOP_KEY' | translate}}</kbd></span>
-                                            <span class="label label-rlevel label-info"
-                                                  ng-show="item.torrent.torrent_recommended != 'level0'"
-                                                  ng-click="$event.stopPropagation();">
-                                                {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent.torrent_recommended.toUpperCase() | translate}}
-                                            </span>
-                                            <span class="label label-sale" ng-if="item.torrent.isSaling"
-                                                  title="{{vm.TGI.getTorrentSaleTypeDesc(item.torrent);}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{item.torrent.torrent_sale_expires | date: 'MM-dd HH:mm'}}"
-                                                  ng-click="$event.stopPropagation();"
-                                                  ng-class="{'label-default': !item.torrent.isSaling, 'label-success': item.torrent.isSaling}">
-                                                    {{item.torrent.torrent_sale_status}} {{item.torrent.torrent_sale_expires | unlife}}
-                                            </span>
-                                            <span class="label label-se-info" ng-if="item.torrent_type == 'tvserial'"
-                                                  ng-click="$event.stopPropagation();">S{{item.torrent.torrent_seasons}}E{{item.torrent.torrent_episodes}}</span>
-
-                                            <span class="label label-hnr-info" ng-if="item.torrent.torrent_hnr"
-                                                  ng-click="$event.stopPropagation();">H&R</span>
-
-                                            <span class="label label-vip-info" ng-if="item.torrent.torrent_vip"
-                                                  ng-click="$event.stopPropagation();">VIP</span>
-
-                                            <span ng-repeat="t in item.torrent.torrent_tags">
-                                                <span class="label label-tag" ng-class="{'used': vm.searchTags.indexOf(t) !== -1}"
-                                                      ng-click="$event.stopPropagation();"
-                                                      ng-if="vm.RTS.tagInList(t);">
-                                                    {{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
-                                                </span>
-                                            </span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </td>
-                            <td class="col-md-1 td-v-middle td-imdb">
-                            <span title="{{ 'TITLE_ALT.IMDB_VOTES' | translate}}"
-                                  class="torrent-votes"><kbd>{{vm.TGI.getVoteTitle(item.torrent)}}</kbd> {{item.torrent.resource_detail_info.vote_average | number : 1}}</span>
-                            </td>
-                            <td class="col-md-1 td-v-middle text-center td-life">{{item.torrent.createdat | life}}</td>
-                            <td class="col-md-1 td-v-middle text-center td-size">{{item.torrent.torrent_size | bytes:2}}</td>
-                            <td class="col-md-1 td-v-middle text-center list-user-info td-user-info">
-                                <p class="no-margin-p">
-                                    {{item.total_uploaded | bytes:2}}
-                                </p>
-
-                                <p class="no-margin-p">
-                                    {{item.total_downloaded | bytes:2}}
-                                </p>
-
-                                <p class="no-margin-p">
-                                    {{item.total_ratio | ratio}}
-                                </p>
-
-                                <p class="no-margin-p">
-                                    {{item.total_seed_time | seedlife}}
-                                </p>
-                            </td>
-                            <td class="col-md-1 td-v-middle text-center td-uploader">
-                                <button class="btn btn-default btn-sm"
-                                        ng-click="vm.removeWarning(item); $event.stopPropagation();">{{'BTN_REMOVE_WARNING' | translate}}
-                                </button>
-                            </td>
-                        </tr>
-                    </tbody>
+                    <tbody torrent-list-item parent="vm" item="item.torrent" warning="item" list="vm.warningList" ng-repeat="item in vm.warningList"></tbody>
                 </table>
             </div>
         </div>
diff --git a/modules/vip/client/controllers/vip.client.controller.js b/modules/vip/client/controllers/vip.client.controller.js
index 6553e790..98203ab7 100644
--- a/modules/vip/client/controllers/vip.client.controller.js
+++ b/modules/vip/client/controllers/vip.client.controller.js
@@ -268,6 +268,7 @@
         torrent_vip: true,
         keys: vm.searchKey.trim(),
 
+        torrent_rlevel: vm.torrentRLevel,
         torrent_release: vm.releaseYear,
         torrent_tags: vm.searchTags,
         torrent_hnr: vm.filterHnR,
@@ -382,6 +383,7 @@
       vm.releaseYear = undefined;
       vm.filterHnR = false;
       vm.filterSale = false;
+      vm.torrentRLevel = 'level0';
 
       vm.buildPager();
     };
diff --git a/modules/vip/client/views/vip.client.view.html b/modules/vip/client/views/vip.client.view.html
index 0f8ba10e..7ef3d7c9 100644
--- a/modules/vip/client/views/vip.client.view.html
+++ b/modules/vip/client/views/vip.client.view.html
@@ -162,7 +162,9 @@
                                 </div>
 
                                 <div>
-                                    <dt class="h-line"><i class="fa fa-rss-square color-mt-base" aria-hidden="true"></i> {{'CA_MAKE_RSS_URL' | translate}}:</dt>
+                                    <dt class="h-line"><i class="fa fa-rss-square color-mt-base"
+                                                          aria-hidden="true"></i> {{'CA_MAKE_RSS_URL' | translate}}:
+                                    </dt>
                                     <dd class="h-line rss-desc-line">{{'DESC_MAKE_RSS_URL' | translate}}
                                         <div class="margin-top-5">
                                             <a href="{{vm.rssUrl}}" target="_blank">{{vm.rssUrl}}</a>
@@ -226,122 +228,16 @@
                                 <th class="text-center">{{ 'TABLE_FIELDS.PUBLISHER' | translate}}</th>
                             </tr>
                         </thead>
-                        <tbody>
-                            <tr ng-if="vm.tooltipMsg">
+                        <tbody ng-if="vm.tooltipMsg">
+                            <tr>
                                 <td colspan="7">
                                     <div class="text-center margin-top-50 margin-bottom-30 padding-top-20 padding-bottom-50">
                                         <h3>{{vm.tooltipMsg | translate}}</h3>
                                     </div>
                                 </td>
                             </tr>
-                            <tr class="torrent-list-info"
-                                ng-if="!vm.tooltipMsg" ng-repeat-start="item in vm.pagedItems" ng-click="vm.TGI.openTorrentDetailInfo(item._id);">
-                                <td class="td-width-0" rowspan="2"></td>
-                                <td class="col-md-7 td-text-overflow">
-                                    <div class="media">
-                                        <div class="media-left">
-                                            <img class="media-object" torrent-logo="item"
-                                                 ng-src="{{vm.TGI.getTorrentListImage(item)}}"
-                                                 alt="{{vm.TGI.getTorrentTitle(item)}}">
-
-                                            <div class="layer-download" ng-class="{'music': item.torrent_type=='music'}">
-                                                <i class="fa fa-arrow-circle-o-down fa-3x" aria-hidden="true"
-                                                   title="{{ 'TITLE_ALT.DOWNLOAD_TORRENT' | translate}}"
-                                                   ng-click="vm.DLS.downloadTorrent(item._id); $event.stopPropagation();"
-                                                   ng-class="{'fa-arrow-circle-down': vm.hover}"
-                                                   ng-mouseover="vm.hover = true;" ng-mouseleave="vm.hover = false;"></i>
-                                            </div>
-                                        </div>
-                                        <div class="media-body">
-                                            <h5 class="media-heading">
-                                                <a ui-sref="torrents.view({torrentId: item._id})">{{vm.TGI.getTorrentDoubleTitle(item)}}</a>
-                                                <span torrent-file-link="item" torrent-user="vm.user" info-class="color-mt-base"></span>
-                                            </h5>
-
-                                            <div class="torrent-filename text-long">{{item.torrent_filename | filename}}</div>
-                                            <div class="torrent-filename text-long">{{item.resource_detail_info.subtitle}}</div>
-
-                                            <div class="list-all-genres">
-                                                <span class="genres-item" ng-repeat="t in item.resource_detail_info.genres">{{t.name}}</span>
-                                            </div>
-
-                                            <div class="list-all-tags">
-                                                <span class="label label-release label-warning" ng-show="item.resource_detail_info.release_date"
-                                                      ng-class="{'used': item.resource_detail_info.release_date == vm.releaseYear}"
-                                                      ng-click="vm.onReleaseClicked(item.resource_detail_info.release_date); $event.stopPropagation();">
-                                                    {{ item.resource_detail_info.release_date}}
-                                                </span>
-                                                <span title="{{ 'TORRENT_STATUS_TOP_TITLE' | translate}}" ng-if="item.isTop"
-                                                      class="torrent-votes"><kbd>{{'STATUS_TOP_KEY' | translate}}</kbd></span>
-                                                <span class="label label-rlevel label-info"
-                                                      ng-show="item.torrent_recommended != 'level0'"
-                                                      ng-class="{'used': vm.torrentRLevel == item.torrent_recommended}"
-                                                      ng-click="vm.onRLevelClicked(item.torrent_recommended); $event.stopPropagation();">
-                                                    {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent_recommended.toUpperCase() | translate}}
-                                                </span>
-                                                <span class="label label-sale" ng-if="item.isSaling"
-                                                      title="{{vm.TGI.getTorrentSaleTypeDesc(item);}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{item.torrent_sale_expires | date: 'MM-dd HH:mm'}}"
-                                                      ng-click="vm.onSaleClicked(); $event.stopPropagation();"
-                                                      ng-class="{'label-default': !item.isSaling, 'label-success': item.isSaling}">
-                                                        {{item.torrent_sale_status}} {{item.torrent_sale_expires | unlife}}
-                                                </span>
-                                                <span class="label label-se-info" ng-if="item.torrent_type == 'tvserial'"
-                                                      ng-click="$event.stopPropagation();">S{{item.torrent_seasons}}E{{item.torrent_episodes}}</span>
-
-                                                <span class="label label-hnr-info" ng-if="item.torrent_hnr" ng-class="{'used': vm.filterHnR}"
-                                                      ng-click="vm.onHnRClicked(); $event.stopPropagation();">H&R</span>
-
-                                                <span class="label label-vip-info" ng-if="item.torrent_vip" ng-class="{'used': vm.filterVIP}"
-                                                      ng-click="$event.stopPropagation();">VIP</span>
-
-                                                <span ng-repeat="t in item.torrent_tags">
-                                                    <span class="label label-tag" ng-class="{'used': vm.searchTags.indexOf(t) !== -1}"
-                                                          ng-click="vm.onTagClicked(t); $event.stopPropagation();"
-                                                          ng-if="vm.RTS.tagInList(t);">
-                                                        {{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
-                                                    </span>
-                                                </span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </td>
-                                <td class="col-md-1 td-v-middle td-imdb">
-                                    <span title="{{ 'TITLE_ALT.IMDB_VOTES' | translate}}"
-                                          class="torrent-votes"><kbd>{{vm.TGI.getVoteTitle(item)}}</kbd> {{item.resource_detail_info.vote_average | number : 1}}</span>
-                                </td>
-                                <td class="col-md-1 td-v-middle text-center td-life">{{item.createdat | life}}</td>
-                                <td class="col-md-1 td-v-middle text-center td-size">{{item.torrent_size | bytes:2}}</td>
-                                <td class="col-md-1 td-v-middle list-user-info td-user-info">
-                                    <p class="no-margin-p" title="{{ 'TITLE_ALT.SEEDS' | translate}}">
-                                        <span class="glyphicon glyphicon-arrow-up torrent-up"></span>
-                                        {{item.torrent_seeds}}
-                                    </p>
-
-                                    <p class="no-margin-p" title="{{ 'TITLE_ALT.LEECHERS' | translate}}">
-                                        <span class="glyphicon glyphicon-arrow-down torrent-down"></span>
-                                        {{item.torrent_leechers}}
-                                    </p>
-
-                                    <p class="no-margin-p" title="{{ 'TITLE_ALT.FINISHED' | translate}}">
-                                        <span class="glyphicon glyphicon-ok torrent-finished"></span>
-                                        {{item.torrent_finished}}
-                                    </p>
-                                </td>
-                                <td class="col-md-1 td-v-middle text-center td-uploader">
-                                    <span ng-if="!item.isAnonymous" user-info="item.user" info-name></span>
-                                    <span ng-if="item.isAnonymous">{{ 'ANONYMOUS' | translate }}</span>
-
-                                    <div maker-info="item.maker"></div>
-                                    <!--<span vip-flag="item.user"></span>-->
-                                    <!--<span message-to="item.user" to-class="message-to-icon"></span>-->
-                                </td>
-                            </tr>
-                            <tr ng-repeat-end>
-                                <td class="td-progress" colspan="6">
-                                    <div torrent-progress="item.my_peers"></div>
-                                </td>
-                            </tr>
                         </tbody>
+                        <tbody ng-if="!vm.tooltipMsg" torrent-list-item parent="vm" item="item" list="vm.pagedItems" ng-repeat="item in vm.pagedItems"></tbody>
                     </table>
                 </div>
 

From 979038a38142b2da5de67ddbebb6190647bac544 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 12 May 2018 03:00:10 +0800
Subject: [PATCH 06/96] fix(torrents): remove default tmdb config value

---
 config/env/torrents.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index 5db83830..f02dc368 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -1186,7 +1186,7 @@ module.exports = {
      * @resourcesLanguage:        settings for language of dropdown resource info
      */
     tmdbConfig: {
-      key: '7888f0042a366f63289ff571b68b7ce0',
+      key: 'this is access key from tmdb',
       tmdbHome: 'https://www.themoviedb.org',
       tmdbMovieLinkUrl: 'https://www.themoviedb.org/movie/',
       tmdbTvserialLinkUrl: 'https://www.themoviedb.org/tv/',

From 78478b8e9ff791154061fc9975d12968e2f9e7ad Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 12 May 2018 03:42:55 +0800
Subject: [PATCH 07/96] fix(torrents): css of torrent list

---
 modules/core/client/less/mt.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less
index 23fdf247..661596cd 100644
--- a/modules/core/client/less/mt.less
+++ b/modules/core/client/less/mt.less
@@ -1076,7 +1076,7 @@ body {
         }
         .list-all-tags {
             min-height: 52px;
-            margin-top: 10px;
+            margin-top: 8px;
             width: 100%;
             .label {
                 margin-top: 5px;
@@ -1107,6 +1107,7 @@ body {
             }
         }
         .media-heading {
+            line-height: 1.2;
             margin-bottom: 5px;
         }
         .list-all-genres {

From f46fa8215129aea77d826d9b6ef02dee3c9604a9 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 12 May 2018 11:21:22 +0800
Subject: [PATCH 08/96] fix(core): change languages order

---
 config/env/torrents.js                            | 4 ++--
 modules/core/client/views/footer.client.view.html | 2 +-
 modules/core/client/views/header.client.view.html | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index 0c201d9a..060a31f4 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -84,8 +84,8 @@ module.exports = {
      *
      */
     language: [
-      {name: 'zh', index: 0, class: 'flag-icon-cn', title: '中文'},
-      {name: 'en', index: 1, class: 'flag-icon-gb', title: 'English'},
+      {name: 'en', index: 0, class: 'flag-icon-gb', title: 'English'},
+      {name: 'zh', index: 1, class: 'flag-icon-cn', title: '中文'},
       {name: 'zh-tw', index: 2, class: 'flag-icon-tw', title: '繁體中文'}
     ],
 
diff --git a/modules/core/client/views/footer.client.view.html b/modules/core/client/views/footer.client.view.html
index fae498d4..b9ca8778 100644
--- a/modules/core/client/views/footer.client.view.html
+++ b/modules/core/client/views/footer.client.view.html
@@ -36,7 +36,7 @@
                             <li>
                             <span class="lang-list lang-footer">
                                 <span class="flag-icon {{l.class}}" title="{{l.title}}" ng-click="vm.changeLanguage(l.name);"
-                                      ng-repeat="l in vm.language | orderBy: '-index'"></span>
+                                      ng-repeat="l in vm.language"></span>
                             </span>
                             </li>
                             <li translate="GIT_REPO"></li>
diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html
index 9cbed53e..b496259e 100644
--- a/modules/core/client/views/header.client.view.html
+++ b/modules/core/client/views/header.client.view.html
@@ -58,7 +58,7 @@
                     <li>
             <span class="lang-list">
               <span class="flag-icon {{l.class}}" title="{{l.title}}" ng-click="vm.changeLanguage(l.name);"
-                    ng-repeat="l in vm.language | orderBy: '-index'"></span>
+                    ng-repeat="l in vm.language"></span>
             </span>
                     </li>
                     <li class="divider"></li>

From a96abac21a416676c34584a2176ace0f7f6b47a5 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 12 May 2018 12:34:08 +0800
Subject: [PATCH 09/96] feat(torrents): add torrent top status filter

---
 .../controllers/about.client.controller.js      |  4 +++-
 modules/core/client/app/trans-string-en.js      |  1 +
 modules/core/client/app/trans-string-zh-tw.js   |  1 +
 modules/core/client/app/trans-string-zh.js      |  1 +
 .../torrent-list-item.client.directive.js       |  8 ++++++++
 .../admin/admin-list.client.controller.js       | 16 +++++++++++++++-
 .../controllers/torrents.client.controller.js   | 17 ++++++++++++++++-
 .../services/torrent-get-info.client.service.js |  1 -
 .../templates/torrent-item.client.view.html     |  4 ++--
 .../views/admin/admin-list.client.view.html     | 16 +++++++++++++++-
 .../client/views/list-torrents.client.view.html | 16 +++++++++++++++-
 .../admin/user-uploaded.client.controller.js    |  4 +++-
 .../status/uploaded.client.controller.js        |  4 +++-
 .../client/controllers/vip.client.controller.js | 17 ++++++++++++++++-
 modules/vip/client/views/vip.client.view.html   | 16 +++++++++++++++-
 15 files changed, 114 insertions(+), 12 deletions(-)

diff --git a/modules/about/client/controllers/about.client.controller.js b/modules/about/client/controllers/about.client.controller.js
index a9156b46..ab2b8f4c 100644
--- a/modules/about/client/controllers/about.client.controller.js
+++ b/modules/about/client/controllers/about.client.controller.js
@@ -46,6 +46,7 @@
     vm.searchKey = '';
     vm.releaseYear = undefined;
     vm.filterHnR = false;
+    vm.filterTop = false;
     vm.filterSale = false;
     vm.torrentRLevel = 'level0';
 
@@ -286,7 +287,8 @@
         torrent_release: vm.releaseYear,
         torrent_tags: vm.searchTags,
         torrent_hnr: vm.filterHnR,
-        torrent_sale: vm.filterSale
+        torrent_sale: vm.filterSale,
+        isTop: vm.filterTop
       }, function (data) {
         mtDebug.info(data);
         callback(data);
diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index 2dba28d7..4b9b22a6 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -337,6 +337,7 @@
     CA_TORRENT_SALE_STATUS: 'Sale Status',
     CA_TORRENT_SALE_NOW: 'Saling',
     CA_TORRENT_VIP: 'VIP resources',
+    CA_TORRENT_TOP: 'Top Status',
     CA_RESOURCE_TYPE: 'Resource type',
     CA_MAKE_RSS_URL: 'Rss Url',
     DESC_MAKE_RSS_URL: 'This RSS url is make with above filter conditions, you can used it in the BT client (such as uTorrent) that supports the RSS subscription function to download torrent and resources automatic.',
diff --git a/modules/core/client/app/trans-string-zh-tw.js b/modules/core/client/app/trans-string-zh-tw.js
index 01fb4b62..934e362e 100644
--- a/modules/core/client/app/trans-string-zh-tw.js
+++ b/modules/core/client/app/trans-string-zh-tw.js
@@ -340,6 +340,7 @@
     CA_TORRENT_SALE_STATUS: '促銷狀態',
     CA_TORRENT_SALE_NOW: '正在促銷',
     CA_TORRENT_VIP: 'VIP 資源',
+    CA_TORRENT_TOP: '置頂狀態',
     CA_RESOURCE_TYPE: '資源型別',
     CA_MAKE_RSS_URL: 'RSS連線',
     DESC_MAKE_RSS_URL: '這個 RSS 地址是通過上面的過濾條件生成的，您可以使用支援 RSS 訂閱功能的BT客戶端（如uTorrent）來自動下載您想要的這些種子和資原始檔.',
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index 8a8d2bcf..9b050a89 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -337,6 +337,7 @@
     CA_TORRENT_SALE_STATUS: '促销状态',
     CA_TORRENT_SALE_NOW: '正在促销',
     CA_TORRENT_VIP: 'VIP 资源',
+    CA_TORRENT_TOP: '置顶状态',
     CA_RESOURCE_TYPE: '资源类型',
     CA_MAKE_RSS_URL: 'RSS连接',
     DESC_MAKE_RSS_URL: '这个 RSS 地址是通过上面的过滤条件生成的，您可以使用支持 RSS 订阅功能的BT客户端（如uTorrent）来自动下载您想要的这些种子和资源文件.',
diff --git a/modules/core/client/directives/torrent-list-item.client.directive.js b/modules/core/client/directives/torrent-list-item.client.directive.js
index 7755ad5b..a1074e3d 100644
--- a/modules/core/client/directives/torrent-list-item.client.directive.js
+++ b/modules/core/client/directives/torrent-list-item.client.directive.js
@@ -127,6 +127,14 @@
           buildPager();
         };
 
+        /**
+         * onTopClicked, onTopChanged
+         */
+        vm.onTopClicked = function () {
+          $scope.parent.filterTop = !$scope.parent.filterTop;
+          buildPager();
+        };
+
         /**
          * toggleTop
          */
diff --git a/modules/torrents/client/controllers/admin/admin-list.client.controller.js b/modules/torrents/client/controllers/admin/admin-list.client.controller.js
index 908f48ee..41199f33 100644
--- a/modules/torrents/client/controllers/admin/admin-list.client.controller.js
+++ b/modules/torrents/client/controllers/admin/admin-list.client.controller.js
@@ -31,6 +31,7 @@
     vm.releaseYear = undefined;
     vm.filterHnR = false;
     vm.filterSale = false;
+    vm.filterTop = false;
     vm.filterType = undefined;
     vm.torrentStatus = 'reviewed';
     vm.torrentRLevel = 'level0';
@@ -214,7 +215,8 @@
         torrent_tags: vm.searchTags,
         torrent_hnr: vm.filterHnR,
         torrent_vip: vm.filterVIP ? vm.filterVIP : undefined,
-        torrent_sale: vm.filterSale
+        torrent_sale: vm.filterSale,
+        isTop: vm.filterTop
       }, function (items) {
         if (items.length === 0) {
           Notification.error({
@@ -242,6 +244,7 @@
       vm.releaseYear = undefined;
       vm.filterHnR = false;
       vm.filterSale = false;
+      vm.filterTop = false;
       vm.torrentStatus = 'reviewed';
       vm.torrentRLevel = 'level0';
 
@@ -318,6 +321,17 @@
       vm.torrentBuildPager();
     };
 
+    /**
+     * onTopClicked, onTopChanged
+     */
+    vm.onTopClicked = function () {
+      vm.filterTop = !vm.filterTop;
+      vm.torrentBuildPager();
+    };
+    vm.onTopChanged = function () {
+      vm.torrentBuildPager();
+    };
+
     /**
      * onRLevelClicked
      * @param y
diff --git a/modules/torrents/client/controllers/torrents.client.controller.js b/modules/torrents/client/controllers/torrents.client.controller.js
index 148cf0ee..9bf4caf9 100644
--- a/modules/torrents/client/controllers/torrents.client.controller.js
+++ b/modules/torrents/client/controllers/torrents.client.controller.js
@@ -28,6 +28,7 @@
     vm.releaseYear = undefined;
     vm.filterType = undefined;
     vm.filterHnR = false;
+    vm.filterTop = false;
     vm.filterSale = false;
     vm.topItems = 6;
     vm.torrentRLevel = 'level0';
@@ -307,7 +308,8 @@
         torrent_release: vm.releaseYear,
         torrent_tags: vm.searchTags,
         torrent_hnr: vm.filterHnR,
-        torrent_sale: vm.filterSale
+        torrent_sale: vm.filterSale,
+        isTop: vm.filterTop
       }, function (items) {
         if (items.length === 0) {
           Notification.error({
@@ -336,6 +338,7 @@
       vm.rssUrl += vm.releaseYear ? '&torrent_release=' + vm.releaseYear : '';
       vm.rssUrl += vm.searchTags.length ? '&torrent_tags=' + vm.searchTags : '';
       vm.rssUrl += '&torrent_hnr=' + vm.filterHnR;
+      vm.rssUrl += '&isTop=' + vm.filterTop;
       vm.rssUrl += vm.filterSale ? '&torrent_sale=' + vm.filterSale : '';
     };
 
@@ -348,6 +351,7 @@
       $('.btn-tag').removeClass('btn-success').addClass('btn-default');
       vm.releaseYear = undefined;
       vm.filterHnR = false;
+      vm.filterTop = false;
       vm.filterSale = false;
       vm.torrentRLevel = 'level0';
       vm.filterType = undefined;
@@ -415,6 +419,17 @@
       vm.torrentBuildPager();
     };
 
+    /**
+     * onTopClicked, onTopChanged
+     */
+    vm.onTopClicked = function () {
+      vm.filterTop = !vm.filterTop;
+      vm.torrentBuildPager();
+    };
+    vm.onTopChanged = function () {
+      vm.torrentBuildPager();
+    };
+
     /**
      * onSaleChanged
      */
diff --git a/modules/torrents/client/services/torrent-get-info.client.service.js b/modules/torrents/client/services/torrent-get-info.client.service.js
index 2bea4f45..40fa058d 100644
--- a/modules/torrents/client/services/torrent-get-info.client.service.js
+++ b/modules/torrents/client/services/torrent-get-info.client.service.js
@@ -117,7 +117,6 @@
      * @returns {*}
      */
     function getTorrentCustomSubTitle(item) {
-      console.log(item);
       if (item.resource_detail_info.custom_subtitle) {
         return item.resource_detail_info.custom_subtitle;
       } else if (item.resource_detail_info.subtitle) {
diff --git a/modules/torrents/client/templates/torrent-item.client.view.html b/modules/torrents/client/templates/torrent-item.client.view.html
index 268cda58..c080ee13 100644
--- a/modules/torrents/client/templates/torrent-item.client.view.html
+++ b/modules/torrents/client/templates/torrent-item.client.view.html
@@ -76,8 +76,8 @@
                     <span class="label label-vip-info" ng-if="item.torrent_vip" ng-class="{'used': parent.filterVIP}"
                           ng-click="vm.onVIPClicked(); $event.stopPropagation();">VIP</span>
 
-                    <span title="{{ 'TORRENT_STATUS_TOP_TITLE' | translate}}" ng-if="item.isTop"
-                          ng-click="$event.stopPropagation();"
+                    <span title="{{ 'TORRENT_STATUS_TOP_TITLE' | translate}}" ng-if="item.isTop" ng-class="{'used': parent.filterTop}"
+                          ng-click="vm.onTopClicked(); $event.stopPropagation();"
                           class="label torrent-top">{{'STATUS_TOP_KEY' | translate}}
                     </span>
 
diff --git a/modules/torrents/client/views/admin/admin-list.client.view.html b/modules/torrents/client/views/admin/admin-list.client.view.html
index b0c16fb5..3b935acc 100644
--- a/modules/torrents/client/views/admin/admin-list.client.view.html
+++ b/modules/torrents/client/views/admin/admin-list.client.view.html
@@ -5,7 +5,7 @@
         </div>
         <div class="panel-body">
             <div class="row filter-tags text-center"
-                 ng-if="vm.filterType || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.searchTags.length>0 || vm.filterVIP">
+                 ng-if="vm.filterType || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.searchTags.length>0 || vm.filterVIP || vm.filterTop">
                 <div class="col-md-6 col-md-offset-3">
                     <span class="filter-tag-item label-tag" ng-if="vm.filterType">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
                         <i class="fa fa-times-circle-o"
@@ -37,6 +37,11 @@
                            ng-click="vm.onVIPClicked();">
                         </i>
                     </span>
+                    <span class="filter-tag-item label-tag" ng-if="vm.filterTop">{{'STATUS_TOP_KEY' | translate}}
+                        <i class="fa fa-times-circle-o"
+                           ng-click="vm.onTopClicked();">
+                        </i>
+                    </span>
                     <span ng-repeat="t in vm.searchTags" ng-if="vm.searchTags.length>0">
                         <span class="filter-tag-item label-tag">{{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
                             <i class="fa fa-times-circle-o"
@@ -115,6 +120,15 @@
                         </div>
                     </dd>
 
+                    <dt class="h-line">{{ 'CA_TORRENT_TOP' | translate}}:</dt>
+                    <dd class="h-line">
+                        <div class="checkbox checkbox-vip">
+                            <label>
+                                <input type="checkbox" ng-model="vm.filterTop" ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
+                            </label>
+                        </div>
+                    </dd>
+
                     <div ng-hide="vm.selectedType=='newest'">
                         <dt class="h-line">{{ 'CA_TORRENT_STATUS' | translate}}:</dt>
                         <dd class="h-line">
diff --git a/modules/torrents/client/views/list-torrents.client.view.html b/modules/torrents/client/views/list-torrents.client.view.html
index e3d39890..200b45f4 100644
--- a/modules/torrents/client/views/list-torrents.client.view.html
+++ b/modules/torrents/client/views/list-torrents.client.view.html
@@ -72,7 +72,7 @@
         </div>
         <div class="panel-body">
             <div class="row filter-tags text-center"
-                 ng-if="vm.filterType || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.searchTags.length>0">
+                 ng-if="vm.filterType || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.searchTags.length>0">
                 <div class="col-md-6 col-md-offset-3">
                     <span class="filter-tag-item label-tag" ng-if="vm.filterType">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
                         <i class="fa fa-times-circle-o"
@@ -99,6 +99,11 @@
                            ng-click="vm.onHnRClicked();">
                         </i>
                     </span>
+                    <span class="filter-tag-item label-tag" ng-if="vm.filterTop">{{'STATUS_TOP_KEY' | translate}}
+                        <i class="fa fa-times-circle-o"
+                           ng-click="vm.onTopClicked();">
+                        </i>
+                    </span>
                     <span ng-repeat="t in vm.searchTags" ng-if="vm.searchTags.length>0">
                         <span class="filter-tag-item label-tag">{{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
                             <i class="fa fa-times-circle-o"
@@ -153,6 +158,15 @@
                         </div>
                     </dd>
 
+                    <dt class="h-line">{{ 'CA_TORRENT_TOP' | translate}}:</dt>
+                    <dd class="h-line">
+                        <div class="checkbox checkbox-vip">
+                            <label>
+                                <input type="checkbox" ng-model="vm.filterTop" ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
+                            </label>
+                        </div>
+                    </dd>
+
                     <div class="more-tags panel-collapsed" style="display: none; margin-bottom: 20px;">
                         <div ng-repeat="item in vm.resourcesTags.radio | filter: vm.tagsFilter">
                             <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}:</dt>
diff --git a/modules/users/client/controllers/admin/user-uploaded.client.controller.js b/modules/users/client/controllers/admin/user-uploaded.client.controller.js
index b7036fdf..f4c181f1 100644
--- a/modules/users/client/controllers/admin/user-uploaded.client.controller.js
+++ b/modules/users/client/controllers/admin/user-uploaded.client.controller.js
@@ -21,6 +21,7 @@
     vm.releaseYear = undefined;
     vm.filterType = undefined;
     vm.filterHnR = false;
+    vm.filterTop = false;
     vm.filterSale = false;
     vm.torrentRLevel = 'level0';
     vm.torrentType = 'aggregate';
@@ -88,7 +89,8 @@
         torrent_release: vm.releaseYear,
         torrent_tags: vm.searchTags,
         torrent_hnr: vm.filterHnR,
-        torrent_sale: vm.filterSale
+        torrent_sale: vm.filterSale,
+        isTop: vm.filterTop
       }, function (data) {
         mtDebug.info(data);
         callback(data);
diff --git a/modules/users/client/controllers/status/uploaded.client.controller.js b/modules/users/client/controllers/status/uploaded.client.controller.js
index 37e021b0..44c5239e 100644
--- a/modules/users/client/controllers/status/uploaded.client.controller.js
+++ b/modules/users/client/controllers/status/uploaded.client.controller.js
@@ -21,6 +21,7 @@
     vm.releaseYear = undefined;
     vm.filterType = undefined;
     vm.filterHnR = false;
+    vm.filterTop = false;
     vm.filterSale = false;
     vm.torrentRLevel = 'level0';
     vm.torrentType = 'aggregate';
@@ -88,7 +89,8 @@
         torrent_release: vm.releaseYear,
         torrent_tags: vm.searchTags,
         torrent_hnr: vm.filterHnR,
-        torrent_sale: vm.filterSale
+        torrent_sale: vm.filterSale,
+        isTop: vm.filterTop
       }, function (data) {
         mtDebug.info(data);
         callback(data);
diff --git a/modules/vip/client/controllers/vip.client.controller.js b/modules/vip/client/controllers/vip.client.controller.js
index 98203ab7..ed9c8e31 100644
--- a/modules/vip/client/controllers/vip.client.controller.js
+++ b/modules/vip/client/controllers/vip.client.controller.js
@@ -46,6 +46,7 @@
     vm.searchKey = '';
     vm.releaseYear = undefined;
     vm.filterHnR = false;
+    vm.filterTop = false;
     vm.filterSale = false;
     vm.torrentRLevel = 'level0';
 
@@ -272,7 +273,8 @@
         torrent_release: vm.releaseYear,
         torrent_tags: vm.searchTags,
         torrent_hnr: vm.filterHnR,
-        torrent_sale: vm.filterSale
+        torrent_sale: vm.filterSale,
+        isTop: vm.filterTop
       }, function (data) {
         mtDebug.info(data);
         callback(data);
@@ -293,6 +295,7 @@
       vm.rssUrl += vm.releaseYear ? '&torrent_release=' + vm.releaseYear : '';
       vm.rssUrl += vm.searchTags.length ? '&torrent_tags=' + vm.searchTags : '';
       vm.rssUrl += '&torrent_hnr=' + vm.filterHnR;
+      vm.rssUrl += '&isTop=' + vm.filterTop;
       vm.rssUrl += vm.filterSale ? '&torrent_sale=' + vm.filterSale : '';
       vm.rssUrl += '&torrent_vip=true';
     };
@@ -382,6 +385,7 @@
       $('.btn-tag').removeClass('btn-success').addClass('btn-default');
       vm.releaseYear = undefined;
       vm.filterHnR = false;
+      vm.filterTop = false;
       vm.filterSale = false;
       vm.torrentRLevel = 'level0';
 
@@ -435,6 +439,17 @@
       vm.buildPager();
     };
 
+    /**
+     * onTopClicked, onTopChanged
+     */
+    vm.onTopClicked = function () {
+      vm.filterTop = !vm.filterTop;
+      vm.buildPager();
+    };
+    vm.onTopChanged = function () {
+      vm.buildPager();
+    };
+
     /**
      * onSaleChanged
      */
diff --git a/modules/vip/client/views/vip.client.view.html b/modules/vip/client/views/vip.client.view.html
index 7ef3d7c9..cfdb3579 100644
--- a/modules/vip/client/views/vip.client.view.html
+++ b/modules/vip/client/views/vip.client.view.html
@@ -52,7 +52,7 @@
                     </div>
                     <div class="panel-body">
                         <div class="row filter-tags text-center"
-                             ng-if="vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.searchTags.length>0">
+                             ng-if="vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.searchTags.length>0">
                             <div class="col-md-6 col-md-offset-3">
                                 <span class="filter-tag-item label-tag" ng-if="vm.releaseYear">{{vm.releaseYear}}
                                     <i class="fa fa-times-circle-o"
@@ -74,6 +74,11 @@
                                        ng-click="vm.onHnRClicked();">
                                     </i>
                                 </span>
+                                <span class="filter-tag-item label-tag" ng-if="vm.filterTop">{{'STATUS_TOP_KEY' | translate}}
+                                    <i class="fa fa-times-circle-o"
+                                       ng-click="vm.onTopClicked();">
+                                    </i>
+                                </span>
                                 <span ng-repeat="t in vm.searchTags" ng-if="vm.searchTags.length>0">
                                     <span class="filter-tag-item label-tag">{{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
                                         <i class="fa fa-times-circle-o"
@@ -129,6 +134,15 @@
                                     </div>
                                 </dd>
 
+                                <dt class="h-line">{{ 'CA_TORRENT_TOP' | translate}}:</dt>
+                                <dd class="h-line">
+                                    <div class="checkbox checkbox-vip">
+                                        <label>
+                                            <input type="checkbox" ng-model="vm.filterTop" ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
+                                        </label>
+                                    </div>
+                                </dd>
+
                                 <div class="more-tags panel-collapsed" style="display: none; margin-bottom: 20px;">
                                     <div ng-repeat="item in vm.resourcesTags.radio | filter:vm.vipTorrentType">
                                         <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}:</dt>

From 600d6f0cd39bb694f5e45056a715d68bf17fd116 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 12 May 2018 14:04:59 +0800
Subject: [PATCH 10/96] feat(core): current language selected status

---
 .../controllers/header.client.controller.js   |  5 ++--
 modules/core/client/less/mt.less              | 26 +++++++++++++++++--
 .../core/client/views/footer.client.view.html |  2 +-
 .../core/client/views/header.client.view.html | 11 ++++----
 4 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/modules/core/client/controllers/header.client.controller.js b/modules/core/client/controllers/header.client.controller.js
index f519a558..4c1911df 100644
--- a/modules/core/client/controllers/header.client.controller.js
+++ b/modules/core/client/controllers/header.client.controller.js
@@ -6,13 +6,14 @@
     .controller('HeaderController', HeaderController);
 
   HeaderController.$inject = ['$scope', '$state', '$timeout', '$translate', 'Authentication', 'menuService', 'MeanTorrentConfig', 'localStorageService',
-    'ScoreLevelService', 'InvitationsService', '$interval', 'MessagesService', 'TorrentsService', 'UsersService', 'DebugConsoleService'];
+    'ScoreLevelService', 'InvitationsService', '$interval', 'MessagesService', 'TorrentsService', 'UsersService', 'DebugConsoleService', 'getStorageLangService'];
 
   function HeaderController($scope, $state, $timeout, $translate, Authentication, menuService, MeanTorrentConfig, localStorageService, ScoreLevelService,
-                            InvitationsService, $interval, MessagesService, TorrentsService, UsersService, mtDebug) {
+                            InvitationsService, $interval, MessagesService, TorrentsService, UsersService, mtDebug, getStorageLangService) {
     $scope.$state = $state;
     var vm = this;
     vm.user = Authentication.user;
+    vm.langService = getStorageLangService;
     vm.language = MeanTorrentConfig.meanTorrentConfig.language;
     vm.announceConfig = MeanTorrentConfig.meanTorrentConfig.announce;
     vm.messageConfig = MeanTorrentConfig.meanTorrentConfig.messages;
diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less
index 661596cd..f3dd281a 100644
--- a/modules/core/client/less/mt.less
+++ b/modules/core/client/less/mt.less
@@ -1773,16 +1773,38 @@ body {
 }
 
 .lang-list {
-    margin-left: 10px;
+    margin-top: 5px;
+    padding-left: 5px;
     line-height: 2;
     .flag-icon {
         font-size: 18px;
         margin-left: 10px;
         &,
-        &:hover,
         &:focus {
             cursor: pointer;
         }
+        &:hover {
+            &:after {
+                content: '';
+                background-color: #c0c0c0;
+                position: absolute;
+                width: 100%;
+                height: 3px;
+                top: -5px;
+                right: 0;
+            }
+        }
+        &.curr-language {
+            &:after {
+                content: '';
+                background-color: @brand-primary;
+                position: absolute;
+                width: 100%;
+                height: 3px;
+                top: -5px;
+                right: 0;
+            }
+        }
     }
 }
 
diff --git a/modules/core/client/views/footer.client.view.html b/modules/core/client/views/footer.client.view.html
index b9ca8778..803b3c9f 100644
--- a/modules/core/client/views/footer.client.view.html
+++ b/modules/core/client/views/footer.client.view.html
@@ -36,7 +36,7 @@
                             <li>
                             <span class="lang-list lang-footer">
                                 <span class="flag-icon {{l.class}}" title="{{l.title}}" ng-click="vm.changeLanguage(l.name);"
-                                      ng-repeat="l in vm.language"></span>
+                                      ng-repeat="l in vm.language" ng-class="{'curr-language': vm.langService.getLang() == l.name}"></span>
                             </span>
                             </li>
                             <li translate="GIT_REPO"></li>
diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html
index b496259e..273326ac 100644
--- a/modules/core/client/views/header.client.view.html
+++ b/modules/core/client/views/header.client.view.html
@@ -1,4 +1,5 @@
-<div class="container navbar-mt" ng-controller="HeaderController as vm" ng-init="vm.getInvitationsCount(); vm.checkMessageUnread(); vm.checkHnRWarning();">
+<div class="container navbar-mt" ng-controller="HeaderController as vm"
+     ng-init="vm.getInvitationsCount(); vm.checkMessageUnread(); vm.checkHnRWarning();">
     <div class="navbar-header">
         <button class="navbar-toggle" type="button" ng-click="vm.isCollapsed = !vm.isCollapsed">
             <span class="sr-only">Toggle navigation</span>
@@ -55,11 +56,9 @@
                           ng-class="{'bg-hnr': vm.user.hnr_warning>0, 'bg-msg': vm.unreadCount>0}"></span>
                 </a>
                 <ul class="dropdown-menu" role="menu">
-                    <li>
-            <span class="lang-list">
-              <span class="flag-icon {{l.class}}" title="{{l.title}}" ng-click="vm.changeLanguage(l.name);"
-                    ng-repeat="l in vm.language"></span>
-            </span>
+                    <li class="lang-list">
+                        <span class="flag-icon {{l.class}}" title="{{l.title}}" ng-click="vm.changeLanguage(l.name);"
+                              ng-repeat="l in vm.language" ng-class="{'curr-language': vm.langService.getLang() == l.name}"></span>
                     </li>
                     <li class="divider"></li>
                     <li ui-sref-active="active" ng-repeat="item in vm.followMenu.items" class="menu-parent">

From e4d0d8d6421f6dcded07aee5ca8dd400ed8e2649 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 12 May 2018 17:44:54 +0800
Subject: [PATCH 11/96] fix(announce): fixed issue of stop announce

---
 .../announces.server.controller.js            | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js
index 3729f962..728853f6 100644
--- a/modules/announce/server/controllers/announces.server.controller.js
+++ b/modules/announce/server/controllers/announces.server.controller.js
@@ -283,7 +283,7 @@ exports.announce = function (req, res) {
         .populate('user')
         .populate({
           path: '_peers',
-          match: { user: req.passkeyuser._id}
+          match: {user: req.passkeyuser._id}
         })
         .exec(function (err, t) {
           if (err) {
@@ -335,7 +335,7 @@ exports.announce = function (req, res) {
      ---------------------------------------------------------------*/
     function (done) {
       mtDebug.debugGreen('---------------' + eventString(query.event) + '----------------', 'ANNOUNCE', true, req.passkeyuser);
-      if (req.seeder && event(query.event) !== EVENT_COMPLETED) {
+      if (req.seeder && event(query.event) !== EVENT_COMPLETED && event(query.event) !== EVENT_STOPPED) {
         if (announceConfig.seedingInFinishedCheck) {
           if (!req.passkeyuser._id.equals(req.torrent.user._id)) {
             Finished.findOne({
@@ -406,8 +406,6 @@ exports.announce = function (req, res) {
      ----------------------------------------------------------------*/
     function (done) {
       if (event(query.event) === EVENT_STARTED) {
-        mtDebug.debugGreen('---------------EVENT_STARTED----------------', 'ANNOUNCE', true, req.passkeyuser);
-
         Peer.remove({
           torrent: req.torrent._id,
           _id: {$nin: req.torrent._peers}
@@ -493,6 +491,8 @@ exports.announce = function (req, res) {
       }
 
       getCurrentPeer(function () {
+        mtDebug.debugRed('req.currentPeer.isNewCreated = ' + req.currentPeer.isNewCreated, 'ANNOUNCE', true, req.passkeyuser);
+        mtDebug.debugRed(req.currentPeer._id.toString(), 'ANNOUNCE', true, req.passkeyuser);
         done(null);
       });
     },
@@ -508,11 +508,11 @@ exports.announce = function (req, res) {
       var scount = getSelfSeederCount();
 
       if (lcount > announceConfig.announceCheck.maxLeechNumberPerUserPerTorrent && !req.seeder) {
-        mtDebug.debugYellow('getSelfLeecherCount = ' + lcount, 'ANNOUNCE', true, req.passkeyuser);
+        mtDebug.debugRed('getSelfLeecherCount = ' + lcount, 'ANNOUNCE', true, req.passkeyuser);
         removeCurrPeer();
         done(180);
       } else if (scount > announceConfig.announceCheck.maxSeedNumberPerUserPerTorrent && req.seeder) {
-        mtDebug.debugYellow('getSelfSeederCount = ' + scount, 'ANNOUNCE', true, req.passkeyuser);
+        mtDebug.debugRed('getSelfSeederCount = ' + scount, 'ANNOUNCE', true, req.passkeyuser);
         removeCurrPeer();
         done(181);
       } else {
@@ -746,7 +746,7 @@ exports.announce = function (req, res) {
      ---------------------------------------------------------------*/
     function (done) {
       if (!req.currentPeer.isNewCreated) {
-        if (req.seeder && event(query.event) !== EVENT_COMPLETED) {
+        if (req.seeder && event(query.event) !== EVENT_COMPLETED && event(query.event) !== EVENT_STARTED) {
           mtDebug.debugGreen('---------------UPLOAD SCORE THROUGH SEED TIMED----------------', 'ANNOUNCE', true, req.passkeyuser);
 
           var action = scoreConfig.action.seedTimed;
@@ -1034,13 +1034,22 @@ exports.announce = function (req, res) {
   function removeCurrPeer(callback) {
     req.selfpeer.splice(req.selfpeer.indexOf(req.currentPeer), 1);
 
-    req.torrent.update({
-      $pull: {_peers: req.currentPeer._id}
-    }).exec();
+    req.torrent._peers.forEach(function (_p) {
+      if (_p._id.equals(req.currentPeer._id)) {
+        req.torrent._peers.pull(_p);
+        req.torrent.save();
+      }
+    });
 
-    req.currentPeer.remove(function () {
-      if (callback) callback();
-      mtDebug.debugGreen('---------------removeCurrPeer()----------------', 'ANNOUNCE', true, req.passkeyuser);
+    Peer.findById(req.currentPeer._id, function (err, _p) {
+      _p.remove(function (err) {
+        if (err) {
+          mtDebug.debugGreen('---------------removeCurrPeer(): Error----------------', 'ANNOUNCE', true, req.passkeyuser);
+        } else {
+          mtDebug.debugGreen('---------------removeCurrPeer()----------------', 'ANNOUNCE', true, req.passkeyuser);
+        }
+        if (callback) callback();
+      });
     });
   }
 

From ed57bb9498dade81896f78cba766b0916d94a17f Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 12 May 2018 17:54:33 +0800
Subject: [PATCH 12/96] fix(invitations): fixed pagechanged issue

---
 .../client/controllers/admin-invitations.client.controller.js  | 3 ++-
 .../invitations/client/views/admin/official.client.view.html   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/invitations/client/controllers/admin-invitations.client.controller.js b/modules/invitations/client/controllers/admin-invitations.client.controller.js
index 6b0b81b8..625adce6 100644
--- a/modules/invitations/client/controllers/admin-invitations.client.controller.js
+++ b/modules/invitations/client/controllers/admin-invitations.client.controller.js
@@ -28,7 +28,7 @@
      */
     vm.buildPager = function () {
       vm.pagedItems = [];
-      vm.itemsPerPage = 15;
+      vm.itemsPerPage = 1;
       vm.currentPage = 1;
       vm.figureOutItemsToDisplay();
     };
@@ -37,6 +37,7 @@
      * figureOutItemsToDisplay
      */
     vm.figureOutItemsToDisplay = function (callback) {
+      console.log(vm.currentPage);
       vm.filteredItems = $filter('filter')(vm.offlist, {
         $: vm.search
       });
diff --git a/modules/invitations/client/views/admin/official.client.view.html b/modules/invitations/client/views/admin/official.client.view.html
index 65edd439..9ae53732 100644
--- a/modules/invitations/client/views/admin/official.client.view.html
+++ b/modules/invitations/client/views/admin/official.client.view.html
@@ -54,7 +54,7 @@
 
         <div>
             <div class="table-responsive">
-                <table class="table table-hover table-valign-middle">
+                <table class="table table-hover tb-v-middle">
                     <thead>
                         <tr>
                             <!--<th></th>-->

From 3539c308a7be704bb8182472b477cc0c66b3e839 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 12 May 2018 18:03:52 +0800
Subject: [PATCH 13/96] fix(invitations): fixed pagechanged issue

---
 config/env/torrents.js                                        | 2 ++
 .../client/controllers/admin-invitations.client.controller.js | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index 060a31f4..0d8afd34 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -1275,6 +1275,7 @@ module.exports = {
      * @collectionsListPerPage:   movie collections list page settings
      * @backupFilesListPerPage:   system backup files list page settings
      * @torrentPeersListPerPage:  torrent detail seeder & leecher users list page settings
+     * @invitationsListPerPage:   official invitations list page settings
      *
      * @uploaderUserListPerPage:  admin management uploader access list page settings
      * @messageBoxListPerPage:    message box list page settings
@@ -1308,6 +1309,7 @@ module.exports = {
       collectionsListPerPage: 9,
       backupFilesListPerPage: 20,
       torrentPeersListPerPage: 20,
+      invitationsListPerPage: 20,
 
       uploaderUserListPerPage: 20,
       messageBoxListPerPage: 10,
diff --git a/modules/invitations/client/controllers/admin-invitations.client.controller.js b/modules/invitations/client/controllers/admin-invitations.client.controller.js
index 625adce6..01c84555 100644
--- a/modules/invitations/client/controllers/admin-invitations.client.controller.js
+++ b/modules/invitations/client/controllers/admin-invitations.client.controller.js
@@ -15,6 +15,8 @@
     vm.appConfig = MeanTorrentConfig.meanTorrentConfig.app;
     vm.signConfig = MeanTorrentConfig.meanTorrentConfig.sign;
     vm.announce = MeanTorrentConfig.meanTorrentConfig.announce;
+    vm.itemsPerPageConfig = MeanTorrentConfig.meanTorrentConfig.itemsPerPage;
+
     vm.invitationFields = {
       isOfficial: true
     };
@@ -28,7 +30,7 @@
      */
     vm.buildPager = function () {
       vm.pagedItems = [];
-      vm.itemsPerPage = 1;
+      vm.itemsPerPage = vm.itemsPerPageConfig.invitationsListPerPage;
       vm.currentPage = 1;
       vm.figureOutItemsToDisplay();
     };

From d4f4390a4856b47e4bbf962a1098ffe6011a6cf9 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 12 May 2018 18:36:41 +0800
Subject: [PATCH 14/96] fix(announce): fixed announce issue

---
 .../server/controllers/announces.server.controller.js       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js
index 728853f6..afa5c347 100644
--- a/modules/announce/server/controllers/announces.server.controller.js
+++ b/modules/announce/server/controllers/announces.server.controller.js
@@ -282,8 +282,7 @@ exports.announce = function (req, res) {
       })
         .populate('user')
         .populate({
-          path: '_peers',
-          match: {user: req.passkeyuser._id}
+          path: '_peers'
         })
         .exec(function (err, t) {
           if (err) {
@@ -1193,6 +1192,9 @@ exports.announce = function (req, res) {
    * @returns {number}
    */
   function writePeers(buf, count, peers) {
+    mtDebug.debugRed('want count=' + count, 'ANNOUNCE', true, req.passkeyuser);
+    mtDebug.debugRed(peers.length, 'ANNOUNCE', true, req.passkeyuser);
+
     var c = 0;
 
     if (!req.seeder && event(query.event) !== EVENT_STOPPED && event(query.event) !== EVENT_COMPLETED) {

From 137e31e515f36044d410cfee6720591f377b40d4 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 12 May 2018 18:44:11 +0800
Subject: [PATCH 15/96] fix(announce): fixed announce issue

---
 .../server/controllers/announces.server.controller.js         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js
index afa5c347..832d6ef9 100644
--- a/modules/announce/server/controllers/announces.server.controller.js
+++ b/modules/announce/server/controllers/announces.server.controller.js
@@ -1214,14 +1214,14 @@ exports.announce = function (req, res) {
           if (p.last_announce_at > (Date.now() - announceConfig.announceInterval - announceConfig.announceIdleTime)) { //do not send inactive peer
             if (p.user.equals(req.passkeyuser._id)) {
               if (announceConfig.peersCheck.peersSendListIncludeOwnSeed) {
-                mtDebug.debug(p._id.toString(), 'ANNOUNCE', true, req.passkeyuser);
+                mtDebug.debug(p._id.toString() + 'IP:' + p.peer_ip + ' PORT:' + p.peer_port, 'ANNOUNCE', true, req.passkeyuser);
                 bc = compact(p);
                 if (bc) {
                   bc.copy(buf, c++ * PEER_COMPACT_SIZE);
                 }
               }
             } else {
-              mtDebug.debug(p._id.toString(), 'ANNOUNCE', true, req.passkeyuser);
+              mtDebug.debug(p._id.toString() + 'IP:' + p.peer_ip + ' PORT:' + p.peer_port, 'ANNOUNCE', true, req.passkeyuser);
               bc = compact(p);
               if (bc) {
                 bc.copy(buf, c++ * PEER_COMPACT_SIZE);

From 08016874667e14e516ae189f61715b05df049f25 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 12 May 2018 18:46:34 +0800
Subject: [PATCH 16/96] fix(announce): fixed announce issue

---
 .../server/controllers/announces.server.controller.js  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js
index 832d6ef9..ec12311c 100644
--- a/modules/announce/server/controllers/announces.server.controller.js
+++ b/modules/announce/server/controllers/announces.server.controller.js
@@ -1192,12 +1192,12 @@ exports.announce = function (req, res) {
    * @returns {number}
    */
   function writePeers(buf, count, peers) {
-    mtDebug.debugRed('want count=' + count, 'ANNOUNCE', true, req.passkeyuser);
-    mtDebug.debugRed(peers.length, 'ANNOUNCE', true, req.passkeyuser);
-
     var c = 0;
 
     if (!req.seeder && event(query.event) !== EVENT_STOPPED && event(query.event) !== EVENT_COMPLETED) {
+      mtDebug.debugRed('want count=' + count, 'ANNOUNCE', true, req.passkeyuser);
+      mtDebug.debugRed(peers.length, 'ANNOUNCE', true, req.passkeyuser);
+
       var p;
       var bc;
       var m = Math.min(peers.length, count);
@@ -1214,14 +1214,14 @@ exports.announce = function (req, res) {
           if (p.last_announce_at > (Date.now() - announceConfig.announceInterval - announceConfig.announceIdleTime)) { //do not send inactive peer
             if (p.user.equals(req.passkeyuser._id)) {
               if (announceConfig.peersCheck.peersSendListIncludeOwnSeed) {
-                mtDebug.debug(p._id.toString() + 'IP:' + p.peer_ip + ' PORT:' + p.peer_port, 'ANNOUNCE', true, req.passkeyuser);
+                mtDebug.debug(p._id.toString() + '    IP:' + p.peer_ip + '    PORT:' + p.peer_port, 'ANNOUNCE', true, req.passkeyuser);
                 bc = compact(p);
                 if (bc) {
                   bc.copy(buf, c++ * PEER_COMPACT_SIZE);
                 }
               }
             } else {
-              mtDebug.debug(p._id.toString() + 'IP:' + p.peer_ip + ' PORT:' + p.peer_port, 'ANNOUNCE', true, req.passkeyuser);
+              mtDebug.debug(p._id.toString() + '    IP:' + p.peer_ip + '    PORT:' + p.peer_port, 'ANNOUNCE', true, req.passkeyuser);
               bc = compact(p);
               if (bc) {
                 bc.copy(buf, c++ * PEER_COMPACT_SIZE);

From 6e01ac658eef1ce040b62ff3fc5f9bca62031ecd Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sun, 13 May 2018 01:40:33 +0800
Subject: [PATCH 17/96] fix(announce): fixed announce download percent issue

---
 .../announce/server/controllers/announces.server.controller.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js
index ec12311c..5e9f6451 100644
--- a/modules/announce/server/controllers/announces.server.controller.js
+++ b/modules/announce/server/controllers/announces.server.controller.js
@@ -693,7 +693,7 @@ exports.announce = function (req, res) {
       //write peer data
       req.currentPeer.peer_uploaded = query.uploaded;
       req.currentPeer.peer_downloaded = query.downloaded;
-      req.currentPeer.peer_left = query.peer_left;
+      req.currentPeer.peer_left = query.left;
       req.currentPeer.save();
 
       done(null, curru, currd);

From 715e2f27186685229db38340d2b8892e978b026f Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sun, 13 May 2018 16:48:15 +0800
Subject: [PATCH 18/96] fix(announce): fixed score count issue

---
 config/env/torrents.js                        |  10 +-
 config/lib/score.js                           |   6 +-
 .../controllers/makers.server.controller.js   |  10 +-
 .../collections.server.controller.js          |   6 +-
 modules/core/client/less/home.less            | 127 ++++++++++--------
 .../core/client/views/home.client.view.html   |  48 +++----
 .../forums.admin.server.controller.js         |   4 +-
 .../controllers/forums.server.controller.js   |  36 ++---
 .../controllers/requests.server.controller.js |  10 +-
 .../completes.server.controller.js            |   4 +-
 .../controllers/torrents.server.controller.js |  26 ++--
 .../controllers/traces.server.controller.js   |   4 +-
 .../users/server/config/strategies/local.js   |   2 +-
 .../server/config/users.server.config.js      |   2 +-
 .../controllers/admin.server.controller.js    |   4 +-
 .../users.authorization.server.controller.js  |   2 +-
 .../users/users.follow.server.controller.js   |   8 +-
 .../users/server/models/user.server.model.js  |   2 +-
 18 files changed, 168 insertions(+), 143 deletions(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index 0d8afd34..1e9a9017 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -435,8 +435,6 @@ module.exports = {
       action: {
         defaultAction: {name: 'defaultAction', value: 0, enable: true},
 
-        checkInEveryDay: {name: 'checkInEveryDay', value: 10, enable: true},
-        checkInConsDay: {name: 'checkInConsDay', value: 2, enable: true},
         uploadTorrent: {name: 'uploadTorrent', value: 50, enable: true},
         uploadTorrentBeDeleted: {name: 'uploadTorrentBeDeleted', value: -50, enable: true},
         uploadTorrentBeRecommend: {name: 'uploadTorrentBeRecommend', value: 10, enable: true},
@@ -453,6 +451,14 @@ module.exports = {
         scoreToRemoveWarning: {name: 'scoreToRemoveWarning', value: 0, enable: true}, //value used hitAndRun.scoreToRemoveWarning
         activeIdleAccount: {name: 'activeIdleAccount', value: 0, enable: true}, //value used sign.idle.activeIdleAccountBasicScore
 
+        dailyCheckIn: {
+          enable: true,
+          name: 'dailyCheckIn',
+          dailyBasicScore: 10,
+          dailyStepScore: 1,
+          dailyMaxScore: 100
+        },
+
         seedUpDownload: {
           name: 'seedUpDownload',
           additionSize: 1024 * 1024 * 1024 * 10,  //10G
diff --git a/config/lib/score.js b/config/lib/score.js
index 5b9c17f8..8b5c1f02 100644
--- a/config/lib/score.js
+++ b/config/lib/score.js
@@ -40,7 +40,11 @@ module.exports.update = function (req, user, action, value, writeLog = true) {
 
         user.markModified('examinationData');
       }
-      user.score += v;
+
+      mtDebug.info('Old: user.score=' + user.score);
+      user.score = Math.max(user.score + v, 0);
+      mtDebug.info('New: user.score=' + user.score);
+
       user.save(function () {
         traceLogCreate(req, traceConfig.action.userScoreChange, {
           user: user._id,
diff --git a/modules/about/server/controllers/makers.server.controller.js b/modules/about/server/controllers/makers.server.controller.js
index e267bc51..c23a03e8 100644
--- a/modules/about/server/controllers/makers.server.controller.js
+++ b/modules/about/server/controllers/makers.server.controller.js
@@ -153,8 +153,8 @@ exports.delete = function (req, res) {
 exports.list = function (req, res) {
   Maker.find()
     .sort('-torrent_count')
-    .populate('user', 'username displayName profileImageURL isVip')
-    .populate('members', 'username displayName profileImageURL isVip')
+    .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded')
+    .populate('members', 'username displayName profileImageURL isVip score uploaded downloaded')
     .exec(function (err, makers) {
       if (err) {
         return res.status(422).send({
@@ -323,9 +323,9 @@ exports.makerByID = function (req, res, next, id) {
   }
 
   Maker.findById(id)
-    .populate('user', 'username displayName profileImageURL isVip')
-    .populate('members', 'username displayName profileImageURL isVip')
-    .populate('_ratings.user', 'username displayName profileImageURL isVip uploaded downloaded')
+    .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded')
+    .populate('members', 'username displayName profileImageURL isVip score uploaded downloaded')
+    .populate('_ratings.user', 'username displayName profileImageURL isVip score uploaded downloaded')
     .exec(function (err, maker) {
       if (err) {
         return next(err);
diff --git a/modules/collections/server/controllers/collections.server.controller.js b/modules/collections/server/controllers/collections.server.controller.js
index f01de5a4..aee77af3 100644
--- a/modules/collections/server/controllers/collections.server.controller.js
+++ b/modules/collections/server/controllers/collections.server.controller.js
@@ -279,7 +279,7 @@ exports.list = function (req, res) {
   var findQuery = function (callback) {
     Collection.find(condition)
       .sort('-recommend_level -ordered_at -created_at')
-      .populate('user', 'username displayName profileImageURL isVip')
+      .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded')
       .populate('torrents')
       .skip(skip)
       .limit(limit)
@@ -312,12 +312,12 @@ exports.collectionByID = function (req, res, next, id) {
   }
 
   Collection.findById(id)
-    .populate('user', 'username displayName profileImageURL isVip')
+    .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded')
     .populate({
       path: 'torrents',
       populate: [{
         path: 'user',
-        select: 'username displayName profileImageURL isVip'
+        select: 'username displayName profileImageURL isVip score uploaded downloaded'
       }, {
         path: 'maker',
         select: 'name'
diff --git a/modules/core/client/less/home.less b/modules/core/client/less/home.less
index c9bf80cb..1fa413c0 100644
--- a/modules/core/client/less/home.less
+++ b/modules/core/client/less/home.less
@@ -378,75 +378,88 @@
             vertical-align: middle;
         }
     }
-    .search-panel {
+    .top-panel {
         min-height: 120px;
         padding: 20px 0;
         text-shadow: 0 0 0.1em #000,-0 -0 0.1em #000;
-        .search-title {
-            color: #fff;
-            font-size: 2em;
-            font-weight: 400;
-            margin-bottom: 0 !important;
-        }
-        .search-sub-title {
-            margin-top: 10px;
-            color: #aaa;
-            text-shadow: 0 0 0.1em #000, 0 0 0.1em #000;
-        }
-        .search-group {
-            max-width: 50em;
-            margin-right: auto;
-            margin-left: auto;
-            display: block;
-            input {
-                color: #eee;
-                background-color: #ccc;
-                background-color: rgba(255, 255, 255, 0.2);
-                border-radius: 17px;
-                position: inherit;
-                z-index: 2;
-                float: none;
-                width: 100%;
-                margin-bottom: 0;
-                padding-right: 105px;
+        .home-search {
+            .search-title {
+                color: #fff;
+                font-size: 2em;
+                font-weight: 400;
+                margin-bottom: 0 !important;
             }
-            .btn-search {
-                border-top-right-radius: 17px;
-                border-bottom-right-radius: 17px;
-                position: absolute;
-                right: 1px;
-                top: 1px;
-                bottom: 1px;
-                opacity: 0.6;
-                z-index: 3;
-                &:hover,
-                &:focus {
-                    outline: none;
-                    opacity: 1;
+            .search-sub-title {
+                margin-top: 10px;
+                color: #aaa;
+                text-shadow: 0 0 0.1em #000, 0 0 0.1em #000;
+            }
+            .search-group {
+                max-width: 50em;
+                margin-right: auto;
+                margin-left: auto;
+                display: block;
+                input {
+                    color: #eee;
+                    background-color: #ccc;
+                    background-color: rgba(255, 255, 255, 0.2);
+                    border-radius: 17px;
+                    position: inherit;
+                    z-index: 2;
+                    float: none;
+                    width: 100%;
+                    margin-bottom: 0;
+                    padding-right: 105px;
+                }
+                .btn-search {
+                    border-top-right-radius: 17px;
+                    border-bottom-right-radius: 17px;
+                    position: absolute;
+                    right: 1px;
+                    top: 1px;
+                    bottom: 1px;
+                    opacity: 0.6;
+                    z-index: 3;
+                    &:hover,
+                    &:focus {
+                        outline: none;
+                        opacity: 1;
+                    }
                 }
             }
-        }
-        .search-type {
-            color: #aaa;
-            text-shadow: 0 0 0.1em #000, 0 0 0.1em #000;
-            input {
-                opacity: 0.6;
-                &:hover,
-                &:checked,
-                &:focus {
-                    opacity: 1;
+            .search-type {
+                color: #aaa;
+                text-shadow: 0 0 0.1em #000, 0 0 0.1em #000;
+                input {
+                    opacity: 0.6;
+                    &:hover,
+                    &:checked,
+                    &:focus {
+                        opacity: 1;
+                    }
+                }
+                .radio-inline + .radio-inline,
+                .checkbox-inline + .checkbox-inline {
+                    margin-top: 0;
+                    margin-left: 50px; // space out consecutive inline controls
                 }
-            }
-            .radio-inline + .radio-inline,
-            .checkbox-inline + .checkbox-inline {
-                margin-top: 0;
-                margin-left: 50px; // space out consecutive inline controls
-            }
 
+            }
         }
     }
 }
 
+.home-check-in {
+    background-color: #2a2a2a;
+    background-color: rgba(0,0,0, 0.5);
+    .check-in-title {
+        color: #fff;
+        font-size: 2em;
+        font-weight: 400;
+        margin-bottom: 0 !important;
+    }
+}
+
 .view-footer {
     color: #aaa;
     font-size: 12px;
diff --git a/modules/core/client/views/home.client.view.html b/modules/core/client/views/home.client.view.html
index 751ad1a8..4df018de 100644
--- a/modules/core/client/views/home.client.view.html
+++ b/modules/core/client/views/home.client.view.html
@@ -37,34 +37,36 @@
 
     <div class="filter">
         <div class="home_global_search filter-search" ng-init="vm.getForumList()">
-            <div class="search-panel">
+            <div class="top-panel">
                 <div class="container">
                     <div class="row">
                         <div class="search-row">
                             <div class="col-sm-12 text-center search-col">
-                                <p class="search-title" translate="HOME.TITLE_SEARCH"></p>
-                                <!--<p class="search-sub-title" translate="HOME.SEARCH_SUB_TITLE"></p>-->
-                                <div class="input-group search-group margin-top-20">
-                                    <input type="text" class="form-control"
-                                           ng-model="vm.searchKeys"
-                                           ng-keydown="vm.onSearchKeyDown($event);"
-                                           aria-label="search" placeholder="Search">
+                                <div class="home-search">
+                                    <p class="search-title" translate="HOME.TITLE_SEARCH"></p>
+                                    <!--<p class="search-sub-title" translate="HOME.SEARCH_SUB_TITLE"></p>-->
+                                    <div class="input-group search-group margin-top-20">
+                                        <input type="text" class="form-control"
+                                               ng-model="vm.searchKeys"
+                                               ng-keydown="vm.onSearchKeyDown($event);"
+                                               aria-label="search" placeholder="Search">
 
-                                    <button class="btn btn-width-100 btn-search" id="search-button" aria-label="Search"
-                                            mouse-enter-toggle-class="btn-success" base-class="btn-default"
-                                            ng-click="vm.doGlobalSearch()">
-                                        {{'BTN_GLOBAL_SEARCH' | translate}}
-                                    </button>
-                                </div>
-                                <div class="search-type text-center margin-top-20">
-                                    <label class="radio-inline">
-                                        <input type="radio" name="inlineRadioOptions" id="inlineRadio_torrents" value="torrents"
-                                               ng-model="vm.searchType"> {{'HOME.SEARCH_TYPE_TORRENTS' | translate}}
-                                    </label>
-                                    <label class="radio-inline">
-                                        <input type="radio" name="inlineRadioOptions" id="inlineRadio_forum" value="forum"
-                                               ng-model="vm.searchType"> {{'HOME.SEARCH_TYPE_FORUM' | translate}}
-                                    </label>
+                                        <button class="btn btn-width-100 btn-search" id="search-button" aria-label="Search"
+                                                mouse-enter-toggle-class="btn-success" base-class="btn-default"
+                                                ng-click="vm.doGlobalSearch()">
+                                            {{'BTN_GLOBAL_SEARCH' | translate}}
+                                        </button>
+                                    </div>
+                                    <div class="search-type text-center margin-top-20">
+                                        <label class="radio-inline">
+                                            <input type="radio" name="inlineRadioOptions" id="inlineRadio_torrents" value="torrents"
+                                                   ng-model="vm.searchType"> {{'HOME.SEARCH_TYPE_TORRENTS' | translate}}
+                                        </label>
+                                        <label class="radio-inline">
+                                            <input type="radio" name="inlineRadioOptions" id="inlineRadio_forum" value="forum"
+                                                   ng-model="vm.searchType"> {{'HOME.SEARCH_TYPE_FORUM' | translate}}
+                                        </label>
+                                    </div>
                                 </div>
                             </div>
                         </div>
diff --git a/modules/forums/server/controllers/forums.admin.server.controller.js b/modules/forums/server/controllers/forums.admin.server.controller.js
index 61ccae33..191aece0 100644
--- a/modules/forums/server/controllers/forums.admin.server.controller.js
+++ b/modules/forums/server/controllers/forums.admin.server.controller.js
@@ -43,7 +43,7 @@ exports.list = function (req, res) {
   Forum.find()
     .sort('order -createdat')
     .populate('lastTopic')
-    .populate('moderators', 'username displayName profileImageURL uploaded downloaded')
+    .populate('moderators', 'username displayName profileImageURL isVip score uploaded downloaded')
     .exec(function (err, forums) {
       if (err) {
         return res.status(422).send({
@@ -182,7 +182,7 @@ exports.forumByID = function (req, res, next, id) {
 
   Forum.findById(id)
     .populate('lastTopic')
-    .populate('moderators', 'username displayName profileImageURL uploaded downloaded')
+    .populate('moderators', 'username displayName profileImageURL isVip score uploaded downloaded')
     .exec(function (err, forum) {
       if (err) {
         return next(err);
diff --git a/modules/forums/server/controllers/forums.server.controller.js b/modules/forums/server/controllers/forums.server.controller.js
index 2c868c39..34e1b74d 100644
--- a/modules/forums/server/controllers/forums.server.controller.js
+++ b/modules/forums/server/controllers/forums.server.controller.js
@@ -50,10 +50,10 @@ exports.list = function (req, res) {
         path: 'lastTopic',
         populate: {
           path: 'user lastUser',
-          select: 'username displayName profileImageURL isVip uploaded downloaded'
+          select: 'username displayName profileImageURL isVip score uploaded downloaded'
         }
       })
-      .populate('moderators', 'username displayName profileImageURL isVip uploaded downloaded')
+      .populate('moderators', 'username displayName profileImageURL isVip score uploaded downloaded')
       .exec(function (err, forums) {
         if (err) {
           callback(err, null);
@@ -225,8 +225,8 @@ exports.forumsSearch = function (req, res) {
   var findQuery = function (callback) {
     Topic.find(condition)
       .sort('-lastReplyAt -createdAt')
-      .populate('user', 'username displayName profileImageURL isVip uploaded downloaded')
-      .populate('lastUser', 'username displayName profileImageURL isVip uploaded downloaded')
+      .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded')
+      .populate('lastUser', 'username displayName profileImageURL isVip score uploaded downloaded')
       .populate('forum', 'name category')
       .skip(skip)
       .limit(limit)
@@ -281,8 +281,8 @@ exports.listTopics = function (req, res) {
       forum: req.params.forumId
     })
       .sort('-isTop -lastReplyAt -createdAt')
-      .populate('user', 'username displayName profileImageURL isVip uploaded downloaded')
-      .populate('lastUser', 'username displayName profileImageURL isVip uploaded downloaded')
+      .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded')
+      .populate('lastUser', 'username displayName profileImageURL isVip score uploaded downloaded')
       .skip(skip)
       .limit(limit)
       .exec(function (err, topics) {
@@ -316,7 +316,7 @@ exports.getHomeHelpTopic = function (req, res) {
     isHomeHelp: true
   })
     .sort('-pushHomeAt')
-    .populate('user', 'username displayName profileImageURL isVip uploaded downloaded')
+    .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded')
     .skip(skip)
     .limit(limit)
     .exec(function (err, topics) {
@@ -341,7 +341,7 @@ exports.getHomeNoticeTopic = function (req, res) {
     isHomeNotice: true
   })
     .sort('-pushHomeAt')
-    .populate('user', 'username displayName profileImageURL isVip uploaded downloaded')
+    .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded')
     .skip(skip)
     .limit(limit)
     .exec(function (err, topics) {
@@ -364,7 +364,7 @@ exports.getHomeNewTopic = function (req, res) {
 
   Topic.find()
     .sort('-createdAt')
-    .populate('user', 'username displayName profileImageURL isVip uploaded downloaded')
+    .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded')
     .skip(skip)
     .limit(limit)
     .exec(function (err, topics) {
@@ -408,8 +408,8 @@ exports.globalTopics = function (req, res) {
       })
         .sort('-createdAt')
         .populate('forum', 'name')
-        .populate('user', 'username displayName profileImageURL isVip uploaded downloaded')
-        .populate('lastUser', 'username displayName profileImageURL isVip uploaded downloaded')
+        .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded')
+        .populate('lastUser', 'username displayName profileImageURL isVip score uploaded downloaded')
         .exec(function (err, topics) {
           if (err) {
             return res.status(422).send({
@@ -1209,13 +1209,13 @@ exports.topicById = function (req, res, next, id) {
   }
 
   Topic.findById(id)
-    .populate('user', 'username displayName profileImageURL isVip uploaded downloaded score signature')
-    .populate('lastUser', 'username displayName profileImageURL isVip uploaded downloaded')
-    .populate('updatedBy', 'username displayName profileImageURL isVip uploaded downloaded')
-    .populate('_thumbs.user', 'username displayName profileImageURL isVip uploaded downloaded')
-    .populate('_replies.user', 'username displayName profileImageURL isVip uploaded downloaded signature')
-    .populate('_replies.updatedBy', 'username displayName profileImageURL isVip uploaded downloaded')
-    .populate('_replies._thumbs.user', 'username displayName profileImageURL isVip uploaded downloaded')
+    .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded signature')
+    .populate('lastUser', 'username displayName profileImageURL isVip score uploaded downloaded')
+    .populate('updatedBy', 'username displayName profileImageURL isVip score uploaded downloaded')
+    .populate('_thumbs.user', 'username displayName profileImageURL isVip score uploaded downloaded')
+    .populate('_replies.user', 'username displayName profileImageURL isVip score uploaded downloaded signature')
+    .populate('_replies.updatedBy', 'username displayName profileImageURL isVip score uploaded downloaded')
+    .populate('_replies._thumbs.user', 'username displayName profileImageURL isVip score uploaded downloaded')
     .exec(function (err, topic) {
       if (err) {
         return next(err);
diff --git a/modules/requests/server/controllers/requests.server.controller.js b/modules/requests/server/controllers/requests.server.controller.js
index b2648eb0..90829411 100644
--- a/modules/requests/server/controllers/requests.server.controller.js
+++ b/modules/requests/server/controllers/requests.server.controller.js
@@ -267,7 +267,7 @@ exports.list = function (req, res) {
   var findQuery = function (callback) {
     Request.find(condition)
       .sort('-createdAt')
-      .populate('user', 'username displayName profileImageURL isVip')
+      .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded')
       .skip(skip)
       .limit(limit)
       .exec(function (err, requests) {
@@ -302,12 +302,12 @@ exports.requestByID = function (req, res, next, id) {
   }
 
   Request.findById(id)
-    .populate('user', 'username displayName profileImageURL isVip score')
+    .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded')
     .populate({
       path: 'torrents',
       populate: [{
         path: 'user',
-        select: 'username displayName profileImageURL isVip'
+        select: 'username displayName profileImageURL isVip score uploaded downloaded'
       }, {
         path: 'maker',
         select: 'name'
@@ -315,12 +315,12 @@ exports.requestByID = function (req, res, next, id) {
     })
     .populate({
       path: 'comments.user',
-      select: 'username displayName profileImageURL isVip uploaded downloaded',
+      select: 'username displayName profileImageURL isVip score uploaded downloaded',
       model: 'User'
     })
     .populate({
       path: 'comments._replies.user',
-      select: 'username displayName profileImageURL isVip uploaded downloaded',
+      select: 'username displayName profileImageURL isVip score uploaded downloaded',
       model: 'User'
     })
     .exec(function (err, request) {
diff --git a/modules/torrents/server/controllers/completes.server.controller.js b/modules/torrents/server/controllers/completes.server.controller.js
index 776ff2d8..035c08f4 100644
--- a/modules/torrents/server/controllers/completes.server.controller.js
+++ b/modules/torrents/server/controllers/completes.server.controller.js
@@ -109,8 +109,8 @@ exports.completeByID = function (req, res, next, id) {
   }
 
   Complete.findById(id)
-    .populate('user', 'username displayName profileImageURL')
-    .populate('remove_by', 'username displayName profileImageURL')
+    .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded')
+    .populate('remove_by', 'username displayName profileImageURL isVip score uploaded downloaded')
     .exec(function (err, complete) {
       if (err) {
         return next(err);
diff --git a/modules/torrents/server/controllers/torrents.server.controller.js b/modules/torrents/server/controllers/torrents.server.controller.js
index 2de7082e..8fd79916 100644
--- a/modules/torrents/server/controllers/torrents.server.controller.js
+++ b/modules/torrents/server/controllers/torrents.server.controller.js
@@ -1399,7 +1399,7 @@ exports.getTorrentsHomeList = function (req, res) {
       } else {
         Torrent.populate(orderList,
           [
-            {path: 'typeTorrents.user', select: 'username displayName isVip', model: 'User'},
+            {path: 'typeTorrents.user', select: 'username displayName profileImageURL isVip score uploaded downloaded', model: 'User'},
             {path: 'typeTorrents.maker', select: 'name', model: 'Maker'}
           ], function (err, items) {
             if (err) {
@@ -1452,7 +1452,7 @@ exports.getTorrentsHomeList = function (req, res) {
       } else {
         Torrent.populate(newestList,
           [
-            {path: 'typeTorrents.user', select: 'username displayName isVip', model: 'User'},
+            {path: 'typeTorrents.user', select: 'username displayName profileImageURL isVip score uploaded downloaded', model: 'User'},
             {path: 'typeTorrents.maker', select: 'name', model: 'Maker'}
           ], function (err, items) {
             if (err) {
@@ -1714,7 +1714,7 @@ exports.list = function (req, res) {
 
           Torrent.populate(ntorrents,
             [
-              {path: 'user', select: 'username displayName isVip'},
+              {path: 'user', select: 'username displayName profileImageURL isVip score uploaded downloaded'},
               {path: 'maker', select: 'name'}
             ], function (err, ts) {
               if (err) {
@@ -1849,7 +1849,7 @@ exports.makeRss = function (req, res) {
 
       Torrent.find(condition)
         .sort(sort)
-        .populate('user', 'username displayName isVip')
+        .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded')
         .populate('maker', 'name')
         .limit(limit)
         .exec(function (err, torrents) {
@@ -2085,7 +2085,7 @@ exports.getSeederUsers = function (req, res) {
       last_announce_at: {$gt: Date.now() - announceConfig.announceInterval - announceConfig.announceIdleTime}
     })
       .sort('-peer_uploaded')
-      .populate('user', 'username displayName profileImageURL isVip')
+      .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded')
       .skip(skip)
       .limit(limit)
       .exec(function (err, peers) {
@@ -2146,7 +2146,7 @@ exports.getLeecherUsers = function (req, res) {
       last_announce_at: {$gt: Date.now() - announceConfig.announceInterval - announceConfig.announceIdleTime}
     })
       .sort('-peer_downloaded')
-      .populate('user', 'username displayName profileImageURL isVip')
+      .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded')
       .skip(skip)
       .limit(limit)
       .exec(function (err, peers) {
@@ -2181,25 +2181,25 @@ exports.torrentByID = function (req, res, next, id) {
 
   var findTorrents = function (callback) {
     Torrent.find({_id: id}, {'_peers': 0})
-      .populate('user', 'username displayName profileImageURL isVip')
+      .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded')
       .populate('maker', 'name')
-      .populate('_thumbs.user', 'username displayName profileImageURL isVip uploaded downloaded')
-      .populate('_ratings.user', 'username displayName profileImageURL isVip uploaded downloaded')
+      .populate('_thumbs.user', 'username displayName profileImageURL isVip score uploaded downloaded')
+      .populate('_ratings.user', 'username displayName profileImageURL isVip score  uploaded downloaded')
       .populate({
         path: '_replies.user',
-        select: 'username displayName profileImageURL isVip uploaded downloaded',
+        select: 'username displayName profileImageURL isVip score uploaded downloaded',
         model: 'User'
       })
       .populate({
         path: '_replies._replies.user',
-        select: 'username displayName profileImageURL isVip uploaded downloaded',
+        select: 'username displayName profileImageURL isVip score uploaded downloaded',
         model: 'User'
       })
       .populate({
         path: '_subtitles',
         populate: {
           path: 'user',
-          select: 'username displayName profileImageURL isVip'
+          select: 'username displayName profileImageURL isVip score uploaded downloaded'
         }
       })
       .exec(function (err, torrent) {
@@ -2225,7 +2225,7 @@ exports.torrentByID = function (req, res, next, id) {
 
       Torrent.find(condition, fields)
         .sort('-createdat')
-        .populate('user', 'username displayName isVip')
+        .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded')
         .populate('maker', 'name')
         .exec(function (err, torrents) {
           if (err) {
diff --git a/modules/traces/server/controllers/traces.server.controller.js b/modules/traces/server/controllers/traces.server.controller.js
index 79eb56be..cf35ae4d 100644
--- a/modules/traces/server/controllers/traces.server.controller.js
+++ b/modules/traces/server/controllers/traces.server.controller.js
@@ -69,10 +69,10 @@ exports.list = function (req, res) {
   var findQuery = function (callback) {
     Trace.find(condition)
       .sort('-createdat')
-      .populate('user', 'username displayName isVip')
+      .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded')
       .populate({
         path: 'content.user',
-        select: 'username displayName',
+        select: 'username displayName profileImageURL isVip score uploaded downloaded',
         model: 'User'
       })
       .populate({
diff --git a/modules/users/server/config/strategies/local.js b/modules/users/server/config/strategies/local.js
index 32ef6c7f..dd7404b9 100644
--- a/modules/users/server/config/strategies/local.js
+++ b/modules/users/server/config/strategies/local.js
@@ -27,7 +27,7 @@ module.exports = function () {
         }, {
           email: usernameOrEmail.toLowerCase()
         }]
-      }).populate('invited_by', 'username displayName profileImageURL')
+      }).populate('invited_by', 'username displayName profileImageURL isVip score uploaded downloaded')
         .populate('makers', 'name')
         .exec(function (err, user) {
           if (err) {
diff --git a/modules/users/server/config/users.server.config.js b/modules/users/server/config/users.server.config.js
index 2db41289..2f9bc1d3 100644
--- a/modules/users/server/config/users.server.config.js
+++ b/modules/users/server/config/users.server.config.js
@@ -23,7 +23,7 @@ module.exports = function (app) {
     User.findOne({
       _id: id
     }, '-salt -password')
-      .populate('invited_by', 'username displayName profileImageURL')
+      .populate('invited_by', 'username displayName profileImageURL isVip score uploaded downloaded')
       .populate('makers', 'name').exec(function (err, user) {
         done(err, user);
       });
diff --git a/modules/users/server/controllers/admin.server.controller.js b/modules/users/server/controllers/admin.server.controller.js
index 18a3eba0..947bc778 100644
--- a/modules/users/server/controllers/admin.server.controller.js
+++ b/modules/users/server/controllers/admin.server.controller.js
@@ -191,7 +191,7 @@ exports.list = function (req, res) {
   var findQuery = function (callback) {
     User.find(condition, '-salt -password -providerData')
       .sort('-created')
-      .populate('invited_by', 'username displayName profileImageURL isVip uploaded downloaded')
+      .populate('invited_by', 'username displayName profileImageURL isVip score uploaded downloaded')
       .populate('makers', 'name')
       .skip(skip)
       .limit(limit)
@@ -662,7 +662,7 @@ exports.userByID = function (req, res, next, id) {
   }
 
   User.findById(id, '-salt -password -providerData')
-    .populate('invited_by', 'username displayName profileImageURL')
+    .populate('invited_by', 'username displayName profileImageURL isVip score uploaded downloaded')
     .populate('makers', 'user name')
     .exec(function (err, user) {
       if (err) {
diff --git a/modules/users/server/controllers/users/users.authorization.server.controller.js b/modules/users/server/controllers/users/users.authorization.server.controller.js
index 665e0adf..e01e1d81 100644
--- a/modules/users/server/controllers/users/users.authorization.server.controller.js
+++ b/modules/users/server/controllers/users/users.authorization.server.controller.js
@@ -20,7 +20,7 @@ exports.userByID = function (req, res, next, id) {
   User.findOne({
     _id: id
   })
-    .populate('invited_by', 'username displayName profileImageURL')
+    .populate('invited_by', 'username displayName profileImageURL isVip score uploaded downloaded')
     .populate('makers', 'name')
     .exec(function (err, user) {
       if (err) {
diff --git a/modules/users/server/controllers/users/users.follow.server.controller.js b/modules/users/server/controllers/users/users.follow.server.controller.js
index bba5fee1..77fd7f12 100644
--- a/modules/users/server/controllers/users/users.follow.server.controller.js
+++ b/modules/users/server/controllers/users/users.follow.server.controller.js
@@ -73,7 +73,7 @@ exports.myFollowers = function (req, res) {
 
   User.populate(user, {
     path: 'followers',
-    select: 'username displayName profileImageURL uploaded downloaded isVip score'
+    select: 'username displayName profileImageURL isVip score uploaded downloaded'
   }, function (err, u) {
     if (err) {
       return res.status(422).send({
@@ -104,7 +104,7 @@ exports.myFollowing = function (req, res) {
 
   User.populate(user, {
     path: 'following',
-    select: 'username displayName profileImageURL uploaded downloaded isVip score'
+    select: 'username displayName profileImageURL isVip score uploaded downloaded'
   }, function (err, u) {
     if (err) {
       return res.status(422).send({
@@ -137,7 +137,7 @@ exports.getUserFollowers = function (req, res) {
   if (me.followers.indexOf(user._id) >= 0 || me.following.indexOf(user._id) >= 0 || me.isOper) {
     User.populate(user, {
       path: 'followers',
-      select: 'username displayName profileImageURL uploaded downloaded isVip score'
+      select: 'username displayName profileImageURL isVip score uploaded downloaded'
     }, function (err, u) {
       if (err) {
         return res.status(422).send({
@@ -175,7 +175,7 @@ exports.getUserFollowing = function (req, res) {
   if (me.followers.indexOf(user._id) >= 0 || me.following.indexOf(user._id) >= 0 || me.isOper) {
     User.populate(user, {
       path: 'following',
-      select: 'username displayName profileImageURL uploaded downloaded isVip score'
+      select: 'username displayName profileImageURL isVip score uploaded downloaded'
     }, function (err, u) {
       if (err) {
         return res.status(422).send({
diff --git a/modules/users/server/models/user.server.model.js b/modules/users/server/models/user.server.model.js
index e67bbc94..492f5d55 100644
--- a/modules/users/server/models/user.server.model.js
+++ b/modules/users/server/models/user.server.model.js
@@ -171,7 +171,7 @@ var UserSchema = new Schema({
     type: Schema.Types.Decimal128,
     set: setNumberValueToZero,
     get: function (v) {
-      return parseFloat(v) || 0;
+      return parseFloat(parseFloat(v).toFixed(2)) || 0;
     },
     default: 0
   },

From 430875bb8132705585d10137977a7518b6f715f5 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sun, 13 May 2018 17:44:01 +0800
Subject: [PATCH 19/96] feat(status): add user id info to status page

---
 config/lib/score.js                                           | 4 ++--
 .../server/controllers/announces.server.controller.js         | 4 ++--
 modules/users/client/views/admin/view-user.client.view.html   | 3 +++
 modules/users/client/views/status/account.client.view.html    | 3 +++
 modules/users/client/views/userinfo/userinfo.client.view.html | 3 +++
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/config/lib/score.js b/config/lib/score.js
index 8b5c1f02..2a586826 100644
--- a/config/lib/score.js
+++ b/config/lib/score.js
@@ -41,9 +41,9 @@ module.exports.update = function (req, user, action, value, writeLog = true) {
         user.markModified('examinationData');
       }
 
-      mtDebug.info('Old: user.score=' + user.score);
+      mtDebug.info('Old: user.score = ' + user.score);
       user.score = Math.max(user.score + v, 0);
-      mtDebug.info('New: user.score=' + user.score);
+      mtDebug.info('New: user.score = ' + user.score);
 
       user.save(function () {
         traceLogCreate(req, traceConfig.action.userScoreChange, {
diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js
index 5e9f6451..3975e2d2 100644
--- a/modules/announce/server/controllers/announces.server.controller.js
+++ b/modules/announce/server/controllers/announces.server.controller.js
@@ -1195,8 +1195,8 @@ exports.announce = function (req, res) {
     var c = 0;
 
     if (!req.seeder && event(query.event) !== EVENT_STOPPED && event(query.event) !== EVENT_COMPLETED) {
-      mtDebug.debugRed('want count=' + count, 'ANNOUNCE', true, req.passkeyuser);
-      mtDebug.debugRed(peers.length, 'ANNOUNCE', true, req.passkeyuser);
+      mtDebug.debugRed('want count = ' + count, 'ANNOUNCE', true, req.passkeyuser);
+      mtDebug.debugRed('peers.length = ' + peers.length, 'ANNOUNCE', true, req.passkeyuser);
 
       var p;
       var bc;
diff --git a/modules/users/client/views/admin/view-user.client.view.html b/modules/users/client/views/admin/view-user.client.view.html
index 4ccb3a29..e84e157e 100644
--- a/modules/users/client/views/admin/view-user.client.view.html
+++ b/modules/users/client/views/admin/view-user.client.view.html
@@ -31,6 +31,9 @@
                     </div>
                 </dd>
 
+                <dt class="h-line">ID：</dt>
+                <dd class="h-line"><mark>{{ vm.user._id }}</mark></dd>
+
                 <dt class="h-line">{{ 'STATUS_FIELD.USERNAME' | translate}}：</dt>
                 <dd class="h-line">{{ vm.user.username }}</dd>
 
diff --git a/modules/users/client/views/status/account.client.view.html b/modules/users/client/views/status/account.client.view.html
index b5d5fef7..af2ed71a 100644
--- a/modules/users/client/views/status/account.client.view.html
+++ b/modules/users/client/views/status/account.client.view.html
@@ -18,6 +18,9 @@
                     <img class="status-avatar" ng-src="{{vm.user.profileImageURL}}">
                 </dd>
 
+                <dt class="h-line">ID：</dt>
+                <dd class="h-line"><mark>{{ vm.user._id }}</mark></dd>
+
                 <dt class="h-line">{{ 'STATUS_FIELD.USERNAME' | translate}}：</dt>
                 <dd class="h-line">{{ vm.user.username }}</dd>
 
diff --git a/modules/users/client/views/userinfo/userinfo.client.view.html b/modules/users/client/views/userinfo/userinfo.client.view.html
index c993aca5..6bd29baa 100644
--- a/modules/users/client/views/userinfo/userinfo.client.view.html
+++ b/modules/users/client/views/userinfo/userinfo.client.view.html
@@ -34,6 +34,9 @@
                     <img class="status-avatar" ng-src="{{vm.user.profileImageURL}}">
                 </dd>
 
+                <dt class="h-line">ID：</dt>
+                <dd class="h-line"><mark>{{ vm.user._id }}</mark></dd>
+
                 <div ng-if="vm.user._id == vm.authUser._id">
                     <dt class="h-line">{{ 'STATUS_FIELD.USERNAME' | translate}}：</dt>
                     <dd class="h-line">{{ vm.user.username }}</dd>

From ed569840f146da46875bc3238aa327925bcd4ef2 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 14 May 2018 10:58:46 +0800
Subject: [PATCH 20/96] feat(filter): add filter for show score numbers

---
 .../core/client/filter/bytes.client.filter.js  |  2 +-
 .../core/client/filter/dollar.client.filter.js |  2 +-
 .../core/client/filter/score.client.filter.js  | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 modules/core/client/filter/score.client.filter.js

diff --git a/modules/core/client/filter/bytes.client.filter.js b/modules/core/client/filter/bytes.client.filter.js
index ea06792a..9986abf5 100644
--- a/modules/core/client/filter/bytes.client.filter.js
+++ b/modules/core/client/filter/bytes.client.filter.js
@@ -9,7 +9,7 @@
 
   function bytes() {
     return function (bytes, precision) {
-      if (bytes === 0 || isNaN(parseFloat(bytes)) || !isFinite(bytes)) return '-';
+      if (bytes === 0 || isNaN(parseFloat(bytes)) || !isFinite(bytes)) return '0';
       if (typeof precision === 'undefined') precision = 1;
       //var units = ['bytes', 'kB', 'MB', 'GB', 'TB', 'PB'],
       var units = ['b', 'K', 'M', 'G', 'T', 'P'],
diff --git a/modules/core/client/filter/dollar.client.filter.js b/modules/core/client/filter/dollar.client.filter.js
index 38e78fc8..223d9deb 100644
--- a/modules/core/client/filter/dollar.client.filter.js
+++ b/modules/core/client/filter/dollar.client.filter.js
@@ -11,7 +11,7 @@
 
   function dollar($translate) {
     return function (number, precision) {
-      if (number === 0 || isNaN(parseFloat(number)) || !isFinite(number)) return '-';
+      if (number === 0 || isNaN(parseFloat(number)) || !isFinite(number)) return '0';
       if (typeof precision === 'undefined') precision = 1;
       return '$' + (number / 1000000).toFixed(precision) + ' ' + $translate.instant('UNIT_MILLION');
     };
diff --git a/modules/core/client/filter/score.client.filter.js b/modules/core/client/filter/score.client.filter.js
new file mode 100644
index 00000000..6280379d
--- /dev/null
+++ b/modules/core/client/filter/score.client.filter.js
@@ -0,0 +1,18 @@
+(function () {
+  'use strict';
+
+  // Focus the element on page load
+  // Unless the user is on a small device, because this could obscure the page with a keyboard
+
+  angular.module('core')
+    .filter('score', score);
+
+  score.$inject = ['$filter'];
+
+  function score($filter) {
+    return function (input, decimals) {
+      if (input === 0 || isNaN(parseFloat(input)) || !isFinite(input)) return '0';
+      return $filter('number')(input, decimals);
+    };
+  }
+}());

From 6632c52fb23f33a0ff6f4ab6b2140bf8af6930d9 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 14 May 2018 10:59:54 +0800
Subject: [PATCH 21/96] fix(examinations): fixed translate string

---
 modules/core/client/app/trans-string-en.js    | 2 +-
 modules/core/client/app/trans-string-zh-tw.js | 2 +-
 modules/core/client/app/trans-string-zh.js    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index 4b9b22a6..c7135234 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -1710,7 +1710,7 @@
     SITE_NOTICE: {
       GLOBAL_SALES_NOTICE: '### IMPORTANT NOTICE: \n :radio: **Happy new year 2018**, **{{site_name}}** global sale is coming, sales value is <span class="sale_key">**{{sale_value}}**</span>, sales start at **{{sale_start_at | date: "yyyy-MM-dd HH:mm"}}** and continued <span class="sale_key">**{{sale_days}}**</span> days and end at **{{sale_end_at | date: "yyyy-MM-dd HH:mm"}}**, Thank you for all the help and support you have been giving us all the time!',
       EXAMINATION_NOTICE: '### IMPORTANT NOTICE: \n :radio: **{{site_name}}** will take a new incremental examination from **{{examination_start_at | date: "yyyy-MM-dd HH:mm"}}** to **{{examination_end_at | date: "yyyy-MM-dd HH:mm"}}**, Incremental data requirements: upload **{{data_upload | bytes:2}}**, download **{{data_download | bytes:2}}**, score **{{data_score}}**, Please arrange your own time and hope to pass the exam smoothly. All **VIP** users and registered new users within **{{join_days}}** days are exempt, The unfinished user account will be banned. <small>[Get more detail at here]({{detail_url}}).</small>',
-      EXAMINATION_STATUS: '### EXAMINATION STATUS: \n <dl class="dl-horizontal"><dt>Examination time:</dt><dd>{{examination_start_at | date: "yyyy-MM-dd HH:mm"}} - {{examination_end_at | date: "yyyy-MM-dd HH:mm"}}</dd><dt>Incremental data of upload:</dt><dd>{{data_upload | bytes:2}}, finished {{finished_upload | bytes:2}}</dd><dt>Incremental data of download:</dt><dd>{{data_download | bytes:2}}, finished {{finished_download | bytes:2}}</dd><dt>Incremental data of score:</dt><dd>{{data_score | number: 2}}, finished {{finished_score | number: 2}}</dd><dt>Examination status:</dt><dd>{{data_status | translate}}</dd><dt></dt><dd><small>[more detail]({{detail_url}})</small></dd></dl>',
+      EXAMINATION_STATUS: '### EXAMINATION STATUS: \n <dl class="dl-horizontal"><dt>Examination time:</dt><dd>{{examination_start_at | date: "yyyy-MM-dd HH:mm"}} - {{examination_end_at | date: "yyyy-MM-dd HH:mm"}}</dd><dt>Incremental data of upload:</dt><dd>{{data_upload | bytes:2}}, finished {{finished_upload | bytes:2}}</dd><dt>Incremental data of download:</dt><dd>{{data_download | bytes:2}}, finished {{finished_download | bytes:2}}</dd><dt>Incremental data of score:</dt><dd>{{data_score | score: 2}}, finished {{finished_score | score: 2}}</dd><dt>Examination status:</dt><dd>{{data_status | translate}}</dd><dt></dt><dd><small>[more detail]({{detail_url}})</small></dd></dl>',
       EXAMINATION_FINISHED: 'Finished',
       EXAMINATION_UNFINISHED: 'Unfinished'
     }
diff --git a/modules/core/client/app/trans-string-zh-tw.js b/modules/core/client/app/trans-string-zh-tw.js
index 934e362e..9e91dc08 100644
--- a/modules/core/client/app/trans-string-zh-tw.js
+++ b/modules/core/client/app/trans-string-zh-tw.js
@@ -1717,7 +1717,7 @@
     SITE_NOTICE: {
       GLOBAL_SALES_NOTICE: '### 重要通知! \n :radio: **新年快樂 2018**, **{{site_name}}** 新年促銷活動已準備就緒, 促銷活動型別為 <span class="sale_key">**{{sale_value}}**</span> , 活動將開始於 **{{sale_start_at | date: "yyyy-MM-dd HH:mm"}}** 並持續 <span class="sale_key">**{{sale_days}}**</span> 天, 結束於 **{{sale_end_at | date: "yyyy-MM-dd HH:mm"}}**, 並感謝所有會員使用者一直以來給予我們的幫助與支援!',
       EXAMINATION_NOTICE: '### 重要通知! \n :radio: **{{site_name}}** 將從 **{{examination_start_at | date: "yyyy-MM-dd HH:mm"}}** 到 **{{examination_end_at | date: "yyyy-MM-dd HH:mm"}}** 進行一次新的增量考核, 增量資料要求: 上傳 **{{data_upload | bytes:2}}**, 下載 **{{data_download | bytes:2}}**, 積分 **{{data_score}}**, 請各位會員安排好自已的時間，並祝您順利通過這次考核. 所有 **vip** 使用者以及最近 **{{join_days}}** 天內註冊的新使用者免考, 考核未達標的使用者帳號將會被禁止.<small>[更多詳情請看這裡]({{detail_url}}).</small>',
-      EXAMINATION_STATUS: '### 考核狀態資訊: \n <dl class="dl-horizontal"><dt>考核時間區間:</dt><dd>{{examination_start_at | date: "yyyy-MM-dd HH:mm"}} - {{examination_end_at | date: "yyyy-MM-dd HH:mm"}}</dd><dt>增量上傳資料:</dt><dd>{{data_upload | bytes:2}}, 已完成 {{finished_upload | bytes:2}}</dd><dt>增量下載資料:</dt><dd>{{data_download | bytes:2}}, 已完成 {{finished_download | bytes:2}}</dd><dt>增量積分:</dt><dd>{{data_score | number: 2}}, 已完成 {{finished_score | number: 2}}</dd><dt>當前考核狀態:</dt><dd>{{data_status | translate}}</dd><dt></dt><dd><small>[更多詳情]({{detail_url}})</small></dd></dl>',
+      EXAMINATION_STATUS: '### 考核狀態資訊: \n <dl class="dl-horizontal"><dt>考核時間區間:</dt><dd>{{examination_start_at | date: "yyyy-MM-dd HH:mm"}} - {{examination_end_at | date: "yyyy-MM-dd HH:mm"}}</dd><dt>增量上傳資料:</dt><dd>{{data_upload | bytes:2}}, 已完成 {{finished_upload | bytes:2}}</dd><dt>增量下載資料:</dt><dd>{{data_download | bytes:2}}, 已完成 {{finished_download | bytes:2}}</dd><dt>增量積分:</dt><dd>{{data_score | score: 2}}, 已完成 {{finished_score | score: 2}}</dd><dt>當前考核狀態:</dt><dd>{{data_status | translate}}</dd><dt></dt><dd><small>[更多詳情]({{detail_url}})</small></dd></dl>',
       EXAMINATION_FINISHED: '已通過',
       EXAMINATION_UNFINISHED: '未通過'
     }
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index 9b050a89..e9516cc3 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -1710,7 +1710,7 @@
     SITE_NOTICE: {
       GLOBAL_SALES_NOTICE: '### 重要通知! \n :radio: **新年快乐 2018**, **{{site_name}}** 新年促销活动已准备就绪, 促销活动类型为 <span class="sale_key">**{{sale_value}}**</span> , 活动将开始于 **{{sale_start_at | date: "yyyy-MM-dd HH:mm"}}** 并持续 <span class="sale_key">**{{sale_days}}**</span> 天, 结束于 **{{sale_end_at | date: "yyyy-MM-dd HH:mm"}}**, 并感谢所有会员用户一直以来给予我们的帮助与支持!',
       EXAMINATION_NOTICE: '### 重要通知! \n :radio: **{{site_name}}** 将从 **{{examination_start_at | date: "yyyy-MM-dd HH:mm"}}** 到 **{{examination_end_at | date: "yyyy-MM-dd HH:mm"}}** 进行一次新的增量考核, 增量数据要求: 上传 **{{data_upload | bytes:2}}**, 下载 **{{data_download | bytes:2}}**, 积分 **{{data_score}}**, 请各位会员安排好自已的时间，并祝您顺利通过这次考核. 所有 **vip** 用户以及最近 **{{join_days}}** 天内注册的新用户免考, 考核未达标的用户帐号将会被禁止.<small>[更多详情请看这里]({{detail_url}}).</small>',
-      EXAMINATION_STATUS: '### 考核状态信息: \n <dl class="dl-horizontal"><dt>考核时间区间:</dt><dd>{{examination_start_at | date: "yyyy-MM-dd HH:mm"}} - {{examination_end_at | date: "yyyy-MM-dd HH:mm"}}</dd><dt>增量上传数据:</dt><dd>{{data_upload | bytes:2}}, 已完成 {{finished_upload | bytes:2}}</dd><dt>增量下载数据:</dt><dd>{{data_download | bytes:2}}, 已完成 {{finished_download | bytes:2}}</dd><dt>增量积分:</dt><dd>{{data_score | number: 2}}, 已完成 {{finished_score | number: 2}}</dd><dt>当前考核状态:</dt><dd>{{data_status | translate}}</dd><dt></dt><dd><small>[更多详情]({{detail_url}})</small></dd></dl>',
+      EXAMINATION_STATUS: '### 考核状态信息: \n <dl class="dl-horizontal"><dt>考核时间区间:</dt><dd>{{examination_start_at | date: "yyyy-MM-dd HH:mm"}} - {{examination_end_at | date: "yyyy-MM-dd HH:mm"}}</dd><dt>增量上传数据:</dt><dd>{{data_upload | bytes:2}}, 已完成 {{finished_upload | bytes:2}}</dd><dt>增量下载数据:</dt><dd>{{data_download | bytes:2}}, 已完成 {{finished_download | bytes:2}}</dd><dt>增量积分:</dt><dd>{{data_score | score: 2}}, 已完成 {{finished_score | score: 2}}</dd><dt>当前考核状态:</dt><dd>{{data_status | translate}}</dd><dt></dt><dd><small>[更多详情]({{detail_url}})</small></dd></dl>',
       EXAMINATION_FINISHED: '已通过',
       EXAMINATION_UNFINISHED: '未通过'
     }

From 30d371ae19952656c236983a144c57ec0f661b24 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 14 May 2018 11:01:15 +0800
Subject: [PATCH 22/96] fix(dataLogs): fixed data logs model field setter issue

---
 modules/data-logs/server/models/announce-log.server.model.js    | 2 +-
 modules/data-logs/server/models/user-days-log.server.model.js   | 2 +-
 modules/data-logs/server/models/user-months-log.server.model.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/data-logs/server/models/announce-log.server.model.js b/modules/data-logs/server/models/announce-log.server.model.js
index 43c979a7..1fb43e60 100644
--- a/modules/data-logs/server/models/announce-log.server.model.js
+++ b/modules/data-logs/server/models/announce-log.server.model.js
@@ -53,7 +53,7 @@ var AnnounceLogSchema = new Schema({
   write_score: {
     type: Schema.Types.Decimal128,
     get: function (v) {
-      return parseFloat(v) || 0;
+      return parseFloat(parseFloat(v).toFixed(2)) || 0;
     },
     default: 0
   },
diff --git a/modules/data-logs/server/models/user-days-log.server.model.js b/modules/data-logs/server/models/user-days-log.server.model.js
index 75066dd6..0ac9cf69 100644
--- a/modules/data-logs/server/models/user-days-log.server.model.js
+++ b/modules/data-logs/server/models/user-days-log.server.model.js
@@ -37,7 +37,7 @@ var UserDaysLogSchema = new Schema({
   score: {
     type: Schema.Types.Decimal128,
     get: function (v) {
-      return parseFloat(v) || 0;
+      return parseFloat(parseFloat(v).toFixed(2)) || 0;
     },
     default: 0
   },
diff --git a/modules/data-logs/server/models/user-months-log.server.model.js b/modules/data-logs/server/models/user-months-log.server.model.js
index befb5519..b380abfe 100644
--- a/modules/data-logs/server/models/user-months-log.server.model.js
+++ b/modules/data-logs/server/models/user-months-log.server.model.js
@@ -33,7 +33,7 @@ var UserMonthsLogSchema = new Schema({
   score: {
     type: Schema.Types.Decimal128,
     get: function (v) {
-      return parseFloat(v) || 0;
+      return parseFloat(parseFloat(v).toFixed(2)) || 0;
     },
     default: 0
   },

From 4f4ba094f354ded90ac3c09c6126e1ac8dadbaeb Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 14 May 2018 14:59:17 +0800
Subject: [PATCH 23/96] fix(template): fixed some translate string

---
 modules/about/client/templates/score-rules-en.md    | 2 +-
 modules/about/client/templates/score-rules-zh-tw.md | 2 +-
 modules/about/client/templates/score-rules-zh.md    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/about/client/templates/score-rules-en.md b/modules/about/client/templates/score-rules-en.md
index 1b770419..6bbe1009 100644
--- a/modules/about/client/templates/score-rules-en.md
+++ b/modules/about/client/templates/score-rules-en.md
@@ -5,7 +5,7 @@
 &emsp;
 
 #### :white_small_square: Score increase rules
-* Check-in every day to get `%(scoreConfig.action.checkInEveryDay.value)d` scores, continuous check-in to get additional `%(scoreConfig.action.checkInConsDay.value)d` scores per day.
+* Check-in every day to get `%(scoreConfig.action.dailyCheckIn.dailyBasicScore)d` scores, continuous check-in to get additional `%(scoreConfig.action.dailyCheckIn.dailyStepScore)d` scores per day, and the max value is `%(scoreConfig.action.dailyCheckIn.dailyMaxScore)d`.
 * Upload a torrent resource to get `%(scoreConfig.action.uploadTorrent.value)d` scores.
 * The uploaded torrent resource is set as a recommendation by the administrator to get `%(scoreConfig.action.uploadTorrentBeRecommend.value)d` scores.
 * Upload a resource subtitle to get `%(scoreConfig.action.uploadSubtitle.value)d` scores.
diff --git a/modules/about/client/templates/score-rules-zh-tw.md b/modules/about/client/templates/score-rules-zh-tw.md
index af26a106..5f7ab5b9 100644
--- a/modules/about/client/templates/score-rules-zh-tw.md
+++ b/modules/about/client/templates/score-rules-zh-tw.md
@@ -5,7 +5,7 @@
 &emsp;
 
 #### :white_small_square: 積分增加規則
-* 每日簽到獲得 `%(scoreConfig.action.checkInEveryDay.value)d` 積分，連續登記，每天額外增加 `%(scoreConfig.action.checkInConsDay.value)d` 累計積分。
+* 每日簽到獲得 `%(scoreConfig.action.dailyCheckIn.dailyBasicScore)d` 積分，連續簽到，每天額外增加 `%(scoreConfig.action.dailyCheckIn.dailyStepScore)d` 累計積分，`%(scoreConfig.action.dailyCheckIn.dailyMaxScore)d` 積分封頂。
 * 每釋出一條種子資源可獲得 `%(scoreConfig.action.uploadTorrent.value)d` 積分。
 * 釋出的種子資源被管理員設定為推薦可獲得 `%(scoreConfig.action.uploadTorrentBeRecommend.value)d` 積分。
 * 每上傳一條資源字幕可獲得 `%(scoreConfig.action.uploadSubtitle.value)d` 積分。
diff --git a/modules/about/client/templates/score-rules-zh.md b/modules/about/client/templates/score-rules-zh.md
index 8490c3b0..cd097653 100644
--- a/modules/about/client/templates/score-rules-zh.md
+++ b/modules/about/client/templates/score-rules-zh.md
@@ -5,7 +5,7 @@
 &emsp;
 
 #### :white_small_square: 积分增加规则
-* 每日签到获得 `%(scoreConfig.action.checkInEveryDay.value)d` 积分，连续登记，每天额外增加 `%(scoreConfig.action.checkInConsDay.value)d` 累计积分。
+* 每日签到获得 `%(scoreConfig.action.dailyCheckIn.dailyBasicScore)d` 积分，连续签到，每天额外增加 `%(scoreConfig.action.dailyCheckIn.dailyStepScore)d` 累计积分，`%(scoreConfig.action.dailyCheckIn.dailyMaxScore)d` 积分封顶。
 * 每发布一条种子资源可获得 `%(scoreConfig.action.uploadTorrent.value)d` 积分。
 * 发布的种子资源被管理员设置为推荐可获得 `%(scoreConfig.action.uploadTorrentBeRecommend.value)d` 积分。
 * 每上传一条资源字幕可获得 `%(scoreConfig.action.uploadSubtitle.value)d` 积分。

From 2428b622a348d281ad1dce381b90d108e39573b7 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 14 May 2018 15:01:46 +0800
Subject: [PATCH 24/96] fix(announce): fixed up/down/score data count issue

---
 config/env/torrents.js                        |   3 +-
 config/lib/score.js                           |  39 +++--
 .../announces.server.controller.js            | 157 +++++++++++-------
 .../controllers/messages.server.controller.js |   2 +-
 .../server/models/complete.server.model.js    |  24 ++-
 .../server/models/peer.server.model.js        |  24 ++-
 .../server/models/torrent.server.model.js     |  24 ++-
 .../users/server/models/user.server.model.js  |  46 ++++-
 8 files changed, 213 insertions(+), 106 deletions(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index 1e9a9017..6830326f 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -159,7 +159,8 @@ module.exports = {
       debugAnnounceUser: {
         debugAll: false,
         ids: [
-          '59227f9095602327ea1d96ba'
+          '59227f9095602327ea1d96ba',
+          '592280c464be9e281a1ec56e'
         ]
       }
     },
diff --git a/config/lib/score.js b/config/lib/score.js
index 2a586826..da59a94d 100644
--- a/config/lib/score.js
+++ b/config/lib/score.js
@@ -28,29 +28,28 @@ module.exports.update = function (req, user, action, value, writeLog = true) {
 
   if (action.enable && v !== 0) {
     if (user) {
+      var up = {
+        score: v
+      };
+
       if (common.examinationIsValid(user)) {
-        user.examinationData.score = user.examinationData.score || 0;
-        user.examinationData.score += v;
-
-        var uploadFinished = user.examinationData.uploaded >= examinationConfig.incrementData.upload;
-        var downloadFinished = user.examinationData.downloaded >= examinationConfig.incrementData.download;
-        var scoreFinished = user.examinationData.score >= examinationConfig.incrementData.score;
-        user.examinationData.isFinished = uploadFinished && downloadFinished && scoreFinished;
-        user.examinationData.finishedTime = user.examinationData.isFinished ? Date.now() : null;
-
-        user.markModified('examinationData');
+        up['examinationData.score'] = v;
+        mtDebug.debugGreen('---------------WRITE EXAMINATION SCORE----------------', 'ANNOUNCE', true, req.passkeyuser);
+        mtDebug.debugRed('examinationData.score: ' + v, 'ANNOUNCE', true, req.passkeyuser);
       }
 
-      mtDebug.info('Old: user.score = ' + user.score);
-      user.score = Math.max(user.score + v, 0);
-      mtDebug.info('New: user.score = ' + user.score);
-
-      user.save(function () {
-        traceLogCreate(req, traceConfig.action.userScoreChange, {
-          user: user._id,
-          score: v,
-          scoreActionName: action.name
-        });
+      User.update({_id: user._id}, {
+        $inc: up
+      }, function (err, num) {
+        if (err) {
+          logger.error(err);
+        } else {
+          traceLogCreate(req, traceConfig.action.userScoreChange, {
+            user: user._id,
+            score: v,
+            scoreActionName: action.name
+          });
+        }
       });
 
       //write score log
diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js
index 3975e2d2..f248bf08 100644
--- a/modules/announce/server/controllers/announces.server.controller.js
+++ b/modules/announce/server/controllers/announces.server.controller.js
@@ -22,10 +22,8 @@ var path = require('path'),
 var traceConfig = config.meanTorrentConfig.trace;
 var scoreConfig = config.meanTorrentConfig.score;
 var hnrConfig = config.meanTorrentConfig.hitAndRun;
-var signConfig = config.meanTorrentConfig.sign;
 var announceConfig = config.meanTorrentConfig.announce;
 var globalSalesConfig = config.meanTorrentConfig.torrentGlobalSales;
-var examinationConfig = config.meanTorrentConfig.examination;
 
 var appConfig = config.meanTorrentConfig.app;
 
@@ -555,25 +553,23 @@ exports.announce = function (req, res) {
           }
 
           //write user uploaded and downloaded
-          req.passkeyuser.uploaded += u;
-          req.passkeyuser.downloaded += d;
-          req.passkeyuser.true_uploaded += curru;
-          req.passkeyuser.true_downloaded += currd;
-          //write examination uploaded and downloaded
-          if (common.examinationIsValid(req.passkeyuser)) {
-            req.passkeyuser.examinationData.uploaded = req.passkeyuser.examinationData.uploaded || 0;
-            req.passkeyuser.examinationData.uploaded += u;
-            req.passkeyuser.examinationData.downloaded = req.passkeyuser.examinationData.downloaded || 0;
-            req.passkeyuser.examinationData.downloaded += d;
+          var up_d = {
+            uploaded: u,
+            downloaded: d,
+            true_uploaded: curru,
+            true_downloaded: currd
+          };
 
-            var uploadFinished = req.passkeyuser.examinationData.uploaded >= examinationConfig.incrementData.upload;
-            var downloadFinished = req.passkeyuser.examinationData.downloaded >= examinationConfig.incrementData.download;
-            var scoreFinished = req.passkeyuser.examinationData.score >= examinationConfig.incrementData.score;
-            req.passkeyuser.examinationData.isFinished = uploadFinished && downloadFinished && scoreFinished;
-            req.passkeyuser.examinationData.finishedTime = req.passkeyuser.examinationData.isFinished ? Date.now() : null;
-            req.passkeyuser.markModified('examinationData');
+          if (common.examinationIsValid(req.passkeyuser)) {
+            up_d['examinationData.uploaded'] = u;
+            up_d['examinationData.downloaded'] = d;
+            mtDebug.debugGreen('---------------WRITE EXAMINATION DATA----------------', 'ANNOUNCE', true, req.passkeyuser);
+            mtDebug.debugRed('examinationData.uploaded: ' + u + ', examinationData.downloaded: ' + d, 'ANNOUNCE', true, req.passkeyuser);
           }
-          req.passkeyuser.save();
+
+          req.passkeyuser.update({
+            $inc: up_d
+          }).exec();
 
           //write peer speed
           var sp = {};
@@ -691,10 +687,13 @@ exports.announce = function (req, res) {
       }
 
       //write peer data
-      req.currentPeer.peer_uploaded = query.uploaded;
-      req.currentPeer.peer_downloaded = query.downloaded;
-      req.currentPeer.peer_left = query.left;
-      req.currentPeer.save();
+      req.currentPeer.update({
+        $set: {
+          peer_uploaded: query.uploaded,
+          peer_downloaded: query.downloaded,
+          peer_left: query.left
+        }
+      }).exec();
 
       done(null, curru, currd);
     },
@@ -706,9 +705,12 @@ exports.announce = function (req, res) {
       if (curru > 0 || currd > 0) {
         if (req.completeTorrent) {
           mtDebug.debugGreen('---------------WRITE COMPLETE DATA----------------', 'ANNOUNCE', true, req.passkeyuser);
-          req.completeTorrent.total_uploaded += curru;
-          req.completeTorrent.total_downloaded += currd;
-          req.completeTorrent.save(function () {
+          req.completeTorrent.update({
+            $inc: {
+              total_uploaded: curru,
+              total_downloaded: currd
+            }
+          }, function () {
             done(null);
           });
         } else {
@@ -727,8 +729,11 @@ exports.announce = function (req, res) {
       if (!req.currentPeer.isNewCreated) {
         if (req.completeTorrent && req.completeTorrent.complete && event(query.event) !== EVENT_COMPLETED) {
           mtDebug.debugGreen('---------------UPDATE H&R COMPLETE TOTAL_SEED_TIME----------------', 'ANNOUNCE', true, req.passkeyuser);
-          req.completeTorrent.total_seed_time += (Date.now() - req.currentPeer.last_announce_at);
-          req.completeTorrent.save(function () {
+          req.completeTorrent.update({
+            $inc: {
+              total_seed_time: (Date.now() - req.currentPeer.last_announce_at)
+            }
+          }, function () {
             done(null);
           });
         } else {
@@ -803,12 +808,11 @@ exports.announce = function (req, res) {
       mtDebug.debugGreen('---------------UPDATE LAST_ANNOUNCE_AT----------------', 'ANNOUNCE', true, req.passkeyuser);
 
       if (!req.currentPeer.isNewCreated) {
-        req.currentPeer.last_announce_at = Date.now();
-        req.currentPeer.save();
-      }
-
-      if (req.completeTorrent) {
-        req.completeTorrent.globalUpdateMethod();
+        req.currentPeer.update({
+          $set: {
+            last_announce_at: Date.now()
+          }
+        }).exec();
       }
 
       done(null);
@@ -820,22 +824,6 @@ exports.announce = function (req, res) {
     function (done) {
       if (event(query.event) === EVENT_COMPLETED) {
         mtDebug.debugGreen('---------------EVENT_COMPLETED----------------', 'ANNOUNCE', true, req.passkeyuser);
-        //write completed torrent data into finished
-        var finished = new Finished();
-        finished.user = req.passkeyuser;
-        finished.torrent = req.torrent;
-        finished.user_ip = req.cf_ip;
-        finished.user_agent = req.get('User-Agent');
-        finished.user_port = query.port;
-        finished.save();
-
-        traceLogCreate(req, traceConfig.action.userAnnounceFinished, {
-          user: req.passkeyuser._id,
-          torrent: req.torrent._id,
-          agent: req.get('User-Agent'),
-          ip: req.cf_ip,
-          port: query.port
-        });
 
         doCompleteEvent(function () {
           done(null);
@@ -925,6 +913,20 @@ exports.announce = function (req, res) {
       }
 
       done(null, 'done');
+    },
+
+    /**
+     * update user, torrent, peer, complete
+     * @param done
+     */
+    function (done) {
+      req.passkeyuser.globalUpdateMethod(true);
+      req.torrent.globalUpdateMethod(true);
+      req.currentPeer.globalUpdateMethod(true);
+
+      if (req.completeTorrent) {
+        req.completeTorrent.globalUpdateMethod(true);
+      }
     }
   ], function (err, reason) {
     if (err) {
@@ -967,19 +969,48 @@ exports.announce = function (req, res) {
    * doCompleteEvent
    */
   function doCompleteEvent(callback) {
-    req.currentPeer.peer_status = PEERSTATE_SEEDER;
-    req.currentPeer.save();
+    //write completed torrent data into finished
+    var finished = new Finished();
+    finished.user = req.passkeyuser;
+    finished.torrent = req.torrent;
+    finished.user_ip = req.cf_ip;
+    finished.user_agent = req.get('User-Agent');
+    finished.user_port = query.port;
+    finished.save();
 
-    req.torrent.torrent_finished += 1;
-    req.torrent.save();
+    traceLogCreate(req, traceConfig.action.userAnnounceFinished, {
+      user: req.passkeyuser._id,
+      torrent: req.torrent._id,
+      agent: req.get('User-Agent'),
+      ip: req.cf_ip,
+      port: query.port
+    });
 
-    req.passkeyuser.finished += 1;
-    req.passkeyuser.save();
+    req.currentPeer.update({
+      $set: {
+        peer_status: PEERSTATE_SEEDER
+      }
+    }).exec();
+
+    req.torrent.update({
+      $inc: {
+        torrent_finished: 1
+      }
+    }).exec();
+
+    req.passkeyuser.update({
+      $inc: {
+        finished: 1
+      }
+    }).exec();
 
     //update completeTorrent complete status
     if (req.completeTorrent) {
-      req.completeTorrent.complete = true;
-      req.completeTorrent.save(function () {
+      req.completeTorrent.update({
+        $set: {
+          complete: true
+        }
+      }, function () {
         if (callback) callback();
       });
     } else {
@@ -1018,12 +1049,10 @@ exports.announce = function (req, res) {
     req.passkeyuser.addLeechedIp(peer.peer_ip);
     req.passkeyuser.addClientAgent(peer.user_agent);
 
-    peer.save(function (err) {
-      if (!err) {
-        req.currentPeer = peer;
-        mtDebug.debugGreen('---------------createCurrentPeer()----------------', 'ANNOUNCE', true, req.passkeyuser);
-        if (callback) callback();
-      }
+    peer.save(function () {
+      req.currentPeer = peer;
+      mtDebug.debugGreen('---------------createCurrentPeer()----------------', 'ANNOUNCE', true, req.passkeyuser);
+      if (callback) callback();
     });
   }
 
diff --git a/modules/messages/server/controllers/messages.server.controller.js b/modules/messages/server/controllers/messages.server.controller.js
index 4cedd48a..a5d74b0a 100644
--- a/modules/messages/server/controllers/messages.server.controller.js
+++ b/modules/messages/server/controllers/messages.server.controller.js
@@ -228,7 +228,7 @@ exports.countUnread = function (req, res) {
   }
 
   //active user update method to update some fields value
-  req.user.globalUpdateMethod();
+  req.user.globalUpdateMethod(true);
 
   var countFrom = function (callback) {
     Message.count({
diff --git a/modules/torrents/server/models/complete.server.model.js b/modules/torrents/server/models/complete.server.model.js
index 8ccf5750..32ca92be 100644
--- a/modules/torrents/server/models/complete.server.model.js
+++ b/modules/torrents/server/models/complete.server.model.js
@@ -95,11 +95,25 @@ function countRatio(t) {
 /**
  * globalUpdateMethod
  */
-CompleteSchema.methods.globalUpdateMethod = function (callback) {
-  this.refreshat = Date.now();
-  this.save(function () {
-    if (callback) callback();
-  });
+CompleteSchema.methods.globalUpdateMethod = function (findThenUpdate, cb) {
+  if (typeof findThenUpdate === 'function') {
+    cb = findThenUpdate;
+    findThenUpdate = false;
+  }
+
+  if (findThenUpdate) {
+    this.model('Complete').findById(this._id, function (err, c) {
+      c.refreshat = Date.now();
+      c.save(function (err, nc) {
+        if (cb) cb(nc || this);
+      });
+    });
+  } else {
+    this.refreshat = Date.now();
+    this.save(function (err, c) {
+      if (cb) cb(c || this);
+    });
+  }
 };
 
 /**
diff --git a/modules/torrents/server/models/peer.server.model.js b/modules/torrents/server/models/peer.server.model.js
index 445e9225..fda3c5cc 100644
--- a/modules/torrents/server/models/peer.server.model.js
+++ b/modules/torrents/server/models/peer.server.model.js
@@ -106,11 +106,25 @@ PeerSchema.pre('save', function (next) {
 /**
  * globalUpdateMethod
  */
-PeerSchema.methods.globalUpdateMethod = function (cb) {
-  this.refreshat = Date.now();
-  this.save(function (err, p) {
-    if (cb) cb(p || this);
-  });
+PeerSchema.methods.globalUpdateMethod = function (findThenUpdate, cb) {
+  if (typeof findThenUpdate === 'function') {
+    cb = findThenUpdate;
+    findThenUpdate = false;
+  }
+
+  if (findThenUpdate) {
+    this.model('Peer').findById(this._id, function (err, p) {
+      p.refreshat = Date.now();
+      p.save(function (err, np) {
+        if (cb) cb(np || this);
+      });
+    });
+  } else {
+    this.refreshat = Date.now();
+    this.save(function (err, p) {
+      if (cb) cb(p || this);
+    });
+  }
 };
 
 /**
diff --git a/modules/torrents/server/models/torrent.server.model.js b/modules/torrents/server/models/torrent.server.model.js
index 95283f94..56157c84 100644
--- a/modules/torrents/server/models/torrent.server.model.js
+++ b/modules/torrents/server/models/torrent.server.model.js
@@ -245,11 +245,25 @@ TorrentSchema.methods.updateSeedLeechNumbers = function (callback) {
 /**
  * globalUpdateMethod
  */
-TorrentSchema.methods.globalUpdateMethod = function (cb) {
-  this.refreshat = Date.now();
-  this.save(function (err, t) {
-    if (cb) cb(t || this);
-  });
+TorrentSchema.methods.globalUpdateMethod = function (findThenUpdate, cb) {
+  if (typeof findThenUpdate === 'function') {
+    cb = findThenUpdate;
+    findThenUpdate = false;
+  }
+
+  if (findThenUpdate) {
+    this.model('Torrent').findById(this._id, function (err, t) {
+      t.refreshat = Date.now();
+      t.save(function (err, nt) {
+        if (cb) cb(nt || this);
+      });
+    });
+  } else {
+    this.refreshat = Date.now();
+    this.save(function (err, t) {
+      if (cb) cb(t || this);
+    });
+  }
 };
 
 TorrentSchema.index({info_hash: 'hashed'});
diff --git a/modules/users/server/models/user.server.model.js b/modules/users/server/models/user.server.model.js
index 492f5d55..5bd9851c 100644
--- a/modules/users/server/models/user.server.model.js
+++ b/modules/users/server/models/user.server.model.js
@@ -6,6 +6,7 @@
 var mongoose = require('mongoose'),
   path = require('path'),
   config = require(path.resolve('./config/config')),
+  common = require(path.resolve('./config/lib/common')),
   CommonSchema = require(path.resolve('./modules/core/server/models/common.server.model')),
   Schema = mongoose.Schema,
   crypto = require('crypto'),
@@ -19,6 +20,8 @@ var mongoose = require('mongoose'),
 owasp.config(config.shared.owasp);
 
 var announceConfig = config.meanTorrentConfig.announce;
+var examinationConfig = config.meanTorrentConfig.examination;
+var mtDebug = require(path.resolve('./config/lib/debug'));
 
 const PEERSTATE_SEEDER = 'seeder';
 const PEERSTATE_LEECHER = 'leecher';
@@ -313,6 +316,7 @@ UserSchema.pre('save', function (next) {
   countRatio(this);
   updateVipFlag(this);
   updateOperAdminFlag(this);
+  updateExaminationData(this);
 
   this.constructor.count(function (err, count) {
     if (err) {
@@ -376,6 +380,24 @@ function updateOperAdminFlag(user) {
   }
 }
 
+/**
+ * updateExaminationData
+ * @param user
+ */
+function updateExaminationData(user) {
+  if (common.examinationIsValid(user)) {
+    if (!user.examinationData.isFinished) {
+      var uploadFinished = user.examinationData.uploaded >= examinationConfig.incrementData.upload;
+      var downloadFinished = user.examinationData.downloaded >= examinationConfig.incrementData.download;
+      var scoreFinished = user.examinationData.score >= examinationConfig.incrementData.score;
+      user.examinationData.isFinished = uploadFinished && downloadFinished && scoreFinished;
+      user.examinationData.finishedTime = user.examinationData.isFinished ? Date.now() : null;
+
+      user.markModified('examinationData');
+    }
+  }
+}
+
 /**
  * Hook a pre validate method to test the local password
  */
@@ -436,11 +458,25 @@ UserSchema.methods.addLeechedIp = function (ip) {
 /**
  * globalUpdateMethod
  */
-UserSchema.methods.globalUpdateMethod = function (cb) {
-  this.refreshat = Date.now();
-  this.save(function (err, u) {
-    if (cb) cb(u || this);
-  });
+UserSchema.methods.globalUpdateMethod = function (findThenUpdate, cb) {
+  if (typeof findThenUpdate === 'function') {
+    cb = findThenUpdate;
+    findThenUpdate = false;
+  }
+
+  if (findThenUpdate) {
+    this.model('User').findById(this._id, function (err, u) {
+      u.refreshat = Date.now();
+      u.save(function (err, nu) {
+        if (cb) cb(nu || this);
+      });
+    });
+  } else {
+    this.refreshat = Date.now();
+    this.save(function (err, u) {
+      if (cb) cb(u || this);
+    });
+  }
 };
 
 /**

From 2e37108be1f5ac8bbc7cb741ca979e7ae9757044 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 14 May 2018 15:04:40 +0800
Subject: [PATCH 25/96] feat(check): add module of check in

---
 .../checkin/client/checkin.client.module.js   |  9 ++++++
 .../server/config/checkin.server.config.js    | 14 +++++++++
 .../server/models/check.server.model.js       | 30 +++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 modules/checkin/client/checkin.client.module.js
 create mode 100644 modules/checkin/server/config/checkin.server.config.js
 create mode 100644 modules/checkin/server/models/check.server.model.js

diff --git a/modules/checkin/client/checkin.client.module.js b/modules/checkin/client/checkin.client.module.js
new file mode 100644
index 00000000..8dafa42f
--- /dev/null
+++ b/modules/checkin/client/checkin.client.module.js
@@ -0,0 +1,9 @@
+(function (app) {
+  'use strict';
+
+  app.registerModule('checkin', ['core']);// The core module is required for special route handling; see /core/client/config/core.client.routes
+  app.registerModule('checkin.admin', ['core.admin']);
+  app.registerModule('checkin.admin.routes', ['core.admin.routes']);
+  app.registerModule('checkin.services');
+  app.registerModule('checkin.routes', ['ui.router', 'core.routes', 'checkin.services']);
+}(ApplicationConfiguration));
diff --git a/modules/checkin/server/config/checkin.server.config.js b/modules/checkin/server/config/checkin.server.config.js
new file mode 100644
index 00000000..629c3606
--- /dev/null
+++ b/modules/checkin/server/config/checkin.server.config.js
@@ -0,0 +1,14 @@
+'use strict';
+
+/**
+ * Module dependencies
+ */
+var path = require('path'),
+  config = require(path.resolve('./config/config'));
+
+/**
+ * Module init function.
+ */
+module.exports = function (app, db) {
+
+};
diff --git a/modules/checkin/server/models/check.server.model.js b/modules/checkin/server/models/check.server.model.js
new file mode 100644
index 00000000..5db3e04f
--- /dev/null
+++ b/modules/checkin/server/models/check.server.model.js
@@ -0,0 +1,30 @@
+'use strict';
+
+/**
+ * Module dependencies
+ */
+var mongoose = require('mongoose'),
+  Schema = mongoose.Schema;
+
+/**
+ * Check in Schema
+ */
+var CheckSchema = new Schema({
+  user: {
+    type: Schema.Types.ObjectId,
+    ref: 'User'
+  },
+  keepDays: {
+    type: Number,
+    default: 0
+  },
+  lastCheckedAt: {
+    type: Date,
+    default: Date.now
+  }
+}, {usePushEach: true});
+
+
+CheckSchema.index({user: 1, createdAt: -1});
+
+mongoose.model('Check', CheckSchema);

From 71631fba2c1b8614c2080021a6102350e1743913 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 14 May 2018 15:10:40 +0800
Subject: [PATCH 26/96] feat(check): rename module check

---
 modules/check/client/check.client.module.js              | 9 +++++++++
 .../server/config/check.server.config.js}                | 0
 .../server/models/check.server.model.js                  | 0
 modules/checkin/client/checkin.client.module.js          | 9 ---------
 4 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 modules/check/client/check.client.module.js
 rename modules/{checkin/server/config/checkin.server.config.js => check/server/config/check.server.config.js} (100%)
 rename modules/{checkin => check}/server/models/check.server.model.js (100%)
 delete mode 100644 modules/checkin/client/checkin.client.module.js

diff --git a/modules/check/client/check.client.module.js b/modules/check/client/check.client.module.js
new file mode 100644
index 00000000..766781f8
--- /dev/null
+++ b/modules/check/client/check.client.module.js
@@ -0,0 +1,9 @@
+(function (app) {
+  'use strict';
+
+  app.registerModule('check', ['core']);// The core module is required for special route handling; see /core/client/config/core.client.routes
+  app.registerModule('check.admin', ['core.admin']);
+  app.registerModule('check.admin.routes', ['core.admin.routes']);
+  app.registerModule('check.services');
+  app.registerModule('check.routes', ['ui.router', 'core.routes', 'check.services']);
+}(ApplicationConfiguration));
diff --git a/modules/checkin/server/config/checkin.server.config.js b/modules/check/server/config/check.server.config.js
similarity index 100%
rename from modules/checkin/server/config/checkin.server.config.js
rename to modules/check/server/config/check.server.config.js
diff --git a/modules/checkin/server/models/check.server.model.js b/modules/check/server/models/check.server.model.js
similarity index 100%
rename from modules/checkin/server/models/check.server.model.js
rename to modules/check/server/models/check.server.model.js
diff --git a/modules/checkin/client/checkin.client.module.js b/modules/checkin/client/checkin.client.module.js
deleted file mode 100644
index 8dafa42f..00000000
--- a/modules/checkin/client/checkin.client.module.js
+++ /dev/null
@@ -1,9 +0,0 @@
-(function (app) {
-  'use strict';
-
-  app.registerModule('checkin', ['core']);// The core module is required for special route handling; see /core/client/config/core.client.routes
-  app.registerModule('checkin.admin', ['core.admin']);
-  app.registerModule('checkin.admin.routes', ['core.admin.routes']);
-  app.registerModule('checkin.services');
-  app.registerModule('checkin.routes', ['ui.router', 'core.routes', 'checkin.services']);
-}(ApplicationConfiguration));

From 21b79b9b4ce70ee379f3b31d457f8fa0087387fb Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 14 May 2018 15:55:27 +0800
Subject: [PATCH 27/96] fix(announce): fixed issue when session is stop

---
 .../server/controllers/announces.server.controller.js       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js
index f248bf08..ee62caeb 100644
--- a/modules/announce/server/controllers/announces.server.controller.js
+++ b/modules/announce/server/controllers/announces.server.controller.js
@@ -922,7 +922,10 @@ exports.announce = function (req, res) {
     function (done) {
       req.passkeyuser.globalUpdateMethod(true);
       req.torrent.globalUpdateMethod(true);
-      req.currentPeer.globalUpdateMethod(true);
+
+      if(req.currentPeer) {
+        req.currentPeer.globalUpdateMethod(true);
+      }
 
       if (req.completeTorrent) {
         req.completeTorrent.globalUpdateMethod(true);
@@ -1076,6 +1079,7 @@ exports.announce = function (req, res) {
         } else {
           mtDebug.debugGreen('---------------removeCurrPeer()----------------', 'ANNOUNCE', true, req.passkeyuser);
         }
+        req.currentPeer = undefined;
         if (callback) callback();
       });
     });

From a905cf92e48c4b49e9b89d4c817436aab5b9bca4 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 14 May 2018 15:57:41 +0800
Subject: [PATCH 28/96] fix(announce): fixed eslint warning

---
 .../announce/server/controllers/announces.server.controller.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js
index ee62caeb..d9afc940 100644
--- a/modules/announce/server/controllers/announces.server.controller.js
+++ b/modules/announce/server/controllers/announces.server.controller.js
@@ -923,7 +923,7 @@ exports.announce = function (req, res) {
       req.passkeyuser.globalUpdateMethod(true);
       req.torrent.globalUpdateMethod(true);
 
-      if(req.currentPeer) {
+      if (req.currentPeer) {
         req.currentPeer.globalUpdateMethod(true);
       }
 

From 872e726dbdb5e73ce1f21ca289db5cf259aa82d7 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 14 May 2018 16:53:16 +0800
Subject: [PATCH 29/96] fix(status): show download percent on torrent item

---
 .../client/directives/torrent-progress.client.directive.js  | 6 +++---
 .../torrents/client/templates/torrent-item.client.view.html | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/core/client/directives/torrent-progress.client.directive.js b/modules/core/client/directives/torrent-progress.client.directive.js
index b542558e..ffb37ed5 100644
--- a/modules/core/client/directives/torrent-progress.client.directive.js
+++ b/modules/core/client/directives/torrent-progress.client.directive.js
@@ -20,9 +20,9 @@
 
     function link(scope, element, attrs) {
       scope.$watch(attrs.torrentProgress, function (p) {
-        if (p && p.length > 0) {
-          var pt = p[0];
-          //mtDebug.info(pt);
+        var pt = Array.isArray(p) ? (p.length > 0 ? p[0] : undefined) : p;
+        if (pt) {
+          mtDebug.info(pt);
 
           var t_progressbar = ngProgressFactory.createInstance();
           t_progressbar.setParent(element[0]);
diff --git a/modules/torrents/client/templates/torrent-item.client.view.html b/modules/torrents/client/templates/torrent-item.client.view.html
index c080ee13..d0db6324 100644
--- a/modules/torrents/client/templates/torrent-item.client.view.html
+++ b/modules/torrents/client/templates/torrent-item.client.view.html
@@ -276,6 +276,6 @@
 </tr>
 <tr>
     <td class="td-progress" colspan="6">
-        <div torrent-progress="item.my_peers"></div>
+        <div torrent-progress="item.my_peers || peer"></div>
     </td>
 </tr>

From 7ad54487ca76a1943fd9585c8060060123d77673 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 14 May 2018 17:36:56 +0800
Subject: [PATCH 30/96] fix(status): fixed up/down status bar issue

---
 modules/torrents/client/templates/torrent-item.client.view.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/torrents/client/templates/torrent-item.client.view.html b/modules/torrents/client/templates/torrent-item.client.view.html
index d0db6324..57a7694a 100644
--- a/modules/torrents/client/templates/torrent-item.client.view.html
+++ b/modules/torrents/client/templates/torrent-item.client.view.html
@@ -276,6 +276,6 @@
 </tr>
 <tr>
     <td class="td-progress" colspan="6">
-        <div torrent-progress="item.my_peers || peer"></div>
+        <div torrent-progress="item.my_peers || (peer.user == vm.user._id ? peer : undefined)"></div>
     </td>
 </tr>

From d858f6c9a990a86ac9f600266e45c173117971c7 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 14 May 2018 17:45:04 +0800
Subject: [PATCH 31/96] fix(status): fixed up/down status bar issue

---
 modules/torrents/client/templates/torrent-item.client.view.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/torrents/client/templates/torrent-item.client.view.html b/modules/torrents/client/templates/torrent-item.client.view.html
index 57a7694a..ccb994b3 100644
--- a/modules/torrents/client/templates/torrent-item.client.view.html
+++ b/modules/torrents/client/templates/torrent-item.client.view.html
@@ -276,6 +276,6 @@
 </tr>
 <tr>
     <td class="td-progress" colspan="6">
-        <div torrent-progress="item.my_peers || (peer.user == vm.user._id ? peer : undefined)"></div>
+        <div torrent-progress="item.my_peers || (vm.state.current.name.startsWith('status') ? peer : undefined)"></div>
     </td>
 </tr>

From f2882279aba25e92d296ccc843b2d091531611c3 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 14 May 2018 18:58:10 +0800
Subject: [PATCH 32/96] fix(announce): update peer ip & port when changed than
 old peer record

---
 .../controllers/announces.server.controller.js    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js
index d9afc940..477d5a52 100644
--- a/modules/announce/server/controllers/announces.server.controller.js
+++ b/modules/announce/server/controllers/announces.server.controller.js
@@ -489,7 +489,7 @@ exports.announce = function (req, res) {
 
       getCurrentPeer(function () {
         mtDebug.debugRed('req.currentPeer.isNewCreated = ' + req.currentPeer.isNewCreated, 'ANNOUNCE', true, req.passkeyuser);
-        mtDebug.debugRed(req.currentPeer._id.toString(), 'ANNOUNCE', true, req.passkeyuser);
+        mtDebug.debugRed('req.currentPeer._id = ' + req.currentPeer._id.toString(), 'ANNOUNCE', true, req.passkeyuser);
         done(null);
       });
     },
@@ -948,6 +948,19 @@ exports.announce = function (req, res) {
         req.currentPeer.torrent = req.torrent;
         req.currentPeer.isNewCreated = false;
 
+        //if find peer_id, but some time some client (like qbittorrent 4.1.0) the ip or port is changed, update it
+        if (req.currentPeer.peer_ip !== req.cf_ip || req.currentPeer.peer_port !== query.port) {
+          req.currentPeer.peer_ip = req.cf_ip;
+          req.currentPeer.peer_port = query.port;
+
+          req.currentPeer.update({
+            $set: {
+              peer_ip: req.cf_ip,
+              peer_port: query.port
+            }
+          }).exec();
+        }
+
         if (req.seeder && req.currentPeer.peer_status !== PEERSTATE_SEEDER && event(query.event) !== EVENT_COMPLETED) {
           mtDebug.debugGreen('---------------PEER STATUS CHANGED: Seeder----------------', 'ANNOUNCE', true, req.passkeyuser);
           doCompleteEvent(function () {

From 7138c4983eab01ad55a6e45fc6a6c2ff16d15d8d Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 14 May 2018 19:00:38 +0800
Subject: [PATCH 33/96] fix(announce): update peer ip & port when changed than
 old peer record

---
 .../announce/server/controllers/announces.server.controller.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js
index 477d5a52..3b80107e 100644
--- a/modules/announce/server/controllers/announces.server.controller.js
+++ b/modules/announce/server/controllers/announces.server.controller.js
@@ -949,7 +949,7 @@ exports.announce = function (req, res) {
         req.currentPeer.isNewCreated = false;
 
         //if find peer_id, but some time some client (like qbittorrent 4.1.0) the ip or port is changed, update it
-        if (req.currentPeer.peer_ip !== req.cf_ip || req.currentPeer.peer_port !== query.port) {
+        if ((req.currentPeer.peer_ip !== req.cf_ip || req.currentPeer.peer_port !== query.port) && query.port !== 0) {
           req.currentPeer.peer_ip = req.cf_ip;
           req.currentPeer.peer_port = query.port;
 

From e319f0c0fc9f74cb06f115cfd5cf889b6fb97ff5 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Tue, 15 May 2018 11:17:37 +0800
Subject: [PATCH 34/96] feat(torrents): show review button in detail page admin
 panel

---
 .../controllers/torrent-info.client.controller.js  | 14 ++++++++++++++
 .../client/views/view-torrent.client.view.html     |  3 +++
 2 files changed, 17 insertions(+)

diff --git a/modules/torrents/client/controllers/torrent-info.client.controller.js b/modules/torrents/client/controllers/torrent-info.client.controller.js
index c14100e4..0c8cbd9d 100644
--- a/modules/torrents/client/controllers/torrent-info.client.controller.js
+++ b/modules/torrents/client/controllers/torrent-info.client.controller.js
@@ -146,6 +146,20 @@
       });
     };
 
+    /**
+     * reviewedTorrentStatus
+     * @param item
+     */
+    vm.reviewedTorrentStatus = function () {
+      vm.torrentLocalInfo.$setReviewedStatus(function (res) {
+        mtDebug.info(res);
+        vm.torrentLocalInfo = res;
+        NotifycationService.showSuccessNotify('TORRENT_SETREVIEWED_SUCCESSFULLY');
+      }, function (res) {
+        NotifycationService.showErrorNotify(res.data.message, 'TORRENT_SETREVIEWED_ERROR');
+      });
+    };
+
     /**
      * toggleHnR
      */
diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html
index 54467ceb..c179833e 100644
--- a/modules/torrents/client/views/view-torrent.client.view.html
+++ b/modules/torrents/client/views/view-torrent.client.view.html
@@ -1043,6 +1043,9 @@
                             ng-click="vm.updateTorrent();">
                         {{ 'ADMIN_BASIC_UPDATE' | translate}}
                     </button>
+                    <button class="btn btn-mt btn-sm" ng-show="vm.torrentLocalInfo.torrent_status == 'new'"
+                            ng-click="vm.reviewedTorrentStatus();">{{ 'ADMIN_BASIC_REVIEWED' | translate}}
+                    </button>
                     <button class="btn btn-default btn-sm" ng-click="vm.deleteTorrent();">{{ 'ADMIN_BASIC_DELETE' | translate}}</button>
                     <button class="btn btn-default btn-sm"
                             ng-click="vm.toggleHnR();">{{ (vm.torrentLocalInfo.torrent_hnr ? 'ADMIN_BASIC_UNSET_HNR' : 'ADMIN_BASIC_SET_HNR') | translate}}

From cc0bf02045a0c78cafbad0f1d51ce4bb6c7a99a2 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Tue, 15 May 2018 11:51:18 +0800
Subject: [PATCH 35/96] feat(announce): add more debug log info

---
 .../server/controllers/announces.server.controller.js  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js
index 3b80107e..e684f861 100644
--- a/modules/announce/server/controllers/announces.server.controller.js
+++ b/modules/announce/server/controllers/announces.server.controller.js
@@ -275,6 +275,8 @@ exports.announce = function (req, res) {
      torrent data include peers
      ---------------------------------------------------------------*/
     function (done) {
+      mtDebug.debugRed('user _id : ' + req.passkeyuser._id.toString(), 'ANNOUNCE', true, req.passkeyuser);
+      mtDebug.debugRed('torrent info_hash : ' + query.info_hash, 'ANNOUNCE', true, req.passkeyuser);
       Torrent.findOne({
         info_hash: query.info_hash
       })
@@ -501,6 +503,7 @@ exports.announce = function (req, res) {
      numbers is in setting announceConfig.announceCheck
      ---------------------------------------------------------------*/
     function (done) {
+      mtDebug.debugGreen('---------------CHECK USER SEED/LEECH COUNT----------------', 'ANNOUNCE', true, req.passkeyuser);
       var lcount = getSelfLeecherCount();
       var scount = getSelfSeederCount();
 
@@ -559,6 +562,7 @@ exports.announce = function (req, res) {
             true_uploaded: curru,
             true_downloaded: currd
           };
+          mtDebug.debugRed(JSON.stringify(up_d), 'ANNOUNCE', true, req.passkeyuser);
 
           if (common.examinationIsValid(req.passkeyuser)) {
             up_d['examinationData.uploaded'] = u;
@@ -638,6 +642,7 @@ exports.announce = function (req, res) {
               }
               totalScore = Math.round(totalScore * 100) / 100;
               scoreUpdate(req, req.passkeyuser, action, totalScore, false);
+              mtDebug.debugRed('announce score: ' + totalScore, 'ANNOUNCE', true, req.passkeyuser);
             }
           }
 
@@ -784,6 +789,7 @@ exports.announce = function (req, res) {
               }
               seedScore = Math.round(seedScore * 100) / 100;
               scoreUpdate(req, req.passkeyuser, action, seedScore);
+              mtDebug.debugRed('seed timed score: ' + seedScore, 'ANNOUNCE', true, req.passkeyuser);
 
               done(null);
             } else {
@@ -896,8 +902,9 @@ exports.announce = function (req, res) {
       var len = writePeers(peerBuffer, want, req.torrent._peers);
       peerBuffer = peerBuffer.slice(0, len);
 
+      mtDebug.debugGreen('---------------SEND RESPONSE TO USER----------------', 'ANNOUNCE', true, req.passkeyuser);
       var resp = 'd8:intervali' + ANNOUNCE_INTERVAL + 'e8:completei' + req.torrent.torrent_seeds + 'e10:incompletei' + req.torrent.torrent_leechers + 'e10:downloadedi' + req.torrent.torrent_finished + 'e5:peers' + len + ':';
-      mtDebug.debugGreen(resp, 'ANNOUNCE', true, req.passkeyuser);
+      mtDebug.debugRed(resp, 'ANNOUNCE', true, req.passkeyuser);
 
       res.writeHead(200, {
         'Content-Length': resp.length + peerBuffer.length + 1,
@@ -1241,6 +1248,7 @@ exports.announce = function (req, res) {
     var c = 0;
 
     if (!req.seeder && event(query.event) !== EVENT_STOPPED && event(query.event) !== EVENT_COMPLETED) {
+      mtDebug.debugGreen('---------------GET PEERS LIST----------------', 'ANNOUNCE', true, req.passkeyuser);
       mtDebug.debugRed('want count = ' + count, 'ANNOUNCE', true, req.passkeyuser);
       mtDebug.debugRed('peers.length = ' + peers.length, 'ANNOUNCE', true, req.passkeyuser);
 

From 51a2f1bd5734be7e5916cfd10726ba6039cc457e Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Tue, 15 May 2018 13:24:14 +0800
Subject: [PATCH 36/96] feat(announce): add more debug log info

---
 config/lib/debug.js                           |  8 ++++--
 .../announces.server.controller.js            | 21 ++++++++------
 .../server/models/complete.server.model.js    | 12 +++++---
 .../server/models/peer.server.model.js        | 28 +++++++++++++++----
 .../server/models/torrent.server.model.js     | 12 +++++---
 .../users/server/models/user.server.model.js  | 12 +++++---
 6 files changed, 64 insertions(+), 29 deletions(-)

diff --git a/config/lib/debug.js b/config/lib/debug.js
index eb454eb7..114be7a2 100644
--- a/config/lib/debug.js
+++ b/config/lib/debug.js
@@ -3,8 +3,10 @@
 var path = require('path'),
   chalk = require('chalk'),
   logger = require('./logger'),
+  mongoose = require('mongoose'),
   loggerAnnounce = require('./loggerAnnounce'),
   moment = require('moment'),
+  objectId = require('mongodb').ObjectId,
   config = require(path.resolve('./config/config'));
 
 var appConfig = config.meanTorrentConfig.app;
@@ -30,10 +32,12 @@ module.exports.info = function (obj, section = undefined, colorFunction = undefi
     var userPrefix = '';
     if (isAnnounce && !announceConfig.debugAnnounceUser.debugAll) {
       if (user) {
-        if (!announceConfig.debugAnnounceUser.ids.includes(user._id.toString())) {
+        var id = (('_id' in user) ? user._id.toString() : user.toString());
+
+        if (!announceConfig.debugAnnounceUser.ids.includes(id)) {
           return;
         } else {
-          userPrefix = ' - ' + user.displayName + ' - ' + user._id.toString();
+          userPrefix = ' - ' + (user.displayName || '-') + ' - ' + id;
         }
       }
     }
diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js
index e684f861..cd60c0dd 100644
--- a/modules/announce/server/controllers/announces.server.controller.js
+++ b/modules/announce/server/controllers/announces.server.controller.js
@@ -275,8 +275,8 @@ exports.announce = function (req, res) {
      torrent data include peers
      ---------------------------------------------------------------*/
     function (done) {
-      mtDebug.debugRed('user _id : ' + req.passkeyuser._id.toString(), 'ANNOUNCE', true, req.passkeyuser);
-      mtDebug.debugRed('torrent info_hash : ' + query.info_hash, 'ANNOUNCE', true, req.passkeyuser);
+      mtDebug.debugRed('req.passkeyuser._id     = ' + req.passkeyuser._id.toString(), 'ANNOUNCE', true, req.passkeyuser);
+      mtDebug.debugRed('req.torrent.info_hash   = ' + query.info_hash, 'ANNOUNCE', true, req.passkeyuser);
       Torrent.findOne({
         info_hash: query.info_hash
       })
@@ -490,8 +490,9 @@ exports.announce = function (req, res) {
       }
 
       getCurrentPeer(function () {
-        mtDebug.debugRed('req.currentPeer.isNewCreated = ' + req.currentPeer.isNewCreated, 'ANNOUNCE', true, req.passkeyuser);
-        mtDebug.debugRed('req.currentPeer._id = ' + req.currentPeer._id.toString(), 'ANNOUNCE', true, req.passkeyuser);
+        mtDebug.debugRed('req.currentPeer.isNewCreated  = ' + req.currentPeer.isNewCreated, 'ANNOUNCE', true, req.passkeyuser);
+        mtDebug.debugRed('req.currentPeer._id           = ' + req.currentPeer._id.toString(), 'ANNOUNCE', true, req.passkeyuser);
+        mtDebug.debugRed('req.currentPeer.torrent._id   = ' + req.currentPeer.torrent._id, 'ANNOUNCE', true, req.passkeyuser);
         done(null);
       });
     },
@@ -508,11 +509,11 @@ exports.announce = function (req, res) {
       var scount = getSelfSeederCount();
 
       if (lcount > announceConfig.announceCheck.maxLeechNumberPerUserPerTorrent && !req.seeder) {
-        mtDebug.debugRed('getSelfLeecherCount = ' + lcount, 'ANNOUNCE', true, req.passkeyuser);
+        mtDebug.debugRed('getSelfLeecherCount   = ' + lcount, 'ANNOUNCE', true, req.passkeyuser);
         removeCurrPeer();
         done(180);
       } else if (scount > announceConfig.announceCheck.maxSeedNumberPerUserPerTorrent && req.seeder) {
-        mtDebug.debugRed('getSelfSeederCount = ' + scount, 'ANNOUNCE', true, req.passkeyuser);
+        mtDebug.debugRed('getSelfSeederCount    = ' + scount, 'ANNOUNCE', true, req.passkeyuser);
         removeCurrPeer();
         done(181);
       } else {
@@ -919,7 +920,7 @@ exports.announce = function (req, res) {
         mtDebug.debug(peerBuffer, 'ANNOUNCE', true, req.passkeyuser);
       }
 
-      done(null, 'done');
+      done(null);
     },
 
     /**
@@ -937,6 +938,8 @@ exports.announce = function (req, res) {
       if (req.completeTorrent) {
         req.completeTorrent.globalUpdateMethod(true);
       }
+
+      done(null, 'done');
     }
   ], function (err, reason) {
     if (err) {
@@ -1249,8 +1252,8 @@ exports.announce = function (req, res) {
 
     if (!req.seeder && event(query.event) !== EVENT_STOPPED && event(query.event) !== EVENT_COMPLETED) {
       mtDebug.debugGreen('---------------GET PEERS LIST----------------', 'ANNOUNCE', true, req.passkeyuser);
-      mtDebug.debugRed('want count = ' + count, 'ANNOUNCE', true, req.passkeyuser);
-      mtDebug.debugRed('peers.length = ' + peers.length, 'ANNOUNCE', true, req.passkeyuser);
+      mtDebug.debugRed('want.count     = ' + count, 'ANNOUNCE', true, req.passkeyuser);
+      mtDebug.debugRed('peers.length   = ' + peers.length, 'ANNOUNCE', true, req.passkeyuser);
 
       var p;
       var bc;
diff --git a/modules/torrents/server/models/complete.server.model.js b/modules/torrents/server/models/complete.server.model.js
index 32ca92be..11c0d479 100644
--- a/modules/torrents/server/models/complete.server.model.js
+++ b/modules/torrents/server/models/complete.server.model.js
@@ -103,10 +103,14 @@ CompleteSchema.methods.globalUpdateMethod = function (findThenUpdate, cb) {
 
   if (findThenUpdate) {
     this.model('Complete').findById(this._id, function (err, c) {
-      c.refreshat = Date.now();
-      c.save(function (err, nc) {
-        if (cb) cb(nc || this);
-      });
+      if (c) {
+        c.refreshat = Date.now();
+        c.save(function (err, nc) {
+          if (cb) cb(nc || this);
+        });
+      } else {
+        if (cb) cb(this);
+      }
     });
   } else {
     this.refreshat = Date.now();
diff --git a/modules/torrents/server/models/peer.server.model.js b/modules/torrents/server/models/peer.server.model.js
index fda3c5cc..8deb3a42 100644
--- a/modules/torrents/server/models/peer.server.model.js
+++ b/modules/torrents/server/models/peer.server.model.js
@@ -3,9 +3,13 @@
 /**
  * Module dependencies
  */
-var mongoose = require('mongoose'),
+var path = require('path'),
+  config = require(path.resolve('./config/config')),
+  mongoose = require('mongoose'),
   Schema = mongoose.Schema;
 
+var mtDebug = require(path.resolve('./config/lib/debug'));
+
 /**
  * Peer Schema
  */
@@ -107,17 +111,23 @@ PeerSchema.pre('save', function (next) {
  * globalUpdateMethod
  */
 PeerSchema.methods.globalUpdateMethod = function (findThenUpdate, cb) {
+  mtDebug.debugGreen('---------------GLOBAL UPDATE PEER DATA----------------', 'ANNOUNCE', true, this.user);
+
   if (typeof findThenUpdate === 'function') {
     cb = findThenUpdate;
     findThenUpdate = false;
   }
 
   if (findThenUpdate) {
-    this.model('Peer').findById(this._id, function (err, p) {
-      p.refreshat = Date.now();
-      p.save(function (err, np) {
-        if (cb) cb(np || this);
-      });
+    this.model('Peer').findById(this._id).populate('torrent').exec(function (err, p) {
+      if (p) {
+        p.refreshat = Date.now();
+        p.save(function (err, np) {
+          if (cb) cb(np || this);
+        });
+      } else {
+        if (cb) cb(this);
+      }
     });
   } else {
     this.refreshat = Date.now();
@@ -139,6 +149,7 @@ function countRatio(p) {
   } else {
     p.peer_ratio = Math.round((p.peer_uploaded / p.peer_downloaded) * 100) / 100;
   }
+  mtDebug.debugRed('peer_ratio              = ' + p.peer_ratio, 'ANNOUNCE', true, p.user);
 }
 
 /**
@@ -148,9 +159,14 @@ function countRatio(p) {
 function countPercent(p) {
   if (p.peer_status === 'seeder') {
     p.peer_percent = 100;
+    mtDebug.debugRed('peer_percent            = ' + p.peer_percent, 'ANNOUNCE', true, p.user);
   } else {
     // p.peer_percent = (Math.round((p.peer_downloaded / (p.peer_downloaded + p.peer_left)) * 10000) / 100) || 0;
+    mtDebug.debugRed('p.torrent._id           = ' + p.torrent._id, 'ANNOUNCE', true, p.user);
+    mtDebug.debugRed('p.torrent.torrent_size  = ' + p.torrent.torrent_size, 'ANNOUNCE', true, p.user);
+    mtDebug.debugRed('p.peer_left             = ' + p.peer_left, 'ANNOUNCE', true, p.user);
     p.peer_percent = Math.round((p.torrent.torrent_size - p.peer_left) / p.torrent.torrent_size * 10000) / 100;
+    mtDebug.debugRed('peer_percent            = ' + p.peer_percent, 'ANNOUNCE', true, p.user);
   }
 }
 
diff --git a/modules/torrents/server/models/torrent.server.model.js b/modules/torrents/server/models/torrent.server.model.js
index 56157c84..5f214912 100644
--- a/modules/torrents/server/models/torrent.server.model.js
+++ b/modules/torrents/server/models/torrent.server.model.js
@@ -253,10 +253,14 @@ TorrentSchema.methods.globalUpdateMethod = function (findThenUpdate, cb) {
 
   if (findThenUpdate) {
     this.model('Torrent').findById(this._id, function (err, t) {
-      t.refreshat = Date.now();
-      t.save(function (err, nt) {
-        if (cb) cb(nt || this);
-      });
+      if (t) {
+        t.refreshat = Date.now();
+        t.save(function (err, nt) {
+          if (cb) cb(nt || this);
+        });
+      } else {
+        if (cb) cb(this);
+      }
     });
   } else {
     this.refreshat = Date.now();
diff --git a/modules/users/server/models/user.server.model.js b/modules/users/server/models/user.server.model.js
index 5bd9851c..8ac12dbd 100644
--- a/modules/users/server/models/user.server.model.js
+++ b/modules/users/server/models/user.server.model.js
@@ -466,10 +466,14 @@ UserSchema.methods.globalUpdateMethod = function (findThenUpdate, cb) {
 
   if (findThenUpdate) {
     this.model('User').findById(this._id, function (err, u) {
-      u.refreshat = Date.now();
-      u.save(function (err, nu) {
-        if (cb) cb(nu || this);
-      });
+      if (u) {
+        u.refreshat = Date.now();
+        u.save(function (err, nu) {
+          if (cb) cb(nu || this);
+        });
+      } else {
+        if (cb) cb(this);
+      }
     });
   } else {
     this.refreshat = Date.now();

From d0b93db6ff590caef7e62a71d548dd19d767b048 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Tue, 15 May 2018 13:35:02 +0800
Subject: [PATCH 37/96] feat(announce): add more debug log info

---
 modules/torrents/server/models/peer.server.model.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/torrents/server/models/peer.server.model.js b/modules/torrents/server/models/peer.server.model.js
index 8deb3a42..cac9bf34 100644
--- a/modules/torrents/server/models/peer.server.model.js
+++ b/modules/torrents/server/models/peer.server.model.js
@@ -119,7 +119,7 @@ PeerSchema.methods.globalUpdateMethod = function (findThenUpdate, cb) {
   }
 
   if (findThenUpdate) {
-    this.model('Peer').findById(this._id).populate('torrent').exec(function (err, p) {
+    this.model('Peer').findById(this._id).populate('torrent').populate('user').exec(function (err, p) {
       if (p) {
         p.refreshat = Date.now();
         p.save(function (err, np) {

From be7267a22b4928887a519774a41377c8b21477c7 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Tue, 15 May 2018 13:51:30 +0800
Subject: [PATCH 38/96] feat(announce): add more debug log info

---
 .../server/controllers/announces.server.controller.js       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js
index cd60c0dd..6579b197 100644
--- a/modules/announce/server/controllers/announces.server.controller.js
+++ b/modules/announce/server/controllers/announces.server.controller.js
@@ -164,8 +164,10 @@ exports.announce = function (req, res) {
   req.selfpeer = [];
   req.seeder = false;
 
-  mtDebug.debugGreen('', 'ANNOUNCE', true, req.passkeyuser);
-  mtDebug.debugGreen('============= Announce request =============', 'ANNOUNCE', true, req.passkeyuser);
+  mtDebug.debugGreen('\n\n', 'ANNOUNCE', true, req.passkeyuser);
+  mtDebug.debugGreen('================================================================================', 'ANNOUNCE', true, req.passkeyuser);
+  mtDebug.debugGreen('                                  ANNOUNCE REQUEST                              ', 'ANNOUNCE', true, req.passkeyuser);
+  mtDebug.debugGreen('================================================================================', 'ANNOUNCE', true, req.passkeyuser);
   mtDebug.debugBlue(req.url, 'ANNOUNCE', true, req.passkeyuser);
 
   var s = req.url.split('?');

From 7caf321f95550af08316ef37a4b7af9b7323f441 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Tue, 15 May 2018 14:24:13 +0800
Subject: [PATCH 39/96] fix(users): continue write examination data

---
 modules/users/server/models/user.server.model.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/modules/users/server/models/user.server.model.js b/modules/users/server/models/user.server.model.js
index 8ac12dbd..d7e4babb 100644
--- a/modules/users/server/models/user.server.model.js
+++ b/modules/users/server/models/user.server.model.js
@@ -386,15 +386,13 @@ function updateOperAdminFlag(user) {
  */
 function updateExaminationData(user) {
   if (common.examinationIsValid(user)) {
-    if (!user.examinationData.isFinished) {
-      var uploadFinished = user.examinationData.uploaded >= examinationConfig.incrementData.upload;
-      var downloadFinished = user.examinationData.downloaded >= examinationConfig.incrementData.download;
-      var scoreFinished = user.examinationData.score >= examinationConfig.incrementData.score;
-      user.examinationData.isFinished = uploadFinished && downloadFinished && scoreFinished;
-      user.examinationData.finishedTime = user.examinationData.isFinished ? Date.now() : null;
+    var uploadFinished = user.examinationData.uploaded >= examinationConfig.incrementData.upload;
+    var downloadFinished = user.examinationData.downloaded >= examinationConfig.incrementData.download;
+    var scoreFinished = user.examinationData.score >= examinationConfig.incrementData.score;
+    user.examinationData.isFinished = uploadFinished && downloadFinished && scoreFinished;
+    user.examinationData.finishedTime = user.examinationData.isFinished ? Date.now() : null;
 
-      user.markModified('examinationData');
-    }
+    user.markModified('examinationData');
   }
 }
 

From bf78262ce481f370e3f5221de0989ef84fea7763 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Tue, 15 May 2018 15:37:04 +0800
Subject: [PATCH 40/96] feat(torrents): show torrent global sale status if it
 is enabled

---
 .../announces.server.controller.js            |  4 ++-
 .../torrent-list-item.client.directive.js     | 21 +++++++++++++--
 .../admin/admin-list.client.controller.js     | 21 +++++++++++++--
 .../torrent-info.client.controller.js         | 21 +++++++++++++--
 .../controllers/torrents.client.controller.js | 21 +++++++++++++--
 .../torrent-get-info.client.service.js        | 17 +++++++++++-
 .../templates/torrent-item.client.view.html   |  7 ++++-
 .../views/admin/admin-list.client.view.html   | 23 +++++++++-------
 .../views/list-torrents.client.view.html      | 23 +++++++++-------
 .../views/search-torrents.client.view.html    | 20 +++++++-------
 .../views/view-torrent.client.view.html       | 10 ++++---
 .../controllers/vip.client.controller.js      | 20 ++++++++++++--
 modules/vip/client/views/vip.client.view.html | 26 +++++++++++--------
 13 files changed, 177 insertions(+), 57 deletions(-)

diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js
index 6579b197..370ab53d 100644
--- a/modules/announce/server/controllers/announces.server.controller.js
+++ b/modules/announce/server/controllers/announces.server.controller.js
@@ -1158,13 +1158,15 @@ exports.announce = function (req, res) {
     var udr = {};
     var sale = req.torrent.torrent_sale_status;
 
-    var start = moment(globalSalesConfig.global.startAt, globalSalesConfig.global.timeFormats).utc().valueOf();
+    var start = moment(globalSalesConfig.global.startAt, globalSalesConfig.global.timeFormats).valueOf();
     var end = start + globalSalesConfig.global.expires;
     var now = Date.now();
     isGlobalSaleValid = (now > start && now < end && globalSalesConfig.global.value) ? true : false;
 
     if (isGlobalSaleValid && globalSalesConfig.global.value) {
       sale = globalSalesConfig.global.value;
+      mtDebug.debugRed('isGlobalSaleValid   = ' + isGlobalSaleValid, 'ANNOUNCE', true, req.passkeyuser);
+      mtDebug.debugRed('global sale value   = ' + sale, 'ANNOUNCE', true, req.passkeyuser);
     }
 
     switch (sale) {
diff --git a/modules/core/client/directives/torrent-list-item.client.directive.js b/modules/core/client/directives/torrent-list-item.client.directive.js
index a1074e3d..4d32f9ea 100644
--- a/modules/core/client/directives/torrent-list-item.client.directive.js
+++ b/modules/core/client/directives/torrent-list-item.client.directive.js
@@ -6,9 +6,9 @@
 
   function torrentListItem() {
     var TorrentsItemController = ['$scope', '$state', 'TorrentGetInfoServices', 'ResourcesTagsServices', '$timeout', 'DownloadService', 'MeanTorrentConfig',
-      'TorrentsService', 'Authentication', 'NotifycationService', 'ModalConfirmService', '$translate',
+      'TorrentsService', 'Authentication', 'NotifycationService', 'ModalConfirmService', '$translate', 'moment',
       function ($scope, $state, TorrentGetInfoServices, ResourcesTagsServices, $timeout, DownloadService, MeanTorrentConfig, TorrentsService, Authentication,
-                NotifycationService, ModalConfirmService, $translate) {
+                NotifycationService, ModalConfirmService, $translate, moment) {
         var vm = this;
 
         vm.user = Authentication.user;
@@ -18,6 +18,7 @@
         vm.DLS = DownloadService;
         vm.torrentSalesType = MeanTorrentConfig.meanTorrentConfig.torrentSalesType;
         vm.torrentRLevels = MeanTorrentConfig.meanTorrentConfig.torrentRecommendLevel;
+        vm.salesGlobalConfig = MeanTorrentConfig.meanTorrentConfig.torrentGlobalSales;
 
         /**
          * buildPager
@@ -311,6 +312,22 @@
           }
         };
 
+        /**
+         * isGlobalSaleNow
+         * @returns {boolean}
+         */
+        vm.isGlobalSaleNow = function () {
+          var start = moment(vm.salesGlobalConfig.global.startAt, vm.salesGlobalConfig.global.timeFormats).valueOf();
+          var end = start + vm.salesGlobalConfig.global.expires;
+          var now = Date.now();
+
+          if (now > start && now < end && vm.salesGlobalConfig.global.value) {
+            return true;
+          } else {
+            return false;
+          }
+        };
+
       }];
 
     return {
diff --git a/modules/torrents/client/controllers/admin/admin-list.client.controller.js b/modules/torrents/client/controllers/admin/admin-list.client.controller.js
index 41199f33..7d389044 100644
--- a/modules/torrents/client/controllers/admin/admin-list.client.controller.js
+++ b/modules/torrents/client/controllers/admin/admin-list.client.controller.js
@@ -7,12 +7,12 @@
 
   TorrentsAdminController.$inject = ['$scope', '$state', '$translate', '$timeout', 'Authentication', 'Notification', 'TorrentsService',
     'MeanTorrentConfig', 'DownloadService', '$window', 'ModalConfirmService', 'NotifycationService', 'DebugConsoleService', 'TorrentGetInfoServices',
-    'ResourcesTagsServices', 'localStorageService'
+    'ResourcesTagsServices', 'localStorageService', 'moment'
   ];
 
   function TorrentsAdminController($scope, $state, $translate, $timeout, Authentication, Notification, TorrentsService, MeanTorrentConfig,
                                    DownloadService, $window, ModalConfirmService, NotifycationService, mtDebug, TorrentGetInfoServices,
-                                   ResourcesTagsServices, localStorageService) {
+                                   ResourcesTagsServices, localStorageService, moment) {
     var vm = this;
     vm.DLS = DownloadService;
     vm.TGI = TorrentGetInfoServices;
@@ -23,6 +23,7 @@
     vm.torrentSalesType = MeanTorrentConfig.meanTorrentConfig.torrentSalesType;
     vm.torrentRLevels = MeanTorrentConfig.meanTorrentConfig.torrentRecommendLevel;
     vm.torrentTypeConfig = MeanTorrentConfig.meanTorrentConfig.torrentType;
+    vm.salesGlobalConfig = MeanTorrentConfig.meanTorrentConfig.torrentGlobalSales;
 
     vm.selectedType = localStorageService.get('admin_last_selected_type') || 'movie';
     vm.filterVIP = isSelectedVipType(vm.selectedType);
@@ -362,5 +363,21 @@
         i.removeClass('glyphicon-chevron-down').addClass('glyphicon-chevron-up');
       }
     };
+
+    /**
+     * isGlobalSaleNow
+     * @returns {boolean}
+     */
+    vm.isGlobalSaleNow = function () {
+      var start = moment(vm.salesGlobalConfig.global.startAt, vm.salesGlobalConfig.global.timeFormats).valueOf();
+      var end = start + vm.salesGlobalConfig.global.expires;
+      var now = Date.now();
+
+      if (now > start && now < end && vm.salesGlobalConfig.global.value) {
+        return true;
+      } else {
+        return false;
+      }
+    };
   }
 }());
diff --git a/modules/torrents/client/controllers/torrent-info.client.controller.js b/modules/torrents/client/controllers/torrent-info.client.controller.js
index 0c8cbd9d..0c910814 100644
--- a/modules/torrents/client/controllers/torrent-info.client.controller.js
+++ b/modules/torrents/client/controllers/torrent-info.client.controller.js
@@ -8,12 +8,12 @@
   TorrentsInfoController.$inject = ['$scope', '$state', '$stateParams', '$translate', 'Authentication', 'Notification', 'TorrentsService',
     'MeanTorrentConfig', 'DownloadService', '$sce', '$filter', 'CommentsService', 'ModalConfirmService', 'marked', 'Upload', '$timeout',
     'SubtitlesService', 'getStorageLangService', 'NotifycationService', 'DebugConsoleService', 'TorrentGetInfoServices',
-    'localStorageService', '$compile', 'SideOverlay', 'ResourcesTagsServices', 'CollectionsService'];
+    'localStorageService', '$compile', 'SideOverlay', 'ResourcesTagsServices', 'CollectionsService', 'moment'];
 
   function TorrentsInfoController($scope, $state, $stateParams, $translate, Authentication, Notification, TorrentsService, MeanTorrentConfig,
                                   DownloadService, $sce, $filter, CommentsService, ModalConfirmService, marked, Upload, $timeout, SubtitlesService,
                                   getStorageLangService, NotifycationService, mtDebug, TorrentGetInfoServices,
-                                  localStorageService, $compile, SideOverlay, ResourcesTagsServices, CollectionsService) {
+                                  localStorageService, $compile, SideOverlay, ResourcesTagsServices, CollectionsService, moment) {
     var vm = this;
     vm.DLS = DownloadService;
     vm.TGI = TorrentGetInfoServices;
@@ -30,6 +30,7 @@
     vm.itemsPerPageConfig = MeanTorrentConfig.meanTorrentConfig.itemsPerPage;
     vm.scoreConfig = MeanTorrentConfig.meanTorrentConfig.score;
     vm.inputLengthConfig = MeanTorrentConfig.meanTorrentConfig.inputLength;
+    vm.salesGlobalConfig = MeanTorrentConfig.meanTorrentConfig.torrentGlobalSales;
 
     vm.torrentTabs = [];
     vm.searchTags = [];
@@ -1396,5 +1397,21 @@
       });
     };
 
+    /**
+     * isGlobalSaleNow
+     * @returns {boolean}
+     */
+    vm.isGlobalSaleNow = function () {
+      var start = moment(vm.salesGlobalConfig.global.startAt, vm.salesGlobalConfig.global.timeFormats).valueOf();
+      var end = start + vm.salesGlobalConfig.global.expires;
+      var now = Date.now();
+
+      if (now > start && now < end && vm.salesGlobalConfig.global.value) {
+        return true;
+      } else {
+        return false;
+      }
+    };
+
   }
 }());
diff --git a/modules/torrents/client/controllers/torrents.client.controller.js b/modules/torrents/client/controllers/torrents.client.controller.js
index 9bf4caf9..28047b7d 100644
--- a/modules/torrents/client/controllers/torrents.client.controller.js
+++ b/modules/torrents/client/controllers/torrents.client.controller.js
@@ -6,10 +6,10 @@
     .controller('TorrentsController', TorrentsController);
 
   TorrentsController.$inject = ['$scope', '$state', '$translate', '$timeout', 'Authentication', 'Notification', 'TorrentsService', 'getStorageLangService',
-    'MeanTorrentConfig', 'DownloadService', '$window', 'DebugConsoleService', 'TorrentGetInfoServices', 'ResourcesTagsServices'];
+    'MeanTorrentConfig', 'DownloadService', '$window', 'DebugConsoleService', 'TorrentGetInfoServices', 'ResourcesTagsServices', 'moment'];
 
   function TorrentsController($scope, $state, $translate, $timeout, Authentication, Notification, TorrentsService, getStorageLangService, MeanTorrentConfig,
-                              DownloadService, $window, mtDebug, TorrentGetInfoServices, ResourcesTagsServices) {
+                              DownloadService, $window, mtDebug, TorrentGetInfoServices, ResourcesTagsServices, moment) {
     var vm = this;
     vm.DLS = DownloadService;
     vm.TGI = TorrentGetInfoServices;
@@ -22,6 +22,7 @@
     vm.itemsPerPageConfig = MeanTorrentConfig.meanTorrentConfig.itemsPerPage;
     vm.appConfig = MeanTorrentConfig.meanTorrentConfig.app;
     vm.torrentTypeConfig = MeanTorrentConfig.meanTorrentConfig.torrentType;
+    vm.salesGlobalConfig = MeanTorrentConfig.meanTorrentConfig.torrentGlobalSales;
 
     vm.searchTags = [];
     vm.searchKey = $state.params.keys || '';
@@ -479,6 +480,22 @@
       }
     };
 
+    /**
+     * isGlobalSaleNow
+     * @returns {boolean}
+     */
+    vm.isGlobalSaleNow = function () {
+      var start = moment(vm.salesGlobalConfig.global.startAt, vm.salesGlobalConfig.global.timeFormats).valueOf();
+      var end = start + vm.salesGlobalConfig.global.expires;
+      var now = Date.now();
+
+      if (now > start && now < end && vm.salesGlobalConfig.global.value) {
+        return true;
+      } else {
+        return false;
+      }
+    };
+
     /**
      * onTorrentTypeChanged
      */
diff --git a/modules/torrents/client/services/torrent-get-info.client.service.js b/modules/torrents/client/services/torrent-get-info.client.service.js
index 40fa058d..1cd6cf00 100644
--- a/modules/torrents/client/services/torrent-get-info.client.service.js
+++ b/modules/torrents/client/services/torrent-get-info.client.service.js
@@ -31,7 +31,8 @@
       getTorrentOverview: getTorrentOverview,
 
       openTorrentDetailInfo: openTorrentDetailInfo,
-      getTorrentSaleTypeDesc: getTorrentSaleTypeDesc
+      getTorrentSaleTypeDesc: getTorrentSaleTypeDesc,
+      getTorrentSaleTypeDescByValue: getTorrentSaleTypeDescByValue
     };
 
     return service;
@@ -327,5 +328,19 @@
       return desc;
     }
 
+    /**
+     * getTorrentSaleTypeDescByValue
+     */
+    function getTorrentSaleTypeDescByValue(v) {
+      var desc = '';
+
+      angular.forEach(torrentSalesType.value, function (st) {
+        if (st.name === v) {
+          desc = st.desc;
+        }
+      });
+      return desc;
+    }
+
   }
 }());
diff --git a/modules/torrents/client/templates/torrent-item.client.view.html b/modules/torrents/client/templates/torrent-item.client.view.html
index ccb994b3..11b3e900 100644
--- a/modules/torrents/client/templates/torrent-item.client.view.html
+++ b/modules/torrents/client/templates/torrent-item.client.view.html
@@ -60,12 +60,17 @@
                         {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent_recommended.toUpperCase() | translate}}
                     </span>
 
-                    <span class="label label-sale" ng-if="item.isSaling"
+                    <span class="label label-sale" ng-if="!vm.isGlobalSaleNow() && item.isSaling"
                           title="{{vm.TGI.getTorrentSaleTypeDesc(item);}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{item.torrent_sale_expires | date: 'MM-dd HH:mm'}}"
                           ng-click="vm.onSaleClicked(); $event.stopPropagation();"
                           ng-class="{'label-default': !item.isSaling, 'label-success': item.isSaling, 'used': parent.filterSale}">
                         {{item.torrent_sale_status}} {{item.torrent_sale_expires | unlife}}
                     </span>
+                    <span class="label label-sale label-success" ng-if="vm.isGlobalSaleNow()"
+                          title="{{vm.TGI.getTorrentSaleTypeDescByValue(vm.salesGlobalConfig.global.value);}}"
+                          ng-click="$event.stopPropagation();">
+                        G: {{vm.salesGlobalConfig.global.value}}
+                    </span>
 
                     <span class="label label-se-info" ng-if="vm.torrentType == 'tvserial'"
                           ng-click="$event.stopPropagation();">S{{item.torrent_seasons}}E{{item.torrent_episodes}}</span>
diff --git a/modules/torrents/client/views/admin/admin-list.client.view.html b/modules/torrents/client/views/admin/admin-list.client.view.html
index 3b935acc..5d138bd3 100644
--- a/modules/torrents/client/views/admin/admin-list.client.view.html
+++ b/modules/torrents/client/views/admin/admin-list.client.view.html
@@ -101,15 +101,17 @@
                         </div>
                     </dd>
 
-                    <dt class="h-line">{{ 'CA_TORRENT_SALE_STATUS' | translate}}:</dt>
-                    <dd class="h-line">
-                        <div class="checkbox checkbox-hnr">
-                            <label>
-                                <input type="checkbox" ng-model="vm.filterSale"
-                                       ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
-                            </label>
-                        </div>
-                    </dd>
+                    <div ng-if="!vm.isGlobalSaleNow()">
+                        <dt class="h-line">{{ 'CA_TORRENT_SALE_STATUS' | translate}}:</dt>
+                        <dd class="h-line">
+                            <div class="checkbox checkbox-hnr">
+                                <label>
+                                    <input type="checkbox" ng-model="vm.filterSale"
+                                           ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
+                                </label>
+                            </div>
+                        </dd>
+                    </div>
 
                     <dt class="h-line">{{ 'CA_TORRENT_VIP' | translate}}:</dt>
                     <dd class="h-line">
@@ -124,7 +126,8 @@
                     <dd class="h-line">
                         <div class="checkbox checkbox-vip">
                             <label>
-                                <input type="checkbox" ng-model="vm.filterTop" ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
+                                <input type="checkbox" ng-model="vm.filterTop"
+                                       ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
                             </label>
                         </div>
                     </dd>
diff --git a/modules/torrents/client/views/list-torrents.client.view.html b/modules/torrents/client/views/list-torrents.client.view.html
index 200b45f4..d5be715e 100644
--- a/modules/torrents/client/views/list-torrents.client.view.html
+++ b/modules/torrents/client/views/list-torrents.client.view.html
@@ -148,21 +148,24 @@
                         </div>
                     </dd>
 
-                    <dt class="h-line">{{ 'CA_TORRENT_SALE_STATUS' | translate}}:</dt>
-                    <dd class="h-line">
-                        <div class="checkbox checkbox-hnr">
-                            <label>
-                                <input type="checkbox" ng-model="vm.filterSale"
-                                       ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
-                            </label>
-                        </div>
-                    </dd>
+                    <div ng-if="!vm.isGlobalSaleNow()">
+                        <dt class="h-line">{{ 'CA_TORRENT_SALE_STATUS' | translate}}:</dt>
+                        <dd class="h-line">
+                            <div class="checkbox checkbox-hnr">
+                                <label>
+                                    <input type="checkbox" ng-model="vm.filterSale"
+                                           ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
+                                </label>
+                            </div>
+                        </dd>
+                    </div>
 
                     <dt class="h-line">{{ 'CA_TORRENT_TOP' | translate}}:</dt>
                     <dd class="h-line">
                         <div class="checkbox checkbox-vip">
                             <label>
-                                <input type="checkbox" ng-model="vm.filterTop" ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
+                                <input type="checkbox" ng-model="vm.filterTop"
+                                       ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
                             </label>
                         </div>
                     </dd>
diff --git a/modules/torrents/client/views/search-torrents.client.view.html b/modules/torrents/client/views/search-torrents.client.view.html
index af271cdf..0cdc2529 100644
--- a/modules/torrents/client/views/search-torrents.client.view.html
+++ b/modules/torrents/client/views/search-torrents.client.view.html
@@ -96,15 +96,17 @@
                         </div>
                     </dd>
 
-                    <dt class="h-line">{{ 'CA_TORRENT_SALE_STATUS' | translate}}:</dt>
-                    <dd class="h-line">
-                        <div class="checkbox checkbox-hnr">
-                            <label>
-                                <input type="checkbox" ng-model="vm.filterSale"
-                                       ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
-                            </label>
-                        </div>
-                    </dd>
+                    <div ng-if="vm.isGlobalSaleNow()">
+                        <dt class="h-line">{{ 'CA_TORRENT_SALE_STATUS' | translate}}:</dt>
+                        <dd class="h-line">
+                            <div class="checkbox checkbox-hnr">
+                                <label>
+                                    <input type="checkbox" ng-model="vm.filterSale"
+                                           ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
+                                </label>
+                            </div>
+                        </dd>
+                    </div>
 
                     <div class="more-tags panel-collapsed" style="display: none; margin-bottom: 20px;">
                         <div ng-repeat="item in vm.resourcesTags.radio | filter:vm.torrentType">
diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html
index c179833e..bb9ca324 100644
--- a/modules/torrents/client/views/view-torrent.client.view.html
+++ b/modules/torrents/client/views/view-torrent.client.view.html
@@ -634,14 +634,16 @@
 
                 <dt class="h-line">{{ 'VIDEO_SALE_INFO' | translate}}：</dt>
                 <dd class="h-line">
-                    <span class="label label-sale"
+                    <span class="label label-sale" ng-if="!vm.isGlobalSaleNow()"
                           title="{{vm.TGI.getTorrentSaleTypeDesc(vm.torrentLocalInfo);}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{vm.torrentLocalInfo.isSaling ? (vm.torrentLocalInfo.torrent_sale_expires | date: 'MM-dd HH:mm') : 'NO'}}"
                           ng-class="{'label-default': !vm.torrentLocalInfo.isSaling, 'label-success': vm.torrentLocalInfo.isSaling}">
                         {{vm.torrentLocalInfo.torrent_sale_status}} {{vm.torrentLocalInfo.isSaling ? (vm.torrentLocalInfo.torrent_sale_expires | unlife) : ''}}
                     </span>
-                    <!--<span ng-if="vm.torrentLocalInfo.isSaling">-->
-                    <!--[{{ 'SALE_EXPIRES_TIME' | translate}}: {{vm.torrentLocalInfo.torrent_sale_expires | unlife}}]-->
-                    <!--</span>-->
+                    <span class="label label-sale label-success" ng-if="vm.isGlobalSaleNow()"
+                          title="{{vm.TGI.getTorrentSaleTypeDescByValue(vm.salesGlobalConfig.global.value);}}"
+                          ng-click="$event.stopPropagation();">
+                        G: {{vm.salesGlobalConfig.global.value}}
+                    </span>
                 </dd>
 
                 <div ng-if="vm.torrentLocalInfo.torrent_recommended != 'level0' || vm.torrentLocalInfo.isTop">
diff --git a/modules/vip/client/controllers/vip.client.controller.js b/modules/vip/client/controllers/vip.client.controller.js
index ed9c8e31..52844388 100644
--- a/modules/vip/client/controllers/vip.client.controller.js
+++ b/modules/vip/client/controllers/vip.client.controller.js
@@ -7,11 +7,11 @@
 
   VipController.$inject = ['$scope', '$state', '$translate', 'Authentication', 'getStorageLangService', 'MeanTorrentConfig', 'TorrentsService',
     'DebugConsoleService', '$timeout', 'uibButtonConfig', 'TorrentGetInfoServices', 'DownloadService', 'ResourcesTagsServices', '$window',
-    'localStorageService', 'marked', '$templateRequest', '$filter'];
+    'localStorageService', 'marked', '$templateRequest', '$filter', 'moment'];
 
   function VipController($scope, $state, $translate, Authentication, getStorageLangService, MeanTorrentConfig, TorrentsService,
                          mtDebug, $timeout, uibButtonConfig, TorrentGetInfoServices, DownloadService, ResourcesTagsServices, $window,
-                         localStorageService, marked, $templateRequest, $filter) {
+                         localStorageService, marked, $templateRequest, $filter, moment) {
     var vm = this;
     vm.DLS = DownloadService;
     vm.TGI = TorrentGetInfoServices;
@@ -488,5 +488,21 @@
 
       return marked(ts, {sanitize: true});
     };
+
+    /**
+     * isGlobalSaleNow
+     * @returns {boolean}
+     */
+    vm.isGlobalSaleNow = function () {
+      var start = moment(vm.salesGlobalConfig.global.startAt, vm.salesGlobalConfig.global.timeFormats).valueOf();
+      var end = start + vm.salesGlobalConfig.global.expires;
+      var now = Date.now();
+
+      if (now > start && now < end && vm.salesGlobalConfig.global.value) {
+        return true;
+      } else {
+        return false;
+      }
+    };
   }
 }());
diff --git a/modules/vip/client/views/vip.client.view.html b/modules/vip/client/views/vip.client.view.html
index cfdb3579..aa7362da 100644
--- a/modules/vip/client/views/vip.client.view.html
+++ b/modules/vip/client/views/vip.client.view.html
@@ -124,21 +124,24 @@
                                     </div>
                                 </dd>
 
-                                <dt class="h-line">{{ 'CA_TORRENT_SALE_STATUS' | translate}}:</dt>
-                                <dd class="h-line">
-                                    <div class="checkbox checkbox-hnr">
-                                        <label>
-                                            <input type="checkbox" ng-model="vm.filterSale"
-                                                   ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
-                                        </label>
-                                    </div>
-                                </dd>
+                                <div ng-if="!vm.isGlobalSaleNow()">
+                                    <dt class="h-line">{{ 'CA_TORRENT_SALE_STATUS' | translate}}:</dt>
+                                    <dd class="h-line">
+                                        <div class="checkbox checkbox-hnr">
+                                            <label>
+                                                <input type="checkbox" ng-model="vm.filterSale"
+                                                       ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
+                                            </label>
+                                        </div>
+                                    </dd>
+                                </div>
 
                                 <dt class="h-line">{{ 'CA_TORRENT_TOP' | translate}}:</dt>
                                 <dd class="h-line">
                                     <div class="checkbox checkbox-vip">
                                         <label>
-                                            <input type="checkbox" ng-model="vm.filterTop" ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
+                                            <input type="checkbox" ng-model="vm.filterTop"
+                                                   ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
                                         </label>
                                     </div>
                                 </dd>
@@ -251,7 +254,8 @@
                                 </td>
                             </tr>
                         </tbody>
-                        <tbody ng-if="!vm.tooltipMsg" torrent-list-item parent="vm" item="item" list="vm.pagedItems" ng-repeat="item in vm.pagedItems"></tbody>
+                        <tbody ng-if="!vm.tooltipMsg" torrent-list-item parent="vm" item="item" list="vm.pagedItems"
+                               ng-repeat="item in vm.pagedItems"></tbody>
                     </table>
                 </div>
 

From 3e0c0ccd7dbddcd10c63e101d26db9749729a790 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Tue, 15 May 2018 21:22:59 +0800
Subject: [PATCH 41/96] feat(check in): new feather of check in daily

---
 .../client/services/check.client.service.js   |  24 ++++
 .../controllers/check.server.controller.js    | 110 ++++++++++++++++++
 .../server/routes/check.server.routes.js      |   8 ++
 modules/core/client/app/trans-string-en.js    |  12 +-
 modules/core/client/app/trans-string-zh.js    |  12 +-
 .../controllers/home.client.controller.js     |  91 ++++++++++++++-
 modules/core/client/less/home.less            |  47 ++++++--
 .../core/client/views/home.client.view.html   |  40 +++++++
 8 files changed, 327 insertions(+), 17 deletions(-)
 create mode 100644 modules/check/client/services/check.client.service.js
 create mode 100644 modules/check/server/controllers/check.server.controller.js
 create mode 100644 modules/check/server/routes/check.server.routes.js

diff --git a/modules/check/client/services/check.client.service.js b/modules/check/client/services/check.client.service.js
new file mode 100644
index 00000000..b4577736
--- /dev/null
+++ b/modules/check/client/services/check.client.service.js
@@ -0,0 +1,24 @@
+(function () {
+  'use strict';
+
+  // Users service used for communicating with the users REST endpoint
+  angular
+    .module('check.services')
+    .factory('CheckService', CheckService);
+
+  CheckService.$inject = ['$resource'];
+
+  function CheckService($resource) {
+    var Check = $resource('/api/check', {}, {
+      get: {
+        method: 'GET'
+      },
+      update: {
+        method: 'PUT'
+      }
+    });
+
+    return Check;
+  }
+
+}());
diff --git a/modules/check/server/controllers/check.server.controller.js b/modules/check/server/controllers/check.server.controller.js
new file mode 100644
index 00000000..8d40f850
--- /dev/null
+++ b/modules/check/server/controllers/check.server.controller.js
@@ -0,0 +1,110 @@
+'use strict';
+
+/**
+ * Module dependencies
+ */
+var path = require('path'),
+  config = require(path.resolve('./config/config')),
+  mongoose = require('mongoose'),
+  errorHandler = require(path.resolve('./modules/core/server/controllers/errors.server.controller')),
+  moment = require('moment'),
+  User = mongoose.model('User'),
+  Check = mongoose.model('Check'),
+  scoreUpdate = require(path.resolve('./config/lib/score')).update;
+
+var mtDebug = require(path.resolve('./config/lib/debug'));
+var scoreConfig = config.meanTorrentConfig.score;
+
+/**
+ * Show the current collection
+ */
+exports.get = function (req, res) {
+  if (!req.user) {
+    return res.status(403).json({
+      message: 'SERVER.USER_IS_NOT_AUTHORIZED'
+    });
+  } else {
+    Check.findOne({user: req.user._id}, function (err, ck) {
+      if (err) {
+        return res.status(422).send({
+          message: errorHandler.getErrorMessage(err)
+        });
+      } else {
+        if (!ck) {
+          return res.status(422).send({
+            message: 'no check data founded'
+          });
+        } else {
+          var oldCheckDate = moment(moment(ck.lastCheckedAt).format('YYYY-MM-DD'));
+          var now = moment(moment().format('YYYY-MM-DD'));
+          var diff = now.diff(oldCheckDate, 'days');
+
+          var nck = ck.toJSON();
+          nck.todayIsDone = (diff === 0 ? true : false);
+          res.json(nck);
+        }
+      }
+    });
+  }
+
+};
+
+/**
+ * Update an collection
+ */
+exports.check = function (req, res) {
+  if (!req.user) {
+    return res.status(403).json({
+      message: 'SERVER.USER_IS_NOT_AUTHORIZED'
+    });
+  } else {
+    var score = 0;
+    Check.findOne({user: req.user._id}, function (err, ck) {
+      if (!ck) {
+        ck = new Check();
+        ck.user = req.user._id;
+        ck.keepDays = 1;
+        ck.save();
+
+        score = scoreConfig.action.dailyCheckIn.dailyBasicScore + (ck.keepDays - 1) * scoreConfig.action.dailyCheckIn.dailyStepScore;
+        scoreUpdate(req, req.user, scoreConfig.action.dailyCheckIn, score);
+
+        ck = ck.toJSON();
+        ck.todayIsDone = true;
+        res.json(ck);
+      } else {
+        var oldCheckDate = moment(moment(ck.lastCheckedAt).format('YYYY-MM-DD'));
+        var now = moment(moment().format('YYYY-MM-DD'));
+        var diff = now.diff(oldCheckDate, 'days');
+
+        if (diff === 0) {
+          return res.status(422).json({
+            message: 'SERVER.YOU_ALREADY_CHECK_IN'
+          });
+        } else if (diff === 1) {
+          ck.keepDays += 1;
+          ck.lastCheckedAt = Date.now();
+          ck.save();
+
+          score = scoreConfig.action.dailyCheckIn.dailyBasicScore + (ck.keepDays - 1) * scoreConfig.action.dailyCheckIn.dailyStepScore;
+          scoreUpdate(req, req.user, scoreConfig.action.dailyCheckIn, score);
+
+          ck = ck.toJSON();
+          ck.todayIsDone = true;
+          res.json(ck);
+        } else {
+          ck.keepDays = 1;
+          ck.lastCheckedAt = Date.now();
+          ck.save();
+
+          score = scoreConfig.action.dailyCheckIn.dailyBasicScore + (ck.keepDays - 1) * scoreConfig.action.dailyCheckIn.dailyStepScore;
+          scoreUpdate(req, req.user, scoreConfig.action.dailyCheckIn, score);
+
+          ck = ck.toJSON();
+          ck.todayIsDone = true;
+          res.json(ck);
+        }
+      }
+    });
+  }
+};
diff --git a/modules/check/server/routes/check.server.routes.js b/modules/check/server/routes/check.server.routes.js
new file mode 100644
index 00000000..05691f65
--- /dev/null
+++ b/modules/check/server/routes/check.server.routes.js
@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = function (app) {
+  var check = require('../controllers/check.server.controller');
+
+  app.route('/api/check').get(check.get);
+  app.route('/api/check').put(check.check);
+};
diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index c7135234..5231748f 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -132,6 +132,15 @@
       }
     },
 
+    CHECK: {
+      BTN_CHECK_IN: 'Check In',
+      CHECK_TOOLTIP: '#### `mine.pt` invites you to participate in the daily check in. Now check in to get `{{todayScore}}` scores and renew tomorrow to get `{{tomorrowScore}}` scores!',
+      CHECK_TODAY_NOT: '#### You have not checked in yet. Last check in at: `{{checkTime | date: "yyyy-MM-dd HH:mm"}}`. Now check in to get `{{todayScore}}` scores and renew tomorrow to get `{{tomorrowScore}}` scores!',
+      CHECK_TODAY_DONE: '#### You have checked in to `{{keepDays}}` days in a row, today check in at: `{{checkTime | date: "yyyy-MM-dd HH:mm"}}`, you have got `{{todayScore}}` scores and renew tomorrow to get `{{tomorrowScore}}` scores, please be careful not to interrupt!',
+      CHECK_SUCCESSFULLY: 'Check in successfully',
+      CHECK_ERROR: 'Check in failed'
+    },
+
     //element title/alt
     TITLE_ALT: {
       SEEDS: 'Seeds users',
@@ -1609,7 +1618,8 @@
       INFO_HASH_ALREADY_EXISTS: 'This info hash value is already exists',
       UPLOAD_ACCESS_DENY: 'System only accepts resources group to upload torrents',
       READ_TORRENT_FILE_FAILD: 'The torrent file parsing error. Please check your torrent file to check if some of the necessary information is missing',
-      MOVE_TORRENT_FILE_ERROR: 'The torrent file was moved incorrectly. Please do not repeat the submit operation quickly or the uploaded torrent file is missing.'
+      MOVE_TORRENT_FILE_ERROR: 'The torrent file was moved incorrectly. Please do not repeat the submit operation quickly or the uploaded torrent file is missing.',
+      YOU_ALREADY_CHECK_IN: 'You already checked in today'
     },
 
     //server message string, content string support markdown and emoji
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index e9516cc3..7f69660c 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -132,6 +132,15 @@
       }
     },
 
+    CHECK: {
+      BTN_CHECK_IN: '我要签到',
+      CHECK_TOOLTIP: '#### `mine.pt` 邀请您参加每日签到，现在签到可获得 `{{todayScore}}` 积分，明日续签可获得 `{{tomorrowScore}}` 积分哦！',
+      CHECK_TODAY_NOT: '#### 您今日还未签到，上次签到：`{{checkTime | date: "yyyy-MM-dd HH:mm"}}`，现在签到可获得 `{{todayScore}}` 积分，明日续签到可获得 `{{tomorrowScore}}` 积分哦！',
+      CHECK_TODAY_DONE: '#### 您已连续签到 `{{keepDays}}` 天，今日签到时间：`{{checkTime | date: "yyyy-MM-dd HH:mm"}}`，已经获得 `{{todayScore}}` 积分，明日续签到可获得 `{{tomorrowScore}}` 积分，请注意不要中断哦!',
+      CHECK_SUCCESSFULLY: '签到成功',
+      CHECK_ERROR: '签到失败'
+    },
+
     //element title/alt
     TITLE_ALT: {
       SEEDS: '做种用户数',
@@ -1609,7 +1618,8 @@
       INFO_HASH_ALREADY_EXISTS: '该 info hash 值已经存在，不能重复提交',
       UPLOAD_ACCESS_DENY: '当前系统只接受资源制作小组上传种子',
       READ_TORRENT_FILE_FAILD: '种子文件解析错误，请检查您的种子文件，看是否缺少某些必要信息',
-      MOVE_TORRENT_FILE_ERROR: '种子文件移动错误，请不要快速重复进行提交操作或者上传的种子文件已丢失'
+      MOVE_TORRENT_FILE_ERROR: '种子文件移动错误，请不要快速重复进行提交操作或者上传的种子文件已丢失',
+      YOU_ALREADY_CHECK_IN: '您今天已经签过到了，不能重复签到'
     },
 
     //server message string, content string support markdown and emoji
diff --git a/modules/core/client/controllers/home.client.controller.js b/modules/core/client/controllers/home.client.controller.js
index 5981f1bf..1b89df85 100644
--- a/modules/core/client/controllers/home.client.controller.js
+++ b/modules/core/client/controllers/home.client.controller.js
@@ -5,13 +5,13 @@
     .module('core')
     .controller('HomeController', HomeController);
 
-  HomeController.$inject = ['$scope', '$state', '$translate', 'Authentication', 'TorrentsService', 'Notification', 'MeanTorrentConfig',
+  HomeController.$inject = ['$scope', '$state', '$translate', 'Authentication', 'TorrentsService', 'NotifycationService', 'MeanTorrentConfig',
     'getStorageLangService', 'ForumsService', '$timeout', 'localStorageService', 'TopicsService', 'TorrentGetInfoServices', 'DebugConsoleService',
-    'marked'];
+    'marked', 'CheckService'];
 
-  function HomeController($scope, $state, $translate, Authentication, TorrentsService, Notification, MeanTorrentConfig, getStorageLangService,
+  function HomeController($scope, $state, $translate, Authentication, TorrentsService, NotifycationService, MeanTorrentConfig, getStorageLangService,
                           ForumsService, $timeout, localStorageService, TopicsService, TorrentGetInfoServices, mtDebug,
-                          marked) {
+                          marked, CheckService) {
     var vm = this;
     vm.user = Authentication.user;
     vm.appConfig = MeanTorrentConfig.meanTorrentConfig.app;
@@ -23,8 +23,10 @@
     vm.announceConfig = MeanTorrentConfig.meanTorrentConfig.announce;
     vm.homeConfig = MeanTorrentConfig.meanTorrentConfig.home;
     vm.supportConfig = MeanTorrentConfig.meanTorrentConfig.support;
+    vm.scoreConfig = MeanTorrentConfig.meanTorrentConfig.score;
 
     vm.searchType = 'torrents';
+    vm.checkData = undefined;
 
     /**
      * initBodyBackground
@@ -323,5 +325,86 @@
       return marked(ts, {sanitize: true});
     };
 
+    /**
+     * getMyCheckData
+     */
+    vm.getMyCheckData = function () {
+      CheckService.get(function (res) {
+        mtDebug.info(res);
+        vm.checkData = res;
+        vm.openCheckTooltip();
+      }, function (err) {
+        vm.checkData = false;
+        vm.openCheckTooltip();
+      });
+    };
+
+    /**
+     * checkIn
+     */
+    vm.checkIn = function () {
+      CheckService.update(function (res) {
+        mtDebug.info(res);
+        vm.checkData = res;
+        NotifycationService.showSuccessNotify('CHECK.CHECK_SUCCESSFULLY');
+      }, function (err) {
+        NotifycationService.showErrorNotify(err.data.message, 'CHECK.CHECK_ERROR');
+      });
+    };
+
+    /**
+     * getCheckTodayDoneMessage
+     * @returns {*}
+     */
+    vm.getCheckTodayDoneMessage = function () {
+      var ts = $translate.instant('CHECK.CHECK_TODAY_DONE', {
+        keepDays: vm.checkData.keepDays,
+        checkTime: vm.checkData.lastCheckedAt,
+        todayScore: vm.scoreConfig.action.dailyCheckIn.dailyBasicScore + (vm.checkData.keepDays - 1) * vm.scoreConfig.action.dailyCheckIn.dailyStepScore,
+        tomorrowScore: vm.scoreConfig.action.dailyCheckIn.dailyBasicScore + vm.checkData.keepDays * vm.scoreConfig.action.dailyCheckIn.dailyStepScore
+      });
+
+      return marked(ts, {sanitize: false});
+    };
+
+    /**
+     * getCheckTodayNotMessage
+     * @returns {*}
+     */
+    vm.getCheckTodayNotMessage = function () {
+      var ts = $translate.instant('CHECK.CHECK_TODAY_NOT', {
+        checkTime: vm.checkData.lastCheckedAt,
+        todayScore: vm.scoreConfig.action.dailyCheckIn.dailyBasicScore + vm.checkData.keepDays * vm.scoreConfig.action.dailyCheckIn.dailyStepScore,
+        tomorrowScore: vm.scoreConfig.action.dailyCheckIn.dailyBasicScore + (vm.checkData.keepDays + 1) * vm.scoreConfig.action.dailyCheckIn.dailyStepScore
+      });
+
+      return marked(ts, {sanitize: false});
+    };
+
+    /**
+     * getCheckTooltipMessage
+     * @returns {*}
+     */
+    vm.getCheckTooltipMessage = function () {
+      var ts = $translate.instant('CHECK.CHECK_TOOLTIP', {
+        todayScore: vm.scoreConfig.action.dailyCheckIn.dailyBasicScore,
+        tomorrowScore: vm.scoreConfig.action.dailyCheckIn.dailyBasicScore + vm.scoreConfig.action.dailyCheckIn.dailyStepScore
+      });
+
+      return marked(ts, {sanitize: false});
+    };
+
+    /**
+     * openCheckTooltip
+     */
+    vm.openCheckTooltip = function () {
+      var e = $('.home-check-in');
+
+      $timeout(function () {
+        e.slideDown(800);
+        e.removeClass('panel-collapsed');
+      }, 1000);
+    };
+
   }
 }());
diff --git a/modules/core/client/less/home.less b/modules/core/client/less/home.less
index 1fa413c0..bdac4200 100644
--- a/modules/core/client/less/home.less
+++ b/modules/core/client/less/home.less
@@ -113,6 +113,30 @@
     }
 }
 
+.col-valign-middle {
+    @media (min-width: @screen-sm-min) {
+        display: table-cell;
+        vertical-align: middle;
+        float: none;
+    }
+}
+
+.home-check-in {
+    padding: 10px 0;
+    h4, .h4 {
+        line-height: 1.8;
+    }
+    .check-in-btn {
+        margin-top: 10px;
+        @media(max-width: @screen-sm-max){
+            margin-top: 20px;
+        }
+        @media(max-width: @screen-xs-max){
+            margin-top: 15px;
+        }
+    }
+}
+
 .home-button-list {
     padding: 50px 0;
     @media (max-width: @screen-xs-max) {
@@ -316,6 +340,18 @@
     }
 }
 
+.filter-check-in {
+    position: relative;
+    margin-top: 2px;
+    background-color: @mt-body-background-color;
+    background-color: rgba(255, 255, 255, .85);
+    transition: background-color .2s ease-in;
+    &:hover {
+        background-color: @mt-body-background-color;
+        background-color: rgba(255, 255, 255, .95);
+    }
+}
+
 .filter-copy {
     position: relative;
     line-height: 2;
@@ -449,17 +485,6 @@
     }
 }
 
-.home-check-in {
-    background-color: #2a2a2a;
-    background-color: rgba(0,0,0, 0.5);
-    .check-in-title {
-        color: #fff;
-        font-size: 2em;
-        font-weight: 400;
-        margin-bottom: 0 !important;
-    }
-}
-
 .view-footer {
     color: #aaa;
     font-size: 12px;
diff --git a/modules/core/client/views/home.client.view.html b/modules/core/client/views/home.client.view.html
index 4df018de..4f03eda5 100644
--- a/modules/core/client/views/home.client.view.html
+++ b/modules/core/client/views/home.client.view.html
@@ -75,6 +75,46 @@
             </div>
         </div>
 
+        <div class="home-check-in filter-check-in panel-collapsed" ng-init="vm.getMyCheckData()" style="display: none;">
+            <div class="container">
+                <div class="row">
+                    <div class="col-md-12" ng-if="vm.checkData != undefined">
+                        <div ng-if="vm.checkData == false ">
+                            <div class="row text-center">
+                                <div class="col-sm-10">
+                                    <span ng-bind-html="vm.getCheckTooltipMessage()"></span>
+                                </div>
+                                <div class="col-sm-2">
+                                    <button class="btn btn-success btn-block check-in-btn"
+                                            ng-click="vm.checkIn()">{{'CHECK.BTN_CHECK_IN' | translate}}
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                        <div ng-if="vm.checkData && !vm.checkData.todayIsDone">
+                            <div class="row text-center">
+                                <div class="col-sm-10">
+                                    <span ng-bind-html="vm.getCheckTodayNotMessage()"></span>
+                                </div>
+                                <div class="col-sm-2">
+                                    <button class="btn btn-success btn-block check-in-btn"
+                                            ng-click="vm.checkIn()">{{'CHECK.BTN_CHECK_IN' | translate}}
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                        <div ng-if="vm.checkData && vm.checkData.todayIsDone">
+                            <div class="row">
+                                <div class="col-sm-12 text-center">
+                                    <span ng-bind-html="vm.getCheckTodayDoneMessage()"></span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
         <div class="filter-notice">
             <div class="container">
                 <div class="row">

From 21e6929d2b6af87f6a10be68104ba0f0e31f956c Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Tue, 15 May 2018 21:33:08 +0800
Subject: [PATCH 42/96] doc(readme): update readme.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index fe9c2263..dfeda443 100644
--- a/README.md
+++ b/README.md
@@ -121,6 +121,7 @@ and [AngularJS](http://angularjs.org/) based applications.
 56. An examination tasks system to check user`s incremental uploaded, download and score value within a specified period of time, if the value failed to reach the standard, admin can banned them.
 57. Add email white list, user can not to receive invite mail and active mail if the email domain not in the list.
 58. Add [angular-cache](https://github.com/jmdobry/angular-cache) support, to cache all data from $resource GET method, and update these data when $resource POST|PUT|DELETE method.
+59. Daily check in function, continuous check-in to get more points.
 
 #### Chat room feature:
 1. Users name list

From 4185c572d75eb9ecc9ef074c5dd4aace9349a9cc Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Wed, 16 May 2018 10:12:29 +0800
Subject: [PATCH 43/96] feat(check): add check in score max value checked

---
 .../server/controllers/check.server.controller.js     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/check/server/controllers/check.server.controller.js b/modules/check/server/controllers/check.server.controller.js
index 8d40f850..99465d70 100644
--- a/modules/check/server/controllers/check.server.controller.js
+++ b/modules/check/server/controllers/check.server.controller.js
@@ -35,8 +35,8 @@ exports.get = function (req, res) {
             message: 'no check data founded'
           });
         } else {
-          var oldCheckDate = moment(moment(ck.lastCheckedAt).format('YYYY-MM-DD'));
-          var now = moment(moment().format('YYYY-MM-DD'));
+          var oldCheckDate = moment(moment(ck.lastCheckedAt).utcOffset(appConfig.dbTimeZone).format('YYYY-MM-DD'));
+          var now = moment(moment().utcOffset(appConfig.dbTimeZone).format('YYYY-MM-DD'));
           var diff = now.diff(oldCheckDate, 'days');
 
           var nck = ck.toJSON();
@@ -67,14 +67,15 @@ exports.check = function (req, res) {
         ck.save();
 
         score = scoreConfig.action.dailyCheckIn.dailyBasicScore + (ck.keepDays - 1) * scoreConfig.action.dailyCheckIn.dailyStepScore;
+        score = Math.min(score, scoreConfig.action.dailyCheckIn.dailyMaxScore);
         scoreUpdate(req, req.user, scoreConfig.action.dailyCheckIn, score);
 
         ck = ck.toJSON();
         ck.todayIsDone = true;
         res.json(ck);
       } else {
-        var oldCheckDate = moment(moment(ck.lastCheckedAt).format('YYYY-MM-DD'));
-        var now = moment(moment().format('YYYY-MM-DD'));
+        var oldCheckDate = moment(moment(ck.lastCheckedAt).utcOffset(appConfig.dbTimeZone).format('YYYY-MM-DD'));
+        var now = moment(moment().utcOffset(appConfig.dbTimeZone).format('YYYY-MM-DD'));
         var diff = now.diff(oldCheckDate, 'days');
 
         if (diff === 0) {
@@ -87,6 +88,7 @@ exports.check = function (req, res) {
           ck.save();
 
           score = scoreConfig.action.dailyCheckIn.dailyBasicScore + (ck.keepDays - 1) * scoreConfig.action.dailyCheckIn.dailyStepScore;
+          score = Math.min(score, scoreConfig.action.dailyCheckIn.dailyMaxScore);
           scoreUpdate(req, req.user, scoreConfig.action.dailyCheckIn, score);
 
           ck = ck.toJSON();
@@ -98,6 +100,7 @@ exports.check = function (req, res) {
           ck.save();
 
           score = scoreConfig.action.dailyCheckIn.dailyBasicScore + (ck.keepDays - 1) * scoreConfig.action.dailyCheckIn.dailyStepScore;
+          score = Math.min(score, scoreConfig.action.dailyCheckIn.dailyMaxScore);
           scoreUpdate(req, req.user, scoreConfig.action.dailyCheckIn, score);
 
           ck = ck.toJSON();

From f066551309de89462b0a3029439fdf8e1e30537d Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Wed, 16 May 2018 10:16:55 +0800
Subject: [PATCH 44/96] fix(check): fixed check in issue

---
 modules/check/server/controllers/check.server.controller.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/check/server/controllers/check.server.controller.js b/modules/check/server/controllers/check.server.controller.js
index 99465d70..92d93843 100644
--- a/modules/check/server/controllers/check.server.controller.js
+++ b/modules/check/server/controllers/check.server.controller.js
@@ -14,6 +14,7 @@ var path = require('path'),
 
 var mtDebug = require(path.resolve('./config/lib/debug'));
 var scoreConfig = config.meanTorrentConfig.score;
+var appConfig = config.meanTorrentConfig.app;
 
 /**
  * Show the current collection

From 54006f24b2c03a59320529a2b1143c980a433ed0 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Wed, 16 May 2018 10:29:42 +0800
Subject: [PATCH 45/96] fix(check): fixed check in css

---
 .../client/controllers/home.client.controller.js | 16 ++++++++--------
 modules/core/client/less/home.less               |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/core/client/controllers/home.client.controller.js b/modules/core/client/controllers/home.client.controller.js
index 1b89df85..476b0d2f 100644
--- a/modules/core/client/controllers/home.client.controller.js
+++ b/modules/core/client/controllers/home.client.controller.js
@@ -148,9 +148,9 @@
       var e = $('.sales_notice');
 
       $timeout(function () {
-        e.slideDown(800);
+        e.slideDown(500);
         e.removeClass('panel-collapsed');
-      }, 1000);
+      }, 300);
     };
 
     /**
@@ -197,9 +197,9 @@
       var e = $('.examination_notice');
 
       $timeout(function () {
-        e.slideDown(800);
+        e.slideDown(500);
         e.removeClass('panel-collapsed');
-      }, 1000);
+      }, 300);
     };
 
     /**
@@ -249,9 +249,9 @@
       var e = $('.examination_status');
 
       $timeout(function () {
-        e.slideDown(800);
+        e.slideDown(500);
         e.removeClass('panel-collapsed');
-      }, 1000);
+      }, 300);
     };
 
     /**
@@ -401,9 +401,9 @@
       var e = $('.home-check-in');
 
       $timeout(function () {
-        e.slideDown(800);
+        e.slideDown(500);
         e.removeClass('panel-collapsed');
-      }, 1000);
+      }, 300);
     };
 
   }
diff --git a/modules/core/client/less/home.less b/modules/core/client/less/home.less
index bdac4200..0a33e165 100644
--- a/modules/core/client/less/home.less
+++ b/modules/core/client/less/home.less
@@ -122,6 +122,7 @@
 }
 
 .home-check-in {
+    color: @mt-base-color;
     padding: 10px 0;
     h4, .h4 {
         line-height: 1.8;

From 44e664ecac0e290450cf0c7ad5c796d49f97de67 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Wed, 16 May 2018 15:39:07 +0800
Subject: [PATCH 46/96] feat(core): menu bar popup when hover

---
 .../client/controllers/header.client.controller.js | 11 +++++++++++
 modules/core/client/views/header.client.view.html  | 14 +++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/modules/core/client/controllers/header.client.controller.js b/modules/core/client/controllers/header.client.controller.js
index 4c1911df..22a34839 100644
--- a/modules/core/client/controllers/header.client.controller.js
+++ b/modules/core/client/controllers/header.client.controller.js
@@ -45,6 +45,17 @@
           $('.popup_wrapper').remove();
         }
       });
+
+      //set menu bar opened when hover
+      $('div.navbar-mt ul.nav li.dropdown').hover(function () {
+        if (!$(this).hasClass('open')) {
+          $(this).find('.dropdown-toggle', this).trigger('click');
+        }
+      }, function () {
+        if ($(this).hasClass('open')) {
+          $(this).find('.dropdown-toggle', this).trigger('click');
+        }
+      });
     });
 
     /**
diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html
index 273326ac..98dfd8f3 100644
--- a/modules/core/client/views/header.client.view.html
+++ b/modules/core/client/views/header.client.view.html
@@ -30,7 +30,7 @@
                 <a ng-switch-default ui-sref="{{item.state}}" ng-bind="item.title" mt-target="{{item.target}}" menu-title="{{item.title}}"></a>
             </li>
         </ul>
-        <ul class="nav navbar-nav navbar-right" ng-hide="vm.authentication.user">
+        <ul class="nav navbar-nav navbar-right" ng-if="!vm.authentication.user">
             <li ui-sref-active="active">
                 <a ui-sref="authentication.signup">{{'SIGNUP' | translate}}</a>
             </li>
@@ -39,13 +39,13 @@
                 <a ui-sref="authentication.signin">{{'SIGNIN' | translate}}</a>
             </li>
         </ul>
-        <ul class="nav navbar-nav navbar-right" ng-show="vm.authentication.user">
+        <ul class="nav navbar-nav navbar-right" ng-if="vm.authentication.user">
             <li class="scroll-info xs-hide sm-hide" ui-sref="status.account" ng-if="vm.authentication.user">
-        <span>
-            {{'TABLE_FIELDS.RATIO' | translate}}: {{vm.authentication.user.ratio | ratio}},　
-            {{'TABLE_FIELDS.LEVEL' | translate}}: {{vm.scoreLevelData.currLevel}},　
-            {{'TABLE_FIELDS.SEEDED' | translate}}: {{vm.authentication.user.seeded}},　
-            {{'TABLE_FIELDS.LEECHED' | translate}}: {{vm.authentication.user.leeched}}</span>
+                <span>
+                    {{'TABLE_FIELDS.RATIO' | translate}}: {{vm.authentication.user.ratio | ratio}},　
+                    {{'TABLE_FIELDS.LEVEL' | translate}}: {{vm.scoreLevelData.currLevel}},　
+                    {{'TABLE_FIELDS.SEEDED' | translate}}: {{vm.authentication.user.seeded}},　
+                    {{'TABLE_FIELDS.LEECHED' | translate}}: {{vm.authentication.user.leeched}}</span>
             </li>
             <li class="dropdown" uib-dropdown>
                 <a class="dropdown-toggle user-header-dropdown-toggle" uib-dropdown-toggle role="button">

From b95cc5d7f0ab7fead6512bdb88b7ff2178e9dcfd Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Wed, 16 May 2018 16:43:44 +0800
Subject: [PATCH 47/96] feat(core): dropdown menu item default event

---
 .../client/controllers/header.client.controller.js     | 10 ++++++++--
 modules/core/client/services/menu.client.service.js    |  6 ++++--
 modules/core/client/views/header.client.view.html      |  4 ++--
 .../torrents/client/config/torrents.client.menus.js    |  1 +
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/modules/core/client/controllers/header.client.controller.js b/modules/core/client/controllers/header.client.controller.js
index 22a34839..8baba03d 100644
--- a/modules/core/client/controllers/header.client.controller.js
+++ b/modules/core/client/controllers/header.client.controller.js
@@ -47,11 +47,17 @@
       });
 
       //set menu bar opened when hover
-      $('div.navbar-mt ul.nav li.dropdown').hover(function () {
+      $('div.navbar-mt ul.nav li.dropdown').hover(function (evt) {
         if (!$(this).hasClass('open')) {
           $(this).find('.dropdown-toggle', this).trigger('click');
+          $(this).bind('click', function (e) {
+            var sta = $(this).find('.dropdown-toggle', this).attr('alt');
+            if (sta)
+              $state.go(sta);
+          });
         }
-      }, function () {
+      }, function (evt) {
+        $(this).unbind('click');
         if ($(this).hasClass('open')) {
           $(this).find('.dropdown-toggle', this).trigger('click');
         }
diff --git a/modules/core/client/services/menu.client.service.js b/modules/core/client/services/menu.client.service.js
index 20f90d72..f0419915 100644
--- a/modules/core/client/services/menu.client.service.js
+++ b/modules/core/client/services/menu.client.service.js
@@ -61,7 +61,8 @@
         target: options.target || undefined,
         divider: options.divider || false,
         faClass: options.faClass || null,
-        faIcon: options.faIcon || null
+        faIcon: options.faIcon || null,
+        linkState: options.linkState || undefined
       });
 
       // Add submenu items
@@ -96,7 +97,8 @@
           target: options.target || undefined,
           divider: options.divider || false,
           faClass: options.faClass || null,
-          faIcon: options.faIcon || null
+          faIcon: options.faIcon || null,
+          linkState: options.linkState || undefined
         });
       });
 
diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html
index 98dfd8f3..fa8d5141 100644
--- a/modules/core/client/views/header.client.view.html
+++ b/modules/core/client/views/header.client.view.html
@@ -15,7 +15,7 @@
             <li ng-repeat="item in vm.menu.items | orderBy: 'position'" ng-if="item.shouldRender(vm.authentication.user);" ng-switch="item.type"
                 ng-class="{ dropdown: item.type === 'dropdown' }" ui-sref-active="active" class="{{item.class}}"
                 uib-dropdown="item.type === 'dropdown'">
-                <a ng-switch-when="dropdown" class="dropdown-toggle" uib-dropdown-toggle role="button"><span
+                <a ng-switch-when="dropdown" class="dropdown-toggle" uib-dropdown-toggle role="button" alt="{{item.linkState}}"><span
                         menu-title="{{item.title}}">{{::item.title}}</span>&nbsp;<span class="caret"></span></a>
                 <ul ng-switch-when="dropdown" class="dropdown-menu">
                     <li ui-sref-active="active" ng-repeat="subitem in item.items | orderBy: 'position'"
@@ -48,7 +48,7 @@
                     {{'TABLE_FIELDS.LEECHED' | translate}}: {{vm.authentication.user.leeched}}</span>
             </li>
             <li class="dropdown" uib-dropdown>
-                <a class="dropdown-toggle user-header-dropdown-toggle" uib-dropdown-toggle role="button">
+                <a class="dropdown-toggle user-header-dropdown-toggle" uib-dropdown-toggle role="button" alt="status.account">
                     <img ng-src="{{vm.authentication.user.profileImageURL}}" alt="{{vm.authentication.user.displayName}}"
                          class="header-profile-image"/>
                     <span class="sm-hide" ng-bind="vm.authentication.user.displayName"></span> <b class="caret"></b>
diff --git a/modules/torrents/client/config/torrents.client.menus.js b/modules/torrents/client/config/torrents.client.menus.js
index 72715653..45ffb93c 100644
--- a/modules/torrents/client/config/torrents.client.menus.js
+++ b/modules/torrents/client/config/torrents.client.menus.js
@@ -13,6 +13,7 @@
     menuService.addMenuItem('topbar', {
       title: 'MENU_TORRENTS',
       state: 'torrents',
+      linkState: 'torrents.aggregate',
       type: 'dropdown',
       roles: ['*'],
       position: 0

From 5c3efce9cd2cb45d9edc3b24a824570caffe9b11 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Wed, 16 May 2018 16:45:53 +0800
Subject: [PATCH 48/96] fix(check): fixed check in css

---
 modules/core/client/less/home.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/core/client/less/home.less b/modules/core/client/less/home.less
index 0a33e165..bdac4200 100644
--- a/modules/core/client/less/home.less
+++ b/modules/core/client/less/home.less
@@ -122,7 +122,6 @@
 }
 
 .home-check-in {
-    color: @mt-base-color;
     padding: 10px 0;
     h4, .h4 {
         line-height: 1.8;

From b9a4d8f56a5c978eb45cc5822f4f14fb34e734df Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Wed, 16 May 2018 16:52:35 +0800
Subject: [PATCH 49/96] fix(torrents): fixed torrent review in detail page
 issue

---
 .../client/controllers/torrent-info.client.controller.js     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/torrents/client/controllers/torrent-info.client.controller.js b/modules/torrents/client/controllers/torrent-info.client.controller.js
index 0c910814..ce1d9006 100644
--- a/modules/torrents/client/controllers/torrent-info.client.controller.js
+++ b/modules/torrents/client/controllers/torrent-info.client.controller.js
@@ -152,8 +152,9 @@
      * @param item
      */
     vm.reviewedTorrentStatus = function () {
-      vm.torrentLocalInfo.$setReviewedStatus(function (res) {
-        mtDebug.info(res);
+      TorrentsService.setReviewedStatus({
+        _torrentId: vm.torrentLocalInfo._id
+      }, function (res) {
         vm.torrentLocalInfo = res;
         NotifycationService.showSuccessNotify('TORRENT_SETREVIEWED_SUCCESSFULLY');
       }, function (res) {

From e35f97af3d944feb10c703bee503709a8b2da37a Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Thu, 17 May 2018 13:40:21 +0800
Subject: [PATCH 50/96] feat(torrents): return hash code if exists when upload

---
 modules/core/client/app/trans-string-en.js             |  2 +-
 modules/core/client/app/trans-string-zh-tw.js          |  2 +-
 modules/core/client/app/trans-string-zh.js             |  2 +-
 modules/core/client/less/mt.less                       |  4 ++++
 .../client/controllers/uploads.client.controller.js    | 10 ++++++----
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index 5231748f..66f5e30a 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -1615,7 +1615,7 @@
       INVITE_MAIL_SEND_FAILED: 'Invitation mail send failed (SERVER)',
       EMAIL_ADDRESS_IS_NOT_ALLOW: 'The domain of this email address is not allowable from server',
       INFO_HASH_IS_EMPTY: 'Info hash field of torrent file is empty',
-      INFO_HASH_ALREADY_EXISTS: 'This info hash value is already exists',
+      INFO_HASH_ALREADY_EXISTS: 'This info hash value is already exists, {{hash}}',
       UPLOAD_ACCESS_DENY: 'System only accepts resources group to upload torrents',
       READ_TORRENT_FILE_FAILD: 'The torrent file parsing error. Please check your torrent file to check if some of the necessary information is missing',
       MOVE_TORRENT_FILE_ERROR: 'The torrent file was moved incorrectly. Please do not repeat the submit operation quickly or the uploaded torrent file is missing.',
diff --git a/modules/core/client/app/trans-string-zh-tw.js b/modules/core/client/app/trans-string-zh-tw.js
index 96bcf3d6..c0c7d9db 100644
--- a/modules/core/client/app/trans-string-zh-tw.js
+++ b/modules/core/client/app/trans-string-zh-tw.js
@@ -1606,7 +1606,7 @@
       INVITE_MAIL_SEND_FAILED: '邀請郵件傳送失敗(SERVER)',
       EMAIL_ADDRESS_IS_NOT_ALLOW: '該郵件地址不允許被邀請或註冊',
       INFO_HASH_IS_EMPTY: 'Info hash 欄位值不能為空',
-      INFO_HASH_ALREADY_EXISTS: '該 info hash 值已經存在，不能重複提交',
+      INFO_HASH_ALREADY_EXISTS: '該 info hash 值已經存在，不能重複提交, {{hash}}',
       UPLOAD_ACCESS_DENY: '當前系統只接受資源製作小組上傳種子',
       READ_TORRENT_FILE_FAILD: '種子檔案解析錯誤，請檢查您的種子檔案，看是否缺少某些必要資訊',
       MOVE_TORRENT_FILE_ERROR: '種子檔案移動錯誤，請不要快速重複進行提交操作或者上傳的種子檔案已丟失'
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index 7f69660c..df7218cc 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -1615,7 +1615,7 @@
       INVITE_MAIL_SEND_FAILED: '邀请邮件发送失败(SERVER)',
       EMAIL_ADDRESS_IS_NOT_ALLOW: '该邮件地址不允许被邀请或注册',
       INFO_HASH_IS_EMPTY: 'Info hash 字段值不能为空',
-      INFO_HASH_ALREADY_EXISTS: '该 info hash 值已经存在，不能重复提交',
+      INFO_HASH_ALREADY_EXISTS: '该 info hash 值已经存在，不能重复提交, {{hash}}',
       UPLOAD_ACCESS_DENY: '当前系统只接受资源制作小组上传种子',
       READ_TORRENT_FILE_FAILD: '种子文件解析错误，请检查您的种子文件，看是否缺少某些必要信息',
       MOVE_TORRENT_FILE_ERROR: '种子文件移动错误，请不要快速重复进行提交操作或者上传的种子文件已丢失',
diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less
index f3dd281a..ea5eff62 100644
--- a/modules/core/client/less/mt.less
+++ b/modules/core/client/less/mt.less
@@ -14,6 +14,10 @@ body {
     background-color: @mt-body-background-color;
 }
 
+.ui-notification{
+    width: 400px;
+}
+
 .social-list {
     img {
         border-radius: 12px;
diff --git a/modules/torrents/client/controllers/uploads.client.controller.js b/modules/torrents/client/controllers/uploads.client.controller.js
index 4110e4af..d8141931 100644
--- a/modules/torrents/client/controllers/uploads.client.controller.js
+++ b/modules/torrents/client/controllers/uploads.client.controller.js
@@ -193,10 +193,12 @@
       vm.successfully = false;
       vm.tFile = undefined;
       // Show error message
-      Notification.error({
-        message: response.data,
-        title: '<i class="glyphicon glyphicon-remove"></i> ' + $translate.instant('TORRENTS_UPLOAD_FAILED')
-      });
+      if (response.data.params) {
+        response.data.message = $translate.instant(response.data.message, response.data.params);
+      }
+      console.log(response.data.message);
+
+      NotifycationService.showErrorNotify(response.data.message, 'TORRENTS_UPLOAD_FAILED');
     }
 
     /**

From 072c4006ebe57e2b37c3f60cbf0b25c9c32bac31 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Fri, 18 May 2018 10:34:33 +0800
Subject: [PATCH 51/96] feat(torrents): return torrent filename if exists when
 upload

---
 modules/core/client/app/trans-string-en.js                  | 1 +
 modules/core/client/app/trans-string-zh-tw.js               | 1 +
 modules/core/client/app/trans-string-zh.js                  | 1 +
 modules/core/server/controllers/errors.server.controller.js | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index 66f5e30a..e1c6f7ed 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -1616,6 +1616,7 @@
       EMAIL_ADDRESS_IS_NOT_ALLOW: 'The domain of this email address is not allowable from server',
       INFO_HASH_IS_EMPTY: 'Info hash field of torrent file is empty',
       INFO_HASH_ALREADY_EXISTS: 'This info hash value is already exists, {{hash}}',
+      FILE_ALREADY_EXISTS: 'This torrent file name already exists, {{filename}}',
       UPLOAD_ACCESS_DENY: 'System only accepts resources group to upload torrents',
       READ_TORRENT_FILE_FAILD: 'The torrent file parsing error. Please check your torrent file to check if some of the necessary information is missing',
       MOVE_TORRENT_FILE_ERROR: 'The torrent file was moved incorrectly. Please do not repeat the submit operation quickly or the uploaded torrent file is missing.',
diff --git a/modules/core/client/app/trans-string-zh-tw.js b/modules/core/client/app/trans-string-zh-tw.js
index c0c7d9db..606b6aed 100644
--- a/modules/core/client/app/trans-string-zh-tw.js
+++ b/modules/core/client/app/trans-string-zh-tw.js
@@ -1607,6 +1607,7 @@
       EMAIL_ADDRESS_IS_NOT_ALLOW: '該郵件地址不允許被邀請或註冊',
       INFO_HASH_IS_EMPTY: 'Info hash 欄位值不能為空',
       INFO_HASH_ALREADY_EXISTS: '該 info hash 值已經存在，不能重複提交, {{hash}}',
+      FILE_ALREADY_EXISTS: '該種子檔名已經存在, {{filename}}',
       UPLOAD_ACCESS_DENY: '當前系統只接受資源製作小組上傳種子',
       READ_TORRENT_FILE_FAILD: '種子檔案解析錯誤，請檢查您的種子檔案，看是否缺少某些必要資訊',
       MOVE_TORRENT_FILE_ERROR: '種子檔案移動錯誤，請不要快速重複進行提交操作或者上傳的種子檔案已丟失'
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index df7218cc..af005ca3 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -1616,6 +1616,7 @@
       EMAIL_ADDRESS_IS_NOT_ALLOW: '该邮件地址不允许被邀请或注册',
       INFO_HASH_IS_EMPTY: 'Info hash 字段值不能为空',
       INFO_HASH_ALREADY_EXISTS: '该 info hash 值已经存在，不能重复提交, {{hash}}',
+      FILE_ALREADY_EXISTS: '该种子文件名已经存在, {{filename}}',
       UPLOAD_ACCESS_DENY: '当前系统只接受资源制作小组上传种子',
       READ_TORRENT_FILE_FAILD: '种子文件解析错误，请检查您的种子文件，看是否缺少某些必要信息',
       MOVE_TORRENT_FILE_ERROR: '种子文件移动错误，请不要快速重复进行提交操作或者上传的种子文件已丢失',
diff --git a/modules/core/server/controllers/errors.server.controller.js b/modules/core/server/controllers/errors.server.controller.js
index 027f8b9f..ab704930 100644
--- a/modules/core/server/controllers/errors.server.controller.js
+++ b/modules/core/server/controllers/errors.server.controller.js
@@ -55,7 +55,7 @@ exports.getErrorMessage = function (err) {
         message = 'Missing `newProfilePicture` field';
         break;
       case 'FILE_ALREADY_EXISTS':
-        message = 'File already exists';
+        message = 'SERVER.FILE_ALREADY_EXISTS';
         break;
       default:
         message = 'Something went wrong';

From 6e3f1f4c6ce51cb6471d5184fe919dba4f2d31d6 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Fri, 18 May 2018 16:11:27 +0800
Subject: [PATCH 52/96] feat(torrents): new class to auto get resource attr
 value from mediaInfo

---
 config/lib/mediaInfo.js                       | 601 ++++++++++++++++++
 .../torrent-info.client.controller.js         |  19 +-
 .../views/view-torrent.client.view.html       |   4 +-
 .../controllers/torrents.server.controller.js |  22 +-
 .../server/models/torrent.server.model.js     |   4 +
 5 files changed, 643 insertions(+), 7 deletions(-)
 create mode 100644 config/lib/mediaInfo.js

diff --git a/config/lib/mediaInfo.js b/config/lib/mediaInfo.js
new file mode 100644
index 00000000..f2aa6e7d
--- /dev/null
+++ b/config/lib/mediaInfo.js
@@ -0,0 +1,601 @@
+'use strict';
+
+var logger = require('./logger');
+
+/**
+ * getMediaInfo
+ * @param nfo
+ * @returns {{}}
+ */
+module.exports.getMediaInfo = function (nfo) {
+  var minfo = {};
+
+  /**
+   * general
+   */
+  var gInfo = getGeneralInfoContent();
+  if (gInfo) {
+    minfo = getGeneralFileSize(gInfo, minfo);
+    minfo = getGeneralDuration(gInfo, minfo);
+    minfo = getGeneralOverallBitRate(gInfo, minfo);
+  }
+
+  /**
+   * video
+   */
+  var vInfo = getVideoInfoContent();
+  if (vInfo) {
+    minfo = getVideoFormat(vInfo, minfo);
+    minfo = getVideoDuration(vInfo, minfo);
+    minfo = getVideoBitRate(vInfo, minfo);
+    minfo = getVideoWidth(vInfo, minfo);
+    minfo = getVideoHeight(vInfo, minfo);
+    minfo = getVideoFrameRateMode(vInfo, minfo);
+    minfo = getVideoFrameRate(vInfo, minfo);
+    minfo = getVideoBitDepth(vInfo, minfo);
+    minfo = getVideoStreamSize(vInfo, minfo);
+    minfo = getVideoWritingLibrary(vInfo, minfo);
+  }
+
+  /**
+   * audio
+   */
+  var aInfo = getAudioInfoContent();
+  if (aInfo) {
+    minfo = getAudioFormat(aInfo, minfo);
+    minfo = getAudioBitRateMode(aInfo, minfo);
+    minfo = getAudioBitRate(aInfo, minfo);
+    minfo = getAudioChannel(aInfo, minfo);
+    minfo = getAudioLanguage(aInfo, minfo);
+  }
+
+  /**
+   * text
+   */
+  var tInfo = getTextInfoContent();
+  if (tInfo) {
+    minfo = getTextLanguage(tInfo, minfo);
+  }
+
+  /**
+   * get simple format media info
+   */
+  if (!gInfo && !vInfo && !aInfo && !tInfo) {
+    minfo = getSimpleGeneralFileSize(nfo, minfo);
+    minfo = getSimpleGeneralDuration(nfo, minfo);
+    minfo = getSimpleGeneralRuntime(nfo, minfo);
+    minfo = getSimpleVideoBitRate(nfo, minfo);
+    minfo = getSimpleVideoFrameRate(nfo, minfo);
+    minfo = getSimpleVideoResolution(nfo, minfo);
+    minfo = getSimpleAudioInfo(nfo, minfo);
+    minfo = getSimpleTextInfo(nfo, minfo);
+
+    minfo = getSimpleGeneralReleaseSize(nfo, minfo);
+    minfo = getSimpleVideoCodec(nfo, minfo);
+    minfo = getSimpleAudioCodec(nfo, minfo);
+  }
+
+  return minfo;
+
+
+  /**********************************************************************************
+   * get general value
+   **********************************************************************************/
+  function getGeneralInfoContent() {
+    var reg = /general[\r\n][\s\S]*?[\r\n][\r\n]|general[\r\n][\s\S]*/gi;
+    var res = nfo.match(reg);
+    return res || undefined;
+  }
+
+  function getGeneralFileSize(gInfo, minfo) {
+    var reg = /file\s*size\s*:[^\r\n]+/gi;
+    var res = gInfo[0].match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('general')) {
+        minfo.general = {};
+      }
+      minfo.general.fileSize = str.trim();
+    }
+    return minfo;
+  }
+
+  function getGeneralDuration(gInfo, minfo) {
+    var reg = /duration\s*:[^\r\n]+/gi;
+    var res = gInfo[0].match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('general')) {
+        minfo.general = {};
+      }
+      minfo.general.duration = str.trim();
+    }
+    return minfo;
+  }
+
+  function getGeneralOverallBitRate(gInfo, minfo) {
+    var reg = /overall\s*bit\s*rate\s*:[^\r\n]+/gi;
+    var res = gInfo[0].match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('general')) {
+        minfo.general = {};
+      }
+      minfo.general.overallBitRate = str.trim();
+    }
+    return minfo;
+  }
+
+  /**********************************************************************************
+   * get video value
+   **********************************************************************************/
+  function getVideoInfoContent() {
+    var reg = /video[\s*\#\d]*[\r\n][\s\S]*?[\r\n][\r\n]|video[\s*\#\d]*[\r\n][\s\S]*/gi;
+    var res = nfo.match(reg);
+    return res || undefined;
+  }
+
+  function getVideoFormat(vInfo, minfo) {
+    var reg = /format\s*:[^\r\n]+/gi;
+    var res = vInfo[0].match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('video')) {
+        minfo.video = {};
+      }
+      minfo.video.format = str.trim();
+    }
+    return minfo;
+  }
+
+  function getVideoDuration(vInfo, minfo) {
+    var reg = /duration\s*:[^\r\n]+/gi;
+    var res = vInfo[0].match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('video')) {
+        minfo.video = {};
+      }
+      minfo.video.duration = str.trim();
+    }
+    return minfo;
+  }
+
+  function getVideoBitRate(vInfo, minfo) {
+    var reg = /bit\s*rate\s*:[^\r\n]+/gi;
+    var res = vInfo[0].match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('video')) {
+        minfo.video = {};
+      }
+      minfo.video.bitRate = str.trim();
+    }
+    return minfo;
+  }
+
+  function getVideoWidth(vInfo, minfo) {
+    var reg = /width\s*:[^\r\n]+/gi;
+    var res = vInfo[0].match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('video')) {
+        minfo.video = {};
+      }
+      minfo.video.width = str.trim();
+    }
+    return minfo;
+  }
+
+  function getVideoHeight(vInfo, minfo) {
+    var reg = /height\s*:[^\r\n]+/gi;
+    var res = vInfo[0].match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('video')) {
+        minfo.video = {};
+      }
+      minfo.video.height = str.trim();
+    }
+    return minfo;
+  }
+
+  function getVideoFrameRateMode(vInfo, minfo) {
+    var reg = /frame\s*rate\s*mode\s*:[^\r\n]+/gi;
+    var res = vInfo[0].match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('video')) {
+        minfo.video = {};
+      }
+      minfo.video.frameRateMode = str.trim();
+    }
+    return minfo;
+  }
+
+  function getVideoFrameRate(vInfo, minfo) {
+    var reg = /frame\s*rate\s*:[^\r\n]+/gi;
+    var res = vInfo[0].match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('video')) {
+        minfo.video = {};
+      }
+      minfo.video.frameRate = str.trim();
+    }
+    return minfo;
+  }
+
+  function getVideoBitDepth(vInfo, minfo) {
+    var reg = /bit\s*depth\s*:[^\r\n]+/gi;
+    var res = vInfo[0].match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('video')) {
+        minfo.video = {};
+      }
+      minfo.video.bitDepth = str.trim();
+    }
+    return minfo;
+  }
+
+  function getVideoStreamSize(vInfo, minfo) {
+    var reg = /stream\s*size\s*:[^\r\n]+/gi;
+    var res = vInfo[0].match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('video')) {
+        minfo.video = {};
+      }
+      minfo.video.streamSize = str.trim();
+    }
+    return minfo;
+  }
+
+  function getVideoWritingLibrary(vInfo, minfo) {
+    var reg = /writing\s*library\s*:[^\r\n]+/gi;
+    var res = vInfo[0].match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('video')) {
+        minfo.video = {};
+      }
+      minfo.video.writingLibrary = str.trim();
+    }
+    return minfo;
+  }
+
+  /**********************************************************************************
+   * get audio value
+   **********************************************************************************/
+  function getAudioInfoContent() {
+    var reg = /audio[\s*\#\d]*[\r\n][\s\S]*?[\r\n][\r\n]|audio[\s*\#\d]*[\r\n][\s\S]*/gi;
+    var res = nfo.match(reg);
+    return res || undefined;
+  }
+
+  function getAudioFormat(aInfo, minfo) {
+    var reg = /format\s*:[^\r\n]+/gi;
+    var res = aInfo[0].match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('audio')) {
+        minfo.audio = {};
+      }
+      minfo.audio.format = str.trim();
+    }
+    return minfo;
+  }
+
+  function getAudioBitRateMode(aInfo, minfo) {
+    var reg = /bit\s*rate\s*mode\s*:[^\r\n]+/gi;
+    var res = aInfo[0].match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('audio')) {
+        minfo.audio = {};
+      }
+      minfo.audio.bitRateMode = str.trim();
+    }
+    return minfo;
+  }
+
+  function getAudioBitRate(aInfo, minfo) {
+    var reg = /bit\s*rate\s*:[^\r\n]+/gi;
+    var res = aInfo[0].match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('audio')) {
+        minfo.audio = {};
+      }
+      minfo.audio.bitRate = str.trim();
+    }
+    return minfo;
+  }
+
+  function getAudioChannel(aInfo, minfo) {
+    var reg = /channel\(s\)\s*:[^\r\n]+/gi;
+    var res = aInfo[0].match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('audio')) {
+        minfo.audio = {};
+      }
+      minfo.audio.channel = str.trim();
+    } else {
+      reg = /channel\s*count\s*:[^\r\n]+/gi;
+      res = aInfo[0].match(reg);
+      str = res ? res[0] : undefined;
+      if (str) {
+        str = str.replace(/^[^\:]+.\s*/, '');
+        if (!minfo.hasOwnProperty('audio')) {
+          minfo.audio = {};
+        }
+        minfo.audio.channel = str.trim();
+      }
+    }
+    return minfo;
+  }
+
+  function getAudioLanguage(aInfo, minfo) {
+    aInfo.forEach(function (vi) {
+      var reg = /language\s*:[^\r\n]+/gi;
+      var res = vi.match(reg);
+      var str = res ? res[0] : undefined;
+      if (str) {
+        str = str.replace(/^[^\:]+.\s*/, '');
+        if (!minfo.hasOwnProperty('audio')) {
+          minfo.audio = {};
+        }
+        if (!minfo.audio.hasOwnProperty('language')) {
+          minfo.audio.language = [];
+        }
+        if (!minfo.audio.language.includes(str)) {
+          minfo.audio.language.push(str.trim());
+        }
+      }
+    });
+    return minfo;
+  }
+
+  /**********************************************************************************
+   * get text value
+   **********************************************************************************/
+  function getTextInfoContent() {
+    var reg = /text[\s*\#\d]*[\r\n][\s\S]*?[\r\n][\r\n]|text[\s*\#\d]*[\r\n][\s\S]*/gi;
+    var res = nfo.match(reg);
+    return res || undefined;
+  }
+
+  function getTextLanguage(tInfo, minfo) {
+    tInfo.forEach(function (vi) {
+      var reg = /language\s*:[^\r\n]+/gi;
+      var res = vi.match(reg);
+      var str = res ? res[0] : undefined;
+      if (str) {
+        str = str.replace(/^[^\:]+.\s*/, '');
+        if (!minfo.hasOwnProperty('text')) {
+          minfo.text = {};
+        }
+        if (!minfo.text.hasOwnProperty('language')) {
+          minfo.text.language = [];
+        }
+        if (!minfo.text.language.includes(str)) {
+          minfo.text.language.push(str.trim());
+        }
+      }
+    });
+    return minfo;
+  }
+
+  /**********************************************************************************
+   * get simple value
+   **********************************************************************************/
+  function getSimpleGeneralFileSize(gInfo, minfo) {
+    var reg = /file[\s|\.]*size[\s|\.]*:[^\r\n]+/gi;
+    var res = gInfo.match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('general')) {
+        minfo.general = {};
+      }
+      minfo.general.fileSize = str.trim();
+    }
+    return minfo;
+  }
+
+  function getSimpleGeneralDuration(gInfo, minfo) {
+    var reg = /duration[\s|\.]*:[^\r\n]+/gi;
+    var res = gInfo.match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('general')) {
+        minfo.general = {};
+      }
+      minfo.general.duration = str.trim();
+    }
+    return minfo;
+  }
+
+  function getSimpleGeneralRuntime(gInfo, minfo) {
+    var reg = /run[\s|\.]*time[\s|\.]*:[^\r\n]+/gi;
+    var res = gInfo.match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('general')) {
+        minfo.general = {};
+      }
+      minfo.general.runtime = str.trim();
+    }
+    return minfo;
+  }
+
+  function getSimpleVideoBitRate(gInfo, minfo) {
+    var reg = /(video)*[\s|\.]*bit[\s|\.]*rate[\s|\.]*:[^\r\n]+/gi;
+    var res = gInfo.match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('video')) {
+        minfo.video = {};
+      }
+      minfo.video.bitRate = str.trim();
+    }
+    return minfo;
+  }
+
+  function getSimpleVideoFrameRate(gInfo, minfo) {
+    var reg = /frame[\s|\.]*rate[\s|\.]*:[^\r\n]+/gi;
+    var res = gInfo.match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('video')) {
+        minfo.video = {};
+      }
+      minfo.video.frameRate = str.trim();
+    }
+    return minfo;
+  }
+
+  function getSimpleVideoResolution(gInfo, minfo) {
+    var reg = /resolution[\s|\.]*:[^\r\n]+/gi;
+    var res = gInfo.match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('video')) {
+        minfo.video = {};
+      }
+      minfo.video.resolution = str.trim();
+    }
+    return minfo;
+  }
+
+  function getSimpleAudioInfo(gInfo, minfo) {
+    var reg = /audio\s*\#*\d*[\s|\.]*:[^\r\n]+/gi;
+    var res = gInfo.match(reg);
+    if (res) {
+      res.forEach(function (ai) {
+        var str = ai.replace(/^[^\:]+.\s*/, '');
+        if (!minfo.hasOwnProperty('audio')) {
+          minfo.audio = {};
+        }
+        if (!minfo.audio.hasOwnProperty('info')) {
+          minfo.audio.info = [];
+        }
+        minfo.audio.info.push(str.trim());
+      });
+    }
+    return minfo;
+  }
+
+  function getSimpleTextInfo(gInfo, minfo) {
+    var reg = /subtitles*[\s|\.]*:[^\r\n]+/gi;
+    var res = gInfo.match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      if (!minfo.hasOwnProperty('text')) {
+        minfo.text = {};
+      }
+      if (!minfo.text.hasOwnProperty('language')) {
+        minfo.text.language = [];
+      }
+
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!str.match(/\(|\)/)) {
+        var stlist = str.split(/\/|\,/);
+        stlist.forEach(function (st) {
+          minfo.text.language.push(st.trim());
+        });
+      } else {
+        // some value is "S_TEXT/ASS(chs/cht)", then do not split
+        minfo.text.language.push(str.trim());
+      }
+    } else {
+      reg = /subtitles\d[\s|\.]*:[^\r\n]+/gi;
+      res = gInfo.match(reg);
+      if (res) {
+        res.forEach(function (st) {
+          var st = st.replace(/^[^\:]+.\s*/, '');
+          if (!minfo.hasOwnProperty('text')) {
+            minfo.text = {};
+          }
+          if (!minfo.text.hasOwnProperty('language')) {
+            minfo.text.language = [];
+          }
+          minfo.text.language.push(st.trim());
+        });
+      }
+    }
+    return minfo;
+  }
+
+  //format start of  .plot
+  function getSimpleGeneralReleaseSize(gInfo, minfo) {
+    var reg = /release[\s|\.]*size[\s|\.]*:[^\r\n]+/gi;
+    var res = gInfo.match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('general')) {
+        minfo.general = {};
+      }
+      minfo.general.fileSize = str.trim();
+    }
+    return minfo;
+  }
+
+  function getSimpleVideoCodec(gInfo, minfo) {
+    var reg = /video[\s|\.]*codec[\s|\.]*:[^\r\n]+/gi;
+    var res = gInfo.match(reg);
+    var str = res ? res[0] : undefined;
+    if (str) {
+      str = str.replace(/^[^\:]+.\s*/, '');
+      if (!minfo.hasOwnProperty('video')) {
+        minfo.video = {};
+      }
+      minfo.video.codec = str.trim();
+    }
+    return minfo;
+  }
+
+  function getSimpleAudioCodec(gInfo, minfo) {
+    var reg = /audio[\s|\.]*codec[\s|\.]*:[^\r\n]+/gi;
+    var res = gInfo.match(reg);
+    if (res) {
+      res.forEach(function (ac) {
+        var str = ac.replace(/^[^\:]+.\s*/, '');
+        if (!minfo.hasOwnProperty('audio')) {
+          minfo.audio = {};
+        }
+        if (!minfo.audio.hasOwnProperty('codec')) {
+          minfo.audio.codec = [];
+        }
+        minfo.audio.codec.push(str.trim());
+      });
+    }
+    return minfo;
+  }
+
+};
diff --git a/modules/torrents/client/controllers/torrent-info.client.controller.js b/modules/torrents/client/controllers/torrent-info.client.controller.js
index ce1d9006..f4e89091 100644
--- a/modules/torrents/client/controllers/torrent-info.client.controller.js
+++ b/modules/torrents/client/controllers/torrent-info.client.controller.js
@@ -1019,9 +1019,10 @@
       resinfo.custom_title = vm.torrentLocalInfo.resource_detail_info.custom_title;
       resinfo.custom_subtitle = vm.torrentLocalInfo.resource_detail_info.custom_subtitle;
 
-      vm.torrentLocalInfo.resource_detail_info = resinfo;
-
-      vm.torrentLocalInfo.$update(function (response) {
+      TorrentsService.update({
+        _id: vm.torrentLocalInfo._id,
+        resource_detail_info: resinfo
+      }, function (response) {
         successCallback(response);
       }, function (errorResponse) {
         errorCallback(errorResponse);
@@ -1414,5 +1415,17 @@
       }
     };
 
+    /**
+     * updateTorrentNfo
+     */
+    vm.updateTorrentNfo = function () {
+      TorrentsService.update({
+        _id: vm.torrentLocalInfo._id,
+        torrent_nfo: vm.torrentLocalInfo.torrent_nfo
+      }, function (res) {
+        console.log('updateTorrentNfo successfully');
+        console.log(res);
+      });
+    };
   }
 }());
diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html
index bb9ca324..aa785b10 100644
--- a/modules/torrents/client/views/view-torrent.client.view.html
+++ b/modules/torrents/client/views/view-torrent.client.view.html
@@ -672,8 +672,7 @@
                 <dd class="h-line" ng-if="vm.torrentLocalInfo.torrent_nfo.length>0">
                     <div class="row">
                         <div class="col-md-10">
-                            <textarea class="form-control video-nfo margin-top-10" rows="15" ng-bind="vm.torrentLocalInfo.torrent_nfo"
-                                      readonly></textarea>
+                            <textarea class="form-control video-nfo margin-top-10" rows="15" ng-model="vm.torrentLocalInfo.torrent_nfo"></textarea>
                         </div>
                     </div>
                 </dd>
@@ -684,6 +683,7 @@
                         <button class="btn btn-success btn-width-100" ng-click="vm.DLS.downloadTorrent(vm.torrentLocalInfo._id)"
                                 translate="DOWNLOAD_TORRENT"></button>
                         <span torrent-file-link-button="vm.torrentLocalInfo" torrent-user="vm.user" info-class="btn-default"></span>
+                        <!--<button class="btn btn-default btn-width-100" ng-click="vm.updateTorrentNfo()">Update MediaInfo</button>-->
                     </div>
                 </dd>
             </dl>
diff --git a/modules/torrents/server/controllers/torrents.server.controller.js b/modules/torrents/server/controllers/torrents.server.controller.js
index 8fd79916..80d48ff8 100644
--- a/modules/torrents/server/controllers/torrents.server.controller.js
+++ b/modules/torrents/server/controllers/torrents.server.controller.js
@@ -7,6 +7,7 @@ var path = require('path'),
   config = require(path.resolve('./config/config')),
   mongoose = require('mongoose'),
   common = require(path.resolve('./config/lib/common')),
+  mediaInfo = require(path.resolve('./config/lib/mediaInfo')),
   errorHandler = require(path.resolve('./modules/core/server/controllers/errors.server.controller')),
   multer = require('multer'),
   moment = require('moment'),
@@ -159,7 +160,13 @@ exports.upload = function (req, res) {
         res.status(200).send(torrentinfo);
       })
       .catch(function (err) {
-        res.status(422).send(err);
+        res.status(422).send({
+          message: err,
+          params: {
+            hash: torrentinfo.info_hash,
+            filename: req.file.filename
+          }
+        });
 
         if (req.file && req.file.filename) {
           var newfile = config.uploads.torrent.file.temp + req.file.filename;
@@ -628,6 +635,11 @@ exports.create = function (req, res) {
 
   torrent.user = req.user;
 
+  //get media info detail
+  if (torrent.torrent_nfo) {
+    torrent.torrent_media_info = mediaInfo.getMediaInfo(torrent.torrent_nfo);
+  }
+
   //replace content path
   var tmp = config.uploads.torrent.image.temp.substr(1);
   var dst = config.uploads.torrent.image.dest.substr(1);
@@ -833,7 +845,13 @@ exports.read = function (req, res) {
 exports.update = function (req, res) {
   var torrent = req.torrent;
 
-  torrent.resource_detail_info = req.body.resource_detail_info;
+  if (req.body.hasOwnProperty('resource_detail_info')) {
+    torrent.resource_detail_info = req.body.resource_detail_info;
+  }
+  if (req.body.hasOwnProperty('torrent_nfo')) {
+    torrent.torrent_nfo = req.body.torrent_nfo;
+    torrent.torrent_media_info = mediaInfo.getMediaInfo(req.body.torrent_nfo);
+  }
 
   torrent.save(function (err) {
     if (err) {
diff --git a/modules/torrents/server/models/torrent.server.model.js b/modules/torrents/server/models/torrent.server.model.js
index 5f214912..adfcb844 100644
--- a/modules/torrents/server/models/torrent.server.model.js
+++ b/modules/torrents/server/models/torrent.server.model.js
@@ -63,6 +63,10 @@ var TorrentSchema = new Schema({
     type: String,
     default: ''
   },
+  torrent_media_info: {
+    type: Object,
+    default: undefined
+  },
   torrent_announce: {
     type: String,
     default: '',

From fe04540417e7a7ae03f5c3972495f4a13eabc1b3 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Fri, 18 May 2018 16:49:46 +0800
Subject: [PATCH 53/96] feat(torrents): update torrent detail info page

---
 modules/core/client/app/trans-string-en.js    |  1 -
 modules/core/client/app/trans-string-zh-tw.js |  1 -
 modules/core/client/app/trans-string-zh.js    |  1 -
 .../templates/torrent-item.client.view.html   |  2 +-
 .../views/view-torrent.client.view.html       | 77 ++++++++-----------
 5 files changed, 34 insertions(+), 48 deletions(-)

diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index e1c6f7ed..fb354760 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -390,7 +390,6 @@
     ALL_FILES_LIST: 'Files List',
     VIDEO_SIZE: 'Video Size',
     UPLOAD_TIME: 'Upload Time',
-    VIDEO_SALE_INFO: 'Video Sale Info',
     SALE_EXPIRES_TIME: 'expires',
     TORRENT_STATUS_TOP_TITLE: 'Top Level',
     STATUS_TOP_KEY: 'TOP',
diff --git a/modules/core/client/app/trans-string-zh-tw.js b/modules/core/client/app/trans-string-zh-tw.js
index 606b6aed..d1bb154d 100644
--- a/modules/core/client/app/trans-string-zh-tw.js
+++ b/modules/core/client/app/trans-string-zh-tw.js
@@ -381,7 +381,6 @@
     ALL_FILES_LIST: '檔案清單',
     VIDEO_SIZE: '視訊檔案大小',
     UPLOAD_TIME: '上傳時間',
-    VIDEO_SALE_INFO: '視訊促銷資訊',
     SALE_EXPIRES_TIME: '過期',
     TORRENT_STATUS_TOP_TITLE: '置頂推薦',
     STATUS_TOP_KEY: '置頂',
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index af005ca3..cd17078a 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -390,7 +390,6 @@
     ALL_FILES_LIST: '文件清单',
     VIDEO_SIZE: '视频文件大小',
     UPLOAD_TIME: '上传时间',
-    VIDEO_SALE_INFO: '视频促销信息',
     SALE_EXPIRES_TIME: '过期',
     TORRENT_STATUS_TOP_TITLE: '置顶推荐',
     STATUS_TOP_KEY: '置顶',
diff --git a/modules/torrents/client/templates/torrent-item.client.view.html b/modules/torrents/client/templates/torrent-item.client.view.html
index 11b3e900..29834282 100644
--- a/modules/torrents/client/templates/torrent-item.client.view.html
+++ b/modules/torrents/client/templates/torrent-item.client.view.html
@@ -72,7 +72,7 @@
                         G: {{vm.salesGlobalConfig.global.value}}
                     </span>
 
-                    <span class="label label-se-info" ng-if="vm.torrentType == 'tvserial'"
+                    <span class="label label-se-info" ng-if="item.torrent_type == 'tvserial'"
                           ng-click="$event.stopPropagation();">S{{item.torrent_seasons}}E{{item.torrent_episodes}}</span>
 
                     <span class="label label-hnr-info" ng-if="item.torrent_hnr" ng-class="{'used': parent.filterHnR}"
diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html
index aa785b10..fa1b84de 100644
--- a/modules/torrents/client/views/view-torrent.client.view.html
+++ b/modules/torrents/client/views/view-torrent.client.view.html
@@ -585,6 +585,7 @@
                     <span ng-if="vm.torrentLocalInfo.isAnonymous">{{ 'ANONYMOUS' | translate }}</span>
                     <span maker-info="vm.torrentLocalInfo.maker"></span>
                     <!--<span message-to="vm.torrentLocalInfo.user" to-class="message-to-icon"></span>-->
+                    <span>&emsp;&emsp;{{'MESSAGES_FIELD.INFO_SEND_AT' | translate}}: {{vm.torrentLocalInfo.createdat | date: 'yyyy-MM-dd HH:mm:ss'}}</span>
                 </dd>
 
                 <dt class="h-line">{{ 'TORRENT_FILENAME' | translate}}：</dt>
@@ -593,37 +594,51 @@
                 <dt class="h-line">{{ 'ANNOUNCE_URL' | translate}}：</dt>
                 <dd class="h-line">{{vm.torrentLocalInfo.torrent_announce}}</dd>
 
-                <dt class="h-line">{{ 'TORRENT_INFO_HASH' | translate}}：</dt>
-                <dd class="h-line">{{vm.torrentLocalInfo.info_hash}}</dd>
-
-                <dt class="h-line">{{ 'TABLE_FIELDS.SEEDED' | translate}}：</dt>
-                <dd class="h-line"><span class="glyphicon glyphicon-arrow-up torrent-up"></span> {{vm.torrentLocalInfo.torrent_seeds}}</dd>
-                <dt class="h-line">{{ 'TABLE_FIELDS.LEECHED' | translate}}：</dt>
-                <dd class="h-line"><span class="glyphicon glyphicon-arrow-down torrent-down"></span> {{vm.torrentLocalInfo.torrent_leechers}}</dd>
-                <dt class="h-line">{{ 'TABLE_FIELDS.DOWNLOAD' | translate}}：</dt>
-                <dd class="h-line"><span class="glyphicon glyphicon-ok torrent-finished"></span> {{vm.torrentLocalInfo.torrent_finished}}</dd>
-
-                <div ng-if="vm.torrentLocalInfo.torrent_type == 'tvserial'">
-                    <dt class="h-line">{{ 'TMDB_FIELDS.THIS_SE' | translate}}：</dt>
-                    <dd class="h-line">
-                        <span class="se-info">S{{vm.torrentLocalInfo.torrent_seasons}}E{{vm.torrentLocalInfo.torrent_episodes}}</span>
-                    </dd>
-                </div>
+                <dt class="h-line">{{ 'TABLE_FIELDS.ABBR_SEEDS_LEECHERS_FINISHED' | translate}}：</dt>
+                <dd class="h-line">
+                    <span><span class="glyphicon glyphicon-arrow-up torrent-up"></span> {{vm.torrentLocalInfo.torrent_seeds}}</span>&emsp;&emsp;
+                    <span><span class="glyphicon glyphicon-arrow-down torrent-down"></span> {{vm.torrentLocalInfo.torrent_leechers}}</span>&emsp;&emsp;
+                    <span><span class="glyphicon glyphicon-ok torrent-finished"></span> {{vm.torrentLocalInfo.torrent_finished}}</span>
+                </dd>
 
                 <dt class="h-line">{{ 'VIDEO_SIZE' | translate}}：</dt>
                 <dd class="h-line">{{vm.torrentLocalInfo.torrent_size | bytes:2}}</dd>
 
-                <dt class="h-line">{{ 'UPLOAD_TIME' | translate}}：</dt>
-                <dd class="h-line">{{vm.torrentLocalInfo.createdat | date: 'yyyy-MM-dd HH:mm:ss'}}</dd>
+                <dt class="h-line">{{ 'TORRENT_INFO_HASH' | translate}}：</dt>
+                <dd class="h-line">{{vm.torrentLocalInfo.info_hash}}</dd>
 
                 <dt class="h-line">{{ 'ATTRIBUTE_TAGS' | translate}}：</dt>
                 <dd class="h-line">
                     <div class="list-all-tags">
                         <span class="label label-release label-warning">{{ vm.torrentLocalInfo.resource_detail_info.release_date}}</span>
+
+                        <span ng-if="vm.torrentLocalInfo.torrent_recommended != 'level0'">
+                            <span class="label label-rlevel label-info">
+                                {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + vm.torrentLocalInfo.torrent_recommended.toUpperCase() | translate}}
+                            </span>
+                        </span>
+
+                        <span class="label label-sale" ng-if="!vm.isGlobalSaleNow()"
+                              title="{{vm.TGI.getTorrentSaleTypeDesc(vm.torrentLocalInfo);}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{vm.torrentLocalInfo.isSaling ? (vm.torrentLocalInfo.torrent_sale_expires | date: 'MM-dd HH:mm') : 'NO'}}"
+                              ng-class="{'label-default': !vm.torrentLocalInfo.isSaling, 'label-success': vm.torrentLocalInfo.isSaling}">
+                            {{vm.torrentLocalInfo.torrent_sale_status}} {{vm.torrentLocalInfo.isSaling ? (vm.torrentLocalInfo.torrent_sale_expires | unlife) : ''}}
+                        </span>
+                        <span class="label label-sale label-success" ng-if="vm.isGlobalSaleNow()"
+                              title="{{vm.TGI.getTorrentSaleTypeDescByValue(vm.salesGlobalConfig.global.value);}}"
+                              ng-click="$event.stopPropagation();">
+                            G: {{vm.salesGlobalConfig.global.value}}
+                        </span>
+
                         <span class="label label-hnr-info" ng-if="vm.torrentLocalInfo.torrent_hnr">H&R</span>
+
                         <span class="label label-se-info" ng-if="vm.torrentLocalInfo.torrent_type == 'tvserial'">
                             S{{vm.torrentLocalInfo.torrent_seasons}}E{{vm.torrentLocalInfo.torrent_episodes}}
                         </span>
+
+                        <span title="{{ 'TORRENT_STATUS_TOP_TITLE' | translate}}" ng-if="vm.torrentLocalInfo.isTop"
+                              class="label torrent-top">{{'STATUS_TOP_KEY' | translate}}
+                        </span>
+
                         <span ng-repeat="t in vm.torrentLocalInfo.torrent_tags">
                             <span class="label label-tag" ng-if="vm.RTS.tagInList(t);">
                                 {{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
@@ -632,32 +647,6 @@
                     </div>
                 </dd>
 
-                <dt class="h-line">{{ 'VIDEO_SALE_INFO' | translate}}：</dt>
-                <dd class="h-line">
-                    <span class="label label-sale" ng-if="!vm.isGlobalSaleNow()"
-                          title="{{vm.TGI.getTorrentSaleTypeDesc(vm.torrentLocalInfo);}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{vm.torrentLocalInfo.isSaling ? (vm.torrentLocalInfo.torrent_sale_expires | date: 'MM-dd HH:mm') : 'NO'}}"
-                          ng-class="{'label-default': !vm.torrentLocalInfo.isSaling, 'label-success': vm.torrentLocalInfo.isSaling}">
-                        {{vm.torrentLocalInfo.torrent_sale_status}} {{vm.torrentLocalInfo.isSaling ? (vm.torrentLocalInfo.torrent_sale_expires | unlife) : ''}}
-                    </span>
-                    <span class="label label-sale label-success" ng-if="vm.isGlobalSaleNow()"
-                          title="{{vm.TGI.getTorrentSaleTypeDescByValue(vm.salesGlobalConfig.global.value);}}"
-                          ng-click="$event.stopPropagation();">
-                        G: {{vm.salesGlobalConfig.global.value}}
-                    </span>
-                </dd>
-
-                <div ng-if="vm.torrentLocalInfo.torrent_recommended != 'level0' || vm.torrentLocalInfo.isTop">
-                    <dt class="h-line">{{ 'ADMIN_BASIC_RLEVEL_SET' | translate}}：</dt>
-                    <dd class="h-line">
-                        <span title="{{ 'TORRENT_STATUS_TOP_TITLE' | translate}}" ng-if="vm.torrentLocalInfo.isTop"
-                              class="torrent-votes"><kbd>{{'STATUS_TOP_KEY' | translate}}</kbd></span>
-
-                        <span class="label label-rlevel label-info">
-                            {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + vm.torrentLocalInfo.torrent_recommended.toUpperCase() | translate}}
-                        </span>
-                    </dd>
-                </div>
-
                 <dt class="h-line">{{ 'ALL_FILES_LIST' | translate}}：</dt>
                 <dd class="h-line">
                     <div class="row">

From e920791ecd0b54788aa5079aac83904e1ea11c04 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Fri, 18 May 2018 16:59:20 +0800
Subject: [PATCH 54/96] fix(home): fixed menu item event issue

---
 modules/core/client/views/header.client.view.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html
index fa8d5141..b50325ba 100644
--- a/modules/core/client/views/header.client.view.html
+++ b/modules/core/client/views/header.client.view.html
@@ -57,7 +57,7 @@
                 </a>
                 <ul class="dropdown-menu" role="menu">
                     <li class="lang-list">
-                        <span class="flag-icon {{l.class}}" title="{{l.title}}" ng-click="vm.changeLanguage(l.name);"
+                        <span class="flag-icon {{l.class}}" title="{{l.title}}" ng-click="vm.changeLanguage(l.name); $event.stopPropagation();"
                               ng-repeat="l in vm.language" ng-class="{'curr-language': vm.langService.getLang() == l.name}"></span>
                     </li>
                     <li class="divider"></li>

From 96e2ed3b8cbf2de8fa30cebb6c28115074f5a178 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Fri, 18 May 2018 17:06:52 +0800
Subject: [PATCH 55/96] fix(announce): uncheck ratio when download from oper
 users

---
 .../announce/server/controllers/announces.server.controller.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js
index 370ab53d..cef8db32 100644
--- a/modules/announce/server/controllers/announces.server.controller.js
+++ b/modules/announce/server/controllers/announces.server.controller.js
@@ -457,7 +457,7 @@ exports.announce = function (req, res) {
      vip user not checked
      ---------------------------------------------------------------*/
     function (done) {
-      if (!req.seeder && !req.passkeyuser.isVip && event(query.event) === EVENT_STARTED) {
+      if (!req.seeder && !req.passkeyuser.isVip && !req.passkeyuser.isOper && event(query.event) === EVENT_STARTED) {
         if (req.passkeyuser.ratio !== -1 && req.passkeyuser.ratio < announceConfig.downloadCheck.ratio) {
           var checkTimeBegin = moment(req.passkeyuser.created).add(announceConfig.downloadCheck.checkAfterSignupDays, 'd');
           if (checkTimeBegin < moment(Date.now())) {

From 4d53a851c5d439d130451e08fa89619378497860 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Fri, 18 May 2018 20:04:39 +0800
Subject: [PATCH 56/96] fix(core): fixed home menu auto nav issue

---
 config/lib/mediaInfo.js                       |  2 +-
 .../controllers/header.client.controller.js   | 48 ++++++++++++-------
 .../core/client/views/header.client.view.html |  4 +-
 3 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/config/lib/mediaInfo.js b/config/lib/mediaInfo.js
index f2aa6e7d..a616e46a 100644
--- a/config/lib/mediaInfo.js
+++ b/config/lib/mediaInfo.js
@@ -537,7 +537,7 @@ module.exports.getMediaInfo = function (nfo) {
       res = gInfo.match(reg);
       if (res) {
         res.forEach(function (st) {
-          var st = st.replace(/^[^\:]+.\s*/, '');
+          st = st.replace(/^[^\:]+.\s*/, '');
           if (!minfo.hasOwnProperty('text')) {
             minfo.text = {};
           }
diff --git a/modules/core/client/controllers/header.client.controller.js b/modules/core/client/controllers/header.client.controller.js
index 8baba03d..3c993e14 100644
--- a/modules/core/client/controllers/header.client.controller.js
+++ b/modules/core/client/controllers/header.client.controller.js
@@ -45,31 +45,45 @@
           $('.popup_wrapper').remove();
         }
       });
-
-      //set menu bar opened when hover
-      $('div.navbar-mt ul.nav li.dropdown').hover(function (evt) {
-        if (!$(this).hasClass('open')) {
-          $(this).find('.dropdown-toggle', this).trigger('click');
-          $(this).bind('click', function (e) {
-            var sta = $(this).find('.dropdown-toggle', this).attr('alt');
-            if (sta)
-              $state.go(sta);
-          });
-        }
-      }, function (evt) {
-        $(this).unbind('click');
-        if ($(this).hasClass('open')) {
-          $(this).find('.dropdown-toggle', this).trigger('click');
-        }
-      });
     });
 
+    /**
+     * bindHoverToMenuItem
+     */
+    vm.bindHoverToMenuItem = function () {
+      //set menu bar opened when hover
+      $timeout(function () {
+        $('div.navbar-mt ul.nav li.dropdown').off('mouseenter mouseleave').hover(function (evt) {
+          if (!$(this).hasClass('open')) {
+            $(this).find('.dropdown-toggle', this).trigger('click');
+            $(this).off('click').on('click', function (e) {
+              var sta = $(this).find('.dropdown-toggle', this).attr('alt');
+              if (sta) {
+                $state.go(sta);
+              }
+            });
+          }
+        }, function (evt) {
+          $(this).off('click');
+          if ($(this).hasClass('open')) {
+            $(this).find('.dropdown-toggle', this).trigger('click');
+          }
+        });
+
+        $('div.navbar-mt ul.nav li.dropdown ul.dropdown-menu').off('mouseenter mouseleave').hover(function (evt) {
+          $(this).parent().off('click');
+        }, function (evt) {
+        });
+      }, 0);
+    };
+
     /**
      * auth-user-changed
      */
     $scope.$on('auth-user-changed', function (event, args) {
       vm.user = Authentication.user;
       vm.scoreLevelData = vm.user ? ScoreLevelService.getScoreLevelJson(vm.user.score) : undefined;
+      vm.bindHoverToMenuItem();
       vm.getInvitationsCount();
       vm.getWarning();
       vm.getCountUnread();
diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html
index b50325ba..27fc391d 100644
--- a/modules/core/client/views/header.client.view.html
+++ b/modules/core/client/views/header.client.view.html
@@ -1,5 +1,5 @@
 <div class="container navbar-mt" ng-controller="HeaderController as vm"
-     ng-init="vm.getInvitationsCount(); vm.checkMessageUnread(); vm.checkHnRWarning();">
+     ng-init="vm.bindHoverToMenuItem(); vm.getInvitationsCount(); vm.checkMessageUnread(); vm.checkHnRWarning();">
     <div class="navbar-header">
         <button class="navbar-toggle" type="button" ng-click="vm.isCollapsed = !vm.isCollapsed">
             <span class="sr-only">Toggle navigation</span>
@@ -57,7 +57,7 @@
                 </a>
                 <ul class="dropdown-menu" role="menu">
                     <li class="lang-list">
-                        <span class="flag-icon {{l.class}}" title="{{l.title}}" ng-click="vm.changeLanguage(l.name); $event.stopPropagation();"
+                        <span class="flag-icon {{l.class}}" title="{{l.title}}" ng-click="vm.changeLanguage(l.name);"
                               ng-repeat="l in vm.language" ng-class="{'curr-language': vm.langService.getLang() == l.name}"></span>
                     </li>
                     <li class="divider"></li>

From 668f547bd26e22c07d30072d46c4633882c861a4 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 19 May 2018 01:13:13 +0800
Subject: [PATCH 57/96] fix(core): fixed torrent upload issue

---
 config/env/torrents.js                        |  2 +-
 config/lib/multer.js                          | 13 ++---
 .../controllers/uploads.client.controller.js  |  2 +-
 .../torrent-get-info.client.service.js        |  8 +--
 .../controllers/torrents.server.controller.js | 55 +++++++++++--------
 5 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index 6830326f..3c68220e 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -1194,7 +1194,7 @@ module.exports = {
      * @resourcesLanguage:        settings for language of dropdown resource info
      */
     tmdbConfig: {
-      key: 'this is access key from tmdb',
+      key: '7888f0042a366f63289ff571b68b7ce0',
       tmdbHome: 'https://www.themoviedb.org',
       tmdbMovieLinkUrl: 'https://www.themoviedb.org/movie/',
       tmdbTvserialLinkUrl: 'https://www.themoviedb.org/tv/',
diff --git a/config/lib/multer.js b/config/lib/multer.js
index c02e0988..5358f37e 100644
--- a/config/lib/multer.js
+++ b/config/lib/multer.js
@@ -59,14 +59,13 @@ module.exports.createUploadFilename = function (req, file, cb) {
   }
 
   //replace other pt site prefix
-  var reg = /^\{([^}]+)\}[\.\s]|^\{([^}]+)\}/i;
-  while (reg.test(filename)) {
-    filename = filename.replace(reg, '');
-  }
+  var reg = /\{([a-zA-Z0-9\_\-\.\s]){2,10}\}[\.|\s]*/gi;
+  filename = filename.replace(reg, '');
 
   if (fs.existsSync(config.uploads.torrent.file.dest + filename)) {
     var err = new Error();
     err.code = 'FILE_ALREADY_EXISTS';
+    err.filename = config.uploads.torrent.file.dest + filename;
     cb(err, null);
   } else {
     cb(null, filename);
@@ -101,10 +100,8 @@ module.exports.createUploadAttachFilename = function (req, file, cb) {
   }
 
   //replace other pt site prefix
-  var reg = /^\{([^}]+)\}[\.\s]|^\{([^}]+)\}/i;
-  while (reg.test(filename)) {
-    filename = filename.replace(reg, '');
-  }
+  var reg = /\{([a-zA-Z0-9\_\-\.\s]){2,10}\}[\.|\s]*/gi;
+  filename = filename.replace(reg, '');
 
 
   if (fs.existsSync(config.uploads.attach.file.dest + filename)) {
diff --git a/modules/torrents/client/controllers/uploads.client.controller.js b/modules/torrents/client/controllers/uploads.client.controller.js
index d8141931..fb112abc 100644
--- a/modules/torrents/client/controllers/uploads.client.controller.js
+++ b/modules/torrents/client/controllers/uploads.client.controller.js
@@ -345,7 +345,7 @@
     function getTitleFromResourceFileName(fname) {
       if (fname) {
         //replace other pt site prefix
-        fname = fname.replace(/^\{([^}]+)\}[\.\s]|^\{([^}]+)\}/, '');
+        fname = fname.replace(/\{([a-zA-Z0-9\_\-\.\s]){2,10}\}[\.|\s]*/gi, '');
         fname = fname.replace(/.torrent/g, '');
         return fname;
       } else {
diff --git a/modules/torrents/client/services/torrent-get-info.client.service.js b/modules/torrents/client/services/torrent-get-info.client.service.js
index 1cd6cf00..60d6ffb2 100644
--- a/modules/torrents/client/services/torrent-get-info.client.service.js
+++ b/modules/torrents/client/services/torrent-get-info.client.service.js
@@ -134,12 +134,8 @@
      */
     function getTitleFromResourceFileName(fname) {
       if (fname) {
-        var reg = /^\{([^}]+)\}[\.\s]|^\{([^}]+)\}/i;
-        //replace other pt site prefix
-        while (reg.test(fname)) {
-          fname = fname.replace(reg, '');
-        }
-
+        var reg = /\{([a-zA-Z0-9\_\-\.\s]){2,10}\}[\.|\s]*|\[([a-zA-Z0-9\_\-\.\s]){2,10}\][\.|\s]*/gi;
+        fname = fname.replace(reg, '');
         fname = fname.replace(/.torrent/g, '');
 
         return fname;
diff --git a/modules/torrents/server/controllers/torrents.server.controller.js b/modules/torrents/server/controllers/torrents.server.controller.js
index 80d48ff8..22ee34ec 100644
--- a/modules/torrents/server/controllers/torrents.server.controller.js
+++ b/modules/torrents/server/controllers/torrents.server.controller.js
@@ -161,11 +161,8 @@ exports.upload = function (req, res) {
       })
       .catch(function (err) {
         res.status(422).send({
-          message: err,
-          params: {
-            hash: torrentinfo.info_hash,
-            filename: req.file.filename
-          }
+          message: err.message,
+          params: err.params
         });
 
         if (req.file && req.file.filename) {
@@ -193,7 +190,7 @@ exports.upload = function (req, res) {
             message = 'Torrent file too large. Maximum size allowed is ' + (config.uploads.torrent.file.limits.fileSize / (1024 * 1024)).toFixed(2) + ' Mb files.';
           }
 
-          reject(message);
+          reject({message: message, params: {filename: uploadError.filename}});
         } else {
           resolve();
         }
@@ -211,7 +208,7 @@ exports.upload = function (req, res) {
         if (err) {
           mtDebug.debugError(err, 'READ_TORRENT_FILE_FAILD');
           message = 'SERVER.READ_TORRENT_FILE_FAILD';
-          reject(message);
+          reject({message: message});
         } else {
           //force change announce url to config value
           var announce = config.meanTorrentConfig.announce.url;
@@ -253,7 +250,7 @@ exports.upload = function (req, res) {
 
       if (torrentinfo.info_hash === '' || !torrentinfo.info_hash) {
         message = 'SERVER.INFO_HASH_IS_EMPTY';
-        reject(message);
+        reject({message: message});
       } else {
         Torrent.findOne({
           info_hash: torrentinfo.info_hash
@@ -264,7 +261,7 @@ exports.upload = function (req, res) {
             if (torrent) {
               message = 'SERVER.INFO_HASH_ALREADY_EXISTS';
 
-              reject(message);
+              reject({message: message, params: {hash: torrentinfo.info_hash}});
             } else {
               resolve();
             }
@@ -2265,25 +2262,35 @@ exports.torrentByID = function (req, res, next, id) {
 
   var writeAllFiles = function (torrent, callback) {
     if (torrent) {
-      var filePath = config.uploads.torrent.file.dest + torrent.torrent_filename;
-      nt.read(filePath, function (err, torrent_data) {
-        if (err) {
-          callback(err);
-        } else {
-          var mdata = torrent_data.metadata;
-          torrent._all_files = [];
+      try {
+        var filePath = config.uploads.torrent.file.dest + torrent.torrent_filename;
+        fs.exists(filePath, function (exists) {
+          if (exists) {
+            nt.read(filePath, function (err, torrent_data) {
+              if (err) {
+                callback(err);
+              } else {
+                var mdata = torrent_data.metadata;
+                torrent._all_files = [];
 
-          if (mdata.info.files) {
-            mdata.info.files.forEach(function (f) {
-              torrent._all_files.push(f.path.join('/') + ', ' + common.fileSizeFormat(f.length, 2));
+                if (mdata.info.files) {
+                  mdata.info.files.forEach(function (f) {
+                    torrent._all_files.push(f.path.join('/') + ', ' + common.fileSizeFormat(f.length, 2));
+                  });
+                } else {
+                  torrent._all_files.push(mdata.info.name + ', ' + common.fileSizeFormat(mdata.info.length, 2));
+                }
+
+                callback(null, torrent);
+              }
             });
           } else {
-            torrent._all_files.push(mdata.info.name + ', ' + common.fileSizeFormat(mdata.info.length, 2));
+            callback(null, torrent);
           }
-
-          callback(null, torrent);
-        }
-      });
+        });
+      } catch (e) {
+        callback(null, torrent);
+      }
     } else {
       callback(null, torrent);
     }

From 7a95976b8ce40a6e7a151e29bfebff5b82fc3f91 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 19 May 2018 01:15:55 +0800
Subject: [PATCH 58/96] fix(core): remove tmdb test key

---
 config/env/torrents.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index 3c68220e..6830326f 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -1194,7 +1194,7 @@ module.exports = {
      * @resourcesLanguage:        settings for language of dropdown resource info
      */
     tmdbConfig: {
-      key: '7888f0042a366f63289ff571b68b7ce0',
+      key: 'this is access key from tmdb',
       tmdbHome: 'https://www.themoviedb.org',
       tmdbMovieLinkUrl: 'https://www.themoviedb.org/movie/',
       tmdbTvserialLinkUrl: 'https://www.themoviedb.org/tv/',

From b8b8af6a5e6fca2b5f0945e520702d22e990d440 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 19 May 2018 02:44:19 +0800
Subject: [PATCH 59/96] fix(torrents): auto get resource main title when upload

---
 config/env/torrents.js                                 |  2 +-
 .../client/controllers/uploads.client.controller.js    | 10 +++++++++-
 .../client/services/torrent-get-info.client.service.js |  9 ++++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index 6830326f..3c68220e 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -1194,7 +1194,7 @@ module.exports = {
      * @resourcesLanguage:        settings for language of dropdown resource info
      */
     tmdbConfig: {
-      key: 'this is access key from tmdb',
+      key: '7888f0042a366f63289ff571b68b7ce0',
       tmdbHome: 'https://www.themoviedb.org',
       tmdbMovieLinkUrl: 'https://www.themoviedb.org/movie/',
       tmdbTvserialLinkUrl: 'https://www.themoviedb.org/tv/',
diff --git a/modules/torrents/client/controllers/uploads.client.controller.js b/modules/torrents/client/controllers/uploads.client.controller.js
index fb112abc..31bfa7be 100644
--- a/modules/torrents/client/controllers/uploads.client.controller.js
+++ b/modules/torrents/client/controllers/uploads.client.controller.js
@@ -347,7 +347,15 @@
         //replace other pt site prefix
         fname = fname.replace(/\{([a-zA-Z0-9\_\-\.\s]){2,10}\}[\.|\s]*/gi, '');
         fname = fname.replace(/.torrent/g, '');
-        return fname;
+
+        // var re = /((?:^|\D)\d\.\d(?=\D|$))|\./g;
+        var re = /[0-9]\.[0-9]\b|(\.)/g;
+        var repl = fname.replace(re, function ($0, $1) {
+          // return ($1 ? $1.replace(/^\./, ' ') : ' ');
+          return $1 === '.' ? ' ' : $0;
+        });
+
+        return repl;
       } else {
         return '';
       }
diff --git a/modules/torrents/client/services/torrent-get-info.client.service.js b/modules/torrents/client/services/torrent-get-info.client.service.js
index 60d6ffb2..ef1ae957 100644
--- a/modules/torrents/client/services/torrent-get-info.client.service.js
+++ b/modules/torrents/client/services/torrent-get-info.client.service.js
@@ -138,7 +138,14 @@
         fname = fname.replace(reg, '');
         fname = fname.replace(/.torrent/g, '');
 
-        return fname;
+        // var re = /((?:^|\D)\d\.\d(?=\D|$))|\./g;
+        var re = /[0-9]\.[0-9]\b|(\.)/g;
+        var repl = fname.replace(re, function ($0, $1) {
+          // return ($1 ? $1.replace(/^\./, ' ') : ' ');
+          return $1 === '.' ? ' ' : $0;
+        });
+
+        return repl;
       } else {
         return '';
       }

From 09a30be6b892b72f230b66a48c7e08816a83903a Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 19 May 2018 02:44:44 +0800
Subject: [PATCH 60/96] fix(core): remove tmdb test key

---
 config/env/torrents.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index 3c68220e..6830326f 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -1194,7 +1194,7 @@ module.exports = {
      * @resourcesLanguage:        settings for language of dropdown resource info
      */
     tmdbConfig: {
-      key: '7888f0042a366f63289ff571b68b7ce0',
+      key: 'this is access key from tmdb',
       tmdbHome: 'https://www.themoviedb.org',
       tmdbMovieLinkUrl: 'https://www.themoviedb.org/movie/',
       tmdbTvserialLinkUrl: 'https://www.themoviedb.org/tv/',

From 948b9e989f305d191fa20eb7695628cb12796ef4 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 19 May 2018 02:55:56 +0800
Subject: [PATCH 61/96] fix(torrents): auto get resource main title when upload

---
 .../controllers/uploads.client.controller.js  | 18 ++++++++---------
 .../torrent-get-info.client.service.js        | 20 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/modules/torrents/client/controllers/uploads.client.controller.js b/modules/torrents/client/controllers/uploads.client.controller.js
index 31bfa7be..ab668b17 100644
--- a/modules/torrents/client/controllers/uploads.client.controller.js
+++ b/modules/torrents/client/controllers/uploads.client.controller.js
@@ -338,19 +338,19 @@
     };
 
     /**
-     * getTitleFromResourceFileName
-     * @param fname
+     * getFormattedResourceTitle
+     * @param title
      * @returns {*}
      */
-    function getTitleFromResourceFileName(fname) {
-      if (fname) {
+    function getFormattedResourceTitle(title) {
+      if (title) {
         //replace other pt site prefix
-        fname = fname.replace(/\{([a-zA-Z0-9\_\-\.\s]){2,10}\}[\.|\s]*/gi, '');
-        fname = fname.replace(/.torrent/g, '');
+        title = title.replace(/\{([a-zA-Z0-9\_\-\.\s]){2,10}\}[\.|\s]*/gi, '');
+        title = title.replace(/.torrent/g, '');
 
         // var re = /((?:^|\D)\d\.\d(?=\D|$))|\./g;
         var re = /[0-9]\.[0-9]\b|(\.)/g;
-        var repl = fname.replace(re, function ($0, $1) {
+        var repl = title.replace(re, function ($0, $1) {
           // return ($1 ? $1.replace(/^\./, ' ') : ' ');
           return $1 === '.' ? ' ' : $0;
         });
@@ -413,7 +413,7 @@
         tmdbid: tmdbid,
         language: getStorageLangService.getLang()
       }, function (res) {
-        vm.customTorrent.title = getTitleFromResourceFileName(vm.torrentInfo.filename);
+        vm.customTorrent.title = getFormattedResourceTitle(vm.torrentInfo.filename);
         vm.customTorrent.subtitle = res.title;
 
         vm.tmdb_info_ok = true;
@@ -459,7 +459,7 @@
         tmdbid: tmdbid,
         language: getStorageLangService.getLang()
       }, function (res) {
-        vm.customTorrent.title = getTitleFromResourceFileName(vm.torrentInfo.filename);
+        vm.customTorrent.title = getFormattedResourceTitle(vm.torrentInfo.filename);
         vm.customTorrent.subtitle = res.name;
 
         vm.tmdb_info_ok = true;
diff --git a/modules/torrents/client/services/torrent-get-info.client.service.js b/modules/torrents/client/services/torrent-get-info.client.service.js
index ef1ae957..e54dbf60 100644
--- a/modules/torrents/client/services/torrent-get-info.client.service.js
+++ b/modules/torrents/client/services/torrent-get-info.client.service.js
@@ -20,7 +20,7 @@
       getTorrentDoubleTitle: getTorrentDoubleTitle,
       getTorrentCustomTitle: getTorrentCustomTitle,
       getTorrentCustomSubTitle: getTorrentCustomSubTitle,
-      getTitleFromResourceFileName: getTitleFromResourceFileName,
+      getFormattedResourceTitle: getFormattedResourceTitle,
       getTorrentListImage: getTorrentListImage,
       getTorrentListTopImage: getTorrentListTopImage,
       getTorrentTopOneImage: getTorrentTopOneImage,
@@ -106,9 +106,9 @@
      */
     function getTorrentCustomTitle(item) {
       if (item.resource_detail_info.custom_title) {
-        return item.resource_detail_info.custom_title;
+        return getFormattedResourceTitle(item.resource_detail_info.custom_title);
       } else {
-        return getTitleFromResourceFileName(item.torrent_filename);
+        return getFormattedResourceTitle(item.torrent_filename);
       }
     }
 
@@ -128,19 +128,19 @@
     }
 
     /**
-     * getTitleFromResourceFileName
-     * @param fname
+     * getFormattedResourceTitle
+     * @param title
      * @returns {*}
      */
-    function getTitleFromResourceFileName(fname) {
-      if (fname) {
+    function getFormattedResourceTitle(title) {
+      if (title) {
         var reg = /\{([a-zA-Z0-9\_\-\.\s]){2,10}\}[\.|\s]*|\[([a-zA-Z0-9\_\-\.\s]){2,10}\][\.|\s]*/gi;
-        fname = fname.replace(reg, '');
-        fname = fname.replace(/.torrent/g, '');
+        title = title.replace(reg, '');
+        title = title.replace(/.torrent/g, '');
 
         // var re = /((?:^|\D)\d\.\d(?=\D|$))|\./g;
         var re = /[0-9]\.[0-9]\b|(\.)/g;
-        var repl = fname.replace(re, function ($0, $1) {
+        var repl = title.replace(re, function ($0, $1) {
           // return ($1 ? $1.replace(/^\./, ' ') : ' ');
           return $1 === '.' ? ' ' : $0;
         });

From 8a89b27d9ab06dc41e5342ce9035161aa3210763 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 19 May 2018 10:41:25 +0800
Subject: [PATCH 62/96] feat(torrents): owner and oper can modify the main
 title and subtitle now

---
 .../editable-line.client.directive.js         |  4 +-
 .../torrent-info.client.controller.js         | 82 +++++++++++++++++--
 modules/torrents/client/less/torrents.less    |  4 +
 .../views/view-torrent.client.view.html       | 20 ++++-
 .../controllers/torrents.server.controller.js |  8 ++
 5 files changed, 106 insertions(+), 12 deletions(-)

diff --git a/modules/core/client/directives/editable-line.client.directive.js b/modules/core/client/directives/editable-line.client.directive.js
index 22496fb8..c2372ebb 100644
--- a/modules/core/client/directives/editable-line.client.directive.js
+++ b/modules/core/client/directives/editable-line.client.directive.js
@@ -27,9 +27,9 @@
         $scope.input = jQuery($element).find('.editable-line-input');
         $scope.originalDivBackground = $scope.div.css('background-color');
 
-        $scope.div.awesomeCursor('wrench', {
+        $scope.div.awesomeCursor('pencil', {
           color: '#ff6000',
-          flip: 'horizontal',
+          flip: 'vertical',
           outline: '#ff3e00'
         });
 
diff --git a/modules/torrents/client/controllers/torrent-info.client.controller.js b/modules/torrents/client/controllers/torrent-info.client.controller.js
index f4e89091..59cdc559 100644
--- a/modules/torrents/client/controllers/torrent-info.client.controller.js
+++ b/modules/torrents/client/controllers/torrent-info.client.controller.js
@@ -95,6 +95,11 @@
      * $watch 'vm.torrentLocalInfo'
      */
     $scope.$watch('vm.torrentLocalInfo', function (newValue, oldValue) {
+      if(vm.torrentLocalInfo) {
+        vm.torrentLocalInfo.resource_detail_info.custom_title = vm.TGI.getTorrentCustomTitle(vm.torrentLocalInfo);
+        vm.torrentLocalInfo.resource_detail_info.custom_subtitle = vm.TGI.getTorrentCustomSubTitle(vm.torrentLocalInfo);
+      }
+
       if (vm.torrentLocalInfo && vm.torrentLocalInfo._replies) {
         var hasme = false;
         var meitem = null;
@@ -517,13 +522,13 @@
             }
           ]
         },
-        {
-          icon: 'fa-user-md',
-          title: $translate.instant('TAB_MY_PANEL'),
-          templateUrl: 'myPanel.html',
-          ng_show: vm.torrentLocalInfo.isCurrentUserOwner,
-          badges: []
-        },
+        // {
+        //   icon: 'fa-user-md',
+        //   title: $translate.instant('TAB_MY_PANEL'),
+        //   templateUrl: 'myPanel.html',
+        //   ng_show: vm.torrentLocalInfo.isCurrentUserOwner,
+        //   badges: []
+        // },
         {
           icon: 'fa-cog',
           title: $translate.instant('TAB_ADMIN_PANEL'),
@@ -1011,6 +1016,69 @@
         });
     };
 
+    /**
+     * isOwner
+     * @param o, topic or reply
+     * @returns {boolean}
+     */
+    vm.isOwner = function (o) {
+      if (o) {
+        if (o.isCurrentUserOwner) {
+          return true;
+        } else {
+          return false;
+        }
+      } else {
+        return false;
+      }
+    };
+
+    /**
+     * canEdit
+     * @returns {boolean}
+     */
+    vm.canEdit = function () {
+      if (vm.user.isOper) {
+        return true;
+      } else {
+        return false;
+      }
+    };
+
+    /**
+     * onTorrentTitleEdited
+     */
+    $scope.onTorrentTitleEdited = function (modifyed) {
+      if (vm.torrentLocalInfo && modifyed) {
+        TorrentsService.update({
+          _id: vm.torrentLocalInfo._id,
+          custom_title: vm.torrentLocalInfo.resource_detail_info.custom_title
+        }, function (res) {
+          vm.torrentLocalInfo = res;
+          NotifycationService.showSuccessNotify('TORRENT_UPDATE_SUCCESSFULLY');
+        }, function (res) {
+          NotifycationService.showErrorNotify(res.data.message, 'TORRENT_UPDATE_ERROR');
+        });
+      }
+    };
+
+    /**
+     * onTorrentSubTitleEdited
+     */
+    $scope.onTorrentSubTitleEdited = function (modifyed) {
+      if (vm.torrentLocalInfo && modifyed) {
+        TorrentsService.update({
+          _id: vm.torrentLocalInfo._id,
+          custom_subtitle: vm.torrentLocalInfo.resource_detail_info.custom_subtitle
+        }, function (res) {
+          vm.torrentLocalInfo = res;
+          NotifycationService.showSuccessNotify('TORRENT_UPDATE_SUCCESSFULLY');
+        }, function (res) {
+          NotifycationService.showErrorNotify(res.data.message, 'TORRENT_UPDATE_ERROR');
+        });
+      }
+    };
+
     /**
      * doUpdateTorrentInfo
      * @param minfo
diff --git a/modules/torrents/client/less/torrents.less b/modules/torrents/client/less/torrents.less
index 05542481..e20fe2bf 100644
--- a/modules/torrents/client/less/torrents.less
+++ b/modules/torrents/client/less/torrents.less
@@ -1,5 +1,9 @@
 @import (reference) "../../../core/client/less/mt-var.less";
 
+.text-bold {
+    font-weight: bold;
+}
+
 .filter-tags {
     padding-bottom: 10px;
     margin-bottom: 15px;
diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html
index fa1b84de..9c21fa15 100644
--- a/modules/torrents/client/views/view-torrent.client.view.html
+++ b/modules/torrents/client/views/view-torrent.client.view.html
@@ -579,13 +579,27 @@
             </span>
 
             <dl class="dl-horizontal" style="margin-bottom: 0;">
+                <dt class="h-line">{{ 'RESOURCE_TITLE' | translate}}：</dt>
+                <dd class="h-line">
+                    <span class="text-bold" editable-line readonly="!vm.canEdit() && !vm.isOwner(vm.torrentLocalInfo)"
+                          ng-model="vm.torrentLocalInfo.resource_detail_info.custom_title"
+                          callback="onTorrentTitleEdited"></span>
+                </dd>
+
+                <dt class="h-line">{{ 'RESOURCE_SUB_TITLE' | translate}}：</dt>
+                <dd class="h-line">
+                    <span class="text-bold" editable-line readonly="!vm.canEdit() && !vm.isOwner(vm.torrentLocalInfo)"
+                          ng-model="vm.torrentLocalInfo.resource_detail_info.custom_subtitle"
+                          callback="onTorrentSubTitleEdited"></span>
+                </dd>
+
                 <dt class="h-line">{{ 'TABLE_FIELDS.PUBLISHER' | translate}}：</dt>
                 <dd class="h-line">
                     <span ng-if="!vm.torrentLocalInfo.isAnonymous" user-info="vm.torrentLocalInfo.user" info-name></span>
                     <span ng-if="vm.torrentLocalInfo.isAnonymous">{{ 'ANONYMOUS' | translate }}</span>
                     <span maker-info="vm.torrentLocalInfo.maker"></span>
                     <!--<span message-to="vm.torrentLocalInfo.user" to-class="message-to-icon"></span>-->
-                    <span>&emsp;&emsp;{{'MESSAGES_FIELD.INFO_SEND_AT' | translate}}: {{vm.torrentLocalInfo.createdat | date: 'yyyy-MM-dd HH:mm:ss'}}</span>
+                    <span>&nbsp;{{'MESSAGES_FIELD.INFO_SEND_AT' | translate}}: {{vm.torrentLocalInfo.createdat | date: 'yyyy-MM-dd HH:mm:ss'}}</span>
                 </dd>
 
                 <dt class="h-line">{{ 'TORRENT_FILENAME' | translate}}：</dt>
@@ -596,8 +610,8 @@
 
                 <dt class="h-line">{{ 'TABLE_FIELDS.ABBR_SEEDS_LEECHERS_FINISHED' | translate}}：</dt>
                 <dd class="h-line">
-                    <span><span class="glyphicon glyphicon-arrow-up torrent-up"></span> {{vm.torrentLocalInfo.torrent_seeds}}</span>&emsp;&emsp;
-                    <span><span class="glyphicon glyphicon-arrow-down torrent-down"></span> {{vm.torrentLocalInfo.torrent_leechers}}</span>&emsp;&emsp;
+                    <span><span class="glyphicon glyphicon-arrow-up torrent-up"></span> {{vm.torrentLocalInfo.torrent_seeds}}</span>&emsp;
+                    <span><span class="glyphicon glyphicon-arrow-down torrent-down"></span> {{vm.torrentLocalInfo.torrent_leechers}}</span>&emsp;
                     <span><span class="glyphicon glyphicon-ok torrent-finished"></span> {{vm.torrentLocalInfo.torrent_finished}}</span>
                 </dd>
 
diff --git a/modules/torrents/server/controllers/torrents.server.controller.js b/modules/torrents/server/controllers/torrents.server.controller.js
index 22ee34ec..251589f6 100644
--- a/modules/torrents/server/controllers/torrents.server.controller.js
+++ b/modules/torrents/server/controllers/torrents.server.controller.js
@@ -849,6 +849,14 @@ exports.update = function (req, res) {
     torrent.torrent_nfo = req.body.torrent_nfo;
     torrent.torrent_media_info = mediaInfo.getMediaInfo(req.body.torrent_nfo);
   }
+  if (req.body.hasOwnProperty('custom_title')) {
+    torrent.resource_detail_info.custom_title = req.body.custom_title;
+    torrent.markModified('resource_detail_info');
+  }
+  if (req.body.hasOwnProperty('custom_subtitle')) {
+    torrent.resource_detail_info.custom_subtitle = req.body.custom_subtitle;
+    torrent.markModified('resource_detail_info');
+  }
 
   torrent.save(function (err) {
     if (err) {

From 7f4cb7caf3641990e3101ec5376267cd21b719a4 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 19 May 2018 10:42:48 +0800
Subject: [PATCH 63/96] fix(torrents): fixed eslint warning

---
 .../client/controllers/torrent-info.client.controller.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/torrents/client/controllers/torrent-info.client.controller.js b/modules/torrents/client/controllers/torrent-info.client.controller.js
index 59cdc559..fc99ecb6 100644
--- a/modules/torrents/client/controllers/torrent-info.client.controller.js
+++ b/modules/torrents/client/controllers/torrent-info.client.controller.js
@@ -95,7 +95,7 @@
      * $watch 'vm.torrentLocalInfo'
      */
     $scope.$watch('vm.torrentLocalInfo', function (newValue, oldValue) {
-      if(vm.torrentLocalInfo) {
+      if (vm.torrentLocalInfo) {
         vm.torrentLocalInfo.resource_detail_info.custom_title = vm.TGI.getTorrentCustomTitle(vm.torrentLocalInfo);
         vm.torrentLocalInfo.resource_detail_info.custom_subtitle = vm.TGI.getTorrentCustomSubTitle(vm.torrentLocalInfo);
       }

From 3cb5e7d1428863f78a323555f99725409386ca11 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 19 May 2018 11:08:40 +0800
Subject: [PATCH 64/96] feat(torrents): owner and oper can modify the main
 title and subtitle now

---
 .../directives/editable-line.client.directive.js     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/core/client/directives/editable-line.client.directive.js b/modules/core/client/directives/editable-line.client.directive.js
index c2372ebb..37a80fce 100644
--- a/modules/core/client/directives/editable-line.client.directive.js
+++ b/modules/core/client/directives/editable-line.client.directive.js
@@ -27,11 +27,13 @@
         $scope.input = jQuery($element).find('.editable-line-input');
         $scope.originalDivBackground = $scope.div.css('background-color');
 
-        $scope.div.awesomeCursor('pencil', {
-          color: '#ff6000',
-          flip: 'vertical',
-          outline: '#ff3e00'
-        });
+        if (!$scope.readonly) {
+          $scope.div.awesomeCursor('pencil', {
+            color: '#ff6000',
+            flip: 'vertical',
+            outline: '#ff3e00'
+          });
+        }
 
         var originalValue;
         $scope.div.bind('click', function () {

From a7012e75433ce39a8fb8b98f38270f36e978bf61 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 19 May 2018 15:04:09 +0800
Subject: [PATCH 65/96] feat(torrents): add torrent attribute 'unique', these
 resource no transfer

---
 config/env/torrents.js                        |  1 +
 .../controllers/about.client.controller.js    |  4 +-
 modules/core/client/app/trans-string-en.js    | 10 ++++
 modules/core/client/app/trans-string-zh.js    | 12 ++++
 modules/core/client/css/core.css              |  4 ++
 .../torrent-list-item.client.directive.js     | 25 ++++++++-
 modules/core/client/less/mt.less              | 13 +++++
 .../client/config/torrents.client.routes.js   |  2 +-
 .../admin/admin-list.client.controller.js     | 16 +++++-
 .../torrent-info.client.controller.js         | 13 +++++
 .../controllers/torrents.client.controller.js | 17 +++++-
 .../services/torrents.client.service.js       |  8 +++
 .../templates/torrent-item.client.view.html   |  9 ++-
 .../views/admin/admin-list.client.view.html   | 55 ++++++++-----------
 .../views/list-torrents.client.view.html      | 41 +++++++-------
 .../views/search-torrents.client.view.html    | 45 +++++++++------
 .../views/view-torrent.client.view.html       | 12 ++++
 .../controllers/torrents.server.controller.js | 39 +++++++++++++
 .../server/models/torrent.server.model.js     |  4 ++
 .../server/policies/torrents.server.policy.js |  1 +
 .../server/routes/torrents.server.routes.js   |  3 +
 .../admin/user-uploaded.client.controller.js  |  4 +-
 .../status/uploaded.client.controller.js      |  4 +-
 .../controllers/vip.client.controller.js      | 17 +++++-
 modules/vip/client/views/vip.client.view.html | 44 +++++++--------
 25 files changed, 299 insertions(+), 104 deletions(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index 6830326f..58741457 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -614,6 +614,7 @@ module.exports = {
         torrentReviewed: {title: 'TITLE_TORRENT_REVIEWED', content: 'CONTENT_TORRENT_REVIEWED', enable: true},
         torrentVipChanged: {title: 'TITLE_TORRENT_VIP_CHANGED', content: 'CONTENT_TORRENT_VIP_CHANGED', enable: true},
         torrentTopChanged: {title: 'TITLE_TORRENT_TOP_CHANGED', content: 'CONTENT_TORRENT_TOP_CHANGED', enable: true},
+        torrentUniqueChanged: {title: 'TITLE_TORRENT_UNIQUE_CHANGED', content: 'CONTENT_TORRENT_UNIQUE_CHANGED', enable: true},
         torrentHnRChanged: {title: 'TITLE_TORRENT_HNR_CHANGED', content: 'CONTENT_TORRENT_HNR_CHANGED', enable: true},
         torrentSaleChanged: {title: 'TITLE_TORRENT_SALE_CHANGED', content: 'CONTENT_TORRENT_SALE_CHANGED', enable: true},
         torrentDeleted: {title: 'TITLE_TORRENT_DELETED', content: 'CONTENT_TORRENT_DELETED', enable: true},
diff --git a/modules/about/client/controllers/about.client.controller.js b/modules/about/client/controllers/about.client.controller.js
index ab2b8f4c..b2c315fc 100644
--- a/modules/about/client/controllers/about.client.controller.js
+++ b/modules/about/client/controllers/about.client.controller.js
@@ -47,6 +47,7 @@
     vm.releaseYear = undefined;
     vm.filterHnR = false;
     vm.filterTop = false;
+    vm.filterUnique = false;
     vm.filterSale = false;
     vm.torrentRLevel = 'level0';
 
@@ -288,7 +289,8 @@
         torrent_tags: vm.searchTags,
         torrent_hnr: vm.filterHnR,
         torrent_sale: vm.filterSale,
-        isTop: vm.filterTop
+        isTop: vm.filterTop,
+        isUnique: vm.filterUnique
       }, function (data) {
         mtDebug.info(data);
         callback(data);
diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index fb354760..e2608cef 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -342,11 +342,13 @@
     TAGS_SEARCH_GLOBAL: 'Tags Search - Global',
     CA_KEYWORD: 'Keyword',
     CA_TORRENT_STATUS: 'Torrent status',
+    CA_TORRENT_ATTR: 'Torrent attribute',
     CA_TORRENT_HNR: 'Hit and Run',
     CA_TORRENT_SALE_STATUS: 'Sale Status',
     CA_TORRENT_SALE_NOW: 'Saling',
     CA_TORRENT_VIP: 'VIP resources',
     CA_TORRENT_TOP: 'Top Status',
+    CA_TORRENT_UNIQUE: 'Unique Status',
     CA_RESOURCE_TYPE: 'Resource type',
     CA_MAKE_RSS_URL: 'Rss Url',
     DESC_MAKE_RSS_URL: 'This RSS url is make with above filter conditions, you can used it in the BT client (such as uTorrent) that supports the RSS subscription function to download torrent and resources automatic.',
@@ -392,7 +394,10 @@
     UPLOAD_TIME: 'Upload Time',
     SALE_EXPIRES_TIME: 'expires',
     TORRENT_STATUS_TOP_TITLE: 'Top Level',
+    TORRENT_STATUS_UNIQUE: 'Unique resource',
+    TORRENT_STATUS_UNIQUE_TITLE: 'Unique resource, no transfer',
     STATUS_TOP_KEY: 'TOP',
+    STATUS_UNIQUE_KEY: 'UNIQUE',
     UPLOAD_SUBTITLE: 'Upload Subtitle file',
     SUBTITLE_LIST: 'Subtitle list',
     SUBTITLE_RULES: {
@@ -429,6 +434,8 @@
     ADMIN_BASIC_UNSET_VIP: 'UnsetVIP',
     ADMIN_BASIC_SET_TOP: 'SetTop',
     ADMIN_BASIC_UNSET_TOP: 'UnsetTop',
+    ADMIN_BASIC_SET_UNIQUE: 'SetUnique',
+    ADMIN_BASIC_UNSET_UNIQUE: 'UnsetUnique',
     ADMIN_BASIC_TYPE_SET: 'Sale Type',
     ADMIN_SALE_TYPE_SET: 'Sale Type Set',
     ADMIN_BASIC_RLEVEL_SET: 'Recommend Level',
@@ -1692,6 +1699,9 @@
       TITLE_TORRENT_TOP_CHANGED: 'Torrent TOP status changed',
       CONTENT_TORRENT_TOP_CHANGED: '### TOP status changed! \n You uploaded torrent [{{torrent_file_name}}](/torrents/{{torrent_id}}) TOP status was changed by user [{{by_name}}](/userinfo/{{by_id}}), current status is **{{top_status}}**.',
 
+      TITLE_TORRENT_UNIQUE_CHANGED: 'Torrent Unique status changed',
+      CONTENT_TORRENT_UNIQUE_CHANGED: '### Unique status changed! \n You uploaded torrent [{{torrent_file_name}}](/torrents/{{torrent_id}}) Unique status was changed by user [{{by_name}}](/userinfo/{{by_id}}), current status is **{{unique_status}}**.',
+
       TITLE_TORRENT_SALE_CHANGED: 'Torrent sale status changed',
       CONTENT_TORRENT_SALE_CHANGED: '### Sale status changed! \n You uploaded torrent [{{torrent_file_name}}](/torrents/{{torrent_id}}) sale status was changed by user [{{by_name}}](/userinfo/{{by_id}}), current status is **{{sale_status}}**.',
 
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index cd17078a..170fa158 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -342,11 +342,13 @@
     TAGS_SEARCH_GLOBAL: '种子搜索 - 全局',
     CA_KEYWORD: '关键字',
     CA_TORRENT_STATUS: '种子状态',
+    CA_TORRENT_ATTR: '种子属性',
     CA_TORRENT_HNR: 'H&R 黑种',
     CA_TORRENT_SALE_STATUS: '促销状态',
     CA_TORRENT_SALE_NOW: '正在促销',
     CA_TORRENT_VIP: 'VIP 资源',
     CA_TORRENT_TOP: '置顶状态',
+    CA_TORRENT_UNIQUE: '独占状态',
     CA_RESOURCE_TYPE: '资源类型',
     CA_MAKE_RSS_URL: 'RSS连接',
     DESC_MAKE_RSS_URL: '这个 RSS 地址是通过上面的过滤条件生成的，您可以使用支持 RSS 订阅功能的BT客户端（如uTorrent）来自动下载您想要的这些种子和资源文件.',
@@ -392,7 +394,10 @@
     UPLOAD_TIME: '上传时间',
     SALE_EXPIRES_TIME: '过期',
     TORRENT_STATUS_TOP_TITLE: '置顶推荐',
+    TORRENT_STATUS_UNIQUE: '独占资源',
+    TORRENT_STATUS_UNIQUE_TITLE: '独占资源，禁止转发',
     STATUS_TOP_KEY: '置顶',
+    STATUS_UNIQUE_KEY: '独占',
     UPLOAD_SUBTITLE: '上传字幕文件',
     SUBTITLE_LIST: '字幕列表',
     SUBTITLE_RULES: {
@@ -429,6 +434,8 @@
     ADMIN_BASIC_UNSET_VIP: '取消VIP',
     ADMIN_BASIC_SET_TOP: '设为置顶',
     ADMIN_BASIC_UNSET_TOP: '取消置顶',
+    ADMIN_BASIC_SET_UNIQUE: '设为独占',
+    ADMIN_BASIC_UNSET_UNIQUE: '取消独占',
     ADMIN_BASIC_TYPE_SET: '设置促销',
     ADMIN_SALE_TYPE_SET: '种子促销类型',
     ADMIN_BASIC_RLEVEL_SET: '推荐级别',
@@ -472,6 +479,8 @@
     TORRENT_TOGGLE_VIP_FAILED: '改变种子VIP标签失败',
     TORRENT_TOGGLE_TOP_SUCCESSFULLY: '改变种子置顶状态成功',
     TORRENT_TOGGLE_TOP_FAILED: '改变种子置顶状态失败',
+    TORRENT_TOGGLE_UNIQUE_SUCCESSFULLY: '改变种子独占状态成功',
+    TORRENT_TOGGLE_UNIQUE_FAILED: '改变种子独占状态失败',
     TORRENT_SETTAGS_SUCCESSFULLY: '种子属性标签设置成功',
     TORRENT_SETTAGS_ERROR: '种子属性标签设置失败',
 
@@ -1692,6 +1701,9 @@
       TITLE_TORRENT_TOP_CHANGED: '上传的种子 置顶 状态改变',
       CONTENT_TORRENT_TOP_CHANGED: '### 置顶 状态改变! \n 您上传的种子 [{{torrent_file_name}}](/torrents/{{torrent_id}}) 置顶 状态已经由管理员用户 [{{by_name}}](/userinfo/{{by_id}}) 修改, 当前状态为: **{{top_status}}**.',
 
+      TITLE_TORRENT_UNIQUE_CHANGED: '上传的种子 独占 状态改变',
+      CONTENT_TORRENT_UNIQUE_CHANGED: '### 独占 状态改变! \n 您上传的种子 [{{torrent_file_name}}](/torrents/{{torrent_id}}) 独占 状态已经由管理员用户 [{{by_name}}](/userinfo/{{by_id}}) 修改, 当前状态为: **{{unique_status}}**.',
+
       TITLE_TORRENT_SALE_CHANGED: '上传的种子促销状态改变',
       CONTENT_TORRENT_SALE_CHANGED: '### 促销状态改变! \n 您上传的种子 [{{torrent_file_name}}](/torrents/{{torrent_id}}) 促销状态已经由管理员用户 [{{by_name}}](/userinfo/{{by_id}}) 修改, 当前状态为: **{{sale_status}}**.',
 
diff --git a/modules/core/client/css/core.css b/modules/core/client/css/core.css
index 2574bbfc..38ee2367 100644
--- a/modules/core/client/css/core.css
+++ b/modules/core/client/css/core.css
@@ -91,3 +91,7 @@ a:hover .header-profile-image {
 .dl-horizontal .h-line .checkbox-inline {
     min-width: 150px;
 }
+
+.tags-dl .checkbox-inline {
+    min-width: 100px !important;
+}
diff --git a/modules/core/client/directives/torrent-list-item.client.directive.js b/modules/core/client/directives/torrent-list-item.client.directive.js
index 4d32f9ea..c3af830a 100644
--- a/modules/core/client/directives/torrent-list-item.client.directive.js
+++ b/modules/core/client/directives/torrent-list-item.client.directive.js
@@ -120,7 +120,7 @@
         };
 
         /**
-         * onVIPClicked, onVIPChanged
+         * onVIPClicked
          */
         vm.onVIPClicked = function () {
           $scope.parent.filterVIP = !$scope.parent.filterVIP;
@@ -129,13 +129,21 @@
         };
 
         /**
-         * onTopClicked, onTopChanged
+         * onTopClicked
          */
         vm.onTopClicked = function () {
           $scope.parent.filterTop = !$scope.parent.filterTop;
           buildPager();
         };
 
+        /**
+         * onUniqueClicked
+         */
+        vm.onUniqueClicked = function () {
+          $scope.parent.filterUnique = !$scope.parent.filterUnique;
+          buildPager();
+        };
+
         /**
          * toggleTop
          */
@@ -149,6 +157,19 @@
           });
         };
 
+        /**
+         * toggleTop
+         */
+        vm.toggleUnique = function (item) {
+          var dt = new TorrentsService(item);
+          dt.$toggleUniqueStatus(function (res) {
+            $scope.list[$scope.list.indexOf(item)] = res;
+            NotifycationService.showSuccessNotify('TORRENT_TOGGLE_UNIQUE_SUCCESSFULLY');
+          }, function (res) {
+            NotifycationService.showErrorNotify(res.data.message, 'TORRENT_TOGGLE_UNIQUE_FAILED');
+          });
+        };
+
         /**
          * toggleHnR
          */
diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less
index ea5eff62..e48b3111 100644
--- a/modules/core/client/less/mt.less
+++ b/modules/core/client/less/mt.less
@@ -1284,6 +1284,19 @@ body {
     }
 }
 
+.label-unique-info {
+    color: #fff;
+    background-color: @brand-danger;
+    border: solid 1px darken(@brand-danger, 2%);
+    &:hover {
+        cursor: pointer;
+        color: #f00;
+    }
+    &:active {
+        color: #0366d6;
+    }
+}
+
 .upload-by {
     color: #888;
     background-color: #dedede;
diff --git a/modules/torrents/client/config/torrents.client.routes.js b/modules/torrents/client/config/torrents.client.routes.js
index d77be421..cf9a6a14 100644
--- a/modules/torrents/client/config/torrents.client.routes.js
+++ b/modules/torrents/client/config/torrents.client.routes.js
@@ -31,7 +31,7 @@
 
     $stateProvider
       .state('torrents.aggregate', {
-        url: '/aggregate',
+        url: '/aggregate?keys',
         templateUrl: '/modules/torrents/client/views/list-torrents.client.view.html',
         data: {
           pageTitle: 'PAGETITLE.TORRENTS_AGGREGATE',
diff --git a/modules/torrents/client/controllers/admin/admin-list.client.controller.js b/modules/torrents/client/controllers/admin/admin-list.client.controller.js
index 7d389044..642f968d 100644
--- a/modules/torrents/client/controllers/admin/admin-list.client.controller.js
+++ b/modules/torrents/client/controllers/admin/admin-list.client.controller.js
@@ -33,6 +33,7 @@
     vm.filterHnR = false;
     vm.filterSale = false;
     vm.filterTop = false;
+    vm.filterUnique = false;
     vm.filterType = undefined;
     vm.torrentStatus = 'reviewed';
     vm.torrentRLevel = 'level0';
@@ -217,7 +218,8 @@
         torrent_hnr: vm.filterHnR,
         torrent_vip: vm.filterVIP ? vm.filterVIP : undefined,
         torrent_sale: vm.filterSale,
-        isTop: vm.filterTop
+        isTop: vm.filterTop,
+        isUnique: vm.filterUnique
       }, function (items) {
         if (items.length === 0) {
           Notification.error({
@@ -246,6 +248,7 @@
       vm.filterHnR = false;
       vm.filterSale = false;
       vm.filterTop = false;
+      vm.filterUnique = false;
       vm.torrentStatus = 'reviewed';
       vm.torrentRLevel = 'level0';
 
@@ -333,6 +336,17 @@
       vm.torrentBuildPager();
     };
 
+    /**
+     * onUniqueClicked, onUniqueChanged
+     */
+    vm.onUniqueClicked = function () {
+      vm.filterUnique = !vm.filterUnique;
+      vm.torrentBuildPager();
+    };
+    vm.onUniqueChanged = function () {
+      vm.torrentBuildPager();
+    };
+
     /**
      * onRLevelClicked
      * @param y
diff --git a/modules/torrents/client/controllers/torrent-info.client.controller.js b/modules/torrents/client/controllers/torrent-info.client.controller.js
index fc99ecb6..8b7a04a6 100644
--- a/modules/torrents/client/controllers/torrent-info.client.controller.js
+++ b/modules/torrents/client/controllers/torrent-info.client.controller.js
@@ -207,6 +207,19 @@
       });
     };
 
+    /**
+     * toggleUnique
+     */
+    vm.toggleUnique = function (item) {
+      vm.torrentLocalInfo.$toggleUniqueStatus(function (res) {
+        mtDebug.info(res);
+        vm.torrentLocalInfo = res;
+        NotifycationService.showSuccessNotify('TORRENT_TOGGLE_UNIQUE_SUCCESSFULLY');
+      }, function (res) {
+        NotifycationService.showErrorNotify(res.data.message, 'TORRENT_TOGGLE_UNIQUE_FAILED');
+      });
+    };
+
     /**
      * editTags
      * @param evt
diff --git a/modules/torrents/client/controllers/torrents.client.controller.js b/modules/torrents/client/controllers/torrents.client.controller.js
index 28047b7d..c652cee8 100644
--- a/modules/torrents/client/controllers/torrents.client.controller.js
+++ b/modules/torrents/client/controllers/torrents.client.controller.js
@@ -30,6 +30,7 @@
     vm.filterType = undefined;
     vm.filterHnR = false;
     vm.filterTop = false;
+    vm.filterUnique = false;
     vm.filterSale = false;
     vm.topItems = 6;
     vm.torrentRLevel = 'level0';
@@ -310,7 +311,8 @@
         torrent_tags: vm.searchTags,
         torrent_hnr: vm.filterHnR,
         torrent_sale: vm.filterSale,
-        isTop: vm.filterTop
+        isTop: vm.filterTop,
+        isUnique: vm.filterUnique
       }, function (items) {
         if (items.length === 0) {
           Notification.error({
@@ -340,6 +342,7 @@
       vm.rssUrl += vm.searchTags.length ? '&torrent_tags=' + vm.searchTags : '';
       vm.rssUrl += '&torrent_hnr=' + vm.filterHnR;
       vm.rssUrl += '&isTop=' + vm.filterTop;
+      vm.rssUrl += '&isUnique=' + vm.filterUnique;
       vm.rssUrl += vm.filterSale ? '&torrent_sale=' + vm.filterSale : '';
     };
 
@@ -353,6 +356,7 @@
       vm.releaseYear = undefined;
       vm.filterHnR = false;
       vm.filterTop = false;
+      vm.filterUnique = false;
       vm.filterSale = false;
       vm.torrentRLevel = 'level0';
       vm.filterType = undefined;
@@ -431,6 +435,17 @@
       vm.torrentBuildPager();
     };
 
+    /**
+     * onUniqueClicked, onUniqueChanged
+     */
+    vm.onUniqueClicked = function () {
+      vm.filterUnique = !vm.filterUnique;
+      vm.torrentBuildPager();
+    };
+    vm.onUniqueChanged = function () {
+      vm.torrentBuildPager();
+    };
+
     /**
      * onSaleChanged
      */
diff --git a/modules/torrents/client/services/torrents.client.service.js b/modules/torrents/client/services/torrents.client.service.js
index 24bf5170..a5b69b3e 100644
--- a/modules/torrents/client/services/torrents.client.service.js
+++ b/modules/torrents/client/services/torrents.client.service.js
@@ -123,6 +123,14 @@
         },
         interceptor: {response: removeCache}
       },
+      toggleUniqueStatus: {
+        method: 'PUT',
+        url: '/api/torrents/:torrentId/toggleUniqueStatus',
+        params: {
+          torrentId: '@_id'
+        },
+        interceptor: {response: removeCache}
+      },
       thumbsUp: {
         method: 'PUT',
         url: '/api/torrents/:torrentId/thumbsUp',
diff --git a/modules/torrents/client/templates/torrent-item.client.view.html b/modules/torrents/client/templates/torrent-item.client.view.html
index 29834282..6aa57a9d 100644
--- a/modules/torrents/client/templates/torrent-item.client.view.html
+++ b/modules/torrents/client/templates/torrent-item.client.view.html
@@ -86,6 +86,10 @@
                           class="label torrent-top">{{'STATUS_TOP_KEY' | translate}}
                     </span>
 
+                    <span class="label label-unique-info" title="{{'TORRENT_STATUS_UNIQUE_TITLE' | translate}}"
+                          ng-if="item.isUnique" ng-class="{'used': parent.filterUnique}"
+                          ng-click="vm.onUniqueClicked(); $event.stopPropagation();">{{'STATUS_UNIQUE_KEY' | translate}}</span>
+
                     <span torrent-file-link-label="item" torrent-user="vm.user" info-class="label label-torrent-link"></span>
 
                     <span class="label upload-by" ng-if="vm.showByLabel()">by:
@@ -266,9 +270,12 @@
                 </div>
             </div>
             <div class="margin-top-2">
-                <button class="btn btn-xs btn-default btn-block" ng-click="vm.toggleTop(item); $event.stopPropagation();">
+                <button class="btn col-xs-6 btn-xs btn-default" ng-click="vm.toggleTop(item); $event.stopPropagation();">
                     {{ (item.isTop ? 'ADMIN_BASIC_UNSET_TOP' : 'ADMIN_BASIC_SET_TOP') | translate}}
                 </button>
+                <button class="btn col-xs-6 btn-xs btn-default" ng-click="vm.toggleUnique(item); $event.stopPropagation();">
+                    {{ (item.isUnique ? 'ADMIN_BASIC_UNSET_UNIQUE' : 'ADMIN_BASIC_SET_UNIQUE') | translate}}
+                </button>
             </div>
         </div>
     </td>
diff --git a/modules/torrents/client/views/admin/admin-list.client.view.html b/modules/torrents/client/views/admin/admin-list.client.view.html
index 5d138bd3..ace99eb8 100644
--- a/modules/torrents/client/views/admin/admin-list.client.view.html
+++ b/modules/torrents/client/views/admin/admin-list.client.view.html
@@ -5,7 +5,7 @@
         </div>
         <div class="panel-body">
             <div class="row filter-tags text-center"
-                 ng-if="vm.filterType || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.searchTags.length>0 || vm.filterVIP || vm.filterTop">
+                 ng-if="vm.filterType || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.searchTags.length>0 || vm.filterVIP || vm.filterTop || vm.filterUnique">
                 <div class="col-md-6 col-md-offset-3">
                     <span class="filter-tag-item label-tag" ng-if="vm.filterType">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
                         <i class="fa fa-times-circle-o"
@@ -42,6 +42,11 @@
                            ng-click="vm.onTopClicked();">
                         </i>
                     </span>
+                    <span class="filter-tag-item label-tag" ng-if="vm.filterUnique">{{'STATUS_UNIQUE_KEY' | translate}}
+                        <i class="fa fa-times-circle-o"
+                           ng-click="vm.onUniqueClicked();">
+                        </i>
+                    </span>
                     <span ng-repeat="t in vm.searchTags" ng-if="vm.searchTags.length>0">
                         <span class="filter-tag-item label-tag">{{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
                             <i class="fa fa-times-circle-o"
@@ -52,7 +57,7 @@
                 </div>
             </div>
             <div class="col-md-10 col-md-offset-1">
-                <dl class="dl-horizontal">
+                <dl class="dl-horizontal tags-dl">
                     <dt class="h-line">{{'CA_RESOURCE_TYPE' | translate}}</dt>
                     <dd class="h-line">
                         <div class="row margin-bottom-5">
@@ -92,44 +97,30 @@
                         </div>
                     </dd>
 
-                    <dt class="h-line">{{ 'CA_TORRENT_HNR' | translate}}:</dt>
+                    <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
                     <dd class="h-line">
-                        <div class="checkbox checkbox-hnr">
-                            <label>
+                        <span class="checkbox checkbox-hnr">
+                            <label class="checkbox-inline">
                                 <input type="checkbox" ng-model="vm.filterHnR" ng-change="vm.onHnRChanged();"> {{ 'CA_TORRENT_HNR' | translate}}
                             </label>
-                        </div>
-                    </dd>
-
-                    <div ng-if="!vm.isGlobalSaleNow()">
-                        <dt class="h-line">{{ 'CA_TORRENT_SALE_STATUS' | translate}}:</dt>
-                        <dd class="h-line">
-                            <div class="checkbox checkbox-hnr">
-                                <label>
-                                    <input type="checkbox" ng-model="vm.filterSale"
-                                           ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
-                                </label>
-                            </div>
-                        </dd>
-                    </div>
-
-                    <dt class="h-line">{{ 'CA_TORRENT_VIP' | translate}}:</dt>
-                    <dd class="h-line">
-                        <div class="checkbox checkbox-vip">
-                            <label>
+                            <label class="checkbox-inline" ng-if="!vm.isGlobalSaleNow()">
+                                <input type="checkbox" ng-model="vm.filterSale"
+                                       ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
+                            </label>
+                            <label class="checkbox-inline">
                                 <input type="checkbox" ng-model="vm.filterVIP" ng-change="vm.onVIPChanged();"> {{ 'CA_TORRENT_VIP' | translate}}
                             </label>
-                        </div>
-                    </dd>
-
-                    <dt class="h-line">{{ 'CA_TORRENT_TOP' | translate}}:</dt>
-                    <dd class="h-line">
-                        <div class="checkbox checkbox-vip">
-                            <label>
+                        </span>
+                        <span class="checkbox checkbox-hnr">
+                            <label class="checkbox-inline">
                                 <input type="checkbox" ng-model="vm.filterTop"
                                        ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
                             </label>
-                        </div>
+                             <label class="checkbox-inline">
+                                <input type="checkbox" ng-model="vm.filterUnique"
+                                       ng-change="vm.onUniqueChanged();"> {{ 'TORRENT_STATUS_UNIQUE' | translate}}
+                            </label>
+                        </span>
                     </dd>
 
                     <div ng-hide="vm.selectedType=='newest'">
diff --git a/modules/torrents/client/views/list-torrents.client.view.html b/modules/torrents/client/views/list-torrents.client.view.html
index d5be715e..124024be 100644
--- a/modules/torrents/client/views/list-torrents.client.view.html
+++ b/modules/torrents/client/views/list-torrents.client.view.html
@@ -72,7 +72,7 @@
         </div>
         <div class="panel-body">
             <div class="row filter-tags text-center"
-                 ng-if="vm.filterType || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.searchTags.length>0">
+                 ng-if="vm.filterType || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
                 <div class="col-md-6 col-md-offset-3">
                     <span class="filter-tag-item label-tag" ng-if="vm.filterType">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
                         <i class="fa fa-times-circle-o"
@@ -104,6 +104,11 @@
                            ng-click="vm.onTopClicked();">
                         </i>
                     </span>
+                    <span class="filter-tag-item label-tag" ng-if="vm.filterUnique">{{'STATUS_UNIQUE_KEY' | translate}}
+                        <i class="fa fa-times-circle-o"
+                           ng-click="vm.onUniqueClicked();">
+                        </i>
+                    </span>
                     <span ng-repeat="t in vm.searchTags" ng-if="vm.searchTags.length>0">
                         <span class="filter-tag-item label-tag">{{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
                             <i class="fa fa-times-circle-o"
@@ -114,7 +119,7 @@
                 </div>
             </div>
             <div class="col-md-10 col-md-offset-1">
-                <dl class="dl-horizontal">
+                <dl class="dl-horizontal tags-dl">
                     <dt class="h-line">{{ 'CA_KEYWORD' | translate}}:</dt>
                     <dd class="h-line">
                         <div class="row" style="">
@@ -139,34 +144,26 @@
                         </div>
                     </dd>
 
-                    <dt class="h-line">{{ 'CA_TORRENT_HNR' | translate}}:</dt>
+                    <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
                     <dd class="h-line">
                         <div class="checkbox checkbox-hnr">
-                            <label>
+                            <label class="checkbox-inline">
                                 <input type="checkbox" ng-model="vm.filterHnR" ng-change="vm.onHnRChanged();"> {{ 'CA_TORRENT_HNR' | translate}}
                             </label>
+                            <label class="checkbox-inline" ng-if="!vm.isGlobalSaleNow()">
+                                <input type="checkbox" ng-model="vm.filterSale"
+                                       ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
+                            </label>
                         </div>
-                    </dd>
-
-                    <div ng-if="!vm.isGlobalSaleNow()">
-                        <dt class="h-line">{{ 'CA_TORRENT_SALE_STATUS' | translate}}:</dt>
-                        <dd class="h-line">
-                            <div class="checkbox checkbox-hnr">
-                                <label>
-                                    <input type="checkbox" ng-model="vm.filterSale"
-                                           ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
-                                </label>
-                            </div>
-                        </dd>
-                    </div>
-
-                    <dt class="h-line">{{ 'CA_TORRENT_TOP' | translate}}:</dt>
-                    <dd class="h-line">
-                        <div class="checkbox checkbox-vip">
-                            <label>
+                        <div class="checkbox checkbox-hnr">
+                            <label class="checkbox-inline">
                                 <input type="checkbox" ng-model="vm.filterTop"
                                        ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
                             </label>
+                            <label class="checkbox-inline">
+                                <input type="checkbox" ng-model="vm.filterUnique"
+                                       ng-change="vm.onUniqueChanged();"> {{ 'TORRENT_STATUS_UNIQUE' | translate}}
+                            </label>
                         </div>
                     </dd>
 
diff --git a/modules/torrents/client/views/search-torrents.client.view.html b/modules/torrents/client/views/search-torrents.client.view.html
index 0cdc2529..e39ab8f0 100644
--- a/modules/torrents/client/views/search-torrents.client.view.html
+++ b/modules/torrents/client/views/search-torrents.client.view.html
@@ -5,7 +5,7 @@
         </div>
         <div class="panel-body">
             <div class="row filter-tags text-center"
-                 ng-if="vm.filterType || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.searchTags.length>0 || vm.filterVIP">
+                 ng-if="vm.filterType || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.searchTags.length>0 || vm.filterVIP || vm.filterTop || vm.filterUnique">
                 <div class="col-md-6 col-md-offset-3">
                     <span class="filter-tag-item label-tag" ng-if="vm.filterType">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
                         <i class="fa fa-times-circle-o"
@@ -37,6 +37,16 @@
                            ng-click="vm.onVIPClicked();">
                         </i>
                     </span>
+                    <span class="filter-tag-item label-tag" ng-if="vm.filterTop">{{'STATUS_TOP_KEY' | translate}}
+                        <i class="fa fa-times-circle-o"
+                           ng-click="vm.onTopClicked();">
+                        </i>
+                    </span>
+                    <span class="filter-tag-item label-tag" ng-if="vm.filterUnique">{{'STATUS_UNIQUE_KEY' | translate}}
+                        <i class="fa fa-times-circle-o"
+                           ng-click="vm.onUniqueClicked();">
+                        </i>
+                    </span>
                     <span ng-repeat="t in vm.searchTags" ng-if="vm.searchTags.length>0">
                         <span class="filter-tag-item label-tag">{{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
                             <i class="fa fa-times-circle-o"
@@ -47,7 +57,7 @@
                 </div>
             </div>
             <div class="col-md-10 col-md-offset-1">
-                <dl class="dl-horizontal">
+                <dl class="dl-horizontal tags-dl">
                     <dt class="h-line">{{'CA_RESOURCE_TYPE' | translate}}</dt>
                     <dd class="h-line">
                         <div class="row margin-bottom-5">
@@ -87,27 +97,30 @@
                         </div>
                     </dd>
 
-                    <dt class="h-line">{{ 'CA_TORRENT_HNR' | translate}}:</dt>
+
+                    <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
                     <dd class="h-line">
                         <div class="checkbox checkbox-hnr">
-                            <label>
+                            <label class="checkbox-inline">
                                 <input type="checkbox" ng-model="vm.filterHnR" ng-change="vm.onHnRChanged();"> {{ 'CA_TORRENT_HNR' | translate}}
                             </label>
+                            <label class="checkbox-inline" ng-if="!vm.isGlobalSaleNow()">
+                                <input type="checkbox" ng-model="vm.filterSale"
+                                       ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
+                            </label>
+                        </div>
+                        <div class="checkbox checkbox-hnr">
+                            <label class="checkbox-inline">
+                                <input type="checkbox" ng-model="vm.filterTop"
+                                       ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
+                            </label>
+                            <label class="checkbox-inline">
+                                <input type="checkbox" ng-model="vm.filterUnique"
+                                       ng-change="vm.onUniqueChanged();"> {{ 'TORRENT_STATUS_UNIQUE' | translate}}
+                            </label>
                         </div>
                     </dd>
 
-                    <div ng-if="vm.isGlobalSaleNow()">
-                        <dt class="h-line">{{ 'CA_TORRENT_SALE_STATUS' | translate}}:</dt>
-                        <dd class="h-line">
-                            <div class="checkbox checkbox-hnr">
-                                <label>
-                                    <input type="checkbox" ng-model="vm.filterSale"
-                                           ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
-                                </label>
-                            </div>
-                        </dd>
-                    </div>
-
                     <div class="more-tags panel-collapsed" style="display: none; margin-bottom: 20px;">
                         <div ng-repeat="item in vm.resourcesTags.radio | filter:vm.torrentType">
                             <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}:</dt>
diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html
index 9c21fa15..eba21748 100644
--- a/modules/torrents/client/views/view-torrent.client.view.html
+++ b/modules/torrents/client/views/view-torrent.client.view.html
@@ -653,6 +653,9 @@
                               class="label torrent-top">{{'STATUS_TOP_KEY' | translate}}
                         </span>
 
+                        <span class="label label-unique-info" title="{{'TORRENT_STATUS_UNIQUE_TITLE' | translate}}"
+                              ng-if="vm.torrentLocalInfo.isUnique">{{'STATUS_UNIQUE_KEY' | translate}}</span>
+
                         <span ng-repeat="t in vm.torrentLocalInfo.torrent_tags">
                             <span class="label label-tag" ng-if="vm.RTS.tagInList(t);">
                                 {{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
@@ -926,6 +929,12 @@
                                         <span class="label label-hnr-info" ng-if="item.torrent_hnr"
                                               ng-click="$event.stopPropagation();">H&R</span>
 
+                                        <span title="{{ 'TORRENT_STATUS_TOP_TITLE' | translate}}" ng-if="item.isTop"
+                                              class="label torrent-top">{{'STATUS_TOP_KEY' | translate}}</span>
+
+                                        <span class="label label-unique-info" title="{{'TORRENT_STATUS_UNIQUE_TITLE' | translate}}"
+                                              ng-if="item.isUnique">{{'STATUS_UNIQUE_KEY' | translate}}</span>
+
                                         <span ng-repeat="t in item.torrent_tags">
                                             <span class="label label-tag" ng-if="vm.RTS.tagInList(t);" ng-click="$event.stopPropagation();">
                                                 {{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
@@ -1061,6 +1070,9 @@
                     <button class="btn btn-default btn-sm"
                             ng-click="vm.toggleTop();">{{ (vm.torrentLocalInfo.isTop ? 'ADMIN_BASIC_UNSET_TOP' : 'ADMIN_BASIC_SET_TOP') | translate}}
                     </button>
+                    <button class="btn btn-default btn-sm"
+                            ng-click="vm.toggleUnique();">{{ (vm.torrentLocalInfo.isUnique ? 'ADMIN_BASIC_UNSET_UNIQUE' : 'ADMIN_BASIC_SET_UNIQUE') | translate}}
+                    </button>
                     <button class="btn btn-default btn-sm"
                             ng-click="vm.editTags($event);">{{ 'ADMIN_BASIC_EDIT_TAGS' | translate}}
                     </button>
diff --git a/modules/torrents/server/controllers/torrents.server.controller.js b/modules/torrents/server/controllers/torrents.server.controller.js
index 251589f6..bce586ef 100644
--- a/modules/torrents/server/controllers/torrents.server.controller.js
+++ b/modules/torrents/server/controllers/torrents.server.controller.js
@@ -971,6 +971,38 @@ exports.toggleTOPStatus = function (req, res) {
   });
 };
 
+/**
+ * toggleUniqueStatus
+ * @param req
+ * @param res
+ */
+exports.toggleUniqueStatus = function (req, res) {
+  var torrent = req.torrent;
+
+  torrent.isUnique = !torrent.isUnique;
+
+  torrent.save(function (err) {
+    if (err) {
+      return res.status(422).send({
+        message: errorHandler.getErrorMessage(err)
+      });
+    } else {
+      res.json(torrent);
+
+      //add server message
+      if (serverNoticeConfig.action.torrentUniqueChanged.enable) {
+        serverMessage.addMessage(torrent.user._id, serverNoticeConfig.action.torrentUniqueChanged.title, serverNoticeConfig.action.torrentUniqueChanged.content, {
+          torrent_file_name: torrent.torrent_filename,
+          torrent_id: torrent._id,
+          by_name: req.user.displayName,
+          by_id: req.user._id,
+          unique_status: torrent.isUnique ? 'ON' : 'OFF'
+        });
+      }
+    }
+  });
+};
+
 /**
  * removeTorrentHnRWarning
  * @param torrent
@@ -1513,6 +1545,7 @@ exports.list = function (req, res) {
   var newest = false;
   var hnr = false;
   var top = false;
+  var unique = false;
   var sale = false;
   var vip = undefined;
   var release = undefined;
@@ -1551,6 +1584,9 @@ exports.list = function (req, res) {
   if (req.query.isTop !== undefined) {
     top = (req.query.isTop === 'true');
   }
+  if (req.query.isUnique !== undefined) {
+    unique = (req.query.isUnique === 'true');
+  }
   if (req.query.torrent_sale !== undefined) {
     sale = (req.query.torrent_sale === 'true');
   }
@@ -1612,6 +1648,9 @@ exports.list = function (req, res) {
     condition.isTop = true;
     sort = {topedat: -1, createdat: -1};
   }
+  if (unique === true) {
+    condition.isUnique = true;
+  }
   if (sale === true) {
     condition.torrent_sale_status = {
       $ne: 'U1/D1'
diff --git a/modules/torrents/server/models/torrent.server.model.js b/modules/torrents/server/models/torrent.server.model.js
index adfcb844..ab589987 100644
--- a/modules/torrents/server/models/torrent.server.model.js
+++ b/modules/torrents/server/models/torrent.server.model.js
@@ -128,6 +128,10 @@ var TorrentSchema = new Schema({
     type: Boolean,
     default: false
   },
+  isUnique: {
+    type: Boolean,
+    default: false
+  },
   isAnonymous: {
     type: Boolean,
     default: false
diff --git a/modules/torrents/server/policies/torrents.server.policy.js b/modules/torrents/server/policies/torrents.server.policy.js
index 269f993b..90680f18 100644
--- a/modules/torrents/server/policies/torrents.server.policy.js
+++ b/modules/torrents/server/policies/torrents.server.policy.js
@@ -37,6 +37,7 @@ exports.invokeRolesPolicies = function () {
           {resources: '/api/torrents/:torrentId/toggleHnRStatus', permissions: '*'},
           {resources: '/api/torrents/:torrentId/toggleVIPStatus', permissions: '*'},
           {resources: '/api/torrents/:torrentId/toggleTOPStatus', permissions: '*'},
+          {resources: '/api/torrents/:torrentId/toggleUniqueStatus', permissions: '*'},
           {resources: '/api/torrents/:torrentId/set/saletype/:saleType', permissions: '*'},
           {resources: '/api/torrents/:torrentId/set/recommendlevel/:rlevel', permissions: '*'},
           {resources: '/api/torrents/:torrentId/set/reviewed', permissions: '*'},
diff --git a/modules/torrents/server/routes/torrents.server.routes.js b/modules/torrents/server/routes/torrents.server.routes.js
index b3d4b372..c787c543 100644
--- a/modules/torrents/server/routes/torrents.server.routes.js
+++ b/modules/torrents/server/routes/torrents.server.routes.js
@@ -71,6 +71,9 @@ module.exports = function (app) {
   app.route('/api/torrents/:torrentId/toggleTOPStatus').all(torrentsPolicy.isAllowed)
     .put(torrents.toggleTOPStatus);
 
+  app.route('/api/torrents/:torrentId/toggleUniqueStatus').all(torrentsPolicy.isAllowed)
+    .put(torrents.toggleUniqueStatus);
+
   app.route('/api/torrents/:torrentId/set/saletype/:saleType').all(torrentsPolicy.isAllowed)
     .put(torrents.setSaleType);
 
diff --git a/modules/users/client/controllers/admin/user-uploaded.client.controller.js b/modules/users/client/controllers/admin/user-uploaded.client.controller.js
index f4c181f1..afcd3b0d 100644
--- a/modules/users/client/controllers/admin/user-uploaded.client.controller.js
+++ b/modules/users/client/controllers/admin/user-uploaded.client.controller.js
@@ -22,6 +22,7 @@
     vm.filterType = undefined;
     vm.filterHnR = false;
     vm.filterTop = false;
+    vm.filterUnique = false;
     vm.filterSale = false;
     vm.torrentRLevel = 'level0';
     vm.torrentType = 'aggregate';
@@ -90,7 +91,8 @@
         torrent_tags: vm.searchTags,
         torrent_hnr: vm.filterHnR,
         torrent_sale: vm.filterSale,
-        isTop: vm.filterTop
+        isTop: vm.filterTop,
+        isUnique: vm.filterUnique
       }, function (data) {
         mtDebug.info(data);
         callback(data);
diff --git a/modules/users/client/controllers/status/uploaded.client.controller.js b/modules/users/client/controllers/status/uploaded.client.controller.js
index 44c5239e..ae348a8f 100644
--- a/modules/users/client/controllers/status/uploaded.client.controller.js
+++ b/modules/users/client/controllers/status/uploaded.client.controller.js
@@ -22,6 +22,7 @@
     vm.filterType = undefined;
     vm.filterHnR = false;
     vm.filterTop = false;
+    vm.filterUnique = false;
     vm.filterSale = false;
     vm.torrentRLevel = 'level0';
     vm.torrentType = 'aggregate';
@@ -90,7 +91,8 @@
         torrent_tags: vm.searchTags,
         torrent_hnr: vm.filterHnR,
         torrent_sale: vm.filterSale,
-        isTop: vm.filterTop
+        isTop: vm.filterTop,
+        isUnique: vm.filterUnique
       }, function (data) {
         mtDebug.info(data);
         callback(data);
diff --git a/modules/vip/client/controllers/vip.client.controller.js b/modules/vip/client/controllers/vip.client.controller.js
index 52844388..ebad3afe 100644
--- a/modules/vip/client/controllers/vip.client.controller.js
+++ b/modules/vip/client/controllers/vip.client.controller.js
@@ -47,6 +47,7 @@
     vm.releaseYear = undefined;
     vm.filterHnR = false;
     vm.filterTop = false;
+    vm.filterUnique = false;
     vm.filterSale = false;
     vm.torrentRLevel = 'level0';
 
@@ -274,7 +275,8 @@
         torrent_tags: vm.searchTags,
         torrent_hnr: vm.filterHnR,
         torrent_sale: vm.filterSale,
-        isTop: vm.filterTop
+        isTop: vm.filterTop,
+        isUnique: vm.filterUnique
       }, function (data) {
         mtDebug.info(data);
         callback(data);
@@ -296,6 +298,7 @@
       vm.rssUrl += vm.searchTags.length ? '&torrent_tags=' + vm.searchTags : '';
       vm.rssUrl += '&torrent_hnr=' + vm.filterHnR;
       vm.rssUrl += '&isTop=' + vm.filterTop;
+      vm.rssUrl += '&isUnique=' + vm.filterUnique;
       vm.rssUrl += vm.filterSale ? '&torrent_sale=' + vm.filterSale : '';
       vm.rssUrl += '&torrent_vip=true';
     };
@@ -386,6 +389,7 @@
       vm.releaseYear = undefined;
       vm.filterHnR = false;
       vm.filterTop = false;
+      vm.filterUnique = false;
       vm.filterSale = false;
       vm.torrentRLevel = 'level0';
 
@@ -450,6 +454,17 @@
       vm.buildPager();
     };
 
+    /**
+     * onUniqueClicked, onUniqueChanged
+     */
+    vm.onUniqueClicked = function () {
+      vm.filterUnique = !vm.filterUnique;
+      vm.buildPager();
+    };
+    vm.onUniqueChanged = function () {
+      vm.buildPager();
+    };
+
     /**
      * onSaleChanged
      */
diff --git a/modules/vip/client/views/vip.client.view.html b/modules/vip/client/views/vip.client.view.html
index aa7362da..3c144c8a 100644
--- a/modules/vip/client/views/vip.client.view.html
+++ b/modules/vip/client/views/vip.client.view.html
@@ -52,7 +52,7 @@
                     </div>
                     <div class="panel-body">
                         <div class="row filter-tags text-center"
-                             ng-if="vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.searchTags.length>0">
+                             ng-if="vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
                             <div class="col-md-6 col-md-offset-3">
                                 <span class="filter-tag-item label-tag" ng-if="vm.releaseYear">{{vm.releaseYear}}
                                     <i class="fa fa-times-circle-o"
@@ -79,6 +79,11 @@
                                        ng-click="vm.onTopClicked();">
                                     </i>
                                 </span>
+                                <span class="filter-tag-item label-tag" ng-if="vm.filterUnique">{{'STATUS_UNIQUE_KEY' | translate}}
+                                    <i class="fa fa-times-circle-o"
+                                        ng-click="vm.onUniqueClicked();">
+                                    </i>
+                                </span>
                                 <span ng-repeat="t in vm.searchTags" ng-if="vm.searchTags.length>0">
                                     <span class="filter-tag-item label-tag">{{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
                                         <i class="fa fa-times-circle-o"
@@ -89,7 +94,7 @@
                             </div>
                         </div>
                         <div class="col-md-10 col-md-offset-1">
-                            <dl class="dl-horizontal">
+                            <dl class="dl-horizontal tags-dl">
                                 <dt class="h-line">{{ 'CA_KEYWORD' | translate}}:</dt>
                                 <dd class="h-line">
                                     <div class="row" style="">
@@ -114,35 +119,26 @@
                                     </div>
                                 </dd>
 
-                                <dt class="h-line">{{ 'CA_TORRENT_HNR' | translate}}:</dt>
+                                <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
                                 <dd class="h-line">
                                     <div class="checkbox checkbox-hnr">
-                                        <label>
-                                            <input type="checkbox" ng-model="vm.filterHnR"
-                                                   ng-change="vm.onHnRChanged();"> {{ 'CA_TORRENT_HNR' | translate}}
+                                        <label class="checkbox-inline">
+                                            <input type="checkbox" ng-model="vm.filterHnR" ng-change="vm.onHnRChanged();"> {{ 'CA_TORRENT_HNR' | translate}}
+                                        </label>
+                                        <label class="checkbox-inline" ng-if="!vm.isGlobalSaleNow()">
+                                            <input type="checkbox" ng-model="vm.filterSale"
+                                                   ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
                                         </label>
                                     </div>
-                                </dd>
-
-                                <div ng-if="!vm.isGlobalSaleNow()">
-                                    <dt class="h-line">{{ 'CA_TORRENT_SALE_STATUS' | translate}}:</dt>
-                                    <dd class="h-line">
-                                        <div class="checkbox checkbox-hnr">
-                                            <label>
-                                                <input type="checkbox" ng-model="vm.filterSale"
-                                                       ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
-                                            </label>
-                                        </div>
-                                    </dd>
-                                </div>
-
-                                <dt class="h-line">{{ 'CA_TORRENT_TOP' | translate}}:</dt>
-                                <dd class="h-line">
-                                    <div class="checkbox checkbox-vip">
-                                        <label>
+                                    <div class="checkbox checkbox-hnr">
+                                        <label class="checkbox-inline">
                                             <input type="checkbox" ng-model="vm.filterTop"
                                                    ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
                                         </label>
+                                        <label class="checkbox-inline">
+                                            <input type="checkbox" ng-model="vm.filterUnique"
+                                                   ng-change="vm.onUniqueChanged();"> {{ 'TORRENT_STATUS_UNIQUE' | translate}}
+                                        </label>
                                     </div>
                                 </dd>
 

From 397dc5d3e6acbfa75dd79bc0e7e56c56036445ed Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 19 May 2018 15:16:13 +0800
Subject: [PATCH 66/96] fix(torrent): change unique resource title string

---
 modules/core/client/app/trans-string-zh.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index 170fa158..b4633c3c 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -348,7 +348,7 @@
     CA_TORRENT_SALE_NOW: '正在促销',
     CA_TORRENT_VIP: 'VIP 资源',
     CA_TORRENT_TOP: '置顶状态',
-    CA_TORRENT_UNIQUE: '独占状态',
+    CA_TORRENT_UNIQUE: '禁转状态',
     CA_RESOURCE_TYPE: '资源类型',
     CA_MAKE_RSS_URL: 'RSS连接',
     DESC_MAKE_RSS_URL: '这个 RSS 地址是通过上面的过滤条件生成的，您可以使用支持 RSS 订阅功能的BT客户端（如uTorrent）来自动下载您想要的这些种子和资源文件.',
@@ -394,10 +394,10 @@
     UPLOAD_TIME: '上传时间',
     SALE_EXPIRES_TIME: '过期',
     TORRENT_STATUS_TOP_TITLE: '置顶推荐',
-    TORRENT_STATUS_UNIQUE: '独占资源',
-    TORRENT_STATUS_UNIQUE_TITLE: '独占资源，禁止转发',
+    TORRENT_STATUS_UNIQUE: '禁转资源',
+    TORRENT_STATUS_UNIQUE_TITLE: '禁转资源，禁止转发',
     STATUS_TOP_KEY: '置顶',
-    STATUS_UNIQUE_KEY: '独占',
+    STATUS_UNIQUE_KEY: '禁转',
     UPLOAD_SUBTITLE: '上传字幕文件',
     SUBTITLE_LIST: '字幕列表',
     SUBTITLE_RULES: {
@@ -434,8 +434,8 @@
     ADMIN_BASIC_UNSET_VIP: '取消VIP',
     ADMIN_BASIC_SET_TOP: '设为置顶',
     ADMIN_BASIC_UNSET_TOP: '取消置顶',
-    ADMIN_BASIC_SET_UNIQUE: '设为独占',
-    ADMIN_BASIC_UNSET_UNIQUE: '取消独占',
+    ADMIN_BASIC_SET_UNIQUE: '设为禁转',
+    ADMIN_BASIC_UNSET_UNIQUE: '取消禁转',
     ADMIN_BASIC_TYPE_SET: '设置促销',
     ADMIN_SALE_TYPE_SET: '种子促销类型',
     ADMIN_BASIC_RLEVEL_SET: '推荐级别',
@@ -479,8 +479,8 @@
     TORRENT_TOGGLE_VIP_FAILED: '改变种子VIP标签失败',
     TORRENT_TOGGLE_TOP_SUCCESSFULLY: '改变种子置顶状态成功',
     TORRENT_TOGGLE_TOP_FAILED: '改变种子置顶状态失败',
-    TORRENT_TOGGLE_UNIQUE_SUCCESSFULLY: '改变种子独占状态成功',
-    TORRENT_TOGGLE_UNIQUE_FAILED: '改变种子独占状态失败',
+    TORRENT_TOGGLE_UNIQUE_SUCCESSFULLY: '改变种子禁转状态成功',
+    TORRENT_TOGGLE_UNIQUE_FAILED: '改变种子禁转状态失败',
     TORRENT_SETTAGS_SUCCESSFULLY: '种子属性标签设置成功',
     TORRENT_SETTAGS_ERROR: '种子属性标签设置失败',
 
@@ -1701,8 +1701,8 @@
       TITLE_TORRENT_TOP_CHANGED: '上传的种子 置顶 状态改变',
       CONTENT_TORRENT_TOP_CHANGED: '### 置顶 状态改变! \n 您上传的种子 [{{torrent_file_name}}](/torrents/{{torrent_id}}) 置顶 状态已经由管理员用户 [{{by_name}}](/userinfo/{{by_id}}) 修改, 当前状态为: **{{top_status}}**.',
 
-      TITLE_TORRENT_UNIQUE_CHANGED: '上传的种子 独占 状态改变',
-      CONTENT_TORRENT_UNIQUE_CHANGED: '### 独占 状态改变! \n 您上传的种子 [{{torrent_file_name}}](/torrents/{{torrent_id}}) 独占 状态已经由管理员用户 [{{by_name}}](/userinfo/{{by_id}}) 修改, 当前状态为: **{{unique_status}}**.',
+      TITLE_TORRENT_UNIQUE_CHANGED: '上传的种子 禁转 状态改变',
+      CONTENT_TORRENT_UNIQUE_CHANGED: '### 禁转 状态改变! \n 您上传的种子 [{{torrent_file_name}}](/torrents/{{torrent_id}}) 禁转 状态已经由管理员用户 [{{by_name}}](/userinfo/{{by_id}}) 修改, 当前状态为: **{{unique_status}}**.',
 
       TITLE_TORRENT_SALE_CHANGED: '上传的种子促销状态改变',
       CONTENT_TORRENT_SALE_CHANGED: '### 促销状态改变! \n 您上传的种子 [{{torrent_file_name}}](/torrents/{{torrent_id}}) 促销状态已经由管理员用户 [{{by_name}}](/userinfo/{{by_id}}) 修改, 当前状态为: **{{sale_status}}**.',

From e9efa208f012102b481ab2c6a82a268576f47325 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 19 May 2018 17:51:23 +0800
Subject: [PATCH 67/96] feat(torrent): torrent main title filter

---
 modules/core/client/less/mt.less                              | 4 ++--
 .../torrents/client/controllers/uploads.client.controller.js  | 2 ++
 .../client/services/torrent-get-info.client.service.js        | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less
index e48b3111..ceb4edf8 100644
--- a/modules/core/client/less/mt.less
+++ b/modules/core/client/less/mt.less
@@ -1299,8 +1299,8 @@ body {
 
 .upload-by {
     color: #888;
-    background-color: #dedede;
-    border: solid 1px #8a8a8a;
+    background-color: #efefef;
+    border: solid 1px #dedede;
 }
 
 .label-se-info {
diff --git a/modules/torrents/client/controllers/uploads.client.controller.js b/modules/torrents/client/controllers/uploads.client.controller.js
index ab668b17..57af7ae9 100644
--- a/modules/torrents/client/controllers/uploads.client.controller.js
+++ b/modules/torrents/client/controllers/uploads.client.controller.js
@@ -347,6 +347,8 @@
         //replace other pt site prefix
         title = title.replace(/\{([a-zA-Z0-9\_\-\.\s]){2,10}\}[\.|\s]*/gi, '');
         title = title.replace(/.torrent/g, '');
+        title = title.replace(/[\.|\s]*mp4$/i, '');
+        title = title.replace(/[\.|\s]*mkv$/i, '');
 
         // var re = /((?:^|\D)\d\.\d(?=\D|$))|\./g;
         var re = /[0-9]\.[0-9]\b|(\.)/g;
diff --git a/modules/torrents/client/services/torrent-get-info.client.service.js b/modules/torrents/client/services/torrent-get-info.client.service.js
index e54dbf60..e8775fea 100644
--- a/modules/torrents/client/services/torrent-get-info.client.service.js
+++ b/modules/torrents/client/services/torrent-get-info.client.service.js
@@ -137,6 +137,8 @@
         var reg = /\{([a-zA-Z0-9\_\-\.\s]){2,10}\}[\.|\s]*|\[([a-zA-Z0-9\_\-\.\s]){2,10}\][\.|\s]*/gi;
         title = title.replace(reg, '');
         title = title.replace(/.torrent/g, '');
+        title = title.replace(/[\.|\s]*mp4$/i, '');
+        title = title.replace(/[\.|\s]*mkv$/i, '');
 
         // var re = /((?:^|\D)\d\.\d(?=\D|$))|\./g;
         var re = /[0-9]\.[0-9]\b|(\.)/g;

From 3626e7ff47d0955b2be28a0b3003b7a6296fc4f8 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 19 May 2018 22:34:02 +0800
Subject: [PATCH 68/96] feat(torrent): new torrent media info

---
 config/env/torrents.js                        | 18 ++++++
 modules/core/client/app/trans-string-en.js    | 47 +++++++++++++++-
 modules/core/client/app/trans-string-zh.js    | 43 +++++++++++++++
 modules/core/client/less/mt.less              |  1 +
 .../torrent-info.client.controller.js         | 17 +++++-
 modules/torrents/client/less/torrents.less    | 49 +++++++++++++++++
 .../views/view-torrent.client.view.html       | 55 ++++++++++++++++++-
 7 files changed, 224 insertions(+), 6 deletions(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index 58741457..f7e246d3 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -1357,6 +1357,24 @@ module.exports = {
       {command: './restart.sh', eid: 'restart', desc: 'COMMAND.RESTART'}
     ],
 
+    /**
+     * @mediaInfo
+     *
+     * mediaInfo settings
+     *
+     * @subtitle:         subtitles of media info
+     *    @flag:          flag icon class, can find flag icon at '/public/lib/flag-icon-css/flags'
+     */
+    mediaInfo: {
+      subtitles: {
+        flag: {
+          chs: {class: 'flag-icon-cn'},
+          cht: {class: 'flag-icon-tw'},
+          eng: {class: 'flag-icon-gb'}
+        }
+      }
+    },
+
     /**
      * @resourcesTags
      *
diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index e2608cef..2959ecff 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -381,7 +381,11 @@
     TORRENT_THUMBS_FAILED: 'Thumbs-up for torrent failed',
     TORRENT_RATING_SUCCESSFULLY: 'Rating torrent successfully',
     TORRENT_RATING_FAILED: 'Rating torrent failed',
-    EDIT_THIS_OVERVIEW: 'Edit this Overview',
+    EDIT_THIS_OVERVIEW: 'Edit this overview',
+    EDIT_THIS_MEDIA_INFO: 'Edit this media info',
+    SAVE_THIS_MEDIA_INFO: 'Save this media info',
+    EDIT_TORRENT_NFO_SUCCESSFULLY: 'Torrent media info edited successfully',
+    EDIT_TORRENT_NFO_FAILED: 'Torrent media info edited failed',
     IMG_PAGE_INFO: 'Current: {{index}} / {{total}}',
 
     ANNOUNCE_URL: 'Announce Url',
@@ -479,6 +483,8 @@
     TORRENT_TOGGLE_VIP_FAILED: 'Torrent toggle VIP tag failed',
     TORRENT_TOGGLE_TOP_SUCCESSFULLY: 'Torrent toggle TOP tag successfully',
     TORRENT_TOGGLE_TOP_FAILED: 'Torrent toggle TOP tag failed',
+    TORRENT_TOGGLE_UNIQUE_SUCCESSFULLY: 'Torrent toggle Unique tag successfully',
+    TORRENT_TOGGLE_UNIQUE_FAILED: 'Torrent toggle Unique tag failed',
     TORRENT_SETTAGS_SUCCESSFULLY: 'Torrent tags set successfully',
     TORRENT_SETTAGS_ERROR: 'Torrent tags set failed',
 
@@ -1587,6 +1593,45 @@
       }
     },
 
+    MEDIAINFO: {
+      GENERAL: {
+        SELF: 'General Info',
+        FILESIZE: 'File Size',
+        RUNTIME: 'Runtime',
+        DURATION: 'Duration',
+        OVERALLBITRATE: 'Overall Bit Rate'
+      },
+      VIDEO: {
+        SELF: 'Video Info',
+        FORMAT: 'Format',
+        Duration: 'Duration',
+        BITRATE: 'Bit Rate',
+        WIDTH: 'Width',
+        HEIGHT: 'Height',
+        FRAMERATEMODE: 'Frame Rate Mode',
+        FRAMERATE: 'Frame Rate',
+        BITDEPTH: 'Bit Depth',
+        STREAMSIZE: 'Stream Size',
+        WRITINGLIBRARY: 'Writing Library',
+        RESOLUTION: 'Resolution',
+        CODEC: 'Video Codec'
+      },
+      AUDIO: {
+        SELF: 'Audio Info',
+        FORMAT: 'Format',
+        BITRATEMODE: 'Bit Rate Mode',
+        BITRATE: 'Bit Rate',
+        CHANNEL: 'Channel',
+        LANGUAGE: 'Language',
+        INFO: 'Audio Info',
+        CODEC: 'Codec'
+      },
+      TEXT: {
+        SELF: 'Subtitle Info',
+        LANGUAGE: 'Language'
+      }
+    },
+
     //server returned string
     SERVER: {
       USER_IS_NOT_AUTHORIZED: 'User is not authorized',
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index b4633c3c..4a018951 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -382,6 +382,10 @@
     TORRENT_RATING_SUCCESSFULLY: '为种子投票成功',
     TORRENT_RATING_FAILED: '为种子投票失败',
     EDIT_THIS_OVERVIEW: '编辑详情介绍',
+    EDIT_THIS_MEDIA_INFO: '编辑媒体信息',
+    SAVE_THIS_MEDIA_INFO: '保存媒体信息',
+    EDIT_TORRENT_NFO_SUCCESSFULLY: '种子媒体信息编辑成功',
+    EDIT_TORRENT_NFO_FAILED: '种子媒体信息编辑失败',
     IMG_PAGE_INFO: '当前页: {{index}} / {{total}}',
 
     ANNOUNCE_URL: 'Tracker 地址',
@@ -1589,6 +1593,45 @@
       }
     },
 
+    MEDIAINFO: {
+      GENERAL: {
+        SELF: '资源通用信息',
+        FILESIZE: '资源总体积',
+        RUNTIME: '资源总时长',
+        DURATION: '资源总时长',
+        OVERALLBITRATE: '资源总码率'
+      },
+      VIDEO: {
+        SELF: '视频信息',
+        FORMAT: '格式',
+        Duration: '时长',
+        BITRATE: '码率',
+        WIDTH: '分辨率.宽',
+        HEIGHT: '分辨率.高',
+        FRAMERATEMODE: '帧率模式',
+        FRAMERATE: '帧率',
+        BITDEPTH: '位深',
+        STREAMSIZE: '体积',
+        WRITINGLIBRARY: '编码方式',
+        RESOLUTION: '分辨率',
+        CODEC: '编码'
+      },
+      AUDIO: {
+        SELF: '音频信息',
+        FORMAT: '格式',
+        BITRATEMODE: '码率模式',
+        BITRATE: '码率',
+        CHANNEL: '声道',
+        LANGUAGE: '音轨',
+        INFO: '音轨信息',
+        CODEC: '编码'
+      },
+      TEXT: {
+        SELF: '字幕信息',
+        LANGUAGE: '语言'
+      }
+    },
+
     //server returned string
     SERVER: {
       USER_IS_NOT_AUTHORIZED: '用户身份验证未通过',
diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less
index ceb4edf8..43c178b6 100644
--- a/modules/core/client/less/mt.less
+++ b/modules/core/client/less/mt.less
@@ -1610,6 +1610,7 @@ body {
 }
 
 .all-files {
+    font-size: 12px;
     json-tree {
         json-node.expandable {
             &::before {
diff --git a/modules/torrents/client/controllers/torrent-info.client.controller.js b/modules/torrents/client/controllers/torrent-info.client.controller.js
index 8b7a04a6..e73e21a8 100644
--- a/modules/torrents/client/controllers/torrent-info.client.controller.js
+++ b/modules/torrents/client/controllers/torrent-info.client.controller.js
@@ -31,6 +31,9 @@
     vm.scoreConfig = MeanTorrentConfig.meanTorrentConfig.score;
     vm.inputLengthConfig = MeanTorrentConfig.meanTorrentConfig.inputLength;
     vm.salesGlobalConfig = MeanTorrentConfig.meanTorrentConfig.torrentGlobalSales;
+    vm.mediaInfoConfig = MeanTorrentConfig.meanTorrentConfig.mediaInfo;
+
+    vm.mediaInfoEditMode = false;
 
     vm.torrentTabs = [];
     vm.searchTags = [];
@@ -1504,9 +1507,19 @@
         _id: vm.torrentLocalInfo._id,
         torrent_nfo: vm.torrentLocalInfo.torrent_nfo
       }, function (res) {
-        console.log('updateTorrentNfo successfully');
-        console.log(res);
+        vm.torrentLocalInfo = res;
+        NotifycationService.showSuccessNotify('EDIT_TORRENT_NFO_SUCCESSFULLY');
+        vm.mediaInfoEditMode = false;
+      }, function (res) {
+        NotifycationService.showErrorNotify(res.data.message, 'EDIT_TORRENT_NFO_FAILED');
       });
     };
+
+    /**
+     * doEditMediaInfo
+     */
+    vm.doEditMediaInfo = function () {
+      vm.mediaInfoEditMode = true;
+    };
   }
 }());
diff --git a/modules/torrents/client/less/torrents.less b/modules/torrents/client/less/torrents.less
index e20fe2bf..bdeaf977 100644
--- a/modules/torrents/client/less/torrents.less
+++ b/modules/torrents/client/less/torrents.less
@@ -217,6 +217,55 @@ pre.prettyprint {
     }
 }
 
+.media-info-formated {
+    background-color: #fcfcfc;
+    border: solid 1px #f1f1f1;
+    border-radius: 4px;
+    padding: 10px 20px;
+    legend {
+        font-size: 13px;
+        font-weight: 400;
+        color: #7a7a7a;
+        margin-bottom: 6px;
+    }
+    .info-key {
+        width: 120px;
+        text-align: right;
+        color: #2a2a2a;
+    }
+    .info-value {
+        color: #7a7a7a;
+        font-size: 12px;
+    }
+    .flag-group {
+        font-family: monospace, 'Courier New';
+        padding: 4px 5px 2px 5px;
+        border: solid 1px #ccc;
+        display: inline-block;
+        margin-bottom: 3px;
+        margin-right: 5px;
+        .flag-icon {
+            font-size: 18px;
+            margin-right: 5px;
+        }
+    }
+}
+
+.dl-media-info {
+    margin-bottom: 10px;
+    dt {
+        color: #2a2a2a;
+        @media (min-width: @screen-sm-min) {
+            width: 120px;
+        }
+    }
+    dd {
+        @media (min-width: @screen-sm-min) {
+            margin-left: 140px;
+        }
+    }
+}
+
 /* csslint ignore:end */
 
 //popup overlay----------------------------------------------
diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html
index eba21748..d352fc8f 100644
--- a/modules/torrents/client/views/view-torrent.client.view.html
+++ b/modules/torrents/client/views/view-torrent.client.view.html
@@ -675,10 +675,60 @@
                 </dd>
 
                 <dt class="h-line" ng-if="vm.torrentLocalInfo.torrent_nfo.length>0">{{ 'VIDEO_NFO' | translate}}：</dt>
-                <dd class="h-line" ng-if="vm.torrentLocalInfo.torrent_nfo.length>0">
-                    <div class="row">
+                <dd ng-if="vm.torrentLocalInfo.torrent_nfo.length>0">
+                    <div class="row" ng-if="!vm.mediaInfoEditMode">
+                        <div class="col-md-10">
+                            <div class="media-info-formated">
+                                <legend ng-repeat-start="(key, value)  in vm.torrentLocalInfo.torrent_media_info track by $index">
+                                    {{'MEDIAINFO.'+key.toUpperCase()+'.SELF' | translate}}:
+                                </legend>
+                                <div class="info-value" ng-repeat-end>
+                                    <dl class="dl-horizontal dl-media-info">
+                                        <dt ng-repeat-start="(subKey, subValue) in value">
+                                            {{'MEDIAINFO.'+key.toUpperCase()+'.'+subKey.toUpperCase() | translate}}:
+                                        </dt>
+                                        <dd ng-repeat-end>
+                                            <div ng-if="subKey!='info' && subKey!='language'">
+                                                <div>{{subValue}}</div>
+                                            </div>
+                                            <div ng-if="subKey=='info'" ng-repeat="ifo in subValue track by $index">
+                                                <div>{{ifo}}</div>
+                                            </div>
+                                            <div ng-if="subKey=='language'">
+                                                <span ng-if="key=='audio'" ng-repeat="lang in subValue">
+                                                    <div>{{lang}}</div>
+                                                </span>
+                                                <span ng-if="key=='text'" ng-repeat="lang in subValue">
+                                                    <span class="flag-group">
+                                                        <span class="flag-icon {{vm.mediaInfoConfig.subtitles.flag[lang].class}}"></span>{{lang}}
+                                                    </span>
+                                                </span>
+                                            </div>
+                                        </dd>
+                                    </dl>
+                                </div>
+                            </div>
+                            <div>
+                                <button class="btn btn-xs btn-mt-o margin-top-15" mouse-enter-toggle-class="btn-success"
+                                        base-class="btn-mt-o-success"
+                                        ng-if="vm.isOwner(vm.torrentLocalInfo) || vm.user.isOper"
+                                        ng-click="vm.doEditMediaInfo()">
+                                    {{'EDIT_THIS_MEDIA_INFO' | translate}}
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row" ng-if="vm.mediaInfoEditMode">
                         <div class="col-md-10">
                             <textarea class="form-control video-nfo margin-top-10" rows="15" ng-model="vm.torrentLocalInfo.torrent_nfo"></textarea>
+                            <div>
+                                <button class="btn btn-xs btn-mt-o margin-top-15" mouse-enter-toggle-class="btn-success"
+                                        base-class="btn-mt-o-success"
+                                        ng-if="vm.isOwner(vm.torrentLocalInfo) || vm.user.isOper"
+                                        ng-click="vm.updateTorrentNfo()">
+                                    {{'SAVE_THIS_MEDIA_INFO' | translate}}
+                                </button>
+                            </div>
                         </div>
                     </div>
                 </dd>
@@ -689,7 +739,6 @@
                         <button class="btn btn-success btn-width-100" ng-click="vm.DLS.downloadTorrent(vm.torrentLocalInfo._id)"
                                 translate="DOWNLOAD_TORRENT"></button>
                         <span torrent-file-link-button="vm.torrentLocalInfo" torrent-user="vm.user" info-class="btn-default"></span>
-                        <!--<button class="btn btn-default btn-width-100" ng-click="vm.updateTorrentNfo()">Update MediaInfo</button>-->
                     </div>
                 </dd>
             </dl>

From f5b80f0d3e486dd7dcfc1a370323296402db585e Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 19 May 2018 22:41:27 +0800
Subject: [PATCH 69/96] fix(torrents): torrent mediainfo hide/show status

---
 modules/torrents/client/views/view-torrent.client.view.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html
index d352fc8f..7c627c9b 100644
--- a/modules/torrents/client/views/view-torrent.client.view.html
+++ b/modules/torrents/client/views/view-torrent.client.view.html
@@ -674,7 +674,7 @@
                     </div>
                 </dd>
 
-                <dt class="h-line" ng-if="vm.torrentLocalInfo.torrent_nfo.length>0">{{ 'VIDEO_NFO' | translate}}：</dt>
+                <dt class="h-line">{{ 'VIDEO_NFO' | translate}}：</dt>
                 <dd ng-if="vm.torrentLocalInfo.torrent_nfo.length>0">
                     <div class="row" ng-if="!vm.mediaInfoEditMode">
                         <div class="col-md-10">

From 533db788d55f1ad6b1b626589e865d1eaeb4fd1b Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 19 May 2018 22:53:22 +0800
Subject: [PATCH 70/96] fix(torrents): torrent mediainfo hide/show status

---
 config/env/torrents.js                                    | 8 +++++---
 modules/core/client/app/trans-string-zh.js                | 2 +-
 .../torrents/client/views/view-torrent.client.view.html   | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index f7e246d3..746931a6 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -1368,9 +1368,11 @@ module.exports = {
     mediaInfo: {
       subtitles: {
         flag: {
-          chs: {class: 'flag-icon-cn'},
-          cht: {class: 'flag-icon-tw'},
-          eng: {class: 'flag-icon-gb'}
+          chs:      {class: 'flag-icon-cn'},
+          chinese:  {class: 'flag-icon-cn'},
+          cht:      {class: 'flag-icon-tw'},
+          korean:   {class: 'flag-icon-kr'},
+          eng:      {class: 'flag-icon-gb'}
         }
       }
     },
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index 4a018951..6e99fd64 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -1604,7 +1604,7 @@
       VIDEO: {
         SELF: '视频信息',
         FORMAT: '格式',
-        Duration: '时长',
+        DURATION: '时长',
         BITRATE: '码率',
         WIDTH: '分辨率.宽',
         HEIGHT: '分辨率.高',
diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html
index 7c627c9b..49f17ee4 100644
--- a/modules/torrents/client/views/view-torrent.client.view.html
+++ b/modules/torrents/client/views/view-torrent.client.view.html
@@ -700,7 +700,7 @@
                                                 </span>
                                                 <span ng-if="key=='text'" ng-repeat="lang in subValue">
                                                     <span class="flag-group">
-                                                        <span class="flag-icon {{vm.mediaInfoConfig.subtitles.flag[lang].class}}"></span>{{lang}}
+                                                        <span class="flag-icon {{vm.mediaInfoConfig.subtitles.flag[lang.toLowerCase()].class}}"></span>{{lang}}
                                                     </span>
                                                 </span>
                                             </div>

From 1cbda6c942a39754fb8ebb7bbd07ff891154fab7 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 19 May 2018 22:55:43 +0800
Subject: [PATCH 71/96] fix(torrents): fixed eslint warning

---
 config/env/torrents.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index 746931a6..d0742942 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -1368,11 +1368,11 @@ module.exports = {
     mediaInfo: {
       subtitles: {
         flag: {
-          chs:      {class: 'flag-icon-cn'},
-          chinese:  {class: 'flag-icon-cn'},
-          cht:      {class: 'flag-icon-tw'},
-          korean:   {class: 'flag-icon-kr'},
-          eng:      {class: 'flag-icon-gb'}
+          chs: {class: 'flag-icon-cn'},
+          chinese: {class: 'flag-icon-cn'},
+          cht: {class: 'flag-icon-tw'},
+          korean: {class: 'flag-icon-kr'},
+          eng: {class: 'flag-icon-gb'}
         }
       }
     },

From 79424bbd03126248b7bb323257f4dd0553e8c049 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 19 May 2018 23:18:02 +0800
Subject: [PATCH 72/96] fix(torrents): fixed media info css

---
 modules/core/client/less/mt.less                   |  1 -
 modules/torrents/client/less/torrents.less         | 14 ++++++++------
 .../client/views/view-torrent.client.view.html     | 12 ++++++++++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less
index 43c178b6..ceb4edf8 100644
--- a/modules/core/client/less/mt.less
+++ b/modules/core/client/less/mt.less
@@ -1610,7 +1610,6 @@ body {
 }
 
 .all-files {
-    font-size: 12px;
     json-tree {
         json-node.expandable {
             &::before {
diff --git a/modules/torrents/client/less/torrents.less b/modules/torrents/client/less/torrents.less
index bdeaf977..e890a86c 100644
--- a/modules/torrents/client/less/torrents.less
+++ b/modules/torrents/client/less/torrents.less
@@ -218,15 +218,17 @@ pre.prettyprint {
 }
 
 .media-info-formated {
-    background-color: #fcfcfc;
-    border: solid 1px #f1f1f1;
-    border-radius: 4px;
-    padding: 10px 20px;
+    //background-color: #fcfcfc;
+    //border-top: solid 1px #dedede;
+    //border-radius: 4px;
+    padding: 10px 20px 10px 0;
+    margin-top: 8px;
     legend {
-        font-size: 13px;
+        font-size: 14px;
         font-weight: 400;
         color: #7a7a7a;
         margin-bottom: 6px;
+        border-bottom: solid 1px #d0d0d0;
     }
     .info-key {
         width: 120px;
@@ -235,7 +237,7 @@ pre.prettyprint {
     }
     .info-value {
         color: #7a7a7a;
-        font-size: 12px;
+        font-size: 14px;
     }
     .flag-group {
         font-family: monospace, 'Courier New';
diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html
index 49f17ee4..aaa14f82 100644
--- a/modules/torrents/client/views/view-torrent.client.view.html
+++ b/modules/torrents/client/views/view-torrent.client.view.html
@@ -674,7 +674,7 @@
                     </div>
                 </dd>
 
-                <dt class="h-line">{{ 'VIDEO_NFO' | translate}}：</dt>
+                <dt class="h-line margin-top-15">{{ 'VIDEO_NFO' | translate}}：</dt>
                 <dd ng-if="vm.torrentLocalInfo.torrent_nfo.length>0">
                     <div class="row" ng-if="!vm.mediaInfoEditMode">
                         <div class="col-md-10">
@@ -688,7 +688,7 @@
                                             {{'MEDIAINFO.'+key.toUpperCase()+'.'+subKey.toUpperCase() | translate}}:
                                         </dt>
                                         <dd ng-repeat-end>
-                                            <div ng-if="subKey!='info' && subKey!='language'">
+                                            <div ng-if="subKey!='info' && subKey!='language' && subKey!='codec'">
                                                 <div>{{subValue}}</div>
                                             </div>
                                             <div ng-if="subKey=='info'" ng-repeat="ifo in subValue track by $index">
@@ -704,6 +704,14 @@
                                                     </span>
                                                 </span>
                                             </div>
+                                            <div ng-if="subKey=='codec'">
+                                                <span ng-if="key=='video'">
+                                                    <div>{{subValue}}</div>
+                                                </span>
+                                                <span ng-if="key=='audio'" ng-repeat="co in subValue">
+                                                    <div>{{co}}</div>
+                                                </span>
+                                            </div>
                                         </dd>
                                     </dl>
                                 </div>

From 8a03c0bec1042750db182cbcb89bb97707416689 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 19 May 2018 23:25:20 +0800
Subject: [PATCH 73/96] fix(torrents): fixed media info css

---
 config/lib/mediaInfo.js                                  | 6 +++---
 modules/torrents/client/less/torrents.less               | 9 ++-------
 .../torrents/client/views/view-torrent.client.view.html  | 2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/config/lib/mediaInfo.js b/config/lib/mediaInfo.js
index a616e46a..8cf8ddaa 100644
--- a/config/lib/mediaInfo.js
+++ b/config/lib/mediaInfo.js
@@ -62,17 +62,17 @@ module.exports.getMediaInfo = function (nfo) {
    */
   if (!gInfo && !vInfo && !aInfo && !tInfo) {
     minfo = getSimpleGeneralFileSize(nfo, minfo);
+    minfo = getSimpleGeneralReleaseSize(nfo, minfo);
     minfo = getSimpleGeneralDuration(nfo, minfo);
     minfo = getSimpleGeneralRuntime(nfo, minfo);
     minfo = getSimpleVideoBitRate(nfo, minfo);
     minfo = getSimpleVideoFrameRate(nfo, minfo);
     minfo = getSimpleVideoResolution(nfo, minfo);
+    minfo = getSimpleVideoCodec(nfo, minfo);
     minfo = getSimpleAudioInfo(nfo, minfo);
+    minfo = getSimpleAudioCodec(nfo, minfo);
     minfo = getSimpleTextInfo(nfo, minfo);
 
-    minfo = getSimpleGeneralReleaseSize(nfo, minfo);
-    minfo = getSimpleVideoCodec(nfo, minfo);
-    minfo = getSimpleAudioCodec(nfo, minfo);
   }
 
   return minfo;
diff --git a/modules/torrents/client/less/torrents.less b/modules/torrents/client/less/torrents.less
index e890a86c..448b234d 100644
--- a/modules/torrents/client/less/torrents.less
+++ b/modules/torrents/client/less/torrents.less
@@ -222,7 +222,7 @@ pre.prettyprint {
     //border-top: solid 1px #dedede;
     //border-radius: 4px;
     padding: 10px 20px 10px 0;
-    margin-top: 8px;
+    margin-top: 13px;
     legend {
         font-size: 14px;
         font-weight: 400;
@@ -230,11 +230,6 @@ pre.prettyprint {
         margin-bottom: 6px;
         border-bottom: solid 1px #d0d0d0;
     }
-    .info-key {
-        width: 120px;
-        text-align: right;
-        color: #2a2a2a;
-    }
     .info-value {
         color: #7a7a7a;
         font-size: 14px;
@@ -256,7 +251,7 @@ pre.prettyprint {
 .dl-media-info {
     margin-bottom: 10px;
     dt {
-        color: #2a2a2a;
+        color: #6A6A6A;
         @media (min-width: @screen-sm-min) {
             width: 120px;
         }
diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html
index aaa14f82..9dbae84c 100644
--- a/modules/torrents/client/views/view-torrent.client.view.html
+++ b/modules/torrents/client/views/view-torrent.client.view.html
@@ -674,7 +674,7 @@
                     </div>
                 </dd>
 
-                <dt class="h-line margin-top-15">{{ 'VIDEO_NFO' | translate}}：</dt>
+                <dt class="h-line margin-top-20">{{ 'VIDEO_NFO' | translate}}：</dt>
                 <dd ng-if="vm.torrentLocalInfo.torrent_nfo.length>0">
                     <div class="row" ng-if="!vm.mediaInfoEditMode">
                         <div class="col-md-10">

From 98d41662570c5476681fdfafa8f747f20201208c Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 19 May 2018 23:43:06 +0800
Subject: [PATCH 74/96] fix(torrents): fixed media info css

---
 modules/core/client/app/trans-string-zh.js             |  8 ++++----
 modules/torrents/client/less/torrents.less             |  2 +-
 .../client/views/view-torrent.client.view.html         | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index 6e99fd64..e24215c8 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -1596,10 +1596,10 @@
     MEDIAINFO: {
       GENERAL: {
         SELF: '资源通用信息',
-        FILESIZE: '资源总体积',
-        RUNTIME: '资源总时长',
-        DURATION: '资源总时长',
-        OVERALLBITRATE: '资源总码率'
+        FILESIZE: '总体积',
+        RUNTIME: '总时长',
+        DURATION: '总时长',
+        OVERALLBITRATE: '总码率'
       },
       VIDEO: {
         SELF: '视频信息',
diff --git a/modules/torrents/client/less/torrents.less b/modules/torrents/client/less/torrents.less
index 448b234d..35132bc8 100644
--- a/modules/torrents/client/less/torrents.less
+++ b/modules/torrents/client/less/torrents.less
@@ -226,7 +226,7 @@ pre.prettyprint {
     legend {
         font-size: 14px;
         font-weight: 400;
-        color: #7a7a7a;
+        color: #333;
         margin-bottom: 6px;
         border-bottom: solid 1px #d0d0d0;
     }
diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html
index 9dbae84c..50362096 100644
--- a/modules/torrents/client/views/view-torrent.client.view.html
+++ b/modules/torrents/client/views/view-torrent.client.view.html
@@ -680,7 +680,7 @@
                         <div class="col-md-10">
                             <div class="media-info-formated">
                                 <legend ng-repeat-start="(key, value)  in vm.torrentLocalInfo.torrent_media_info track by $index">
-                                    {{'MEDIAINFO.'+key.toUpperCase()+'.SELF' | translate}}:
+                                    {{'MEDIAINFO.'+key.toUpperCase()+'.SELF' | translate}}
                                 </legend>
                                 <div class="info-value" ng-repeat-end>
                                     <dl class="dl-horizontal dl-media-info">
@@ -691,19 +691,19 @@
                                             <div ng-if="subKey!='info' && subKey!='language' && subKey!='codec'">
                                                 <div>{{subValue}}</div>
                                             </div>
+
                                             <div ng-if="subKey=='info'" ng-repeat="ifo in subValue track by $index">
                                                 <div>{{ifo}}</div>
                                             </div>
+
                                             <div ng-if="subKey=='language'">
-                                                <span ng-if="key=='audio'" ng-repeat="lang in subValue">
-                                                    <div>{{lang}}</div>
-                                                </span>
-                                                <span ng-if="key=='text'" ng-repeat="lang in subValue">
+                                                <span ng-repeat="lang in subValue">
                                                     <span class="flag-group">
                                                         <span class="flag-icon {{vm.mediaInfoConfig.subtitles.flag[lang.toLowerCase()].class}}"></span>{{lang}}
                                                     </span>
                                                 </span>
                                             </div>
+
                                             <div ng-if="subKey=='codec'">
                                                 <span ng-if="key=='video'">
                                                     <div>{{subValue}}</div>

From 599c7ea6dc9a231fa9d71d0ecd250a11785182a3 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sun, 20 May 2018 11:01:49 +0800
Subject: [PATCH 75/96] feat(torrents): view original media info

---
 modules/core/client/app/trans-string-en.js    |  6 ++--
 modules/core/client/app/trans-string-zh.js    |  2 ++
 modules/core/client/less/btn-size.less        | 10 +++++++
 modules/torrents/client/less/torrents.less    |  8 +++--
 .../views/view-torrent.client.view.html       | 30 ++++++++++++-------
 5 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index 2959ecff..691cb46e 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -382,8 +382,10 @@
     TORRENT_RATING_SUCCESSFULLY: 'Rating torrent successfully',
     TORRENT_RATING_FAILED: 'Rating torrent failed',
     EDIT_THIS_OVERVIEW: 'Edit this overview',
-    EDIT_THIS_MEDIA_INFO: 'Edit this media info',
-    SAVE_THIS_MEDIA_INFO: 'Save this media info',
+    VIEW_ORIGINAL_MEDIA_INFO: 'View original media info',
+    VIEW_FORMATTED_MEDIA_INFO: 'View formatted media info',
+    EDIT_THIS_MEDIA_INFO: 'Edit media info',
+    SAVE_THIS_MEDIA_INFO: 'Save media info',
     EDIT_TORRENT_NFO_SUCCESSFULLY: 'Torrent media info edited successfully',
     EDIT_TORRENT_NFO_FAILED: 'Torrent media info edited failed',
     IMG_PAGE_INFO: 'Current: {{index}} / {{total}}',
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index e24215c8..b0857bff 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -382,6 +382,8 @@
     TORRENT_RATING_SUCCESSFULLY: '为种子投票成功',
     TORRENT_RATING_FAILED: '为种子投票失败',
     EDIT_THIS_OVERVIEW: '编辑详情介绍',
+    VIEW_ORIGINAL_MEDIA_INFO: '查看原始的媒体信息',
+    VIEW_FORMATTED_MEDIA_INFO: '查看格式化的媒体信息',
     EDIT_THIS_MEDIA_INFO: '编辑媒体信息',
     SAVE_THIS_MEDIA_INFO: '保存媒体信息',
     EDIT_TORRENT_NFO_SUCCESSFULLY: '种子媒体信息编辑成功',
diff --git a/modules/core/client/less/btn-size.less b/modules/core/client/less/btn-size.less
index 1226af3f..d495eef3 100644
--- a/modules/core/client/less/btn-size.less
+++ b/modules/core/client/less/btn-size.less
@@ -174,9 +174,19 @@
     }
 }
 
+.btn-mt-o-default-dark {
+    color: #666;
+    border: solid 1px #666;
+    &:focus {
+        color: #666;
+        border-color: #666;
+    }
+}
+
 .btn-mt-o-success {
     color: @state-success-text;
     border: solid 1px @state-success-text;
+    &:hover,
     &:focus {
         color: @state-success-text;
         border-color: @state-success-text;
diff --git a/modules/torrents/client/less/torrents.less b/modules/torrents/client/less/torrents.less
index 35132bc8..76b82e9e 100644
--- a/modules/torrents/client/less/torrents.less
+++ b/modules/torrents/client/less/torrents.less
@@ -232,15 +232,16 @@ pre.prettyprint {
     }
     .info-value {
         color: #7a7a7a;
-        font-size: 14px;
+        font-size: 12px;
     }
     .flag-group {
-        font-family: monospace, 'Courier New';
         padding: 4px 5px 2px 5px;
         border: solid 1px #ccc;
+        border-radius: 3px;
         display: inline-block;
         margin-bottom: 3px;
         margin-right: 5px;
+        background-color: #fff;
         .flag-icon {
             font-size: 18px;
             margin-right: 5px;
@@ -252,11 +253,14 @@ pre.prettyprint {
     margin-bottom: 10px;
     dt {
         color: #6A6A6A;
+        line-height: 1.6;
         @media (min-width: @screen-sm-min) {
             width: 120px;
         }
     }
     dd {
+        font-family: monospace, 'Courier New';
+        line-height: 1.6;
         @media (min-width: @screen-sm-min) {
             margin-left: 140px;
         }
diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html
index 50362096..7134c972 100644
--- a/modules/torrents/client/views/view-torrent.client.view.html
+++ b/modules/torrents/client/views/view-torrent.client.view.html
@@ -675,10 +675,22 @@
                 </dd>
 
                 <dt class="h-line margin-top-20">{{ 'VIDEO_NFO' | translate}}：</dt>
-                <dd ng-if="vm.torrentLocalInfo.torrent_nfo.length>0">
+                <dd class="margin-top-10">
                     <div class="row" ng-if="!vm.mediaInfoEditMode">
                         <div class="col-md-10">
-                            <div class="media-info-formated">
+                            <div>
+                                <button class="btn btn-xs margin-top-15" mouse-enter-toggle-class="btn-mt-o-success"
+                                        base-class="btn-mt-o-default-dark" ng-click="vm.mediaInfoViewMode=!vm.mediaInfoViewMode">
+                                    {{vm.mediaInfoViewMode ? ('VIEW_FORMATTED_MEDIA_INFO' | translate) : ('VIEW_ORIGINAL_MEDIA_INFO' | translate)}}
+                                </button>
+                                <button class="btn btn-xs margin-top-15" mouse-enter-toggle-class="btn-mt-o-success"
+                                        base-class="btn-mt-o-default-dark"
+                                        ng-if="vm.isOwner(vm.torrentLocalInfo) || vm.user.isOper"
+                                        ng-click="vm.doEditMediaInfo()">
+                                    {{'EDIT_THIS_MEDIA_INFO' | translate}}
+                                </button>
+                            </div>
+                            <div class="media-info-formated" ng-if="!vm.mediaInfoViewMode">
                                 <legend ng-repeat-start="(key, value)  in vm.torrentLocalInfo.torrent_media_info track by $index">
                                     {{'MEDIAINFO.'+key.toUpperCase()+'.SELF' | translate}}
                                 </legend>
@@ -716,13 +728,9 @@
                                     </dl>
                                 </div>
                             </div>
-                            <div>
-                                <button class="btn btn-xs btn-mt-o margin-top-15" mouse-enter-toggle-class="btn-success"
-                                        base-class="btn-mt-o-success"
-                                        ng-if="vm.isOwner(vm.torrentLocalInfo) || vm.user.isOper"
-                                        ng-click="vm.doEditMediaInfo()">
-                                    {{'EDIT_THIS_MEDIA_INFO' | translate}}
-                                </button>
+                            <div ng-if="vm.mediaInfoViewMode">
+                                <textarea class="form-control video-nfo margin-top-10" rows="15" ng-model="vm.torrentLocalInfo.torrent_nfo"
+                                      readonly></textarea>
                             </div>
                         </div>
                     </div>
@@ -730,8 +738,8 @@
                         <div class="col-md-10">
                             <textarea class="form-control video-nfo margin-top-10" rows="15" ng-model="vm.torrentLocalInfo.torrent_nfo"></textarea>
                             <div>
-                                <button class="btn btn-xs btn-mt-o margin-top-15" mouse-enter-toggle-class="btn-success"
-                                        base-class="btn-mt-o-success"
+                                <button class="btn btn-xs margin-top-15" mouse-enter-toggle-class="btn-mt-o-success"
+                                        base-class="btn-mt-o-default-dark"
                                         ng-if="vm.isOwner(vm.torrentLocalInfo) || vm.user.isOper"
                                         ng-click="vm.updateTorrentNfo()">
                                     {{'SAVE_THIS_MEDIA_INFO' | translate}}

From f055fa7668fe60f25f4764668425a025111885fb Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sun, 20 May 2018 11:12:40 +0800
Subject: [PATCH 76/96] feat(torrents): new torrent tags of 'video vision'

---
 config/env/torrents.js                     | 10 ++++++++++
 modules/core/client/app/trans-string-en.js |  8 ++++++++
 modules/core/client/app/trans-string-zh.js |  8 ++++++++
 3 files changed, 26 insertions(+)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index d0742942..44596512 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -1431,6 +1431,16 @@ module.exports = {
             {name: 'X265', icon: ''}
           ]
         },
+        {
+          name: 'VISION',
+          cats: ['movie', 'tvserial', 'documentary', 'music', 'sports', 'variety', 'adult'],
+          value: [
+            {name: 'DOLBY', icon: ''},
+            {name: 'HDR10PLUS', icon: ''},
+            {name: 'HDR10', icon: ''},
+            {name: 'HDR', icon: ''}
+          ]
+        },
         {
           name: 'AUDIO',
           cats: ['movie', 'tvserial', 'documentary', 'music', 'sports', 'variety', 'adult'],
diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index 691cb46e..af3c584b 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -1483,6 +1483,14 @@
         X265: 'x265'
       },
 
+      VISION: {
+        SELF: 'Video Vision',
+        DOLBY: 'DolbyVision',
+        HDR10PLUS: 'HDR10+',
+        HDR10: 'HDR10',
+        HDR: 'HDR'
+      },
+
       AUDIO: {
         SELF: 'Audio Codec',
         DTS_X: 'DTS:X',
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index b0857bff..a30a3e7c 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -1483,6 +1483,14 @@
         X265: 'x265'
       },
 
+      VISION: {
+        SELF: '视频色彩',
+        DOLBY: 'DolbyVision',
+        HDR10PLUS: 'HDR10+',
+        HDR10: 'HDR10',
+        HDR: 'HDR'
+      },
+
       AUDIO: {
         SELF: '音频编码',
         DTS_X: 'DTS:X',

From 7526f196bba65a65813ec53a7437d13d7cdc033c Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sun, 20 May 2018 11:23:21 +0800
Subject: [PATCH 77/96] feat(fix): fixed torrent.js mediainfo flag config

---
 config/env/torrents.js                          | 17 +++++++----------
 .../client/views/view-torrent.client.view.html  |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index 44596512..69065c01 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -1362,18 +1362,15 @@ module.exports = {
      *
      * mediaInfo settings
      *
-     * @subtitle:         subtitles of media info
-     *    @flag:          flag icon class, can find flag icon at '/public/lib/flag-icon-css/flags'
+     * @flag:          flag icon class, can find flag icon at '/public/lib/flag-icon-css/flags'
      */
     mediaInfo: {
-      subtitles: {
-        flag: {
-          chs: {class: 'flag-icon-cn'},
-          chinese: {class: 'flag-icon-cn'},
-          cht: {class: 'flag-icon-tw'},
-          korean: {class: 'flag-icon-kr'},
-          eng: {class: 'flag-icon-gb'}
-        }
+      flag: {
+        chs: {class: 'flag-icon-cn'},
+        chinese: {class: 'flag-icon-cn'},
+        cht: {class: 'flag-icon-tw'},
+        korean: {class: 'flag-icon-kr'},
+        eng: {class: 'flag-icon-gb'}
       }
     },
 
diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html
index 7134c972..fb39e808 100644
--- a/modules/torrents/client/views/view-torrent.client.view.html
+++ b/modules/torrents/client/views/view-torrent.client.view.html
@@ -711,7 +711,7 @@
                                             <div ng-if="subKey=='language'">
                                                 <span ng-repeat="lang in subValue">
                                                     <span class="flag-group">
-                                                        <span class="flag-icon {{vm.mediaInfoConfig.subtitles.flag[lang.toLowerCase()].class}}"></span>{{lang}}
+                                                        <span class="flag-icon {{vm.mediaInfoConfig.flag[lang.toLowerCase()].class}}"></span>{{lang}}
                                                     </span>
                                                 </span>
                                             </div>

From 2d902e90e2161578e6fac3678c7c6017fe3e2430 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sun, 20 May 2018 14:11:38 +0800
Subject: [PATCH 78/96] fix(torrents): move many tags into more panel

---
 config/env/torrents.js                        |   5 +-
 modules/core/client/app/trans-string-en.js    |   9 +-
 modules/core/client/app/trans-string-zh.js    |   9 +-
 modules/torrents/client/less/torrents.less    |  13 ++
 .../views/admin/admin-list.client.view.html   | 118 +++++++++---------
 .../views/list-torrents.client.view.html      |  74 ++++++-----
 .../views/search-torrents.client.view.html    |  49 ++++----
 modules/vip/client/views/vip.client.view.html |  48 ++++---
 8 files changed, 166 insertions(+), 159 deletions(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index 69065c01..aeb26ab7 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -1403,8 +1403,8 @@ module.exports = {
           value: [
             {name: 'BLU_RAY', icon: ''},
             {name: 'REMUX', icon: ''},
-            {name: 'WEB', icon: ''},
             {name: 'ENCODE', icon: ''},
+            {name: 'WEB', icon: ''},
             {name: 'HDTV', icon: ''}
           ]
         },
@@ -1435,7 +1435,8 @@ module.exports = {
             {name: 'DOLBY', icon: ''},
             {name: 'HDR10PLUS', icon: ''},
             {name: 'HDR10', icon: ''},
-            {name: 'HDR', icon: ''}
+            {name: 'HDR', icon: ''},
+            {name: 'SDR', icon: ''}
           ]
         },
         {
diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index af3c584b..f92b39b0 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -1461,7 +1461,7 @@
       TYPE: {
         SELF: 'Medium',
         BLU_RAY: 'Blu-ray',
-        WEB: 'Web',
+        WEB: 'WEB',
         REMUX: 'Remux',
         ENCODE: 'Encode',
         HDTV: 'HDTV'
@@ -1488,7 +1488,8 @@
         DOLBY: 'DolbyVision',
         HDR10PLUS: 'HDR10+',
         HDR10: 'HDR10',
-        HDR: 'HDR'
+        HDR: 'HDR',
+        SDR: 'SDR'
       },
 
       AUDIO: {
@@ -1496,9 +1497,9 @@
         DTS_X: 'DTS:X',
         ATMOS: 'Atmos',
         DTS_HD: 'DTS-HD',
-        TRUE_HD: 'TRUE-HD',
+        TRUE_HD: 'True-HD',
         DTS: 'DTS',
-        AC3: 'AC3',
+        AC3: 'AC-3',
         AAC: 'AAC'
       },
 
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index a30a3e7c..b30bc328 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -1461,7 +1461,7 @@
       TYPE: {
         SELF: '媒介',
         BLU_RAY: 'Blu-ray',
-        WEB: 'Web',
+        WEB: 'WEB',
         REMUX: 'Remux',
         ENCODE: 'Encode',
         HDTV: 'HDTV'
@@ -1488,7 +1488,8 @@
         DOLBY: 'DolbyVision',
         HDR10PLUS: 'HDR10+',
         HDR10: 'HDR10',
-        HDR: 'HDR'
+        HDR: 'HDR',
+        SDR: 'SDR'
       },
 
       AUDIO: {
@@ -1496,9 +1497,9 @@
         DTS_X: 'DTS:X',
         ATMOS: 'Atmos',
         DTS_HD: 'DTS-HD',
-        TRUE_HD: 'TRUE-HD',
+        TRUE_HD: 'True-HD',
         DTS: 'DTS',
-        AC3: 'AC3',
+        AC3: 'AC-3',
         AAC: 'AAC'
       },
 
diff --git a/modules/torrents/client/less/torrents.less b/modules/torrents/client/less/torrents.less
index 76b82e9e..19a664bb 100644
--- a/modules/torrents/client/less/torrents.less
+++ b/modules/torrents/client/less/torrents.less
@@ -267,6 +267,19 @@ pre.prettyprint {
     }
 }
 
+.tags-dl {
+    dt {
+        @media (min-width: @screen-sm-min) {
+            width: 120px;
+        }
+    }
+    dd {
+        @media (min-width: @screen-sm-min) {
+            margin-left: 140px;
+        }
+    }
+}
+
 /* csslint ignore:end */
 
 //popup overlay----------------------------------------------
diff --git a/modules/torrents/client/views/admin/admin-list.client.view.html b/modules/torrents/client/views/admin/admin-list.client.view.html
index ace99eb8..d28d2fba 100644
--- a/modules/torrents/client/views/admin/admin-list.client.view.html
+++ b/modules/torrents/client/views/admin/admin-list.client.view.html
@@ -76,12 +76,12 @@
                     <dt class="h-line">{{ 'CA_KEYWORD' | translate}}:</dt>
                     <dd class="h-line">
                         <div class="row">
-                            <div class="col-sm-7">
+                            <div class="col-sm-6">
                                 <input type="text" class="form-control" ng-model="vm.searchKey"
                                        ng-keydown="vm.onKeysKeyDown($event);"
                                        placeholder="{{ 'PH_KEYWORD' | translate}}">
                             </div>
-                            <div class="col-sm-5">
+                            <div class="col-sm-6">
                                 <span class="label label-tag text-uppercase incline-block-valign"
                                       title="{{ 'TITLE_ALT.MORE_TAGS' | translate}}"
                                       ng-click="vm.onMoreTagsClicked();">
@@ -97,71 +97,69 @@
                         </div>
                     </dd>
 
-                    <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
-                    <dd class="h-line">
-                        <span class="checkbox checkbox-hnr">
-                            <label class="checkbox-inline">
-                                <input type="checkbox" ng-model="vm.filterHnR" ng-change="vm.onHnRChanged();"> {{ 'CA_TORRENT_HNR' | translate}}
-                            </label>
-                            <label class="checkbox-inline" ng-if="!vm.isGlobalSaleNow()">
-                                <input type="checkbox" ng-model="vm.filterSale"
-                                       ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
-                            </label>
-                            <label class="checkbox-inline">
-                                <input type="checkbox" ng-model="vm.filterVIP" ng-change="vm.onVIPChanged();"> {{ 'CA_TORRENT_VIP' | translate}}
-                            </label>
-                        </span>
-                        <span class="checkbox checkbox-hnr">
-                            <label class="checkbox-inline">
-                                <input type="checkbox" ng-model="vm.filterTop"
-                                       ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
-                            </label>
-                             <label class="checkbox-inline">
-                                <input type="checkbox" ng-model="vm.filterUnique"
-                                       ng-change="vm.onUniqueChanged();"> {{ 'TORRENT_STATUS_UNIQUE' | translate}}
-                            </label>
-                        </span>
-                    </dd>
+                    <div class="more-tags panel-collapsed padding-top-10" style="display: none;">
+                        <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
+                        <dd class="h-line">
+                            <span class="checkbox checkbox-hnr">
+                                <label class="checkbox-inline">
+                                    <input type="checkbox" ng-model="vm.filterHnR" ng-change="vm.onHnRChanged();"> {{ 'CA_TORRENT_HNR' | translate}}
+                                </label>
+                                <label class="checkbox-inline" ng-if="!vm.isGlobalSaleNow()">
+                                    <input type="checkbox" ng-model="vm.filterSale"
+                                           ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
+                                </label>
+                                <label class="checkbox-inline">
+                                    <input type="checkbox" ng-model="vm.filterVIP" ng-change="vm.onVIPChanged();"> {{ 'CA_TORRENT_VIP' | translate}}
+                                </label>
+                                <label class="checkbox-inline">
+                                    <input type="checkbox" ng-model="vm.filterTop"
+                                           ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
+                                </label>
+                                 <label class="checkbox-inline">
+                                    <input type="checkbox" ng-model="vm.filterUnique"
+                                           ng-change="vm.onUniqueChanged();"> {{ 'TORRENT_STATUS_UNIQUE' | translate}}
+                                </label>
+                            </span>
+                        </dd>
 
-                    <div ng-hide="vm.selectedType=='newest'">
-                        <dt class="h-line">{{ 'CA_TORRENT_STATUS' | translate}}:</dt>
+                        <div ng-hide="vm.selectedType=='newest'">
+                            <dt class="h-line">{{ 'CA_TORRENT_STATUS' | translate}}:</dt>
+                            <dd class="h-line">
+                                <div class="btn-group btn-group-xs" role="group">
+                                    <button id="torrent_status_reviewed"
+                                            class="btn btn-xs btn-tag" value="reviewed"
+                                            ng-class="{'btn-success': vm.torrentStatus == 'reviewed', 'btn-default': vm.torrentStatus != 'reviewed'}"
+                                            ng-click="vm.onTorrentStatusClicked($event, 'reviewed')">
+                                        {{'TORRENT_STATUS_REVIEWED' | translate}}
+                                    </button>
+                                    <button id="torrent_status_new"
+                                            class="btn btn-xs btn-tag" value="new"
+                                            ng-class="{'btn-success': vm.torrentStatus == 'new', 'btn-default': vm.torrentStatus != 'new'}"
+                                            ng-click="vm.onTorrentStatusClicked($event, 'new')">
+                                        {{'TORRENT_STATUS_NEW' | translate}}
+                                    </button>
+                                    <button id="torrent_status_all"
+                                            class="btn btn-xs btn-tag" value="all"
+                                            ng-class="{'btn-success': vm.torrentStatus == 'all', 'btn-default': vm.torrentStatus != 'all'}"
+                                            ng-click="vm.onTorrentStatusClicked($event, 'all')">
+                                        {{'TORRENT_STATUS_ALL' | translate}}
+                                    </button>
+                                </div>
+                            </dd>
+                        </div>
+
+                        <dt class="h-line">{{ 'TORRENT_RECOMMEND_LEVEL' | translate}}:</dt>
                         <dd class="h-line">
                             <div class="btn-group btn-group-xs" role="group">
-                                <button id="torrent_status_reviewed"
-                                        class="btn btn-xs btn-tag" value="reviewed"
-                                        ng-class="{'btn-success': vm.torrentStatus == 'reviewed', 'btn-default': vm.torrentStatus != 'reviewed'}"
-                                        ng-click="vm.onTorrentStatusClicked($event, 'reviewed')">
-                                    {{'TORRENT_STATUS_REVIEWED' | translate}}
-                                </button>
-                                <button id="torrent_status_new"
-                                        class="btn btn-xs btn-tag" value="new"
-                                        ng-class="{'btn-success': vm.torrentStatus == 'new', 'btn-default': vm.torrentStatus != 'new'}"
-                                        ng-click="vm.onTorrentStatusClicked($event, 'new')">
-                                    {{'TORRENT_STATUS_NEW' | translate}}
-                                </button>
-                                <button id="torrent_status_all"
-                                        class="btn btn-xs btn-tag" value="all"
-                                        ng-class="{'btn-success': vm.torrentStatus == 'all', 'btn-default': vm.torrentStatus != 'all'}"
-                                        ng-click="vm.onTorrentStatusClicked($event, 'all')">
-                                    {{'TORRENT_STATUS_ALL' | translate}}
+                                <button ng-repeat="litem in vm.torrentRLevels.value" id="r_{{litem.name}}"
+                                        class="btn btn-xs btn-tag" value="{{litem.value}}"
+                                        ng-class="{'btn-success': vm.torrentRLevel == litem.value, 'btn-default': vm.torrentRLevel != litem.value}"
+                                        ng-click="vm.onRecommendLevelClicked($event, litem.value)">
+                                    {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + litem.name | translate}}
                                 </button>
                             </div>
                         </dd>
-                    </div>
 
-                    <dt class="h-line">{{ 'TORRENT_RECOMMEND_LEVEL' | translate}}:</dt>
-                    <dd class="h-line">
-                        <div class="btn-group btn-group-xs" role="group">
-                            <button ng-repeat="litem in vm.torrentRLevels.value" id="r_{{litem.name}}"
-                                    class="btn btn-xs btn-tag" value="{{litem.value}}"
-                                    ng-class="{'btn-success': vm.torrentRLevel == litem.value, 'btn-default': vm.torrentRLevel != litem.value}"
-                                    ng-click="vm.onRecommendLevelClicked($event, litem.value)">
-                                {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + litem.name | translate}}
-                            </button>
-                        </div>
-                    </dd>
-
-                    <div class="more-tags panel-collapsed" style="display: none;">
                         <div ng-repeat="item in vm.resourcesTags.radio | filter:vm.selectedType">
                             <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}：</dt>
                             <dd class="h-line">
diff --git a/modules/torrents/client/views/list-torrents.client.view.html b/modules/torrents/client/views/list-torrents.client.view.html
index 124024be..509d0b81 100644
--- a/modules/torrents/client/views/list-torrents.client.view.html
+++ b/modules/torrents/client/views/list-torrents.client.view.html
@@ -123,12 +123,12 @@
                     <dt class="h-line">{{ 'CA_KEYWORD' | translate}}:</dt>
                     <dd class="h-line">
                         <div class="row" style="">
-                            <div class="col-sm-7">
+                            <div class="col-sm-6">
                                 <input type="text" class="form-control" ng-model="vm.searchKey"
                                        ng-keydown="vm.onKeysKeyDown($event);"
                                        placeholder="{{ 'PH_KEYWORD' | translate}}">
                             </div>
-                            <div class="col-sm-5">
+                            <div class="col-sm-6">
                                 <span class="label label-tag text-uppercase incline-block-valign"
                                       title="{{ 'TITLE_ALT.MORE_TAGS' | translate}}"
                                       ng-click="vm.onMoreTagsClicked();">
@@ -144,30 +144,28 @@
                         </div>
                     </dd>
 
-                    <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
-                    <dd class="h-line">
-                        <div class="checkbox checkbox-hnr">
-                            <label class="checkbox-inline">
-                                <input type="checkbox" ng-model="vm.filterHnR" ng-change="vm.onHnRChanged();"> {{ 'CA_TORRENT_HNR' | translate}}
-                            </label>
-                            <label class="checkbox-inline" ng-if="!vm.isGlobalSaleNow()">
-                                <input type="checkbox" ng-model="vm.filterSale"
-                                       ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
-                            </label>
-                        </div>
-                        <div class="checkbox checkbox-hnr">
-                            <label class="checkbox-inline">
-                                <input type="checkbox" ng-model="vm.filterTop"
-                                       ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
-                            </label>
-                            <label class="checkbox-inline">
-                                <input type="checkbox" ng-model="vm.filterUnique"
-                                       ng-change="vm.onUniqueChanged();"> {{ 'TORRENT_STATUS_UNIQUE' | translate}}
-                            </label>
-                        </div>
-                    </dd>
+                    <div class="more-tags panel-collapsed padding-top-10" style="display: none; margin-bottom: 20px;">
+                        <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
+                        <dd class="h-line">
+                            <div class="checkbox checkbox-hnr">
+                                <label class="checkbox-inline">
+                                    <input type="checkbox" ng-model="vm.filterHnR" ng-change="vm.onHnRChanged();"> {{ 'CA_TORRENT_HNR' | translate}}
+                                </label>
+                                <label class="checkbox-inline" ng-if="!vm.isGlobalSaleNow()">
+                                    <input type="checkbox" ng-model="vm.filterSale"
+                                           ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
+                                </label>
+                                <label class="checkbox-inline">
+                                    <input type="checkbox" ng-model="vm.filterTop"
+                                           ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
+                                </label>
+                                <label class="checkbox-inline">
+                                    <input type="checkbox" ng-model="vm.filterUnique"
+                                           ng-change="vm.onUniqueChanged();"> {{ 'TORRENT_STATUS_UNIQUE' | translate}}
+                                </label>
+                            </div>
+                        </dd>
 
-                    <div class="more-tags panel-collapsed" style="display: none; margin-bottom: 20px;">
                         <div ng-repeat="item in vm.resourcesTags.radio | filter: vm.tagsFilter">
                             <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}:</dt>
                             <dd class="h-line">
@@ -199,19 +197,19 @@
                         </div>
                     </div>
 
-                    <div>
-                        <dt class="h-line"><i class="fa fa-rss-square color-mt-base" aria-hidden="true"></i> {{'CA_MAKE_RSS_URL' | translate}}:</dt>
-                        <dd class="h-line rss-desc-line">{{'DESC_MAKE_RSS_URL' | translate}}
-                            <div class="margin-top-5">
-                                <a href="{{vm.rssUrl}}" target="_blank">{{vm.rssUrl}}</a>
-                                <span style="position: relative">
-                                    <i class="fa fa-clipboard color-mt-base" aria-hidden="true" title="{{'COPY_TO_CLIPBOARD' | translate}}"
-                                       mt-scale-by-click="{scale: 2, duration: '.3s'}"
-                                       mt-copy-to-clipboard="{{vm.rssUrl}}"></i>
-                                </span>
-                            </div>
-                        </dd>
-                    </div>
+                    <!--<div>-->
+                        <!--<dt class="h-line"><i class="fa fa-rss-square color-mt-base" aria-hidden="true"></i> {{'CA_MAKE_RSS_URL' | translate}}:</dt>-->
+                        <!--<dd class="h-line rss-desc-line">{{'DESC_MAKE_RSS_URL' | translate}}-->
+                            <!--<div class="margin-top-5">-->
+                                <!--<a href="{{vm.rssUrl}}" target="_blank">{{vm.rssUrl}}</a>-->
+                                <!--<span style="position: relative">-->
+                                    <!--<i class="fa fa-clipboard color-mt-base" aria-hidden="true" title="{{'COPY_TO_CLIPBOARD' | translate}}"-->
+                                       <!--mt-scale-by-click="{scale: 2, duration: '.3s'}"-->
+                                       <!--mt-copy-to-clipboard="{{vm.rssUrl}}"></i>-->
+                                <!--</span>-->
+                            <!--</div>-->
+                        <!--</dd>-->
+                    <!--</div>-->
                 </dl>
             </div>
         </div>
diff --git a/modules/torrents/client/views/search-torrents.client.view.html b/modules/torrents/client/views/search-torrents.client.view.html
index e39ab8f0..675ae56b 100644
--- a/modules/torrents/client/views/search-torrents.client.view.html
+++ b/modules/torrents/client/views/search-torrents.client.view.html
@@ -76,12 +76,12 @@
                     <dt class="h-line">{{ 'CA_KEYWORD' | translate}}:</dt>
                     <dd class="h-line">
                         <div class="row" style="">
-                            <div class="col-sm-7">
+                            <div class="col-sm-6">
                                 <input type="text" class="form-control" ng-model="vm.searchKey"
                                        ng-keydown="vm.onKeysKeyDown($event);"
                                        placeholder="{{ 'PH_KEYWORD' | translate}}">
                             </div>
-                            <div class="col-sm-5">
+                            <div class="col-sm-6">
                                 <span class="label label-tag text-uppercase incline-block-valign"
                                       title="{{ 'TITLE_ALT.MORE_TAGS' | translate}}"
                                       ng-click="vm.onMoreTagsClicked();" ng-if="vm.torrentType!='all'">
@@ -97,31 +97,28 @@
                         </div>
                     </dd>
 
+                    <div class="more-tags panel-collapsed padding-top-10" style="display: none; margin-bottom: 20px;">
+                        <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
+                        <dd class="h-line">
+                            <div class="checkbox checkbox-hnr">
+                                <label class="checkbox-inline">
+                                    <input type="checkbox" ng-model="vm.filterHnR" ng-change="vm.onHnRChanged();"> {{ 'CA_TORRENT_HNR' | translate}}
+                                </label>
+                                <label class="checkbox-inline" ng-if="!vm.isGlobalSaleNow()">
+                                    <input type="checkbox" ng-model="vm.filterSale"
+                                           ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
+                                </label>
+                                <label class="checkbox-inline">
+                                    <input type="checkbox" ng-model="vm.filterTop"
+                                           ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
+                                </label>
+                                <label class="checkbox-inline">
+                                    <input type="checkbox" ng-model="vm.filterUnique"
+                                           ng-change="vm.onUniqueChanged();"> {{ 'TORRENT_STATUS_UNIQUE' | translate}}
+                                </label>
+                            </div>
+                        </dd>
 
-                    <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
-                    <dd class="h-line">
-                        <div class="checkbox checkbox-hnr">
-                            <label class="checkbox-inline">
-                                <input type="checkbox" ng-model="vm.filterHnR" ng-change="vm.onHnRChanged();"> {{ 'CA_TORRENT_HNR' | translate}}
-                            </label>
-                            <label class="checkbox-inline" ng-if="!vm.isGlobalSaleNow()">
-                                <input type="checkbox" ng-model="vm.filterSale"
-                                       ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
-                            </label>
-                        </div>
-                        <div class="checkbox checkbox-hnr">
-                            <label class="checkbox-inline">
-                                <input type="checkbox" ng-model="vm.filterTop"
-                                       ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
-                            </label>
-                            <label class="checkbox-inline">
-                                <input type="checkbox" ng-model="vm.filterUnique"
-                                       ng-change="vm.onUniqueChanged();"> {{ 'TORRENT_STATUS_UNIQUE' | translate}}
-                            </label>
-                        </div>
-                    </dd>
-
-                    <div class="more-tags panel-collapsed" style="display: none; margin-bottom: 20px;">
                         <div ng-repeat="item in vm.resourcesTags.radio | filter:vm.torrentType">
                             <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}:</dt>
                             <dd class="h-line">
diff --git a/modules/vip/client/views/vip.client.view.html b/modules/vip/client/views/vip.client.view.html
index 3c144c8a..90a82fd3 100644
--- a/modules/vip/client/views/vip.client.view.html
+++ b/modules/vip/client/views/vip.client.view.html
@@ -98,12 +98,12 @@
                                 <dt class="h-line">{{ 'CA_KEYWORD' | translate}}:</dt>
                                 <dd class="h-line">
                                     <div class="row" style="">
-                                        <div class="col-sm-7">
+                                        <div class="col-sm-6">
                                             <input type="text" class="form-control" ng-model="vm.searchKey"
                                                    ng-keydown="vm.onKeysKeyDown($event);"
                                                    placeholder="{{ 'PH_KEYWORD' | translate}}">
                                         </div>
-                                        <div class="col-sm-5">
+                                        <div class="col-sm-6">
                                 <span class="label label-tag text-uppercase incline-block-valign"
                                       title="{{ 'TITLE_ALT.MORE_TAGS' | translate}}"
                                       ng-click="vm.onMoreTagsClicked();">
@@ -119,30 +119,28 @@
                                     </div>
                                 </dd>
 
-                                <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
-                                <dd class="h-line">
-                                    <div class="checkbox checkbox-hnr">
-                                        <label class="checkbox-inline">
-                                            <input type="checkbox" ng-model="vm.filterHnR" ng-change="vm.onHnRChanged();"> {{ 'CA_TORRENT_HNR' | translate}}
-                                        </label>
-                                        <label class="checkbox-inline" ng-if="!vm.isGlobalSaleNow()">
-                                            <input type="checkbox" ng-model="vm.filterSale"
-                                                   ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
-                                        </label>
-                                    </div>
-                                    <div class="checkbox checkbox-hnr">
-                                        <label class="checkbox-inline">
-                                            <input type="checkbox" ng-model="vm.filterTop"
-                                                   ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
-                                        </label>
-                                        <label class="checkbox-inline">
-                                            <input type="checkbox" ng-model="vm.filterUnique"
-                                                   ng-change="vm.onUniqueChanged();"> {{ 'TORRENT_STATUS_UNIQUE' | translate}}
-                                        </label>
-                                    </div>
-                                </dd>
+                                <div class="more-tags panel-collapsed padding-top-10" style="display: none; margin-bottom: 20px;">
+                                    <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
+                                    <dd class="h-line">
+                                        <div class="checkbox checkbox-hnr">
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" ng-model="vm.filterHnR" ng-change="vm.onHnRChanged();"> {{ 'CA_TORRENT_HNR' | translate}}
+                                            </label>
+                                            <label class="checkbox-inline" ng-if="!vm.isGlobalSaleNow()">
+                                                <input type="checkbox" ng-model="vm.filterSale"
+                                                       ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
+                                            </label>
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" ng-model="vm.filterTop"
+                                                       ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
+                                            </label>
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" ng-model="vm.filterUnique"
+                                                       ng-change="vm.onUniqueChanged();"> {{ 'TORRENT_STATUS_UNIQUE' | translate}}
+                                            </label>
+                                        </div>
+                                    </dd>
 
-                                <div class="more-tags panel-collapsed" style="display: none; margin-bottom: 20px;">
                                     <div ng-repeat="item in vm.resourcesTags.radio | filter:vm.vipTorrentType">
                                         <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}:</dt>
                                         <dd class="h-line">

From 49b6eee0a10b2e65c4af0f73b3894349547e17c5 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sun, 20 May 2018 18:45:43 +0800
Subject: [PATCH 79/96] feat(torrents): new css for torrents search panel

---
 .../controllers/about.client.controller.js    | 122 +++++++++-
 .../client/views/maker-view.client.view.html  | 154 ++++++++++--
 .../controllers/home.client.controller.js     |   2 +-
 modules/core/client/css/core.css              |   4 -
 .../torrent-list-item.client.directive.js     |  14 +-
 modules/core/client/less/mt.less              |   9 +
 .../client/config/torrents.client.routes.js   |   7 -
 .../admin/admin-list.client.controller.js     |  42 ++--
 .../controllers/torrents.client.controller.js |  21 +-
 modules/torrents/client/less/torrents.less    |  33 +++
 .../templates/torrent-item.client.view.html   |   2 +-
 .../views/admin/admin-list.client.view.html   |  99 ++++----
 .../views/list-torrents.client.view.html      |  42 +++-
 .../views/search-torrents.client.view.html    | 224 ------------------
 .../controllers/vip.client.controller.js      |  15 +-
 modules/vip/client/views/vip.client.view.html |  60 +++--
 16 files changed, 460 insertions(+), 390 deletions(-)
 delete mode 100644 modules/torrents/client/views/search-torrents.client.view.html

diff --git a/modules/about/client/controllers/about.client.controller.js b/modules/about/client/controllers/about.client.controller.js
index b2c315fc..5e40a0eb 100644
--- a/modules/about/client/controllers/about.client.controller.js
+++ b/modules/about/client/controllers/about.client.controller.js
@@ -24,7 +24,7 @@
     vm.scoreConfig = MeanTorrentConfig.meanTorrentConfig.score;
     vm.announce = MeanTorrentConfig.meanTorrentConfig.announce;
     vm.itemsPerPageConfig = MeanTorrentConfig.meanTorrentConfig.itemsPerPage;
-    vm.torrentType = MeanTorrentConfig.meanTorrentConfig.torrentType;
+    vm.torrentTypeConfig = MeanTorrentConfig.meanTorrentConfig.torrentType;
     vm.inputLengthConfig = MeanTorrentConfig.meanTorrentConfig.inputLength;
     vm.rssConfig = MeanTorrentConfig.meanTorrentConfig.rss;
     vm.ircConfig = MeanTorrentConfig.meanTorrentConfig.ircAnnounce;
@@ -40,8 +40,9 @@
     vm.examinationConfig = MeanTorrentConfig.meanTorrentConfig.examination;
     vm.chatConfig = MeanTorrentConfig.meanTorrentConfig.chat;
     vm.accessConfig = MeanTorrentConfig.meanTorrentConfig.access;
+    vm.resourcesTags = MeanTorrentConfig.meanTorrentConfig.resourcesTags;
 
-    vm.groupTorrentType = localStorageService.get('maker_last_selected_type') || 'movie';
+    vm.torrentType = localStorageService.get('maker_last_selected_type') || 'movie';
     vm.searchTags = [];
     vm.searchKey = '';
     vm.releaseYear = undefined;
@@ -133,10 +134,11 @@
     };
 
     /**
-     * onTypeBtnClick
+     * onTorrentTypeChanged
      */
-    vm.onTypeBtnClick = function () {
-      localStorageService.set('maker_last_selected_type', vm.groupTorrentType);
+    vm.onTorrentTypeChanged = function () {
+      vm.buildPager();
+      localStorageService.set('maker_last_selected_type', vm.torrentType);
     };
 
     /**
@@ -278,12 +280,11 @@
         skip: (p - 1) * vm.itemsPerPage,
         limit: vm.itemsPerPage,
         sort: vm.sort,
-        torrent_type: vm.groupTorrentType,
+        torrent_type: vm.torrentType,
         torrent_status: 'reviewed',
         maker: vm.maker._id,
+        keys: vm.searchKey,
         torrent_vip: false,
-        keys: vm.search,
-
         torrent_rlevel: vm.torrentRLevel,
         torrent_release: vm.releaseYear,
         torrent_tags: vm.searchTags,
@@ -609,5 +610,110 @@
       var e = $('#cog_' + id);
       e.removeClass('fa-spin');
     };
+
+    /**
+     * onMoreTagsClicked
+     */
+    vm.onMoreTagsClicked = function () {
+      var e = $('.more-tags');
+      var i = $('#more-tags-icon');
+
+      if (!e.hasClass('panel-collapsed')) {
+        e.slideUp();
+        e.addClass('panel-collapsed');
+        i.removeClass('glyphicon-chevron-up').addClass('glyphicon-chevron-down');
+      } else {
+        e.slideDown();
+        e.removeClass('panel-collapsed');
+        i.removeClass('glyphicon-chevron-down').addClass('glyphicon-chevron-up');
+      }
+    };
+
+    /**
+     * clearAllCondition
+     */
+    vm.clearAllCondition = function () {
+      vm.searchKey = '';
+      vm.searchTags = [];
+      $('.btn-tag').removeClass('btn-success').addClass('btn-default');
+      vm.releaseYear = undefined;
+      vm.filterHnR = false;
+      vm.filterTop = false;
+      vm.filterUnique = false;
+      vm.filterSale = false;
+      vm.torrentRLevel = 'level0';
+
+      vm.buildPager();
+    };
+
+    /**
+     * onRLevelClicked
+     * @param y
+     */
+    vm.onRLevelClicked = function (l) {
+      if (vm.torrentRLevel === l) {
+        vm.torrentRLevel = 'level0';
+      } else {
+        vm.torrentRLevel = l;
+      }
+      vm.buildPager();
+    };
+
+    /**
+     * onReleaseClicked
+     * @param y
+     */
+    vm.onReleaseClicked = function (y) {
+      if (vm.releaseYear === y) {
+        vm.releaseYear = undefined;
+      } else {
+        vm.releaseYear = y;
+      }
+      vm.buildPager();
+    };
+
+    /**
+     * onHnRClicked
+     */
+    vm.onHnRClicked = function () {
+      vm.filterHnR = !vm.filterHnR;
+      vm.buildPager();
+    };
+    vm.onHnRChanged = function () {
+      vm.buildPager();
+    };
+
+    /**
+     * onTopClicked, onTopChanged
+     */
+    vm.onTopClicked = function () {
+      vm.filterTop = !vm.filterTop;
+      vm.buildPager();
+    };
+    vm.onTopChanged = function () {
+      vm.buildPager();
+    };
+
+    /**
+     * onUniqueClicked, onUniqueChanged
+     */
+    vm.onUniqueClicked = function () {
+      vm.filterUnique = !vm.filterUnique;
+      vm.buildPager();
+    };
+    vm.onUniqueChanged = function () {
+      vm.buildPager();
+    };
+
+    /**
+     * onSaleChanged
+     */
+    vm.onSaleClicked = function () {
+      vm.filterSale = !vm.filterSale;
+      vm.buildPager();
+    };
+    vm.onSaleChanged = function () {
+      vm.buildPager();
+    };
   }
 }());
diff --git a/modules/about/client/views/maker-view.client.view.html b/modules/about/client/views/maker-view.client.view.html
index 90cea3ac..b8575215 100644
--- a/modules/about/client/views/maker-view.client.view.html
+++ b/modules/about/client/views/maker-view.client.view.html
@@ -111,22 +111,152 @@
     </div>
 
     <div class="container">
-        <div class="row margin-top-40">
+        <div class="row margin-top-10">
             <div class="col-md-12 torrent-list" id="top_of_torrent_list" ng-show="vm.pagedItems">
-                <div class="margin-bottom-30 text-center">
-                    <div class="btn-group torrent-type-group">
-                        <label class="btn btn-default"
-                               ng-repeat="t in vm.torrentType.value | filter:{enable: true, role: 'user'} | orderBy: 'position'"
-                               ng-model="vm.groupTorrentType" uib-btn-radio="'{{t.value}}'"
-                               ng-click="vm.onTypeBtnClick(); vm.buildPager();">
-                            {{'MENU_TORRENTS_SUB.'+t.name | translate}}
-                        </label>
+                <div class="panel panel-default">
+                    <div class="panel-heading text-center">
+                        <h3 class="panel-title">-={{vm.maker.name}}=- {{'TAGS_SEARCH' | translate}} - {{'MENU_TORRENTS_SUB.' + vm.torrentType.toUpperCase() | translate}}</h3>
+                    </div>
+                    <div class="panel-body">
+                        <div class="row filter-tags text-center"
+                             ng-if="vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
+                            <div class="col-md-6 col-md-offset-3">
+                                <span class="filter-tag-item label-tag" ng-if="vm.releaseYear">{{vm.releaseYear}}
+                                    <i class="fa fa-times-circle-o"
+                                       ng-click="vm.onReleaseClicked(vm.releaseYear);">
+                                    </i>
+                                </span>
+                                <span class="filter-tag-item label-tag" ng-if="vm.torrentRLevel != 'level0'">{{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + vm.torrentRLevel.toUpperCase() | translate}}
+                                    <i class="fa fa-times-circle-o"
+                                       ng-click="vm.onRLevelClicked(vm.torrentRLevel);">
+                                    </i>
+                                </span>
+                                <span class="filter-tag-item label-tag" ng-if="vm.filterSale">{{ 'CA_TORRENT_SALE_NOW' | translate}}
+                                    <i class="fa fa-times-circle-o"
+                                       ng-click="vm.onSaleClicked();">
+                                    </i>
+                                </span>
+                                <span class="filter-tag-item label-tag" ng-if="vm.filterHnR">H&R
+                                    <i class="fa fa-times-circle-o"
+                                       ng-click="vm.onHnRClicked();">
+                                    </i>
+                                </span>
+                                <span class="filter-tag-item label-tag" ng-if="vm.filterTop">{{'STATUS_TOP_KEY' | translate}}
+                                    <i class="fa fa-times-circle-o"
+                                       ng-click="vm.onTopClicked();">
+                                    </i>
+                                </span>
+                                <span class="filter-tag-item label-tag" ng-if="vm.filterUnique">{{'STATUS_UNIQUE_KEY' | translate}}
+                                    <i class="fa fa-times-circle-o"
+                                       ng-click="vm.onUniqueClicked();">
+                                    </i>
+                                </span>
+                                <span ng-repeat="t in vm.searchTags" ng-if="vm.searchTags.length>0">
+                                    <span class="filter-tag-item label-tag">{{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
+                                        <i class="fa fa-times-circle-o"
+                                           ng-click="vm.onTagClicked(t);">
+                                        </i>
+                                    </span>
+                                </span>
+                            </div>
+                        </div>
+                        <div class="col-md-10 col-md-offset-1">
+                            <dl class="dl-horizontal tags-admin-dl">
+                                <dt class="h-line">{{ 'CA_KEYWORD' | translate}}:</dt>
+                                <dd class="h-line">
+                                    <div class="row" style="">
+                                        <div class="col-sm-6">
+                                            <input type="text" class="form-control" ng-model="vm.searchKey"
+                                                   ng-keydown="vm.onKeysKeyDown($event);"
+                                                   placeholder="{{ 'PH_KEYWORD' | translate}}">
+                                        </div>
+                                        <div class="col-sm-6">
+                                            <span class="label label-tag text-uppercase incline-block-valign"
+                                                  title="{{ 'TITLE_ALT.MORE_TAGS' | translate}}"
+                                                  ng-click="vm.onMoreTagsClicked();">
+                                                <i class="glyphicon glyphicon-chevron-down" id="more-tags-icon"></i> {{ 'MORE_TAGS' | translate}}
+                                            </span>
+                                            <span class="label label-tag text-uppercase incline-block-valign"
+                                                  title="{{ 'TITLE_ALT.RESET_TAGS' | translate}}"
+                                                  ng-click="vm.clearAllCondition();">
+                                                <i class="glyphicon glyphicon-repeat"></i> {{ 'CA_RESET' | translate}}
+                                            </span>
+                                        </div>
+                                    </div>
+                                </dd>
+
+                                <dt class="h-line margin-top-10">{{'CA_RESOURCE_TYPE' | translate}}</dt>
+                                <dd class="h-line margin-top-10">
+                                    <div class="radio radio-type margin-top-5">
+                                        <label class="radio-inline"
+                                               ng-repeat="t in vm.torrentTypeConfig.value | filter:{enable: true, role: 'user'}">
+                                            <input type="radio" ng-model="vm.torrentType" value="{{t.value}}"
+                                                   ng-change="vm.onTorrentTypeChanged();"> {{'MENU_TORRENTS_SUB.'+t.name | translate}}
+                                        </label>
+                                    </div>
+                                </dd>
+
+                                <div class="more-tags panel-collapsed padding-top-10" style="display: none; margin-bottom: 20px;">
+                                    <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
+                                    <dd class="h-line">
+                                        <div class="checkbox checkbox-hnr">
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" ng-model="vm.filterHnR"
+                                                       ng-change="vm.onHnRChanged();"> {{ 'CA_TORRENT_HNR' | translate}}
+                                            </label>
+                                            <label class="checkbox-inline" ng-if="!vm.isGlobalSaleNow()">
+                                                <input type="checkbox" ng-model="vm.filterSale"
+                                                       ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
+                                            </label>
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" ng-model="vm.filterTop"
+                                                       ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
+                                            </label>
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" ng-model="vm.filterUnique"
+                                                       ng-change="vm.onUniqueChanged();"> {{ 'TORRENT_STATUS_UNIQUE' | translate}}
+                                            </label>
+                                        </div>
+                                    </dd>
+
+                                    <div ng-repeat="item in vm.resourcesTags.radio | filter:vm.torrentType">
+                                        <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}:</dt>
+                                        <dd class="h-line">
+                                            <div class="btn-group btn-group-xs" role="group">
+                                                <button ng-repeat="sitem in item.value" id="tag_{{sitem.name}}"
+                                                        class="btn btn-xs btn-default btn-tag" value="{{sitem.name}}"
+                                                        ng-click="vm.onRadioTagClicked($event, sitem.name)">
+                                                    {{ 'RESOURCESTAGS.' + item.name + '.' + sitem.name | translate}}
+                                                </button>
+                                                </span>
+                                            </div>
+                                        </dd>
+                                    </div>
+
+                                    <div style="margin-top: 20px;"></div>
+
+                                    <div ng-repeat="item in vm.resourcesTags.checkbox | filter:vm.torrentType">
+                                        <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}:</dt>
+                                        <dd class="h-line">
+                                            <div class="btn-group btn-group-xs" role="group">
+                                                <button ng-repeat="sitem in item.value" id="tag_{{sitem.name}}"
+                                                        class="btn btn-xs btn-default btn-tag" value="{{sitem.name}}"
+                                                        ng-click="vm.onCheckboxTagClicked($event, sitem.name)"
+                                                        toggle-class="btn-success" base-class="btn-default" onclick="this.blur();">
+                                                    {{ 'RESOURCESTAGS.' + item.name + '.' + sitem.name | translate}}
+                                                </button>
+                                            </div>
+                                        </dd>
+                                    </div>
+                                </div>
+                            </dl>
+                        </div>
                     </div>
                 </div>
 
                 <div class="pagination-div-top">
                     <div class="row">
-                        <div class="col-sm-12 col-md-9">
+                        <div class="col-sm-12">
                             <ul uib-pagination boundary-links="true" max-size="8" items-per-page="vm.itemsPerPage" total-items="vm.filterLength"
                                 ng-model="vm.currentPage"
                                 ng-change="vm.pageChanged()"
@@ -134,10 +264,6 @@
                                 next-text="{{ 'PAGE_TEXT_NEXT' | translate}}" last-text="{{ 'PAGE_TEXT_LAST' | translate}}">
                             </ul>
                         </div>
-                        <div class="col-sm-12 col-md-3">
-                            <input class="form-control margin-top-20 margin-bottom-20" type="text" ng-model="vm.search" placeholder="Search"
-                                   ng-change="vm.figureOutItemsToDisplay()"/>
-                        </div>
                     </div>
                 </div>
 
diff --git a/modules/core/client/controllers/home.client.controller.js b/modules/core/client/controllers/home.client.controller.js
index 476b0d2f..4ec46805 100644
--- a/modules/core/client/controllers/home.client.controller.js
+++ b/modules/core/client/controllers/home.client.controller.js
@@ -91,7 +91,7 @@
 
           $state.go('forums.search', {forumId: fid, keys: vm.searchKeys});
         } else {                            //search from torrents
-          $state.go('torrents.search', {keys: vm.searchKeys});
+          $state.go('torrents.aggregate', {keys: vm.searchKeys});
         }
       }
     };
diff --git a/modules/core/client/css/core.css b/modules/core/client/css/core.css
index 38ee2367..2574bbfc 100644
--- a/modules/core/client/css/core.css
+++ b/modules/core/client/css/core.css
@@ -91,7 +91,3 @@ a:hover .header-profile-image {
 .dl-horizontal .h-line .checkbox-inline {
     min-width: 150px;
 }
-
-.tags-dl .checkbox-inline {
-    min-width: 100px !important;
-}
diff --git a/modules/core/client/directives/torrent-list-item.client.directive.js b/modules/core/client/directives/torrent-list-item.client.directive.js
index c3af830a..2f271d0f 100644
--- a/modules/core/client/directives/torrent-list-item.client.directive.js
+++ b/modules/core/client/directives/torrent-list-item.client.directive.js
@@ -78,10 +78,18 @@
          * @param t
          */
         vm.onTorrentTypeClicked = function (t) {
-          if ($scope.parent.filterType === t) {
-            $scope.parent.filterType = undefined;
+          if ($state.current.name.startsWith('admin.torrents')) {
+            if ($scope.parent.torrentType === t) {
+              $scope.parent.torrentType = 'aggregate';
+            } else {
+              $scope.parent.torrentType = t;
+            }
           } else {
-            $scope.parent.filterType = t;
+            if ($scope.parent.filterType === t) {
+              $scope.parent.filterType = $scope.parent.torrentType;
+            } else {
+              $scope.parent.filterType = t;
+            }
           }
 
           buildPager();
diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less
index ceb4edf8..800198f3 100644
--- a/modules/core/client/less/mt.less
+++ b/modules/core/client/less/mt.less
@@ -1368,6 +1368,15 @@ body {
     }
 }
 
+.radio-type {
+    margin-top: 0;
+    margin-bottom: 0;
+    line-height: 1.6;
+    input[type="radio"] {
+        margin-top: 5px;
+    }
+}
+
 .checkbox-hnr {
     margin-top: 0;
     margin-bottom: 0;
diff --git a/modules/torrents/client/config/torrents.client.routes.js b/modules/torrents/client/config/torrents.client.routes.js
index cf9a6a14..52b8038c 100644
--- a/modules/torrents/client/config/torrents.client.routes.js
+++ b/modules/torrents/client/config/torrents.client.routes.js
@@ -54,13 +54,6 @@
     });
 
     $stateProvider
-      .state('torrents.search', {
-        url: '/search?keys',
-        templateUrl: '/modules/torrents/client/views/search-torrents.client.view.html',
-        data: {
-          pageTitle: 'PAGETITLE.TORRENT_SEARCH'
-        }
-      })
       .state('torrents.view', {
         url: '/:torrentId',
         templateUrl: '/modules/torrents/client/views/view-torrent.client.view.html',
diff --git a/modules/torrents/client/controllers/admin/admin-list.client.controller.js b/modules/torrents/client/controllers/admin/admin-list.client.controller.js
index 642f968d..792d4d69 100644
--- a/modules/torrents/client/controllers/admin/admin-list.client.controller.js
+++ b/modules/torrents/client/controllers/admin/admin-list.client.controller.js
@@ -25,8 +25,8 @@
     vm.torrentTypeConfig = MeanTorrentConfig.meanTorrentConfig.torrentType;
     vm.salesGlobalConfig = MeanTorrentConfig.meanTorrentConfig.torrentGlobalSales;
 
-    vm.selectedType = localStorageService.get('admin_last_selected_type') || 'movie';
-    vm.filterVIP = isSelectedVipType(vm.selectedType);
+    vm.torrentType = localStorageService.get('admin_last_selected_type') || 'movie';
+    vm.filterVIP = isSelectedVipType(vm.torrentType);
     vm.searchTags = [];
     vm.searchKey = '';
     vm.releaseYear = undefined;
@@ -38,7 +38,7 @@
     vm.torrentStatus = 'reviewed';
     vm.torrentRLevel = 'level0';
 
-    vm.torrentType = vm.selectedType === 'newest' ? 'all' : vm.selectedType;
+    // vm.torrentType = vm.selectedType === 'newest' ? 'aggregate' : vm.selectedType;
 
     /**
      * commentBuildPager
@@ -56,12 +56,10 @@
      */
     vm.onTorrentTypeChanged = function () {
       vm.searchTags = [];
-      vm.filterVIP = isSelectedVipType(vm.selectedType);
-
-      vm.torrentType = vm.selectedType === 'newest' ? 'all' : vm.selectedType;
+      vm.filterVIP = isSelectedVipType(vm.torrentType);
 
       vm.torrentBuildPager();
-      localStorageService.set('admin_last_selected_type', vm.selectedType);
+      localStorageService.set('admin_last_selected_type', vm.torrentType);
     };
 
     /**
@@ -121,13 +119,13 @@
     vm.onTorrentStatusClicked = function (event, s) {
       var e = angular.element(event.currentTarget);
 
-      //if (e.hasClass('btn-success')) {
-      //  return;
-      //} else {
-      //  e.addClass('btn-success').removeClass('btn-default').siblings().removeClass('btn-success').addClass('btn-default');
-      //  vm.torrentStatus = s;
-      //}
-      vm.torrentStatus = s;
+      if (e.hasClass('btn-success')) {
+        return;
+      } else {
+        e.addClass('btn-success').removeClass('btn-default').siblings().removeClass('btn-success').addClass('btn-default');
+        vm.torrentStatus = s;
+      }
+      // vm.torrentStatus = s;
       e.blur();
       vm.torrentBuildPager();
     };
@@ -210,9 +208,9 @@
         skip: (p - 1) * vm.torrentItemsPerPage,
         limit: vm.torrentItemsPerPage,
         keys: vm.searchKey.trim(),
-        torrent_status: vm.selectedType === 'newest' ? 'new' : vm.torrentStatus,
+        torrent_status: vm.torrentType === 'aggregate' ? 'new' : vm.torrentStatus,
         torrent_rlevel: vm.torrentRLevel,
-        torrent_type: vm.filterType ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
+        torrent_type: vm.torrentType === 'aggregate' ? 'all' : vm.torrentType,
         torrent_release: vm.releaseYear,
         torrent_tags: vm.searchTags,
         torrent_hnr: vm.filterHnR,
@@ -242,8 +240,8 @@
     vm.clearAllCondition = function () {
       vm.searchKey = '';
       vm.searchTags = [];
-      $('.more-tags .btn-tag').removeClass('btn-success').addClass('btn-default');
-      vm.filterVIP = isSelectedVipType(vm.selectedType);
+      $('.btn-tag-resource .btn-tag').removeClass('btn-success').addClass('btn-default');
+      vm.filterVIP = false;
       vm.releaseYear = undefined;
       vm.filterHnR = false;
       vm.filterSale = false;
@@ -271,11 +269,13 @@
      * @param t
      */
     vm.onTorrentTypeClicked = function (t) {
-      if (vm.filterType === t) {
-        vm.filterType = undefined;
+      if (vm.torrentType === t) {
+        vm.torrentType = 'aggregate';
+        vm.filterVIP = false;
       } else {
-        vm.filterType = t;
+        vm.torrentType = t;
       }
+      localStorageService.set('admin_last_selected_type', vm.torrentType);
       vm.torrentBuildPager();
     };
 
diff --git a/modules/torrents/client/controllers/torrents.client.controller.js b/modules/torrents/client/controllers/torrents.client.controller.js
index c652cee8..38cc161d 100644
--- a/modules/torrents/client/controllers/torrents.client.controller.js
+++ b/modules/torrents/client/controllers/torrents.client.controller.js
@@ -35,7 +35,15 @@
     vm.topItems = 6;
     vm.torrentRLevel = 'level0';
 
-    vm.torrentType = $state.current.data.torrentType || 'all';
+    vm.torrentType = $state.current.data.torrentType || 'aggregate';
+
+    $scope.$watch('vm.torrentType', function (newValue, oldValue) {
+      if (vm.torrentType === 'aggregate') {
+        vm.filterType = 'aggregate';
+      } else {
+        vm.filterType = vm.torrentType;
+      }
+    });
 
     /**
      * commentBuildPager
@@ -305,7 +313,7 @@
         keys: vm.searchKey.trim(),
         torrent_status: 'reviewed',
         torrent_rlevel: vm.torrentRLevel,
-        torrent_type: vm.filterType ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
+        torrent_type: (vm.filterType && vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
         torrent_vip: false,
         torrent_release: vm.releaseYear,
         torrent_tags: vm.searchTags,
@@ -359,7 +367,7 @@
       vm.filterUnique = false;
       vm.filterSale = false;
       vm.torrentRLevel = 'level0';
-      vm.filterType = undefined;
+      vm.filterType = vm.torrentType;
 
       vm.torrentBuildPager();
     };
@@ -393,7 +401,7 @@
      */
     vm.onTorrentTypeClicked = function (t) {
       if (vm.filterType === t) {
-        vm.filterType = undefined;
+        vm.filterType = vm.torrentType;
       } else {
         vm.filterType = t;
       }
@@ -464,13 +472,14 @@
      */
     vm.tagsFilter = function (item) {
       var res = false;
-      if (vm.torrentType === 'aggregate') {
+
+      if (vm.filterType === 'aggregate') {
         angular.forEach(vm.torrentTypeConfig.value, function (t) {
           if (t.enable && item.cats.includes(t.value))
             res = true;
         });
       } else {
-        if (item.cats.includes(vm.torrentType))
+        if (item.cats.includes(vm.filterType))
           res = true;
       }
 
diff --git a/modules/torrents/client/less/torrents.less b/modules/torrents/client/less/torrents.less
index 19a664bb..85d23f44 100644
--- a/modules/torrents/client/less/torrents.less
+++ b/modules/torrents/client/less/torrents.less
@@ -278,6 +278,39 @@ pre.prettyprint {
             margin-left: 140px;
         }
     }
+    .checkbox-inline {
+        min-width: 100px !important;
+    }
+    .radio-inline {
+        min-width: 100px !important;
+        margin-left: 0 !important;
+        &:not(:first-child){
+            margin-right: 4px;
+        }
+    }
+}
+
+.tags-admin-dl {
+    dt {
+        @media (min-width: @screen-sm-min) {
+            width: 120px;
+        }
+    }
+    dd {
+        @media (min-width: @screen-sm-min) {
+            margin-left: 140px;
+        }
+    }
+    .checkbox-inline {
+        min-width: 100px !important;
+    }
+    .radio {
+        margin-top: 0 !important;
+    }
+    .radio-inline {
+        min-width: 100px !important;
+        margin-left: 0 !important;
+    }
 }
 
 /* csslint ignore:end */
diff --git a/modules/torrents/client/templates/torrent-item.client.view.html b/modules/torrents/client/templates/torrent-item.client.view.html
index 6aa57a9d..7e44fc03 100644
--- a/modules/torrents/client/templates/torrent-item.client.view.html
+++ b/modules/torrents/client/templates/torrent-item.client.view.html
@@ -43,7 +43,7 @@
                     <!--<span class="label label-success text-uppercase">{{ item.torrent_type}}</span>-->
                     <span class="label label-ttype label-primary" ng-class="{'used': parent.filterType == item.torrent_type}"
                           ng-click="vm.onTorrentTypeClicked(item.torrent_type); $event.stopPropagation();"
-                          ng-if="parent.torrentType=='aggregate' || parent.torrentType=='all'">
+                          ng-if="parent.torrentType=='aggregate'">
                         {{'TORRENT_TYPE_LABEL.' + item.torrent_type.toUpperCase() | translate}}
                     </span>
 
diff --git a/modules/torrents/client/views/admin/admin-list.client.view.html b/modules/torrents/client/views/admin/admin-list.client.view.html
index d28d2fba..870ce6e4 100644
--- a/modules/torrents/client/views/admin/admin-list.client.view.html
+++ b/modules/torrents/client/views/admin/admin-list.client.view.html
@@ -5,11 +5,11 @@
         </div>
         <div class="panel-body">
             <div class="row filter-tags text-center"
-                 ng-if="vm.filterType || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.searchTags.length>0 || vm.filterVIP || vm.filterTop || vm.filterUnique">
+                 ng-if="vm.torrentType!='aggregate' || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.searchTags.length>0 || vm.filterVIP || vm.filterTop || vm.filterUnique">
                 <div class="col-md-6 col-md-offset-3">
-                    <span class="filter-tag-item label-tag" ng-if="vm.filterType">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
+                    <span class="filter-tag-item label-tag" ng-if="vm.torrentType!='aggregate'">{{'TORRENT_TYPE_LABEL.' + vm.torrentType.toUpperCase() | translate}}
                         <i class="fa fa-times-circle-o"
-                           ng-click="vm.onTorrentTypeClicked(vm.filterType);">
+                           ng-click="vm.onTorrentTypeClicked(vm.torrentType);">
                         </i>
                     </span>
                     <span class="filter-tag-item label-tag" ng-if="vm.releaseYear">{{vm.releaseYear}}
@@ -57,22 +57,7 @@
                 </div>
             </div>
             <div class="col-md-10 col-md-offset-1">
-                <dl class="dl-horizontal tags-dl">
-                    <dt class="h-line">{{'CA_RESOURCE_TYPE' | translate}}</dt>
-                    <dd class="h-line">
-                        <div class="row margin-bottom-5">
-                            <div class="col-sm-6 col-md-4">
-                                <select class="form-control" ng-model="vm.selectedType" ng-change="vm.onTorrentTypeChanged();">
-                                    <option value="newest">{{'TORRENT_TYPE_OPTION_NEWEST' | translate}}
-                                    </option>
-                                    <option ng-repeat="t in vm.torrentTypeConfig.value | filter:{enable: true}"
-                                            value="{{t.value}}">{{'MENU_TORRENTS_SUB.'+t.name | translate}}
-                                    </option>
-                                </select>
-                            </div>
-                        </div>
-                    </dd>
-
+                <dl class="dl-horizontal tags-admin-dl">
                     <dt class="h-line">{{ 'CA_KEYWORD' | translate}}:</dt>
                     <dd class="h-line">
                         <div class="row">
@@ -84,11 +69,13 @@
                             <div class="col-sm-6">
                                 <span class="label label-tag text-uppercase incline-block-valign"
                                       title="{{ 'TITLE_ALT.MORE_TAGS' | translate}}"
+                                      ng-if="vm.torrentType!='aggregate'"
                                       ng-click="vm.onMoreTagsClicked();">
                                     <i class="glyphicon glyphicon-chevron-down" id="more-tags-icon"></i> {{ 'MORE_TAGS' | translate}}
                                 </span>
                                 <span class="label label-tag text-uppercase incline-block-valign"
                                       title="{{ 'TITLE_ALT.RESET_TAGS' | translate}}"
+                                      ng-if="vm.torrentType!='aggregate'"
                                       ng-click="vm.clearAllCondition();">
                                     <i class="glyphicon glyphicon-repeat"></i> {{ 'CA_RESET' | translate}}
                                 </span>
@@ -97,7 +84,23 @@
                         </div>
                     </dd>
 
-                    <div class="more-tags panel-collapsed padding-top-10" style="display: none;">
+                    <dt class="h-line margin-top-10">{{'CA_RESOURCE_TYPE' | translate}}</dt>
+                    <dd class="h-line margin-top-10">
+                        <div class="radio radio-type">
+                            <label class="radio-inline">
+                                <input type="radio" ng-model="vm.torrentType" value="aggregate"
+                                       ng-change="vm.onTorrentTypeChanged();"> {{'TORRENT_TYPE_OPTION_NEWEST' | translate}}
+                            </label>
+                        </div>
+                        <div class="radio radio-type margin-top-5">
+                            <label class="radio-inline" ng-repeat="t in vm.torrentTypeConfig.value | filter:{enable: true}">
+                                <input type="radio" ng-model="vm.torrentType" value="{{t.value}}"
+                                       ng-change="vm.onTorrentTypeChanged();"> {{'MENU_TORRENTS_SUB.'+t.name | translate}}
+                            </label>
+                        </div>
+                    </dd>
+
+                    <div class="more-tags panel-collapsed padding-top-10" ng-if="vm.torrentType!='aggregate'" style="display: none;">
                         <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
                         <dd class="h-line">
                             <span class="checkbox checkbox-hnr">
@@ -115,38 +118,36 @@
                                     <input type="checkbox" ng-model="vm.filterTop"
                                            ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
                                 </label>
-                                 <label class="checkbox-inline">
+                                <label class="checkbox-inline">
                                     <input type="checkbox" ng-model="vm.filterUnique"
                                            ng-change="vm.onUniqueChanged();"> {{ 'TORRENT_STATUS_UNIQUE' | translate}}
                                 </label>
                             </span>
                         </dd>
 
-                        <div ng-hide="vm.selectedType=='newest'">
-                            <dt class="h-line">{{ 'CA_TORRENT_STATUS' | translate}}:</dt>
-                            <dd class="h-line">
-                                <div class="btn-group btn-group-xs" role="group">
-                                    <button id="torrent_status_reviewed"
-                                            class="btn btn-xs btn-tag" value="reviewed"
-                                            ng-class="{'btn-success': vm.torrentStatus == 'reviewed', 'btn-default': vm.torrentStatus != 'reviewed'}"
-                                            ng-click="vm.onTorrentStatusClicked($event, 'reviewed')">
-                                        {{'TORRENT_STATUS_REVIEWED' | translate}}
-                                    </button>
-                                    <button id="torrent_status_new"
-                                            class="btn btn-xs btn-tag" value="new"
-                                            ng-class="{'btn-success': vm.torrentStatus == 'new', 'btn-default': vm.torrentStatus != 'new'}"
-                                            ng-click="vm.onTorrentStatusClicked($event, 'new')">
-                                        {{'TORRENT_STATUS_NEW' | translate}}
-                                    </button>
-                                    <button id="torrent_status_all"
-                                            class="btn btn-xs btn-tag" value="all"
-                                            ng-class="{'btn-success': vm.torrentStatus == 'all', 'btn-default': vm.torrentStatus != 'all'}"
-                                            ng-click="vm.onTorrentStatusClicked($event, 'all')">
-                                        {{'TORRENT_STATUS_ALL' | translate}}
-                                    </button>
-                                </div>
-                            </dd>
-                        </div>
+                        <dt class="h-line">{{ 'CA_TORRENT_STATUS' | translate}}:</dt>
+                        <dd class="h-line">
+                            <div class="btn-group btn-group-xs" role="group">
+                                <button id="torrent_status_reviewed"
+                                        class="btn btn-xs btn-tag" value="reviewed"
+                                        ng-class="{'btn-success': vm.torrentStatus == 'reviewed', 'btn-default': vm.torrentStatus != 'reviewed'}"
+                                        ng-click="vm.onTorrentStatusClicked($event, 'reviewed')">
+                                    {{'TORRENT_STATUS_REVIEWED' | translate}}
+                                </button>
+                                <button id="torrent_status_new"
+                                        class="btn btn-xs btn-tag" value="new"
+                                        ng-class="{'btn-success': vm.torrentStatus == 'new', 'btn-default': vm.torrentStatus != 'new'}"
+                                        ng-click="vm.onTorrentStatusClicked($event, 'new')">
+                                    {{'TORRENT_STATUS_NEW' | translate}}
+                                </button>
+                                <button id="torrent_status_all"
+                                        class="btn btn-xs btn-tag" value="all"
+                                        ng-class="{'btn-success': vm.torrentStatus == 'all', 'btn-default': vm.torrentStatus != 'all'}"
+                                        ng-click="vm.onTorrentStatusClicked($event, 'all')">
+                                    {{'TORRENT_STATUS_ALL' | translate}}
+                                </button>
+                            </div>
+                        </dd>
 
                         <dt class="h-line">{{ 'TORRENT_RECOMMEND_LEVEL' | translate}}:</dt>
                         <dd class="h-line">
@@ -160,10 +161,10 @@
                             </div>
                         </dd>
 
-                        <div ng-repeat="item in vm.resourcesTags.radio | filter:vm.selectedType">
+                        <div ng-repeat="item in vm.resourcesTags.radio | filter:vm.torrentType">
                             <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}：</dt>
                             <dd class="h-line">
-                                <div class="btn-group btn-group-xs" role="group">
+                                <div class="btn-group btn-group-xs btn-tag-resource" role="group">
                                     <button ng-repeat="sitem in item.value" id="tag_{{sitem.name}}"
                                             class="btn btn-xs btn-default btn-tag" value="{{sitem.name}}"
                                             ng-click="vm.onRadioTagClicked($event, sitem.name)">
@@ -173,7 +174,7 @@
                             </dd>
                         </div>
 
-                        <div ng-repeat="item in vm.resourcesTags.checkbox | filter:vm.selectedType">
+                        <div ng-repeat="item in vm.resourcesTags.checkbox | filter:vm.torrentType">
                             <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}：</dt>
                             <dd class="h-line">
                                 <div class="btn-group btn-group-xs" role="group">
diff --git a/modules/torrents/client/views/list-torrents.client.view.html b/modules/torrents/client/views/list-torrents.client.view.html
index 509d0b81..3061200d 100644
--- a/modules/torrents/client/views/list-torrents.client.view.html
+++ b/modules/torrents/client/views/list-torrents.client.view.html
@@ -72,9 +72,9 @@
         </div>
         <div class="panel-body">
             <div class="row filter-tags text-center"
-                 ng-if="vm.filterType || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
+                 ng-if="(vm.filterType && vm.filterType!='aggregate' && vm.filterType!=vm.torrentType) || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
                 <div class="col-md-6 col-md-offset-3">
-                    <span class="filter-tag-item label-tag" ng-if="vm.filterType">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
+                    <span class="filter-tag-item label-tag" ng-if="vm.filterType && vm.filterType!='aggregate' && vm.filterType!=vm.torrentType">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
                         <i class="fa fa-times-circle-o"
                            ng-click="vm.onTorrentTypeClicked(vm.filterType);">
                         </i>
@@ -144,6 +144,22 @@
                         </div>
                     </dd>
 
+                    <div ng-if="vm.torrentType=='aggregate'">
+                        <dt class="h-line">{{'CA_RESOURCE_TYPE' | translate}}</dt>
+                        <dd class="h-line margin-top-10">
+                            <div class="radio radio-type">
+                                <label class="radio-inline">
+                                    <input type="radio" ng-model="vm.filterType" value="aggregate"
+                                           ng-change="vm.onTorrentTypeChanged();"> {{'TORRENT_TYPE_ALL' | translate}}
+                                </label>
+                                <label class="radio-inline" ng-repeat="t in vm.torrentTypeConfig.value | filter:{enable: true, role: 'user'}">
+                                    <input type="radio" ng-model="vm.filterType" value="{{t.value}}"
+                                           ng-change="vm.onTorrentTypeChanged();"> {{'MENU_TORRENTS_SUB.'+t.name | translate}}
+                                </label>
+                            </div>
+                        </dd>
+                    </div>
+
                     <div class="more-tags panel-collapsed padding-top-10" style="display: none; margin-bottom: 20px;">
                         <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
                         <dd class="h-line">
@@ -198,17 +214,17 @@
                     </div>
 
                     <!--<div>-->
-                        <!--<dt class="h-line"><i class="fa fa-rss-square color-mt-base" aria-hidden="true"></i> {{'CA_MAKE_RSS_URL' | translate}}:</dt>-->
-                        <!--<dd class="h-line rss-desc-line">{{'DESC_MAKE_RSS_URL' | translate}}-->
-                            <!--<div class="margin-top-5">-->
-                                <!--<a href="{{vm.rssUrl}}" target="_blank">{{vm.rssUrl}}</a>-->
-                                <!--<span style="position: relative">-->
-                                    <!--<i class="fa fa-clipboard color-mt-base" aria-hidden="true" title="{{'COPY_TO_CLIPBOARD' | translate}}"-->
-                                       <!--mt-scale-by-click="{scale: 2, duration: '.3s'}"-->
-                                       <!--mt-copy-to-clipboard="{{vm.rssUrl}}"></i>-->
-                                <!--</span>-->
-                            <!--</div>-->
-                        <!--</dd>-->
+                    <!--<dt class="h-line"><i class="fa fa-rss-square color-mt-base" aria-hidden="true"></i> {{'CA_MAKE_RSS_URL' | translate}}:</dt>-->
+                    <!--<dd class="h-line rss-desc-line">{{'DESC_MAKE_RSS_URL' | translate}}-->
+                    <!--<div class="margin-top-5">-->
+                    <!--<a href="{{vm.rssUrl}}" target="_blank">{{vm.rssUrl}}</a>-->
+                    <!--<span style="position: relative">-->
+                    <!--<i class="fa fa-clipboard color-mt-base" aria-hidden="true" title="{{'COPY_TO_CLIPBOARD' | translate}}"-->
+                    <!--mt-scale-by-click="{scale: 2, duration: '.3s'}"-->
+                    <!--mt-copy-to-clipboard="{{vm.rssUrl}}"></i>-->
+                    <!--</span>-->
+                    <!--</div>-->
+                    <!--</dd>-->
                     <!--</div>-->
                 </dl>
             </div>
diff --git a/modules/torrents/client/views/search-torrents.client.view.html b/modules/torrents/client/views/search-torrents.client.view.html
deleted file mode 100644
index 675ae56b..00000000
--- a/modules/torrents/client/views/search-torrents.client.view.html
+++ /dev/null
@@ -1,224 +0,0 @@
-<section class="container padding-top-10" ng-controller="TorrentsController as vm" ng-init="vm.torrentBuildPager();">
-    <div class="panel panel-default">
-        <div class="panel-heading text-center">
-            <h3 class="panel-title">{{'TAGS_SEARCH_GLOBAL' | translate}}</h3>
-        </div>
-        <div class="panel-body">
-            <div class="row filter-tags text-center"
-                 ng-if="vm.filterType || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.searchTags.length>0 || vm.filterVIP || vm.filterTop || vm.filterUnique">
-                <div class="col-md-6 col-md-offset-3">
-                    <span class="filter-tag-item label-tag" ng-if="vm.filterType">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
-                        <i class="fa fa-times-circle-o"
-                           ng-click="vm.onTorrentTypeClicked(vm.filterType);">
-                        </i>
-                    </span>
-                    <span class="filter-tag-item label-tag" ng-if="vm.releaseYear">{{vm.releaseYear}}
-                        <i class="fa fa-times-circle-o"
-                           ng-click="vm.onReleaseClicked(vm.releaseYear);">
-                        </i>
-                    </span>
-                    <span class="filter-tag-item label-tag" ng-if="vm.torrentRLevel != 'level0'">{{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + vm.torrentRLevel.toUpperCase() | translate}}
-                        <i class="fa fa-times-circle-o"
-                           ng-click="vm.onRLevelClicked(vm.torrentRLevel);">
-                        </i>
-                    </span>
-                    <span class="filter-tag-item label-tag" ng-if="vm.filterSale">{{ 'CA_TORRENT_SALE_NOW' | translate}}
-                        <i class="fa fa-times-circle-o"
-                           ng-click="vm.onSaleClicked();">
-                        </i>
-                    </span>
-                    <span class="filter-tag-item label-tag" ng-if="vm.filterHnR">H&R
-                        <i class="fa fa-times-circle-o"
-                           ng-click="vm.onHnRClicked();">
-                        </i>
-                    </span>
-                    <span class="filter-tag-item label-tag" ng-if="vm.filterVIP">VIP
-                        <i class="fa fa-times-circle-o"
-                           ng-click="vm.onVIPClicked();">
-                        </i>
-                    </span>
-                    <span class="filter-tag-item label-tag" ng-if="vm.filterTop">{{'STATUS_TOP_KEY' | translate}}
-                        <i class="fa fa-times-circle-o"
-                           ng-click="vm.onTopClicked();">
-                        </i>
-                    </span>
-                    <span class="filter-tag-item label-tag" ng-if="vm.filterUnique">{{'STATUS_UNIQUE_KEY' | translate}}
-                        <i class="fa fa-times-circle-o"
-                           ng-click="vm.onUniqueClicked();">
-                        </i>
-                    </span>
-                    <span ng-repeat="t in vm.searchTags" ng-if="vm.searchTags.length>0">
-                        <span class="filter-tag-item label-tag">{{ 'RESOURCESTAGS.' + vm.RTS.getTagTitle(t) + '.' + t.toUpperCase() | translate}}
-                            <i class="fa fa-times-circle-o"
-                               ng-click="vm.onTagClicked(t);">
-                            </i>
-                        </span>
-                    </span>
-                </div>
-            </div>
-            <div class="col-md-10 col-md-offset-1">
-                <dl class="dl-horizontal tags-dl">
-                    <dt class="h-line">{{'CA_RESOURCE_TYPE' | translate}}</dt>
-                    <dd class="h-line">
-                        <div class="row margin-bottom-5">
-                            <div class="col-sm-6 col-md-4">
-                                <select class="form-control" ng-model="vm.torrentType" ng-change="vm.onTorrentTypeChanged();">
-                                    <option value="all">{{'TORRENT_TYPE_ALL' | translate}}
-                                    </option>
-                                    <option ng-repeat="t in vm.torrentTypeConfig.value | filter:{enable: true}"
-                                            value="{{t.value}}">{{'MENU_TORRENTS_SUB.'+t.name | translate}}
-                                    </option>
-                                </select>
-                            </div>
-                        </div>
-                    </dd>
-
-                    <dt class="h-line">{{ 'CA_KEYWORD' | translate}}:</dt>
-                    <dd class="h-line">
-                        <div class="row" style="">
-                            <div class="col-sm-6">
-                                <input type="text" class="form-control" ng-model="vm.searchKey"
-                                       ng-keydown="vm.onKeysKeyDown($event);"
-                                       placeholder="{{ 'PH_KEYWORD' | translate}}">
-                            </div>
-                            <div class="col-sm-6">
-                                <span class="label label-tag text-uppercase incline-block-valign"
-                                      title="{{ 'TITLE_ALT.MORE_TAGS' | translate}}"
-                                      ng-click="vm.onMoreTagsClicked();" ng-if="vm.torrentType!='all'">
-                                    <i class="glyphicon glyphicon-chevron-down" id="more-tags-icon"></i> {{ 'MORE_TAGS' | translate}}
-                                </span>
-                                <span class="label label-tag text-uppercase incline-block-valign"
-                                      title="{{ 'TITLE_ALT.RESET_TAGS' | translate}}"
-                                      ng-click="vm.clearAllCondition();">
-                                    <i class="glyphicon glyphicon-repeat"></i> {{ 'CA_RESET' | translate}}
-                                </span>
-
-                            </div>
-                        </div>
-                    </dd>
-
-                    <div class="more-tags panel-collapsed padding-top-10" style="display: none; margin-bottom: 20px;">
-                        <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
-                        <dd class="h-line">
-                            <div class="checkbox checkbox-hnr">
-                                <label class="checkbox-inline">
-                                    <input type="checkbox" ng-model="vm.filterHnR" ng-change="vm.onHnRChanged();"> {{ 'CA_TORRENT_HNR' | translate}}
-                                </label>
-                                <label class="checkbox-inline" ng-if="!vm.isGlobalSaleNow()">
-                                    <input type="checkbox" ng-model="vm.filterSale"
-                                           ng-change="vm.onSaleChanged();"> {{ 'CA_TORRENT_SALE_NOW' | translate}}
-                                </label>
-                                <label class="checkbox-inline">
-                                    <input type="checkbox" ng-model="vm.filterTop"
-                                           ng-change="vm.onTopChanged();"> {{ 'TORRENT_STATUS_TOP_TITLE' | translate}}
-                                </label>
-                                <label class="checkbox-inline">
-                                    <input type="checkbox" ng-model="vm.filterUnique"
-                                           ng-change="vm.onUniqueChanged();"> {{ 'TORRENT_STATUS_UNIQUE' | translate}}
-                                </label>
-                            </div>
-                        </dd>
-
-                        <div ng-repeat="item in vm.resourcesTags.radio | filter:vm.torrentType">
-                            <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}:</dt>
-                            <dd class="h-line">
-                                <div class="btn-group btn-group-xs" role="group">
-                                    <button ng-repeat="sitem in item.value" id="tag_{{sitem.name}}"
-                                            class="btn btn-xs btn-default btn-tag" value="{{sitem.name}}"
-                                            ng-click="vm.onRadioTagClicked($event, sitem.name)">
-                                        {{ 'RESOURCESTAGS.' + item.name + '.' + sitem.name | translate}}
-                                    </button>
-                                    </span>
-                                </div>
-                            </dd>
-                        </div>
-
-                        <div style="margin-top: 20px;"></div>
-
-                        <div ng-repeat="item in vm.resourcesTags.checkbox | filter:vm.torrentType">
-                            <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}:</dt>
-                            <dd class="h-line">
-                                <div class="btn-group btn-group-xs" role="group">
-                                    <button ng-repeat="sitem in item.value" id="tag_{{sitem.name}}"
-                                            class="btn btn-xs btn-default btn-tag" value="{{sitem.name}}"
-                                            ng-click="vm.onCheckboxTagClicked($event, sitem.name)"
-                                            toggle-class="btn-success" base-class="btn-default" onclick="this.blur();">
-                                        {{ 'RESOURCESTAGS.' + item.name + '.' + sitem.name | translate}}
-                                    </button>
-                                </div>
-                            </dd>
-                        </div>
-                    </div>
-
-                    <div>
-                        <dt class="h-line"><i class="fa fa-rss-square color-mt-base" aria-hidden="true"></i> {{'CA_MAKE_RSS_URL' | translate}}:</dt>
-                        <dd class="h-line rss-desc-line">{{'DESC_MAKE_RSS_URL' | translate}}
-                            <div class="margin-top-5">
-                                <a href="{{vm.rssUrl}}" target="_blank">{{vm.rssUrl}}</a>
-                                <span style="position: relative">
-                                    <i class="fa fa-clipboard color-mt-base" aria-hidden="true" title="{{'COPY_TO_CLIPBOARD' | translate}}"
-                                       mt-scale-by-click="{scale: 2, duration: '.3s'}"
-                                       mt-copy-to-clipboard="{{vm.rssUrl}}"></i>
-                                </span>
-                            </div>
-                        </dd>
-                    </div>
-                </dl>
-            </div>
-        </div>
-    </div>
-
-    <div class="torrent-list" id="top_of_torrent_list">
-        <div class="pagination-div-top">
-            <ul uib-pagination boundary-links="true" max-size="8" items-per-page="vm.torrentItemsPerPage" total-items="vm.torrentFilterLength"
-                ng-model="vm.torrentCurrentPage" ng-change="vm.torrentPageChanged()"
-                first-text="{{ 'PAGE_TEXT_FIRST' | translate}}" previous-text="{{ 'PAGE_TEXT_PREVIOUS' | translate}}"
-                next-text="{{ 'PAGE_TEXT_NEXT' | translate}}" last-text="{{ 'PAGE_TEXT_LAST' | translate}}">
-            </ul>
-        </div>
-        <div class="table-responsive">
-            <table class="table table-hover tb-v-middle">
-                <thead>
-                    <tr>
-                        <th class="td-width-0"></th>
-                        <th>{{ 'TABLE_FIELDS.INFO' | translate}}</th>
-                        <th>
-                            <a href="#" tooltip-placement="top"
-                               ng-click="vm.orderByVote();"
-                               uib-tooltip="{{ 'TABLE_FIELDS.TITLE_VOTES' | translate}}">{{ 'TABLE_FIELDS.VOTES' | translate}}</a>
-                            <i class="fa fa-caret-down text-info" ng-if="vm.sortVote == '-'"></i>
-                        </th>
-                        <th class="text-center">
-                            <a href="#" tooltip-placement="top"
-                               ng-click="vm.orderByLife();"
-                               uib-tooltip="{{ 'TABLE_FIELDS.TITLE_LIFE' | translate}}">{{ 'TABLE_FIELDS.LIFETIME' | translate}}</a>
-                            <i class="fa fa-caret-down text-info" ng-if="vm.sortLife == '-'"></i>
-                        </th>
-                        <th class="text-center">
-                            <a href="#" tooltip-placement="top"
-                               ng-click="vm.orderBySize();"
-                               uib-tooltip="{{ 'TABLE_FIELDS.TITLE_SIZE' | translate}}">{{ 'TABLE_FIELDS.SIZE' | translate}}</a>
-                            <i class="fa fa-caret-down text-info" ng-if="vm.sortSize == '-'"></i>
-                        </th>
-                        <th>
-                            <a href="#" tooltip-placement="top"
-                               ng-click="vm.orderBySLF();"
-                               uib-tooltip="{{ 'TABLE_FIELDS.TITLE_SEEDS_LEECHERS_FINISHED' | translate}}" ng-bind-html="vm.getOrderTableHead()"></a>
-                        </th>
-                        <th class="text-center">{{ 'TABLE_FIELDS.PUBLISHER' | translate}}</th>
-                    </tr>
-                </thead>
-                <tbody torrent-list-item parent="vm" item="item" list="vm.torrentPagedItems" ng-repeat="item in vm.torrentPagedItems"></tbody>
-                <tbody>
-            </table>
-        </div>
-
-        <div class="pagination-div-bottom">
-            <ul uib-pagination boundary-links="true" max-size="8" items-per-page="vm.torrentItemsPerPage" total-items="vm.torrentFilterLength"
-                ng-model="vm.torrentCurrentPage" ng-change="vm.torrentPageChanged()"
-                first-text="{{ 'PAGE_TEXT_FIRST' | translate}}" previous-text="{{ 'PAGE_TEXT_PREVIOUS' | translate}}"
-                next-text="{{ 'PAGE_TEXT_NEXT' | translate}}" last-text="{{ 'PAGE_TEXT_LAST' | translate}}">
-            </ul>
-        </div>
-    </div>
-</section>
\ No newline at end of file
diff --git a/modules/vip/client/controllers/vip.client.controller.js b/modules/vip/client/controllers/vip.client.controller.js
index ebad3afe..ca4a8cb3 100644
--- a/modules/vip/client/controllers/vip.client.controller.js
+++ b/modules/vip/client/controllers/vip.client.controller.js
@@ -38,9 +38,9 @@
     vm.chatConfig = MeanTorrentConfig.meanTorrentConfig.chat;
     vm.accessConfig = MeanTorrentConfig.meanTorrentConfig.access;
 
-    vm.torrentType = MeanTorrentConfig.meanTorrentConfig.torrentType;
+    vm.torrentTypeConfig = MeanTorrentConfig.meanTorrentConfig.torrentType;
     vm.resourcesTags = MeanTorrentConfig.meanTorrentConfig.resourcesTags;
-    vm.vipTorrentType = localStorageService.get('vip_last_selected_type') || 'movie';
+    vm.torrentType = localStorageService.get('vip_last_selected_type') || 'movie';
 
     vm.searchTags = [];
     vm.searchKey = '';
@@ -265,7 +265,7 @@
         skip: (p - 1) * vm.itemsPerPage,
         limit: vm.itemsPerPage,
         sort: vm.sort,
-        torrent_type: vm.vipTorrentType,
+        torrent_type: vm.torrentType,
         torrent_status: 'reviewed',
         torrent_vip: true,
         keys: vm.searchKey.trim(),
@@ -293,7 +293,7 @@
       vm.rssUrl += '?language=' + localStorageService.get('storage_user_lang');
       vm.rssUrl += '&limit=' + vm.itemsPerPage;
       vm.rssUrl += vm.searchKey.trim() ? '&keys=' + vm.searchKey.trim() : '';
-      vm.rssUrl += '&torrent_type=' + vm.vipTorrentType;
+      vm.rssUrl += '&torrent_type=' + vm.torrentType;
       vm.rssUrl += vm.releaseYear ? '&torrent_release=' + vm.releaseYear : '';
       vm.rssUrl += vm.searchTags.length ? '&torrent_tags=' + vm.searchTags : '';
       vm.rssUrl += '&torrent_hnr=' + vm.filterHnR;
@@ -322,10 +322,11 @@
     };
 
     /**
-     * onTypeBtnClick
+     * onTorrentTypeChanged
      */
-    vm.onTypeBtnClick = function () {
-      localStorageService.set('vip_last_selected_type', vm.vipTorrentType);
+    vm.onTorrentTypeChanged = function () {
+      vm.buildPager();
+      localStorageService.set('vip_last_selected_type', vm.torrentType);
     };
 
     /**
diff --git a/modules/vip/client/views/vip.client.view.html b/modules/vip/client/views/vip.client.view.html
index 90a82fd3..afa200b9 100644
--- a/modules/vip/client/views/vip.client.view.html
+++ b/modules/vip/client/views/vip.client.view.html
@@ -29,26 +29,11 @@
     </div>
 
     <div class="container" ng-if="vm.user.isVip || vm.user.isOper" ng-init="vm.buildPager();">
-        <div class="row margin-top-20">
+        <div class="row margin-top-10">
             <div class="col-md-12 torrent-list" id="top_of_torrent_list" ng-show="vm.pagedItems">
-                <h3 class="margin-bottom-30">
-                    {{'VIP.TORRENTS_LIST' | translate}}
-                </h3>
-
-                <div class="margin-bottom-20 text-center">
-                    <div class="btn-group torrent-type-group">
-                        <label class="btn btn-default"
-                               ng-repeat="t in vm.torrentType.value | filter:{enable: true} | orderBy: 'position'"
-                               ng-model="vm.vipTorrentType" uib-btn-radio="'{{t.value}}'"
-                               ng-click="vm.onTypeBtnClick(); vm.buildPager();">
-                            {{'MENU_TORRENTS_SUB.'+t.name | translate}}
-                        </label>
-                    </div>
-                </div>
-
                 <div class="panel panel-default">
                     <div class="panel-heading text-center">
-                        <h3 class="panel-title">{{'TAGS_SEARCH' | translate}} - {{'MENU_TORRENTS_SUB.' + vm.vipTorrentType.toUpperCase() | translate}}</h3>
+                        <h3 class="panel-title">{{'VIP.TORRENTS_LIST' | translate}} - {{'TAGS_SEARCH' | translate}} - {{'MENU_TORRENTS_SUB.' + vm.torrentType.toUpperCase() | translate}}</h3>
                     </div>
                     <div class="panel-body">
                         <div class="row filter-tags text-center"
@@ -81,7 +66,7 @@
                                 </span>
                                 <span class="filter-tag-item label-tag" ng-if="vm.filterUnique">{{'STATUS_UNIQUE_KEY' | translate}}
                                     <i class="fa fa-times-circle-o"
-                                        ng-click="vm.onUniqueClicked();">
+                                       ng-click="vm.onUniqueClicked();">
                                     </i>
                                 </span>
                                 <span ng-repeat="t in vm.searchTags" ng-if="vm.searchTags.length>0">
@@ -94,7 +79,7 @@
                             </div>
                         </div>
                         <div class="col-md-10 col-md-offset-1">
-                            <dl class="dl-horizontal tags-dl">
+                            <dl class="dl-horizontal tags-admin-dl">
                                 <dt class="h-line">{{ 'CA_KEYWORD' | translate}}:</dt>
                                 <dd class="h-line">
                                     <div class="row" style="">
@@ -104,27 +89,38 @@
                                                    placeholder="{{ 'PH_KEYWORD' | translate}}">
                                         </div>
                                         <div class="col-sm-6">
-                                <span class="label label-tag text-uppercase incline-block-valign"
-                                      title="{{ 'TITLE_ALT.MORE_TAGS' | translate}}"
-                                      ng-click="vm.onMoreTagsClicked();">
-                                    <i class="glyphicon glyphicon-chevron-down" id="more-tags-icon"></i> {{ 'MORE_TAGS' | translate}}
-                                </span>
+                                            <span class="label label-tag text-uppercase incline-block-valign"
+                                                  title="{{ 'TITLE_ALT.MORE_TAGS' | translate}}"
+                                                  ng-click="vm.onMoreTagsClicked();">
+                                                <i class="glyphicon glyphicon-chevron-down" id="more-tags-icon"></i> {{ 'MORE_TAGS' | translate}}
+                                            </span>
                                             <span class="label label-tag text-uppercase incline-block-valign"
                                                   title="{{ 'TITLE_ALT.RESET_TAGS' | translate}}"
                                                   ng-click="vm.clearAllCondition();">
-                                    <i class="glyphicon glyphicon-repeat"></i> {{ 'CA_RESET' | translate}}
-                                </span>
-
+                                                <i class="glyphicon glyphicon-repeat"></i> {{ 'CA_RESET' | translate}}
+                                            </span>
                                         </div>
                                     </div>
                                 </dd>
 
+                                <dt class="h-line margin-top-10">{{'CA_RESOURCE_TYPE' | translate}}</dt>
+                                <dd class="h-line margin-top-10">
+                                    <div class="radio radio-type margin-top-5">
+                                        <label class="radio-inline"
+                                               ng-repeat="t in vm.torrentTypeConfig.value | filter:{enable: true} | orderBy: 'position'">
+                                            <input type="radio" ng-model="vm.torrentType" value="{{t.value}}"
+                                                   ng-change="vm.onTorrentTypeChanged();"> {{'MENU_TORRENTS_SUB.'+t.name | translate}}
+                                        </label>
+                                    </div>
+                                </dd>
+
                                 <div class="more-tags panel-collapsed padding-top-10" style="display: none; margin-bottom: 20px;">
                                     <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
                                     <dd class="h-line">
                                         <div class="checkbox checkbox-hnr">
                                             <label class="checkbox-inline">
-                                                <input type="checkbox" ng-model="vm.filterHnR" ng-change="vm.onHnRChanged();"> {{ 'CA_TORRENT_HNR' | translate}}
+                                                <input type="checkbox" ng-model="vm.filterHnR"
+                                                       ng-change="vm.onHnRChanged();"> {{ 'CA_TORRENT_HNR' | translate}}
                                             </label>
                                             <label class="checkbox-inline" ng-if="!vm.isGlobalSaleNow()">
                                                 <input type="checkbox" ng-model="vm.filterSale"
@@ -141,7 +137,7 @@
                                         </div>
                                     </dd>
 
-                                    <div ng-repeat="item in vm.resourcesTags.radio | filter:vm.vipTorrentType">
+                                    <div ng-repeat="item in vm.resourcesTags.radio | filter:vm.torrentType">
                                         <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}:</dt>
                                         <dd class="h-line">
                                             <div class="btn-group btn-group-xs" role="group">
@@ -157,7 +153,7 @@
 
                                     <div style="margin-top: 20px;"></div>
 
-                                    <div ng-repeat="item in vm.resourcesTags.checkbox | filter:vm.vipTorrentType">
+                                    <div ng-repeat="item in vm.resourcesTags.checkbox | filter:vm.torrentType">
                                         <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}:</dt>
                                         <dd class="h-line">
                                             <div class="btn-group btn-group-xs" role="group">
@@ -173,8 +169,8 @@
                                 </div>
 
                                 <div>
-                                    <dt class="h-line"><i class="fa fa-rss-square color-mt-base"
-                                                          aria-hidden="true"></i> {{'CA_MAKE_RSS_URL' | translate}}:
+                                    <dt class="h-line">
+                                        <i class="fa fa-rss-square color-mt-base" aria-hidden="true"></i> {{'CA_MAKE_RSS_URL' | translate}}:
                                     </dt>
                                     <dd class="h-line rss-desc-line">{{'DESC_MAKE_RSS_URL' | translate}}
                                         <div class="margin-top-5">

From bd19f3ec05aa57944ab0e9a34acdcf6b6b9ce0eb Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sun, 20 May 2018 20:19:52 +0800
Subject: [PATCH 80/96] feat(torrents): new rss url style

---
 config/env/torrents.js                        |  2 +
 .../client/views/maker-view.client.view.html  |  2 +-
 modules/core/client/app/trans-string-en.js    |  3 +-
 modules/core/client/app/trans-string-zh-tw.js |  3 +-
 modules/core/client/app/trans-string-zh.js    |  5 +--
 .../controllers/torrents.client.controller.js |  5 ++-
 modules/torrents/client/less/torrents.less    | 37 +++++++++++++++++++
 .../views/admin/admin-list.client.view.html   |  5 ++-
 .../views/list-torrents.client.view.html      | 31 ++++++----------
 .../controllers/vip.client.controller.js      |  2 +-
 modules/vip/client/views/vip.client.view.html | 30 +++++----------
 11 files changed, 73 insertions(+), 52 deletions(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index aeb26ab7..8c29793d 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -192,6 +192,7 @@ module.exports = {
      * @webMaster:          setting webMaster info of rss document
      * @generator:          setting generator info of rss document
      * @ttl:                setting ttl info of rss document, unit of seconds
+     * @pageItemsNumber:    setting the items number of rss per page
      * @image_url:          setting image_url info of rss document
      */
     rss: {
@@ -202,6 +203,7 @@ module.exports = {
       webMaster: 'webmaster@mean.im (%s Webmaster)',
       generator: '{MEAN.im} RSS Generator by meanTorrent',
       ttl: 60,
+      pageItemsNumber: 30,
       image_url: '/modules/core/client/img/rss.jpeg'
     },
 
diff --git a/modules/about/client/views/maker-view.client.view.html b/modules/about/client/views/maker-view.client.view.html
index b8575215..bfd369e7 100644
--- a/modules/about/client/views/maker-view.client.view.html
+++ b/modules/about/client/views/maker-view.client.view.html
@@ -188,7 +188,7 @@
                                 <dt class="h-line margin-top-10">{{'CA_RESOURCE_TYPE' | translate}}</dt>
                                 <dd class="h-line margin-top-10">
                                     <div class="radio radio-type margin-top-5">
-                                        <label class="radio-inline"
+                                        <label class="radio-inline" ng-class="{checked: vm.torrentType == t.value}"
                                                ng-repeat="t in vm.torrentTypeConfig.value | filter:{enable: true, role: 'user'}">
                                             <input type="radio" ng-model="vm.torrentType" value="{{t.value}}"
                                                    ng-change="vm.onTorrentTypeChanged();"> {{'MENU_TORRENTS_SUB.'+t.name | translate}}
diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index f92b39b0..b5fc5b81 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -350,8 +350,7 @@
     CA_TORRENT_TOP: 'Top Status',
     CA_TORRENT_UNIQUE: 'Unique Status',
     CA_RESOURCE_TYPE: 'Resource type',
-    CA_MAKE_RSS_URL: 'Rss Url',
-    DESC_MAKE_RSS_URL: 'This RSS url is make with above filter conditions, you can used it in the BT client (such as uTorrent) that supports the RSS subscription function to download torrent and resources automatic.',
+    DESC_MAKE_RSS_URL: 'Based on the RSS address generated by the current search conditions, click Copy to clipboard.',
     COPY_TO_CLIPBOARD: 'Copy to clipboard',
     COPY_LINK_TO_CLIPBOARD: 'Copy torrent file download link to clipboard',
     COPY_LINK_TEXT: 'Copy torrent file link',
diff --git a/modules/core/client/app/trans-string-zh-tw.js b/modules/core/client/app/trans-string-zh-tw.js
index d1bb154d..e3f3394f 100644
--- a/modules/core/client/app/trans-string-zh-tw.js
+++ b/modules/core/client/app/trans-string-zh-tw.js
@@ -339,7 +339,6 @@
     CA_TORRENT_VIP: 'VIP 資源',
     CA_TORRENT_TOP: '置頂狀態',
     CA_RESOURCE_TYPE: '資源型別',
-    CA_MAKE_RSS_URL: 'RSS連線',
     DESC_MAKE_RSS_URL: '這個 RSS 地址是通過上面的過濾條件生成的，您可以使用支援 RSS 訂閱功能的BT客戶端（如uTorrent）來自動下載您想要的這些種子和資原始檔.',
     COPY_TO_CLIPBOARD: '複製到剪下板',
     COPY_LINK_TO_CLIPBOARD: '複製種子檔案下載連線到剪下板',
@@ -348,7 +347,7 @@
     TORRENT_LABEL_LINK: '種子地址',
     PH_KEYWORD: '搜尋關鍵字',
     CLEAR_ALL_CONDITION: '清空所有條件',
-    MORE_TAGS: '顯示更多標籤',
+    MORE_TAGS: '更多標籤',
     CA_RESET: '重置條件',
     TORRENT_DOWNLOAD_ERROR: '種子檔案下載失敗',
     TORRENTS_DOWNLOAD_SUCCESSFULLY: '種子檔案下載成功',
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index b30bc328..ea9508a1 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -350,8 +350,7 @@
     CA_TORRENT_TOP: '置顶状态',
     CA_TORRENT_UNIQUE: '禁转状态',
     CA_RESOURCE_TYPE: '资源类型',
-    CA_MAKE_RSS_URL: 'RSS连接',
-    DESC_MAKE_RSS_URL: '这个 RSS 地址是通过上面的过滤条件生成的，您可以使用支持 RSS 订阅功能的BT客户端（如uTorrent）来自动下载您想要的这些种子和资源文件.',
+    DESC_MAKE_RSS_URL: '根据当前检索条件生成的 RSS 地址, 点击复制到粘贴版.',
     COPY_TO_CLIPBOARD: '复制到剪切板',
     COPY_LINK_TO_CLIPBOARD: '复制种子文件下载连接到剪切板',
     COPY_LINK_TEXT: '复制种子文件地址',
@@ -359,7 +358,7 @@
     TORRENT_LABEL_LINK: '种子连接',
     PH_KEYWORD: '搜索关键字',
     CLEAR_ALL_CONDITION: '清空所有条件',
-    MORE_TAGS: '显示更多标签',
+    MORE_TAGS: '更多标签',
     CA_RESET: '重置条件',
     TORRENT_DOWNLOAD_ERROR: '种子文件下载失败',
     TORRENTS_DOWNLOAD_SUCCESSFULLY: '种子文件下载成功',
diff --git a/modules/torrents/client/controllers/torrents.client.controller.js b/modules/torrents/client/controllers/torrents.client.controller.js
index 38cc161d..2e82b953 100644
--- a/modules/torrents/client/controllers/torrents.client.controller.js
+++ b/modules/torrents/client/controllers/torrents.client.controller.js
@@ -23,6 +23,7 @@
     vm.appConfig = MeanTorrentConfig.meanTorrentConfig.app;
     vm.torrentTypeConfig = MeanTorrentConfig.meanTorrentConfig.torrentType;
     vm.salesGlobalConfig = MeanTorrentConfig.meanTorrentConfig.torrentGlobalSales;
+    vm.rssConfig = MeanTorrentConfig.meanTorrentConfig.rss;
 
     vm.searchTags = [];
     vm.searchKey = $state.params.keys || '';
@@ -343,9 +344,9 @@
       vm.rssUrl += '/api/rss';
       vm.rssUrl += '/' + vm.user.passkey;
       vm.rssUrl += '?language=' + vm.lang;
-      vm.rssUrl += '&limit=' + vm.torrentItemsPerPage;
+      vm.rssUrl += '&limit=' + vm.rssConfig.pageItemsNumber;
       vm.rssUrl += vm.searchKey.trim() ? '&keys=' + vm.searchKey.trim() : '';
-      vm.rssUrl += '&torrent_type=' + (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType);
+      vm.rssUrl += '&torrent_type=' + ((vm.filterType && vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType));
       vm.rssUrl += vm.releaseYear ? '&torrent_release=' + vm.releaseYear : '';
       vm.rssUrl += vm.searchTags.length ? '&torrent_tags=' + vm.searchTags : '';
       vm.rssUrl += '&torrent_hnr=' + vm.filterHnR;
diff --git a/modules/torrents/client/less/torrents.less b/modules/torrents/client/less/torrents.less
index 85d23f44..7f0732f5 100644
--- a/modules/torrents/client/less/torrents.less
+++ b/modules/torrents/client/less/torrents.less
@@ -287,6 +287,20 @@ pre.prettyprint {
         &:not(:first-child){
             margin-right: 4px;
         }
+        background-color: #f7f7f7;
+        border: solid 1px #ddd;
+        border-radius: 3px;
+        padding: 2px 3px 2px 25px;
+        margin-bottom: 3px;
+        &:hover {
+            border: solid 1px @brand-primary;
+            color: @brand-primary;
+        }
+        &.checked {
+            border: solid 1px @brand-primary;
+            background-color: lighten(@brand-primary, 45%);
+            color: @brand-primary;
+        }
     }
 }
 
@@ -310,9 +324,32 @@ pre.prettyprint {
     .radio-inline {
         min-width: 100px !important;
         margin-left: 0 !important;
+        background-color: #f7f7f7;
+        border: solid 1px #ddd;
+        border-radius: 3px;
+        padding: 2px 3px 2px 25px;
+        margin-bottom: 3px;
+        margin-right: 4px;
+        &:hover {
+            border: solid 1px @brand-primary;
+            color: @brand-primary;
+        }
+        &.checked {
+            border: solid 1px @brand-primary;
+            background-color: lighten(@brand-primary, 45%);
+            color: @brand-primary;
+        }
     }
 }
 
+.fa-rss-square {
+    font-size: 20px;
+    position: relative;
+    top: 4px;
+    left: 5px;
+    cursor: pointer;
+}
+
 /* csslint ignore:end */
 
 //popup overlay----------------------------------------------
diff --git a/modules/torrents/client/views/admin/admin-list.client.view.html b/modules/torrents/client/views/admin/admin-list.client.view.html
index 870ce6e4..bc17658d 100644
--- a/modules/torrents/client/views/admin/admin-list.client.view.html
+++ b/modules/torrents/client/views/admin/admin-list.client.view.html
@@ -87,13 +87,14 @@
                     <dt class="h-line margin-top-10">{{'CA_RESOURCE_TYPE' | translate}}</dt>
                     <dd class="h-line margin-top-10">
                         <div class="radio radio-type">
-                            <label class="radio-inline">
+                            <label class="radio-inline" ng-class="{checked: vm.torrentType == 'aggregate'}">
                                 <input type="radio" ng-model="vm.torrentType" value="aggregate"
                                        ng-change="vm.onTorrentTypeChanged();"> {{'TORRENT_TYPE_OPTION_NEWEST' | translate}}
                             </label>
                         </div>
                         <div class="radio radio-type margin-top-5">
-                            <label class="radio-inline" ng-repeat="t in vm.torrentTypeConfig.value | filter:{enable: true}">
+                            <label class="radio-inline" ng-class="{checked: vm.torrentType == t.value}"
+                                   ng-repeat="t in vm.torrentTypeConfig.value | filter:{enable: true}">
                                 <input type="radio" ng-model="vm.torrentType" value="{{t.value}}"
                                        ng-change="vm.onTorrentTypeChanged();"> {{'MENU_TORRENTS_SUB.'+t.name | translate}}
                             </label>
diff --git a/modules/torrents/client/views/list-torrents.client.view.html b/modules/torrents/client/views/list-torrents.client.view.html
index 3061200d..28f88e3d 100644
--- a/modules/torrents/client/views/list-torrents.client.view.html
+++ b/modules/torrents/client/views/list-torrents.client.view.html
@@ -130,16 +130,22 @@
                             </div>
                             <div class="col-sm-6">
                                 <span class="label label-tag text-uppercase incline-block-valign"
-                                      title="{{ 'TITLE_ALT.MORE_TAGS' | translate}}"
+                                      uib-tooltip="{{ 'TITLE_ALT.MORE_TAGS' | translate}}"
                                       ng-click="vm.onMoreTagsClicked();">
                                     <i class="glyphicon glyphicon-chevron-down" id="more-tags-icon"></i> {{ 'MORE_TAGS' | translate}}
                                 </span>
                                 <span class="label label-tag text-uppercase incline-block-valign"
-                                      title="{{ 'TITLE_ALT.RESET_TAGS' | translate}}"
+                                      uib-tooltip="{{ 'TITLE_ALT.RESET_TAGS' | translate}}"
                                       ng-click="vm.clearAllCondition();">
                                     <i class="glyphicon glyphicon-repeat"></i> {{ 'CA_RESET' | translate}}
                                 </span>
-
+                                <span>
+                                    <i class="fa fa-rss-square color-mt-base" aria-hidden="true"
+                                       uib-tooltip="{{ 'DESC_MAKE_RSS_URL' | translate}}"
+                                       mt-scale-by-click="{scale: 2, duration: '.3s'}"
+                                       mt-copy-to-clipboard="{{vm.rssUrl}}">
+                                    </i>
+                                </span>
                             </div>
                         </div>
                     </dd>
@@ -148,11 +154,12 @@
                         <dt class="h-line">{{'CA_RESOURCE_TYPE' | translate}}</dt>
                         <dd class="h-line margin-top-10">
                             <div class="radio radio-type">
-                                <label class="radio-inline">
+                                <label class="radio-inline" ng-class="{checked: vm.filterType == 'aggregate'}">
                                     <input type="radio" ng-model="vm.filterType" value="aggregate"
                                            ng-change="vm.onTorrentTypeChanged();"> {{'TORRENT_TYPE_ALL' | translate}}
                                 </label>
-                                <label class="radio-inline" ng-repeat="t in vm.torrentTypeConfig.value | filter:{enable: true, role: 'user'}">
+                                <label class="radio-inline" ng-class="{checked: vm.filterType == t.value}"
+                                       ng-repeat="t in vm.torrentTypeConfig.value | filter:{enable: true, role: 'user'}">
                                     <input type="radio" ng-model="vm.filterType" value="{{t.value}}"
                                            ng-change="vm.onTorrentTypeChanged();"> {{'MENU_TORRENTS_SUB.'+t.name | translate}}
                                 </label>
@@ -212,20 +219,6 @@
                             </dd>
                         </div>
                     </div>
-
-                    <!--<div>-->
-                    <!--<dt class="h-line"><i class="fa fa-rss-square color-mt-base" aria-hidden="true"></i> {{'CA_MAKE_RSS_URL' | translate}}:</dt>-->
-                    <!--<dd class="h-line rss-desc-line">{{'DESC_MAKE_RSS_URL' | translate}}-->
-                    <!--<div class="margin-top-5">-->
-                    <!--<a href="{{vm.rssUrl}}" target="_blank">{{vm.rssUrl}}</a>-->
-                    <!--<span style="position: relative">-->
-                    <!--<i class="fa fa-clipboard color-mt-base" aria-hidden="true" title="{{'COPY_TO_CLIPBOARD' | translate}}"-->
-                    <!--mt-scale-by-click="{scale: 2, duration: '.3s'}"-->
-                    <!--mt-copy-to-clipboard="{{vm.rssUrl}}"></i>-->
-                    <!--</span>-->
-                    <!--</div>-->
-                    <!--</dd>-->
-                    <!--</div>-->
                 </dl>
             </div>
         </div>
diff --git a/modules/vip/client/controllers/vip.client.controller.js b/modules/vip/client/controllers/vip.client.controller.js
index ca4a8cb3..08161f9d 100644
--- a/modules/vip/client/controllers/vip.client.controller.js
+++ b/modules/vip/client/controllers/vip.client.controller.js
@@ -291,7 +291,7 @@
       vm.rssUrl += '/api/rss';
       vm.rssUrl += '/' + vm.user.passkey;
       vm.rssUrl += '?language=' + localStorageService.get('storage_user_lang');
-      vm.rssUrl += '&limit=' + vm.itemsPerPage;
+      vm.rssUrl += '&limit=' + vm.rssConfig.pageItemsNumber;
       vm.rssUrl += vm.searchKey.trim() ? '&keys=' + vm.searchKey.trim() : '';
       vm.rssUrl += '&torrent_type=' + vm.torrentType;
       vm.rssUrl += vm.releaseYear ? '&torrent_release=' + vm.releaseYear : '';
diff --git a/modules/vip/client/views/vip.client.view.html b/modules/vip/client/views/vip.client.view.html
index afa200b9..508cb996 100644
--- a/modules/vip/client/views/vip.client.view.html
+++ b/modules/vip/client/views/vip.client.view.html
@@ -90,15 +90,22 @@
                                         </div>
                                         <div class="col-sm-6">
                                             <span class="label label-tag text-uppercase incline-block-valign"
-                                                  title="{{ 'TITLE_ALT.MORE_TAGS' | translate}}"
+                                                  uib-tooltip="{{ 'TITLE_ALT.MORE_TAGS' | translate}}"
                                                   ng-click="vm.onMoreTagsClicked();">
                                                 <i class="glyphicon glyphicon-chevron-down" id="more-tags-icon"></i> {{ 'MORE_TAGS' | translate}}
                                             </span>
                                             <span class="label label-tag text-uppercase incline-block-valign"
-                                                  title="{{ 'TITLE_ALT.RESET_TAGS' | translate}}"
+                                                  uib-tooltip="{{ 'TITLE_ALT.RESET_TAGS' | translate}}"
                                                   ng-click="vm.clearAllCondition();">
                                                 <i class="glyphicon glyphicon-repeat"></i> {{ 'CA_RESET' | translate}}
                                             </span>
+                                            <span>
+                                                <i class="fa fa-rss-square color-mt-base" aria-hidden="true"
+                                                   uib-tooltip="{{ 'DESC_MAKE_RSS_URL' | translate}}"
+                                                   mt-scale-by-click="{scale: 2, duration: '.3s'}"
+                                                   mt-copy-to-clipboard="{{vm.rssUrl}}">
+                                                </i>
+                                            </span>
                                         </div>
                                     </div>
                                 </dd>
@@ -106,7 +113,7 @@
                                 <dt class="h-line margin-top-10">{{'CA_RESOURCE_TYPE' | translate}}</dt>
                                 <dd class="h-line margin-top-10">
                                     <div class="radio radio-type margin-top-5">
-                                        <label class="radio-inline"
+                                        <label class="radio-inline" ng-class="{checked: vm.torrentType == t.value}"
                                                ng-repeat="t in vm.torrentTypeConfig.value | filter:{enable: true} | orderBy: 'position'">
                                             <input type="radio" ng-model="vm.torrentType" value="{{t.value}}"
                                                    ng-change="vm.onTorrentTypeChanged();"> {{'MENU_TORRENTS_SUB.'+t.name | translate}}
@@ -167,23 +174,6 @@
                                         </dd>
                                     </div>
                                 </div>
-
-                                <div>
-                                    <dt class="h-line">
-                                        <i class="fa fa-rss-square color-mt-base" aria-hidden="true"></i> {{'CA_MAKE_RSS_URL' | translate}}:
-                                    </dt>
-                                    <dd class="h-line rss-desc-line">{{'DESC_MAKE_RSS_URL' | translate}}
-                                        <div class="margin-top-5">
-                                            <a href="{{vm.rssUrl}}" target="_blank">{{vm.rssUrl}}</a>
-                                            <span style="position: relative">
-                                                <i class="fa fa-clipboard color-mt-base" aria-hidden="true"
-                                                   title="{{'COPY_TO_CLIPBOARD' | translate}}"
-                                                   mt-scale-by-click="{scale: 2, duration: '.3s'}"
-                                                   mt-copy-to-clipboard="{{vm.rssUrl}}"></i>
-                                            </span>
-                                        </div>
-                                    </dd>
-                                </div>
                             </dl>
                         </div>
                     </div>

From 120a7da5c1bcb2d4b125c21cd42de88d35aa5ef0 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sun, 20 May 2018 21:54:14 +0800
Subject: [PATCH 81/96] feat(torrents): add H&R system enable config

---
 config/env/torrents.js                        |  2 ++
 config/lib/cron-job.js                        |  7 +++-
 .../client/views/maker-view.client.view.html  |  2 +-
 .../announces.server.controller.js            | 36 ++++++++++---------
 modules/core/client/app/trans-string-en.js    |  2 +-
 .../controllers/header.client.controller.js   |  8 +++--
 .../torrent-list-item.client.directive.js     |  1 +
 .../core/client/views/header.client.view.html |  2 +-
 .../admin-invitations.client.controller.js    |  1 +
 .../invitations.client.controller.js          |  1 +
 .../views/admin/official.client.view.html     |  2 +-
 .../client/views/detail.client.view.html      |  2 +-
 .../admin/admin-list.client.controller.js     |  1 +
 .../controllers/torrents.client.controller.js |  1 +
 modules/torrents/client/less/torrents.less    |  4 +--
 .../templates/torrent-item.client.view.html   |  5 +--
 .../views/admin/admin-list.client.view.html   |  2 +-
 .../views/list-torrents.client.view.html      |  2 +-
 .../status/status.client.controller.js        |  1 +
 .../userinfo/userinfo.client.controller.js    |  1 +
 .../views/admin/view-user.client.view.html    |  2 +-
 .../views/status/account.client.view.html     |  4 +--
 .../views/status/status.client.view.html      |  2 +-
 .../views/userinfo/userinfo.client.view.html  |  2 +-
 modules/vip/client/views/vip.client.view.html |  2 +-
 25 files changed, 58 insertions(+), 37 deletions(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index 8c29793d..25ca83be 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -964,6 +964,7 @@ module.exports = {
      * when admin/oper to delete a h&r torrent, system will auto remove all warning and number of user
      * NOTE: you can change these value at anytime if you understand it
      *
+     * @enable:                             setting whether enable the H&R function
      * @condition:                          the condition of HnR warning, user must meet one of them before you receive the warning
      *        @seedTime:                    torrent seed time, unit of day, default to 7 days
      *        @seedTime_str:                string desc of @seedTime
@@ -975,6 +976,7 @@ module.exports = {
      * @checkWaringInterval_str:            string desc of @checkWaringInterval
      */
     hitAndRun: {
+      enable: true,
       condition: {
         seedTime: 60 * 60 * 1000 * 24 * 7,
         seedTime_str: '7d',
diff --git a/config/lib/cron-job.js b/config/lib/cron-job.js
index c6849034..fff31d05 100644
--- a/config/lib/cron-job.js
+++ b/config/lib/cron-job.js
@@ -22,6 +22,8 @@ var supportConfig = config.meanTorrentConfig.support;
 var backupConfig = config.meanTorrentConfig.backup;
 var announceConfig = config.meanTorrentConfig.announce;
 var signConfig = config.meanTorrentConfig.sign;
+var hnrConfig = config.meanTorrentConfig.hitAndRun;
+
 var inbox = require('inbox');
 var simpleParser = require('mailparser').simpleParser;
 
@@ -71,7 +73,10 @@ module.exports = function (app) {
 
   cronJobs.push(removeGhostPeers());
   cronJobs.push(checkUserAccountIdleStatus());
-  cronJobs.push(countUsersHnrWarning());
+
+  if (hnrConfig.enable) {
+    cronJobs.push(countUsersHnrWarning());
+  }
 
   if (supportConfig.mailTicketSupportService) {
     cronJobs.push(listenServiceEmail());
diff --git a/modules/about/client/views/maker-view.client.view.html b/modules/about/client/views/maker-view.client.view.html
index bfd369e7..79393973 100644
--- a/modules/about/client/views/maker-view.client.view.html
+++ b/modules/about/client/views/maker-view.client.view.html
@@ -200,7 +200,7 @@
                                     <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
                                     <dd class="h-line">
                                         <div class="checkbox checkbox-hnr">
-                                            <label class="checkbox-inline">
+                                            <label class="checkbox-inline" ng-if="vm.hnrConfig.enable">
                                                 <input type="checkbox" ng-model="vm.filterHnR"
                                                        ng-change="vm.onHnRChanged();"> {{ 'CA_TORRENT_HNR' | translate}}
                                             </label>
diff --git a/modules/announce/server/controllers/announces.server.controller.js b/modules/announce/server/controllers/announces.server.controller.js
index cef8db32..f3495bcd 100644
--- a/modules/announce/server/controllers/announces.server.controller.js
+++ b/modules/announce/server/controllers/announces.server.controller.js
@@ -365,7 +365,7 @@ exports.announce = function (req, res) {
      if not find and torrent is h&r and user isn`t vip, then create complete record
      ---------------------------------------------------------------*/
     function (done) {
-      if (req.torrent.torrent_hnr && !req.passkeyuser.isVip) {
+      if (hnrConfig.enable && req.torrent.torrent_hnr && !req.passkeyuser.isVip) {
         Complete.findOne({
           torrent: req.torrent._id,
           user: req.passkeyuser._id
@@ -429,19 +429,23 @@ exports.announce = function (req, res) {
      ---------------------------------------------------------------*/
     function (done) {
       if (!req.seeder && !req.passkeyuser.isVip && event(query.event) === EVENT_STARTED) {
-        if (req.passkeyuser.hnr_warning >= hnrConfig.forbiddenDownloadMinWarningNumber) {
-          if (!req.torrent.torrent_hnr) {
-            done(190);
-          } else {
-            if (!req.completeTorrent) {
-              done(191);
+        if (hnrConfig.enable) {
+          if (req.passkeyuser.hnr_warning >= hnrConfig.forbiddenDownloadMinWarningNumber) {
+            if (!req.torrent.torrent_hnr) {
+              done(190);
             } else {
-              if (!req.completeTorrent.hnr_warning) {
-                done(190);
+              if (!req.completeTorrent) {
+                done(191);
               } else {
-                done(null);
+                if (!req.completeTorrent.hnr_warning) {
+                  done(190);
+                } else {
+                  done(null);
+                }
               }
             }
+          } else {
+            done(null);
           }
         } else {
           done(null);
@@ -711,7 +715,7 @@ exports.announce = function (req, res) {
      ---------------------------------------------------------------*/
     function (curru, currd, done) {
       if (curru > 0 || currd > 0) {
-        if (req.completeTorrent) {
+        if (hnrConfig.enable && req.completeTorrent) {
           mtDebug.debugGreen('---------------WRITE COMPLETE DATA----------------', 'ANNOUNCE', true, req.passkeyuser);
           req.completeTorrent.update({
             $inc: {
@@ -735,7 +739,7 @@ exports.announce = function (req, res) {
      ---------------------------------------------------------------*/
     function (done) {
       if (!req.currentPeer.isNewCreated) {
-        if (req.completeTorrent && req.completeTorrent.complete && event(query.event) !== EVENT_COMPLETED) {
+        if (hnrConfig.enable && req.completeTorrent && req.completeTorrent.complete && event(query.event) !== EVENT_COMPLETED) {
           mtDebug.debugGreen('---------------UPDATE H&R COMPLETE TOTAL_SEED_TIME----------------', 'ANNOUNCE', true, req.passkeyuser);
           req.completeTorrent.update({
             $inc: {
@@ -847,7 +851,7 @@ exports.announce = function (req, res) {
      ---------------------------------------------------------------*/
     function (done) {
       if (!req.currentPeer.isNewCreated) {
-        if (req.completeTorrent && event(query.event) !== EVENT_COMPLETED) {
+        if (hnrConfig.enable && req.completeTorrent && event(query.event) !== EVENT_COMPLETED) {
           mtDebug.debugGreen('---------------COUNT H&R WARNING FOR USER----------------', 'ANNOUNCE', true, req.passkeyuser);
           req.completeTorrent.countHnRWarning(false, true);
         }
@@ -864,7 +868,7 @@ exports.announce = function (req, res) {
       if (event(query.event) === EVENT_STOPPED) {
         mtDebug.debugGreen('---------------EVENT_STOPPED----------------', 'ANNOUNCE', true, req.passkeyuser);
 
-        if (req.completeTorrent) {
+        if (hnrConfig.enable && req.completeTorrent) {
           req.completeTorrent.countHnRWarning(true, false);
         }
         removeCurrPeer(function () {
@@ -937,7 +941,7 @@ exports.announce = function (req, res) {
         req.currentPeer.globalUpdateMethod(true);
       }
 
-      if (req.completeTorrent) {
+      if (hnrConfig.enable && req.completeTorrent) {
         req.completeTorrent.globalUpdateMethod(true);
       }
 
@@ -1033,7 +1037,7 @@ exports.announce = function (req, res) {
     }).exec();
 
     //update completeTorrent complete status
-    if (req.completeTorrent) {
+    if (hnrConfig.enable && req.completeTorrent) {
       req.completeTorrent.update({
         $set: {
           complete: true
diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index b5fc5b81..fcf7528d 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -1614,7 +1614,7 @@
       VIDEO: {
         SELF: 'Video Info',
         FORMAT: 'Format',
-        Duration: 'Duration',
+        DURATION: 'Duration',
         BITRATE: 'Bit Rate',
         WIDTH: 'Width',
         HEIGHT: 'Height',
diff --git a/modules/core/client/controllers/header.client.controller.js b/modules/core/client/controllers/header.client.controller.js
index 3c993e14..0bbc629e 100644
--- a/modules/core/client/controllers/header.client.controller.js
+++ b/modules/core/client/controllers/header.client.controller.js
@@ -181,12 +181,14 @@
      * checkHnRWarning
      */
     vm.checkHnRWarning = function () {
-      vm.getWarning();
-      $interval(vm.getWarning, vm.hnrConfig.checkWaringInterval);
+      if(vm.hnrConfig.enable) {
+        vm.getWarning();
+        $interval(vm.getWarning, vm.hnrConfig.checkWaringInterval);
+      }
     };
 
     vm.getWarning = function () {
-      if (Authentication.user) {
+      if (Authentication.user && vm.hnrConfig.enable) {
         UsersService.getUserWarningNumber()
           .then(function (data) {
             vm.user.hnr_warning = Authentication.user.hnr_warning = data.hnr_warning;
diff --git a/modules/core/client/directives/torrent-list-item.client.directive.js b/modules/core/client/directives/torrent-list-item.client.directive.js
index 2f271d0f..664c6fad 100644
--- a/modules/core/client/directives/torrent-list-item.client.directive.js
+++ b/modules/core/client/directives/torrent-list-item.client.directive.js
@@ -19,6 +19,7 @@
         vm.torrentSalesType = MeanTorrentConfig.meanTorrentConfig.torrentSalesType;
         vm.torrentRLevels = MeanTorrentConfig.meanTorrentConfig.torrentRecommendLevel;
         vm.salesGlobalConfig = MeanTorrentConfig.meanTorrentConfig.torrentGlobalSales;
+        vm.hnrConfig = MeanTorrentConfig.meanTorrentConfig.hitAndRun;
 
         /**
          * buildPager
diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html
index 27fc391d..a003953e 100644
--- a/modules/core/client/views/header.client.view.html
+++ b/modules/core/client/views/header.client.view.html
@@ -78,7 +78,7 @@
                         <a ui-sref="{{item.state}}">
                             <i class="fa fa-fw {{item.faIcon}} {{item.faClass}}"></i><span ng-bind="item.title" menu-title="{{item.title}}"></span>
                         </a>
-                        <span class="badge menu-badge badge_danger" ng-show="vm.user.hnr_warning>0">{{vm.user.hnr_warning}}</span>
+                        <span class="badge menu-badge badge_danger" ng-show="vm.user.hnr_warning>0 && vm.hnrConfig.enable">{{vm.user.hnr_warning}}</span>
                     </li>
                     <li ui-sref-active="active" ng-repeat="item in vm.scoreMenu.items" class="menu-parent">
                         <a ui-sref="{{item.state}}">
diff --git a/modules/invitations/client/controllers/admin-invitations.client.controller.js b/modules/invitations/client/controllers/admin-invitations.client.controller.js
index 01c84555..ce81abf7 100644
--- a/modules/invitations/client/controllers/admin-invitations.client.controller.js
+++ b/modules/invitations/client/controllers/admin-invitations.client.controller.js
@@ -16,6 +16,7 @@
     vm.signConfig = MeanTorrentConfig.meanTorrentConfig.sign;
     vm.announce = MeanTorrentConfig.meanTorrentConfig.announce;
     vm.itemsPerPageConfig = MeanTorrentConfig.meanTorrentConfig.itemsPerPage;
+    vm.hnrConfig = MeanTorrentConfig.meanTorrentConfig.hitAndRun;
 
     vm.invitationFields = {
       isOfficial: true
diff --git a/modules/invitations/client/controllers/invitations.client.controller.js b/modules/invitations/client/controllers/invitations.client.controller.js
index 4bea7425..46e475ed 100644
--- a/modules/invitations/client/controllers/invitations.client.controller.js
+++ b/modules/invitations/client/controllers/invitations.client.controller.js
@@ -15,6 +15,7 @@
     vm.signConfig = MeanTorrentConfig.meanTorrentConfig.sign;
     vm.user = Authentication.user;
     vm.announce = MeanTorrentConfig.meanTorrentConfig.announce;
+    vm.hnrConfig = MeanTorrentConfig.meanTorrentConfig.hitAndRun;
 
     vm.invitePopover = {
       title: 'INVITATION.TITLE_SEND',
diff --git a/modules/invitations/client/views/admin/official.client.view.html b/modules/invitations/client/views/admin/official.client.view.html
index 9ae53732..d3184a92 100644
--- a/modules/invitations/client/views/admin/official.client.view.html
+++ b/modules/invitations/client/views/admin/official.client.view.html
@@ -131,7 +131,7 @@
                 <li>{{ 'STATUS_FIELD.SEEDED' | translate}}：{{ vm.selectedUser.seeded }}</li>
                 <li>{{ 'STATUS_FIELD.LEECHED' | translate}}：{{ vm.selectedUser.leeched }}</li>
                 <li>{{ 'STATUS_FIELD.FINISHED' | translate}}：{{ vm.selectedUser.finished }}</li>
-                <li ng-if="vm.selectedUser.hnr_warning>0">
+                <li ng-if="vm.selectedUser.hnr_warning>0 && vm.hnrConfig.enable">
                     {{ 'STATUS_FIELD.HNR_WARNING' | translate}}：<span class="badge badge_danger">{{vm.selectedUser.hnr_warning}}</span>
                 </li>
 
diff --git a/modules/invitations/client/views/detail.client.view.html b/modules/invitations/client/views/detail.client.view.html
index 1a9da09c..b3519b0d 100644
--- a/modules/invitations/client/views/detail.client.view.html
+++ b/modules/invitations/client/views/detail.client.view.html
@@ -163,7 +163,7 @@
                 <li>{{ 'STATUS_FIELD.SEEDED' | translate}}：{{ vm.selectedUser.seeded }}</li>
                 <li>{{ 'STATUS_FIELD.LEECHED' | translate}}：{{ vm.selectedUser.leeched }}</li>
                 <li>{{ 'STATUS_FIELD.FINISHED' | translate}}：{{ vm.selectedUser.finished }}</li>
-                <li ng-if="vm.selectedUser.hnr_warning>0">
+                <li ng-if="vm.selectedUser.hnr_warning>0 && vm.hnrConfig.enable">
                     {{ 'STATUS_FIELD.HNR_WARNING' | translate}}：<span class="badge badge_danger">{{vm.selectedUser.hnr_warning}}</span>
                 </li>
 
diff --git a/modules/torrents/client/controllers/admin/admin-list.client.controller.js b/modules/torrents/client/controllers/admin/admin-list.client.controller.js
index 792d4d69..ec6e50b5 100644
--- a/modules/torrents/client/controllers/admin/admin-list.client.controller.js
+++ b/modules/torrents/client/controllers/admin/admin-list.client.controller.js
@@ -24,6 +24,7 @@
     vm.torrentRLevels = MeanTorrentConfig.meanTorrentConfig.torrentRecommendLevel;
     vm.torrentTypeConfig = MeanTorrentConfig.meanTorrentConfig.torrentType;
     vm.salesGlobalConfig = MeanTorrentConfig.meanTorrentConfig.torrentGlobalSales;
+    vm.hnrConfig = MeanTorrentConfig.meanTorrentConfig.hitAndRun;
 
     vm.torrentType = localStorageService.get('admin_last_selected_type') || 'movie';
     vm.filterVIP = isSelectedVipType(vm.torrentType);
diff --git a/modules/torrents/client/controllers/torrents.client.controller.js b/modules/torrents/client/controllers/torrents.client.controller.js
index 2e82b953..4b7970c2 100644
--- a/modules/torrents/client/controllers/torrents.client.controller.js
+++ b/modules/torrents/client/controllers/torrents.client.controller.js
@@ -24,6 +24,7 @@
     vm.torrentTypeConfig = MeanTorrentConfig.meanTorrentConfig.torrentType;
     vm.salesGlobalConfig = MeanTorrentConfig.meanTorrentConfig.torrentGlobalSales;
     vm.rssConfig = MeanTorrentConfig.meanTorrentConfig.rss;
+    vm.hnrConfig = MeanTorrentConfig.meanTorrentConfig.hitAndRun;
 
     vm.searchTags = [];
     vm.searchKey = $state.params.keys || '';
diff --git a/modules/torrents/client/less/torrents.less b/modules/torrents/client/less/torrents.less
index 7f0732f5..91c63050 100644
--- a/modules/torrents/client/less/torrents.less
+++ b/modules/torrents/client/less/torrents.less
@@ -290,7 +290,7 @@ pre.prettyprint {
         background-color: #f7f7f7;
         border: solid 1px #ddd;
         border-radius: 3px;
-        padding: 2px 3px 2px 25px;
+        padding: 0 3px 0 25px;
         margin-bottom: 3px;
         &:hover {
             border: solid 1px @brand-primary;
@@ -327,7 +327,7 @@ pre.prettyprint {
         background-color: #f7f7f7;
         border: solid 1px #ddd;
         border-radius: 3px;
-        padding: 2px 3px 2px 25px;
+        padding: 0 3px 0 25px;
         margin-bottom: 3px;
         margin-right: 4px;
         &:hover {
diff --git a/modules/torrents/client/templates/torrent-item.client.view.html b/modules/torrents/client/templates/torrent-item.client.view.html
index 7e44fc03..4e7dac25 100644
--- a/modules/torrents/client/templates/torrent-item.client.view.html
+++ b/modules/torrents/client/templates/torrent-item.client.view.html
@@ -75,7 +75,7 @@
                     <span class="label label-se-info" ng-if="item.torrent_type == 'tvserial'"
                           ng-click="$event.stopPropagation();">S{{item.torrent_seasons}}E{{item.torrent_episodes}}</span>
 
-                    <span class="label label-hnr-info" ng-if="item.torrent_hnr" ng-class="{'used': parent.filterHnR}"
+                    <span class="label label-hnr-info" ng-if="item.torrent_hnr && vm.hnrConfig.enable" ng-class="{'used': parent.filterHnR}"
                           ng-click="vm.onHnRClicked(); $event.stopPropagation();">H&R</span>
 
                     <span class="label label-vip-info" ng-if="item.torrent_vip" ng-class="{'used': parent.filterVIP}"
@@ -227,7 +227,8 @@
                 </button>
             </div>
             <div class="margin-top-2">
-                <button class="btn col-xs-6 btn-xs btn-default" ng-click="vm.toggleHnR(item); $event.stopPropagation();">
+                <button class="btn col-xs-6 btn-xs btn-default" ng-disabled="!vm.hnrConfig.enable"
+                        ng-click="vm.toggleHnR(item); $event.stopPropagation();">
                     {{ (item.torrent_hnr ? 'ADMIN_BASIC_UNSET_HNR' : 'ADMIN_BASIC_SET_HNR') | translate}}
                 </button>
                 <button class="btn col-xs-6 btn-xs btn-default" ng-click="vm.toggleVIP(item); $event.stopPropagation();">
diff --git a/modules/torrents/client/views/admin/admin-list.client.view.html b/modules/torrents/client/views/admin/admin-list.client.view.html
index bc17658d..e2c3cef1 100644
--- a/modules/torrents/client/views/admin/admin-list.client.view.html
+++ b/modules/torrents/client/views/admin/admin-list.client.view.html
@@ -105,7 +105,7 @@
                         <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
                         <dd class="h-line">
                             <span class="checkbox checkbox-hnr">
-                                <label class="checkbox-inline">
+                                <label class="checkbox-inline" ng-if="vm.hnrConfig.enable">
                                     <input type="checkbox" ng-model="vm.filterHnR" ng-change="vm.onHnRChanged();"> {{ 'CA_TORRENT_HNR' | translate}}
                                 </label>
                                 <label class="checkbox-inline" ng-if="!vm.isGlobalSaleNow()">
diff --git a/modules/torrents/client/views/list-torrents.client.view.html b/modules/torrents/client/views/list-torrents.client.view.html
index 28f88e3d..73fc1a25 100644
--- a/modules/torrents/client/views/list-torrents.client.view.html
+++ b/modules/torrents/client/views/list-torrents.client.view.html
@@ -171,7 +171,7 @@
                         <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
                         <dd class="h-line">
                             <div class="checkbox checkbox-hnr">
-                                <label class="checkbox-inline">
+                                <label class="checkbox-inline" ng-if="vm.hnrConfig.enable">
                                     <input type="checkbox" ng-model="vm.filterHnR" ng-change="vm.onHnRChanged();"> {{ 'CA_TORRENT_HNR' | translate}}
                                 </label>
                                 <label class="checkbox-inline" ng-if="!vm.isGlobalSaleNow()">
diff --git a/modules/users/client/controllers/status/status.client.controller.js b/modules/users/client/controllers/status/status.client.controller.js
index b8fcb794..69034dbc 100644
--- a/modules/users/client/controllers/status/status.client.controller.js
+++ b/modules/users/client/controllers/status/status.client.controller.js
@@ -15,6 +15,7 @@
     vm.scoreLevelData = ScoreLevelService.getScoreLevelJson(vm.user.score);
     vm.announce = MeanTorrentConfig.meanTorrentConfig.announce;
     vm.signConfig = MeanTorrentConfig.meanTorrentConfig.sign;
+    vm.hnrConfig = MeanTorrentConfig.meanTorrentConfig.hitAndRun;
 
     /**
      * unIdle
diff --git a/modules/users/client/controllers/userinfo/userinfo.client.controller.js b/modules/users/client/controllers/userinfo/userinfo.client.controller.js
index 728c2eb3..749a0eea 100644
--- a/modules/users/client/controllers/userinfo/userinfo.client.controller.js
+++ b/modules/users/client/controllers/userinfo/userinfo.client.controller.js
@@ -19,6 +19,7 @@
     vm.messageTo = messageTo;
     vm.isContextUserSelf = isContextUserSelf;
     vm.scoreLevelData = ScoreLevelService.getScoreLevelJson(vm.user.score);
+    vm.hnrConfig = MeanTorrentConfig.meanTorrentConfig.hitAndRun;
 
     mtDebug.info(user);
 
diff --git a/modules/users/client/views/admin/view-user.client.view.html b/modules/users/client/views/admin/view-user.client.view.html
index e84e157e..29a495f4 100644
--- a/modules/users/client/views/admin/view-user.client.view.html
+++ b/modules/users/client/views/admin/view-user.client.view.html
@@ -254,7 +254,7 @@
                 <dt class="h-line">{{ 'STATUS_FIELD.FINISHED' | translate}}：</dt>
                 <dd class="h-line">{{ vm.user.finished }}</dd>
 
-                <div ng-if="vm.user.hnr_warning>0">
+                <div ng-if="vm.user.hnr_warning>0 && vm.hnrConfig.enable">
                     <dt class="h-line">{{ 'STATUS_FIELD.HNR_WARNING' | translate}}：</dt>
                     <dd class="h-line">
                         <span class="badge badge_danger">{{vm.user.hnr_warning}}</span>
diff --git a/modules/users/client/views/status/account.client.view.html b/modules/users/client/views/status/account.client.view.html
index af2ed71a..3ceaf548 100644
--- a/modules/users/client/views/status/account.client.view.html
+++ b/modules/users/client/views/status/account.client.view.html
@@ -7,7 +7,7 @@
                 </h4>
             </span>
 
-            <div class="alert alert-warning text-center" role="alert" ng-if="vm.user.hnr_warning>0">
+            <div class="alert alert-warning text-center" role="alert" ng-if="vm.user.hnr_warning>0 && vm.hnrConfig.enable">
                 <span translate="WARNING_TOOLTIP" translate-values="{wnumber: vm.user.hnr_warning}"></span>
                 <a ui-sref="status.warning">{{'WARNING_DETAIL_LINK' | translate}}</a>
             </div>
@@ -184,7 +184,7 @@
                 <dt class="h-line">{{ 'STATUS_FIELD.FINISHED' | translate}}：</dt>
                 <dd class="h-line">{{ vm.user.finished }}</dd>
 
-                <div ng-if="vm.user.hnr_warning>0">
+                <div ng-if="vm.user.hnr_warning>0 && vm.hnrConfig.enable">
                     <dt class="h-line">{{ 'STATUS_FIELD.HNR_WARNING' | translate}}：</dt>
                     <dd class="h-line">
                         <span class="badge badge_danger">{{vm.user.hnr_warning}}</span>
diff --git a/modules/users/client/views/status/status.client.view.html b/modules/users/client/views/status/status.client.view.html
index 46ff4d8f..77c78e9e 100644
--- a/modules/users/client/views/status/status.client.view.html
+++ b/modules/users/client/views/status/status.client.view.html
@@ -17,7 +17,7 @@
                         <a><i class="fa fa-arrow-down fa-2x" aria-hidden="true"></i><span
                                 class="tab-title">{{'STATUS_DOWNLOADING' | translate}}</span></a>
                     </li>
-                    <li ui-sref="status.warning" ui-sref-active="active" title="{{'STATUS_WARNING' | translate}}">
+                    <li ui-sref="status.warning" ui-sref-active="active" title="{{'STATUS_WARNING' | translate}}" ng-if="vm.hnrConfig.enable">
                         <a><i class="fa fa-warning fa-2x" aria-hidden="true"></i><span class="tab-title">{{'STATUS_WARNING' | translate}}</span></a>
                     </li>
                 </ul>
diff --git a/modules/users/client/views/userinfo/userinfo.client.view.html b/modules/users/client/views/userinfo/userinfo.client.view.html
index 6bd29baa..6d93ab0c 100644
--- a/modules/users/client/views/userinfo/userinfo.client.view.html
+++ b/modules/users/client/views/userinfo/userinfo.client.view.html
@@ -168,7 +168,7 @@
                     <dt class="h-line">{{ 'STATUS_FIELD.FINISHED' | translate}}：</dt>
                     <dd class="h-line">{{ vm.user.finished }}</span></dd>
 
-                    <div ng-if="vm.user.hnr_warning>0">
+                    <div ng-if="vm.user.hnr_warning>0 && vm.hnrConfig.enable">
                         <dt class="h-line">{{ 'STATUS_FIELD.HNR_WARNING' | translate}}：</dt>
                         <dd class="h-line"><span class="badge badge_danger">{{vm.user.hnr_warning}}</span></dd>
                     </div>
diff --git a/modules/vip/client/views/vip.client.view.html b/modules/vip/client/views/vip.client.view.html
index 508cb996..1b221c8c 100644
--- a/modules/vip/client/views/vip.client.view.html
+++ b/modules/vip/client/views/vip.client.view.html
@@ -125,7 +125,7 @@
                                     <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
                                     <dd class="h-line">
                                         <div class="checkbox checkbox-hnr">
-                                            <label class="checkbox-inline">
+                                            <label class="checkbox-inline" ng-if="vm.hnrConfig.enable">
                                                 <input type="checkbox" ng-model="vm.filterHnR"
                                                        ng-change="vm.onHnRChanged();"> {{ 'CA_TORRENT_HNR' | translate}}
                                             </label>

From 3d850b7bc217eadef9272ab08538030e67647fb2 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sun, 20 May 2018 21:54:58 +0800
Subject: [PATCH 82/96] fix(core): fixed eslint warning

---
 modules/core/client/controllers/header.client.controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/core/client/controllers/header.client.controller.js b/modules/core/client/controllers/header.client.controller.js
index 0bbc629e..79471835 100644
--- a/modules/core/client/controllers/header.client.controller.js
+++ b/modules/core/client/controllers/header.client.controller.js
@@ -181,7 +181,7 @@
      * checkHnRWarning
      */
     vm.checkHnRWarning = function () {
-      if(vm.hnrConfig.enable) {
+      if (vm.hnrConfig.enable) {
         vm.getWarning();
         $interval(vm.getWarning, vm.hnrConfig.checkWaringInterval);
       }

From 18354352a3ee614972c1f0d603f726ba9ab4e2a9 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sun, 20 May 2018 22:01:27 +0800
Subject: [PATCH 83/96] feat(torrents): add H&R system enable logic

---
 .../client/controllers/torrent-info.client.controller.js        | 1 +
 modules/torrents/client/views/view-torrent.client.view.html     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/torrents/client/controllers/torrent-info.client.controller.js b/modules/torrents/client/controllers/torrent-info.client.controller.js
index e73e21a8..1cc594ff 100644
--- a/modules/torrents/client/controllers/torrent-info.client.controller.js
+++ b/modules/torrents/client/controllers/torrent-info.client.controller.js
@@ -32,6 +32,7 @@
     vm.inputLengthConfig = MeanTorrentConfig.meanTorrentConfig.inputLength;
     vm.salesGlobalConfig = MeanTorrentConfig.meanTorrentConfig.torrentGlobalSales;
     vm.mediaInfoConfig = MeanTorrentConfig.meanTorrentConfig.mediaInfo;
+    vm.hnrConfig = MeanTorrentConfig.meanTorrentConfig.hitAndRun;
 
     vm.mediaInfoEditMode = false;
 
diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html
index fb39e808..d439561c 100644
--- a/modules/torrents/client/views/view-torrent.client.view.html
+++ b/modules/torrents/client/views/view-torrent.client.view.html
@@ -1126,7 +1126,7 @@
                             ng-click="vm.reviewedTorrentStatus();">{{ 'ADMIN_BASIC_REVIEWED' | translate}}
                     </button>
                     <button class="btn btn-default btn-sm" ng-click="vm.deleteTorrent();">{{ 'ADMIN_BASIC_DELETE' | translate}}</button>
-                    <button class="btn btn-default btn-sm"
+                    <button class="btn btn-default btn-sm" ng-if="vm.hnrConfig.enable"
                             ng-click="vm.toggleHnR();">{{ (vm.torrentLocalInfo.torrent_hnr ? 'ADMIN_BASIC_UNSET_HNR' : 'ADMIN_BASIC_SET_HNR') | translate}}
                     </button>
                     <button class="btn btn-default btn-sm"

From a0a72c3d3469844956c78562008959a4e0a13183 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 21 May 2018 13:03:56 +0800
Subject: [PATCH 84/96] feat(torrents): add configure to setting enable/disable
 site language item

---
 config/env/torrents.js                            | 8 ++++----
 modules/core/client/views/footer.client.view.html | 2 +-
 modules/core/client/views/header.client.view.html | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index 25ca83be..a7dbe36c 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -81,12 +81,12 @@ module.exports = {
      * @index:  list index in menu
      * @class:  flag icon class, can find flag icon at '/public/lib/flag-icon-css/flags'
      * @title:  language title show in menu item
-     *
+     * @enable: setting whether to enable or disable this language support, if false, user can not select it
      */
     language: [
-      {name: 'en', index: 0, class: 'flag-icon-gb', title: 'English'},
-      {name: 'zh', index: 1, class: 'flag-icon-cn', title: '中文'},
-      {name: 'zh-tw', index: 2, class: 'flag-icon-tw', title: '繁體中文'}
+      {name: 'en', index: 0, class: 'flag-icon-gb', title: 'English', enable: true},
+      {name: 'zh', index: 1, class: 'flag-icon-cn', title: '中文', enable: true},
+      {name: 'zh-tw', index: 2, class: 'flag-icon-tw', title: '繁體中文', enable: true}
     ],
 
     /**
diff --git a/modules/core/client/views/footer.client.view.html b/modules/core/client/views/footer.client.view.html
index 803b3c9f..e835ab8d 100644
--- a/modules/core/client/views/footer.client.view.html
+++ b/modules/core/client/views/footer.client.view.html
@@ -36,7 +36,7 @@
                             <li>
                             <span class="lang-list lang-footer">
                                 <span class="flag-icon {{l.class}}" title="{{l.title}}" ng-click="vm.changeLanguage(l.name);"
-                                      ng-repeat="l in vm.language" ng-class="{'curr-language': vm.langService.getLang() == l.name}"></span>
+                                      ng-repeat="l in vm.language | filter: {enable: true}" ng-class="{'curr-language': vm.langService.getLang() == l.name}"></span>
                             </span>
                             </li>
                             <li translate="GIT_REPO"></li>
diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html
index a003953e..7ff27125 100644
--- a/modules/core/client/views/header.client.view.html
+++ b/modules/core/client/views/header.client.view.html
@@ -58,7 +58,7 @@
                 <ul class="dropdown-menu" role="menu">
                     <li class="lang-list">
                         <span class="flag-icon {{l.class}}" title="{{l.title}}" ng-click="vm.changeLanguage(l.name);"
-                              ng-repeat="l in vm.language" ng-class="{'curr-language': vm.langService.getLang() == l.name}"></span>
+                              ng-repeat="l in vm.language | filter: {enable: true}" ng-class="{'curr-language': vm.langService.getLang() == l.name}"></span>
                     </li>
                     <li class="divider"></li>
                     <li ui-sref-active="active" ng-repeat="item in vm.followMenu.items" class="menu-parent">

From 987636a816dd50b87b1ea5ed5b9b85b5840d5b89 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 21 May 2018 13:20:43 +0800
Subject: [PATCH 85/96] feat(torrents): add show/hide subtitle tab settings of
 each torrent type

---
 config/env/torrents.js                              | 13 +++++++++++++
 .../controllers/torrent-info.client.controller.js   | 13 ++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index a7dbe36c..ba18f765 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -707,6 +707,7 @@ module.exports = {
      *        @pageTitle:         the page title string, used by translate at PAGETITLE
      *        @uploadTemplateID:  view templateID in upload torrent page, when selected type is changed, then include the template by this id,
      *                            all the template html is in file: modules/torrents/client/views/uploads-torrents.client.view.html
+     *        @showSubtitleTabInDetailPage: setting whether show subtitle tab in torrent detail page
      *        @showTopListInHome: setting whether show the TOP list in site home page, if false, don`t show
      *                            the 'other' type torrent always not show in home page
      *
@@ -732,6 +733,7 @@ module.exports = {
           url: '/movie',
           pageTitle: 'MOVIE_LIST',
           uploadTemplateID: 'movie',
+          showSubtitleTabInDetailPage: true,
           showTopListInHome: true
         },
         {
@@ -748,6 +750,7 @@ module.exports = {
           url: '/tv',
           pageTitle: 'TV_LIST',
           uploadTemplateID: 'tvserial',
+          showSubtitleTabInDetailPage: true,
           showTopListInHome: true
         },
         {
@@ -764,6 +767,7 @@ module.exports = {
           url: '/documentary',
           pageTitle: 'DOCUMENTARY_LIST',
           uploadTemplateID: 'default',
+          showSubtitleTabInDetailPage: true,
           showTopListInHome: true
         },
         {
@@ -780,6 +784,7 @@ module.exports = {
           url: '/music',
           pageTitle: 'MUSIC_LIST',
           uploadTemplateID: 'music',
+          showSubtitleTabInDetailPage: false,
           showTopListInHome: true
         },
         {
@@ -796,6 +801,7 @@ module.exports = {
           url: '/sports',
           pageTitle: 'SPORTS_LIST',
           uploadTemplateID: 'default',
+          showSubtitleTabInDetailPage: false,
           showTopListInHome: false
         },
         {
@@ -812,6 +818,7 @@ module.exports = {
           url: '/variety',
           pageTitle: 'VARIETY_LIST',
           uploadTemplateID: 'default',
+          showSubtitleTabInDetailPage: false,
           showTopListInHome: false
         },
         {
@@ -828,6 +835,7 @@ module.exports = {
           url: '/picture',
           pageTitle: 'PICTURE_LIST',
           uploadTemplateID: 'default',
+          showSubtitleTabInDetailPage: false,
           showTopListInHome: false
         },
         {
@@ -844,6 +852,7 @@ module.exports = {
           url: '/game',
           pageTitle: 'GAME_LIST',
           uploadTemplateID: 'default',
+          showSubtitleTabInDetailPage: false,
           showTopListInHome: false
         },
         {
@@ -860,6 +869,7 @@ module.exports = {
           url: '/software',
           pageTitle: 'SOFTWARE_LIST',
           uploadTemplateID: 'default',
+          showSubtitleTabInDetailPage: false,
           showTopListInHome: false
         },
         {
@@ -876,6 +886,7 @@ module.exports = {
           url: '/ebook',
           pageTitle: 'EBOOK_LIST',
           uploadTemplateID: 'default',
+          showSubtitleTabInDetailPage: false,
           showTopListInHome: false
         },
         {
@@ -892,6 +903,7 @@ module.exports = {
           url: '/other',
           pageTitle: 'OTHER_LIST',
           uploadTemplateID: 'default',
+          showSubtitleTabInDetailPage: false,
           showTopListInHome: false
         },
         {
@@ -908,6 +920,7 @@ module.exports = {
           url: '/adult',
           pageTitle: 'ADULT_LIST',
           uploadTemplateID: 'default',
+          showSubtitleTabInDetailPage: false,
           showTopListInHome: false
         }
       ]
diff --git a/modules/torrents/client/controllers/torrent-info.client.controller.js b/modules/torrents/client/controllers/torrent-info.client.controller.js
index 1cc594ff..9018ca79 100644
--- a/modules/torrents/client/controllers/torrent-info.client.controller.js
+++ b/modules/torrents/client/controllers/torrent-info.client.controller.js
@@ -33,6 +33,7 @@
     vm.salesGlobalConfig = MeanTorrentConfig.meanTorrentConfig.torrentGlobalSales;
     vm.mediaInfoConfig = MeanTorrentConfig.meanTorrentConfig.mediaInfo;
     vm.hnrConfig = MeanTorrentConfig.meanTorrentConfig.hitAndRun;
+    vm.torrentTypeConfig = MeanTorrentConfig.meanTorrentConfig.torrentType;
 
     vm.mediaInfoEditMode = false;
 
@@ -495,7 +496,7 @@
           icon: 'fa-file-text',
           title: $translate.instant('TAB_USER_SUBTITLE'),
           templateUrl: 'subtitleInfo.html',
-          ng_show: vm.torrentLocalInfo.torrent_type === 'movie' || vm.torrentLocalInfo.torrent_type === 'tvserial',
+          ng_show: showSubtitleTab(vm.torrentLocalInfo.torrent_type),
           badges: [
             {
               value: vm.torrentLocalInfo._subtitles.length,
@@ -554,6 +555,16 @@
           badges: []
         }
       );
+
+      function showSubtitleTab(type) {
+        var s = false;
+        angular.forEach(vm.torrentTypeConfig.value, function (t) {
+          if (t.value === type && t.showSubtitleTabInDetailPage) {
+            s = true;
+          }
+        });
+        return s;
+      }
     };
 
     /**

From a093a02969e74e4b479484d1d80757a00bba1fe2 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 21 May 2018 13:33:34 +0800
Subject: [PATCH 86/96] fix(messages): remove message type item

---
 config/env/torrents.js                                    | 3 +--
 modules/core/client/app/trans-string-en.js                | 1 -
 modules/core/client/app/trans-string-zh-tw.js             | 5 ++---
 modules/core/client/app/trans-string-zh.js                | 5 ++---
 modules/messages/client/views/admin-send.client.view.html | 4 ++--
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index ba18f765..f643a3db 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -524,8 +524,7 @@ module.exports = {
           {name: 'USER', value: 'user', role: 'user'},
           {name: 'SERVER', value: 'server', role: 'server'},
           {name: 'SYSTEM', value: 'system', role: 'admin'},
-          {name: 'ADVERT', value: 'advert', role: 'admin'},
-          {name: 'NOTICE', value: 'notice', role: 'admin'}
+          {name: 'ADVERT', value: 'advert', role: 'admin'}
         ]
       },
       checkUnreadInterval: 60 * 1000 * 2,
diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index fcf7528d..3e8b35dc 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -1082,7 +1082,6 @@
     MESSAGE_TYPE_USER: 'User message',
     MESSAGE_TYPE_SYSTEM: 'System message',
     MESSAGE_TYPE_ADVERT: 'Advert message',
-    MESSAGE_TYPE_NOTICE: 'Notice message',
     MESSAGE_TYPE_SERVER: 'Server notice',
     MESSAGE_SEND_SUCCESSFULLY: 'Message send successfully',
     MESSAGE_SEND_FAILED: 'Message send failed',
diff --git a/modules/core/client/app/trans-string-zh-tw.js b/modules/core/client/app/trans-string-zh-tw.js
index e3f3394f..ebc142e9 100644
--- a/modules/core/client/app/trans-string-zh-tw.js
+++ b/modules/core/client/app/trans-string-zh-tw.js
@@ -1056,9 +1056,8 @@
     BUTTON_MESSAGE_REPLY: '回覆',
 
     MESSAGE_TYPE_USER: '使用者訊息',
-    MESSAGE_TYPE_SYSTEM: '全域性系統訊息',
-    MESSAGE_TYPE_ADVERT: '全域性廣告推送',
-    MESSAGE_TYPE_NOTICE: '全域性系統通知',
+    MESSAGE_TYPE_SYSTEM: '系統訊息',
+    MESSAGE_TYPE_ADVERT: '廣告推送',
     MESSAGE_TYPE_SERVER: '伺服器事件通知',
     MESSAGE_SEND_SUCCESSFULLY: '訊息傳送成功',
     MESSAGE_SEND_FAILED: '訊息傳送失敗',
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index ea9508a1..b45ab8f4 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -1080,9 +1080,8 @@
     BUTTON_MESSAGE_REPLY: '回复',
 
     MESSAGE_TYPE_USER: '用户消息',
-    MESSAGE_TYPE_SYSTEM: '全局系统消息',
-    MESSAGE_TYPE_ADVERT: '全局广告推送',
-    MESSAGE_TYPE_NOTICE: '全局系统通知',
+    MESSAGE_TYPE_SYSTEM: '系统消息',
+    MESSAGE_TYPE_ADVERT: '广告推送',
     MESSAGE_TYPE_SERVER: '服务器事件通知',
     MESSAGE_SEND_SUCCESSFULLY: '消息发送成功',
     MESSAGE_SEND_FAILED: '消息发送失败',
diff --git a/modules/messages/client/views/admin-send.client.view.html b/modules/messages/client/views/admin-send.client.view.html
index eb6436ee..00889505 100644
--- a/modules/messages/client/views/admin-send.client.view.html
+++ b/modules/messages/client/views/admin-send.client.view.html
@@ -2,7 +2,7 @@
     <div class="row margin-top-20">
         <div class="col-xs-12">
             <div class="margin-bottom-20">
-                <h3>{{'ADMIN_MESSAGES_SEND' | translate}}</h3>
+                <h4>{{'ADMIN_MESSAGES_SEND' | translate}}</h4>
                 <li class="status-divider"></li>
             </div>
         </div>
@@ -76,7 +76,7 @@
     <div class="row margin-top-20 margin-bottom-50">
         <div class="col-xs-12">
             <div class="margin-bottom-20">
-                <h3>{{'ADMIN_MESSAGES_ALREADY_SEND' | translate}}</h3>
+                <h4>{{'ADMIN_MESSAGES_ALREADY_SEND' | translate}}</h4>
                 <li class="status-divider"></li>
             </div>
         </div>

From 3482b2b9f434eb218ddfd99eacee8875265f1de1 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 21 May 2018 18:00:45 +0800
Subject: [PATCH 87/96] feat(messages): add config setting of server messages
 expires time and auto delete all expired message at midnight

---
 config/env/torrents.js                        |  6 +++--
 config/lib/cron-job.js                        | 27 ++++++++++++++++++-
 modules/core/client/app/trans-string-en.js    |  2 +-
 modules/core/client/app/trans-string-zh-tw.js |  2 +-
 modules/core/client/app/trans-string-zh.js    |  2 +-
 .../controllers/messages.client.controller.js |  2 --
 .../client/views/box.client.view.html         |  2 +-
 .../controllers/messages.server.controller.js | 22 +++------------
 8 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index f643a3db..27a2e9d1 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -513,7 +513,8 @@ module.exports = {
      *                @value:     type value
      * @checkUnreadInterval:      set check unread message interval, default 2 minutes
      * @checkUnreadInterval_str:  string desc of @checkUnreadInterval
-     * @serverMessageLimitCount:  limit server notice message count in messagebox
+     * @serverMessageExpires:     setting server message expire time, old message will be delete automatic
+     * @serverMessageExpires_str: setting desc of @serverMessageExpires
      *
      * NOTE: the first value 'user' cannot be deleted
      */
@@ -529,7 +530,8 @@ module.exports = {
       },
       checkUnreadInterval: 60 * 1000 * 2,
       checkUnreadInterval_str: '2m',
-      serverMessageLimitCount: 100
+      serverMessageExpires: 60 * 60 * 1000 * 24 * 10,
+      serverMessageExpires_str: '10d'
     },
 
     /**
diff --git a/config/lib/cron-job.js b/config/lib/cron-job.js
index fff31d05..695c7b4f 100644
--- a/config/lib/cron-job.js
+++ b/config/lib/cron-job.js
@@ -13,6 +13,7 @@ var path = require('path'),
   User = mongoose.model('User'),
   Peer = mongoose.model('Peer'),
   Complete = mongoose.model('Complete'),
+  Message = mongoose.model('Message'),
   MailTicket = mongoose.model('MailTicket'),
   backup = require('mongodb-backup');
 
@@ -23,6 +24,7 @@ var backupConfig = config.meanTorrentConfig.backup;
 var announceConfig = config.meanTorrentConfig.announce;
 var signConfig = config.meanTorrentConfig.sign;
 var hnrConfig = config.meanTorrentConfig.hitAndRun;
+var messageConfig = config.meanTorrentConfig.messages;
 
 var inbox = require('inbox');
 var simpleParser = require('mailparser').simpleParser;
@@ -72,6 +74,7 @@ module.exports = function (app) {
   }
 
   cronJobs.push(removeGhostPeers());
+  cronJobs.push(removeOldServerMessages());
   cronJobs.push(checkUserAccountIdleStatus());
 
   if (hnrConfig.enable) {
@@ -138,7 +141,6 @@ function cronJobBackupMongoDB() {
  */
 function removeGhostPeers() {
   var cronJob = new CronJob({
-    //cronTime: '00 05 1 * * *',
     //cronTime: '*/5 * * * * *',
     cronTime: '00 30 */2 * * *',
     onTick: function () {
@@ -177,6 +179,29 @@ function removeGhostPeers() {
   return cronJob;
 }
 
+/**
+ * removeOldServerMessages
+ */
+function removeOldServerMessages() {
+  var cronJob = new CronJob({
+    cronTime: '00 05 1 * * *',
+    onTick: function () {
+      logger.info(chalk.green('removeOldServerMessages: process!'));
+
+      Message.remove({
+        type: 'server',
+        createdat: {$lt: Date.now() - messageConfig.serverMessageExpires}
+      }).exec();
+    },
+    start: false,
+    timeZone: appConfig.cronTimeZone
+  });
+
+  cronJob.start();
+
+  return cronJob;
+}
+
 /**
  * checkUserAccountIdleStatus
  */
diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index 3e8b35dc..3e359c98 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -1087,7 +1087,7 @@
     MESSAGE_SEND_FAILED: 'Message send failed',
     MESSAGE_DELETED_SUCCESSFULLY: 'Message deleted successfully',
     MESSAGE_DELETED_ERROR: 'Message deleted failed',
-    MESSAGE_SERVER_TOOLTIP: '<h4>Server message</h4>Server message is send to you by server automatic when you do some operations or your account status make some change or some important things about you, There may be a lot of messages, so you need to check and delete them in time. The system only keeps the last {{count}} messages.',
+    MESSAGE_SERVER_TOOLTIP: '<h4>Server message</h4>Server message is send to you by server automatic when you do some operations or your account status make some change or some important things about you, There may be a lot of messages, so you need to check and delete them in time. The system keeps only the messages of the last {{days}} days.',
 
     MESSAGE_DELETE_CONFIRM_OK: 'Delete',
     MESSAGE_DELETE_CONFIRM_CANCEL: 'Cancel',
diff --git a/modules/core/client/app/trans-string-zh-tw.js b/modules/core/client/app/trans-string-zh-tw.js
index ebc142e9..2f75bf46 100644
--- a/modules/core/client/app/trans-string-zh-tw.js
+++ b/modules/core/client/app/trans-string-zh-tw.js
@@ -1063,7 +1063,7 @@
     MESSAGE_SEND_FAILED: '訊息傳送失敗',
     MESSAGE_DELETED_SUCCESSFULLY: '訊息刪除成功',
     MESSAGE_DELETED_ERROR: '訊息刪除失敗',
-    MESSAGE_SERVER_TOOLTIP: '<h4>伺服器事件通知</h4> 當您做了一些重要的操作或者您的帳戶狀態發生變化以及某些重要事情與您有關時，伺服器會自動傳送訊息給您，這種訊息可能會很多，所以請及時檢視及刪除，伺服器只保留最後的 {{count}} 條訊息.',
+    MESSAGE_SERVER_TOOLTIP: '<h4>伺服器事件通知</h4> 當您做了一些重要的操作或者您的帳戶狀態發生變化以及某些重要事情與您有關時，伺服器會自動傳送訊息給您，這種訊息可能會很多，所以請及時檢視及刪除，系統只保留最近 {{30}} 天的訊息。',
 
     MESSAGE_DELETE_CONFIRM_OK: '刪除',
     MESSAGE_DELETE_CONFIRM_CANCEL: '取消',
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index b45ab8f4..5caf3ecb 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -1087,7 +1087,7 @@
     MESSAGE_SEND_FAILED: '消息发送失败',
     MESSAGE_DELETED_SUCCESSFULLY: '消息删除成功',
     MESSAGE_DELETED_ERROR: '消息删除失败',
-    MESSAGE_SERVER_TOOLTIP: '<h4>服务器事件通知</h4> 当您做了一些重要的操作或者您的帐户状态发生变化以及某些重要事情与您有关时，服务器会自动发送消息给您，这种消息可能会很多，所以请及时查看及删除，服务器只保留最后的 {{count}} 条消息.',
+    MESSAGE_SERVER_TOOLTIP: '<h4>服务器事件通知</h4> 当您做了一些重要的操作或者您的帐户状态发生变化以及某些重要事情与您有关时，服务器会自动发送消息给您，这种消息可能会很多，所以请及时查看及删除，系统只保留最近 {{days}} 天的消息。',
 
     MESSAGE_DELETE_CONFIRM_OK: '删除',
     MESSAGE_DELETE_CONFIRM_CANCEL: '取消',
diff --git a/modules/messages/client/controllers/messages.client.controller.js b/modules/messages/client/controllers/messages.client.controller.js
index 3648e765..b5813f38 100644
--- a/modules/messages/client/controllers/messages.client.controller.js
+++ b/modules/messages/client/controllers/messages.client.controller.js
@@ -417,8 +417,6 @@
             return vm.unreadCountData.countSystem;
           case 'advert':
             return vm.unreadCountData.countAdvert;
-          case 'notice':
-            return vm.unreadCountData.countNotice;
         }
       }
     };
diff --git a/modules/messages/client/views/box.client.view.html b/modules/messages/client/views/box.client.view.html
index 54e5cdbe..9180de57 100644
--- a/modules/messages/client/views/box.client.view.html
+++ b/modules/messages/client/views/box.client.view.html
@@ -26,7 +26,7 @@
 
             <div class="alert alert-warning" ng-if="vm.messageType=='server'" role="alert" style="padding: 20px 50px;">
                 <span translate="MESSAGE_SERVER_TOOLTIP"
-                      translate-values="{count: vm.messageConfig.serverMessageLimitCount}"></span>
+                      translate-values="{days: vm.messageConfig.serverMessageExpiresDays_str}"></span>
             </div>
 
             <div class="pagination-div-top">
diff --git a/modules/messages/server/controllers/messages.server.controller.js b/modules/messages/server/controllers/messages.server.controller.js
index a5d74b0a..bcb0fd67 100644
--- a/modules/messages/server/controllers/messages.server.controller.js
+++ b/modules/messages/server/controllers/messages.server.controller.js
@@ -81,7 +81,6 @@ exports.list = function (req, res) {
       ];
 
       db.find(condition)
-        .limit(role === 'server' ? 100 : 0)
         .sort('-updatedat -createdat')
         .populate('from_user', 'displayName profileImageURL uploaded downloaded')
         .populate('to_user', 'displayName profileImageURL uploaded downloaded')
@@ -297,33 +296,18 @@ exports.countUnread = function (req, res) {
       }
     });
   };
-  var countAdminNoticeMessage = function (callback) {
-    AdminMessage.count({
-      type: 'notice',
-      createdat: {$gt: req.user.created},
-      _readers: {$not: {$in: [req.user._id]}}
 
-    }, function (err, count) {
-      if (err) {
-        callback(err, null);
-      } else {
-        callback(null, count);
-      }
-    });
-  };
-
-  async.parallel([countFrom, countTo, countServer, countAdminSystemMessage, countAdminAdvertMessage, countAdminNoticeMessage], function (err, results) {
+  async.parallel([countFrom, countTo, countServer, countAdminSystemMessage, countAdminAdvertMessage], function (err, results) {
     if (err) {
       return res.status(422).send(err);
     } else {
       res.json({
-        countAll: results[0] + results[1] + results[2] + results[3] + results[4] + results[5],
+        countAll: results[0] + results[1] + results[2] + results[3] + results[4],
         countFrom: results[0],
         countTo: results[1],
         countServer: results[2],
         countSystem: results[3],
-        countAdvert: results[4],
-        countNotice: results[5]
+        countAdvert: results[4]
       });
     }
   });

From eb9f5af01b900cfc22e20ba7c80d542d93853894 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 21 May 2018 21:41:54 +0800
Subject: [PATCH 88/96] feat(torrents): move torrent type tag into more tags on
 line page

---
 .../controllers/about.client.controller.js    | 44 ++++++++++++++++--
 .../client/views/maker-view.client.view.html  | 31 +++++++------
 .../about/client/views/maker.client.view.html |  4 +-
 .../controllers/torrents.client.controller.js |  7 ++-
 modules/torrents/client/less/torrents.less    | 10 ++--
 .../views/list-torrents.client.view.html      | 34 ++++++--------
 .../controllers/vip.client.controller.js      | 46 +++++++++++++++++--
 modules/vip/client/views/vip.client.view.html | 35 ++++++++------
 8 files changed, 147 insertions(+), 64 deletions(-)

diff --git a/modules/about/client/controllers/about.client.controller.js b/modules/about/client/controllers/about.client.controller.js
index 5e40a0eb..48a4f94d 100644
--- a/modules/about/client/controllers/about.client.controller.js
+++ b/modules/about/client/controllers/about.client.controller.js
@@ -42,10 +42,10 @@
     vm.accessConfig = MeanTorrentConfig.meanTorrentConfig.access;
     vm.resourcesTags = MeanTorrentConfig.meanTorrentConfig.resourcesTags;
 
-    vm.torrentType = localStorageService.get('maker_last_selected_type') || 'movie';
     vm.searchTags = [];
     vm.searchKey = '';
     vm.releaseYear = undefined;
+    vm.filterType = undefined;
     vm.filterHnR = false;
     vm.filterTop = false;
     vm.filterUnique = false;
@@ -54,6 +54,9 @@
 
     uibButtonConfig.activeClass = 'btn-success';
 
+    vm.torrentType = 'aggregate';
+    vm.filterType = localStorageService.get('maker_last_selected_type') || 'aggregate';
+
     vm.addMemberPopover = {
       title: 'ABOUT.ADD_MEMBER_TITLE',
       templateUrl: 'add-member.html',
@@ -138,7 +141,28 @@
      */
     vm.onTorrentTypeChanged = function () {
       vm.buildPager();
-      localStorageService.set('maker_last_selected_type', vm.torrentType);
+      localStorageService.set('maker_last_selected_type', vm.filterType);
+    };
+
+    /**
+     * tagsFilter
+     * @param item
+     * @returns {boolean}
+     */
+    vm.tagsFilter = function (item) {
+      var res = false;
+
+      if (vm.filterType === 'aggregate') {
+        angular.forEach(vm.torrentTypeConfig.value, function (t) {
+          if (t.enable && item.cats.includes(t.value))
+            res = true;
+        });
+      } else {
+        if (item.cats.includes(vm.filterType))
+          res = true;
+      }
+
+      return res;
     };
 
     /**
@@ -280,7 +304,7 @@
         skip: (p - 1) * vm.itemsPerPage,
         limit: vm.itemsPerPage,
         sort: vm.sort,
-        torrent_type: vm.torrentType,
+        torrent_type: (vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
         torrent_status: 'reviewed',
         maker: vm.maker._id,
         keys: vm.searchKey,
@@ -642,10 +666,24 @@
       vm.filterUnique = false;
       vm.filterSale = false;
       vm.torrentRLevel = 'level0';
+      vm.filterType = 'aggregate';
 
       vm.buildPager();
     };
 
+    /**
+     * onTorrentTypeClicked
+     * @param t
+     */
+    vm.onTorrentTypeClicked = function (t) {
+      if (vm.filterType === t) {
+        vm.filterType = vm.torrentType;
+      } else {
+        vm.filterType = t;
+      }
+      vm.buildPager();
+    };
+
     /**
      * onRLevelClicked
      * @param y
diff --git a/modules/about/client/views/maker-view.client.view.html b/modules/about/client/views/maker-view.client.view.html
index 79393973..27f0997d 100644
--- a/modules/about/client/views/maker-view.client.view.html
+++ b/modules/about/client/views/maker-view.client.view.html
@@ -115,12 +115,17 @@
             <div class="col-md-12 torrent-list" id="top_of_torrent_list" ng-show="vm.pagedItems">
                 <div class="panel panel-default">
                     <div class="panel-heading text-center">
-                        <h3 class="panel-title">-={{vm.maker.name}}=- {{'TAGS_SEARCH' | translate}} - {{'MENU_TORRENTS_SUB.' + vm.torrentType.toUpperCase() | translate}}</h3>
+                        <h3 class="panel-title">-={{vm.maker.name}}=- &emsp;&emsp; {{'TAGS_SEARCH' | translate}}</h3>
                     </div>
                     <div class="panel-body">
                         <div class="row filter-tags text-center"
-                             ng-if="vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
+                             ng-if="vm.filterType!='aggregate' || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
                             <div class="col-md-6 col-md-offset-3">
+                                <span class="filter-tag-item label-tag" ng-if="vm.filterType!='aggregate'">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
+                                    <i class="fa fa-times-circle-o"
+                                       ng-click="vm.onTorrentTypeClicked(vm.filterType);">
+                                    </i>
+                                </span>
                                 <span class="filter-tag-item label-tag" ng-if="vm.releaseYear">{{vm.releaseYear}}
                                     <i class="fa fa-times-circle-o"
                                        ng-click="vm.onReleaseClicked(vm.releaseYear);">
@@ -185,18 +190,18 @@
                                     </div>
                                 </dd>
 
-                                <dt class="h-line margin-top-10">{{'CA_RESOURCE_TYPE' | translate}}</dt>
-                                <dd class="h-line margin-top-10">
-                                    <div class="radio radio-type margin-top-5">
-                                        <label class="radio-inline" ng-class="{checked: vm.torrentType == t.value}"
-                                               ng-repeat="t in vm.torrentTypeConfig.value | filter:{enable: true, role: 'user'}">
-                                            <input type="radio" ng-model="vm.torrentType" value="{{t.value}}"
-                                                   ng-change="vm.onTorrentTypeChanged();"> {{'MENU_TORRENTS_SUB.'+t.name | translate}}
-                                        </label>
-                                    </div>
-                                </dd>
-
                                 <div class="more-tags panel-collapsed padding-top-10" style="display: none; margin-bottom: 20px;">
+                                    <dt class="h-line margin-top-10">{{'CA_RESOURCE_TYPE' | translate}}</dt>
+                                    <dd class="h-line margin-top-10">
+                                        <div class="radio radio-type margin-top-5">
+                                            <label class="radio-inline" ng-class="{checked: vm.filterType == t.value}"
+                                                   ng-repeat="t in vm.torrentTypeConfig.value | filter:{enable: true, role: 'user'}">
+                                                <input type="radio" ng-model="vm.filterType" value="{{t.value}}"
+                                                       ng-change="vm.onTorrentTypeChanged();"> {{'MENU_TORRENTS_SUB.'+t.name | translate}}
+                                            </label>
+                                        </div>
+                                    </dd>
+
                                     <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
                                     <dd class="h-line">
                                         <div class="checkbox checkbox-hnr">
diff --git a/modules/about/client/views/maker.client.view.html b/modules/about/client/views/maker.client.view.html
index f44e3b7c..2e24c922 100644
--- a/modules/about/client/views/maker.client.view.html
+++ b/modules/about/client/views/maker.client.view.html
@@ -1,6 +1,6 @@
 <section class="container" ng-controller="AboutController as vm" ng-init="vm.getMakerList();">
     <div class="row margin-top-20">
-        <div class="col-sm-12 col-md-10 col-md-offset-1">
+        <div class="col-sm-12">
             <span>
                 <h3 class="margin-bottom-30">
                     {{'ABOUT.MAKER_GROUP' | translate}}
@@ -14,7 +14,7 @@
             </div>
 
             <div class="row maker-group-list">
-                <div class="col-sm-6" ng-repeat="m in vm.makerList">
+                <div class="col-sm-6 col-md-4" ng-repeat="m in vm.makerList">
                     <div class="text-center group-item"
                          ui-sref="about.group({ makerId: m._id })"
                          ng-mouseenter="vm.spinCog($event, m.name)" ng-mouseleave="vm.stopCog($event, m.name)">
diff --git a/modules/torrents/client/controllers/torrents.client.controller.js b/modules/torrents/client/controllers/torrents.client.controller.js
index 4b7970c2..f72e9c01 100644
--- a/modules/torrents/client/controllers/torrents.client.controller.js
+++ b/modules/torrents/client/controllers/torrents.client.controller.js
@@ -39,6 +39,9 @@
 
     vm.torrentType = $state.current.data.torrentType || 'aggregate';
 
+    /**
+     * scope watch vm.torrentType
+     */
     $scope.$watch('vm.torrentType', function (newValue, oldValue) {
       if (vm.torrentType === 'aggregate') {
         vm.filterType = 'aggregate';
@@ -315,7 +318,7 @@
         keys: vm.searchKey.trim(),
         torrent_status: 'reviewed',
         torrent_rlevel: vm.torrentRLevel,
-        torrent_type: (vm.filterType && vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
+        torrent_type: (vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
         torrent_vip: false,
         torrent_release: vm.releaseYear,
         torrent_tags: vm.searchTags,
@@ -347,7 +350,7 @@
       vm.rssUrl += '?language=' + vm.lang;
       vm.rssUrl += '&limit=' + vm.rssConfig.pageItemsNumber;
       vm.rssUrl += vm.searchKey.trim() ? '&keys=' + vm.searchKey.trim() : '';
-      vm.rssUrl += '&torrent_type=' + ((vm.filterType && vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType));
+      vm.rssUrl += '&torrent_type=' + ((vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType));
       vm.rssUrl += vm.releaseYear ? '&torrent_release=' + vm.releaseYear : '';
       vm.rssUrl += vm.searchTags.length ? '&torrent_tags=' + vm.searchTags : '';
       vm.rssUrl += '&torrent_hnr=' + vm.filterHnR;
diff --git a/modules/torrents/client/less/torrents.less b/modules/torrents/client/less/torrents.less
index 91c63050..4d6c299a 100644
--- a/modules/torrents/client/less/torrents.less
+++ b/modules/torrents/client/less/torrents.less
@@ -284,14 +284,12 @@ pre.prettyprint {
     .radio-inline {
         min-width: 100px !important;
         margin-left: 0 !important;
-        &:not(:first-child){
-            margin-right: 4px;
-        }
+        margin-bottom: 3px;
+        margin-right: 4px;
         background-color: #f7f7f7;
         border: solid 1px #ddd;
         border-radius: 3px;
         padding: 0 3px 0 25px;
-        margin-bottom: 3px;
         &:hover {
             border: solid 1px @brand-primary;
             color: @brand-primary;
@@ -324,12 +322,12 @@ pre.prettyprint {
     .radio-inline {
         min-width: 100px !important;
         margin-left: 0 !important;
+        margin-right: 4px;
+        margin-bottom: 3px;
         background-color: #f7f7f7;
         border: solid 1px #ddd;
         border-radius: 3px;
         padding: 0 3px 0 25px;
-        margin-bottom: 3px;
-        margin-right: 4px;
         &:hover {
             border: solid 1px @brand-primary;
             color: @brand-primary;
diff --git a/modules/torrents/client/views/list-torrents.client.view.html b/modules/torrents/client/views/list-torrents.client.view.html
index 73fc1a25..de0714e7 100644
--- a/modules/torrents/client/views/list-torrents.client.view.html
+++ b/modules/torrents/client/views/list-torrents.client.view.html
@@ -72,9 +72,9 @@
         </div>
         <div class="panel-body">
             <div class="row filter-tags text-center"
-                 ng-if="(vm.filterType && vm.filterType!='aggregate' && vm.filterType!=vm.torrentType) || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
+                 ng-if="(vm.filterType!='aggregate' && vm.filterType!=vm.torrentType) || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
                 <div class="col-md-6 col-md-offset-3">
-                    <span class="filter-tag-item label-tag" ng-if="vm.filterType && vm.filterType!='aggregate' && vm.filterType!=vm.torrentType">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
+                    <span class="filter-tag-item label-tag" ng-if="vm.filterType!='aggregate' && vm.filterType!=vm.torrentType">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
                         <i class="fa fa-times-circle-o"
                            ng-click="vm.onTorrentTypeClicked(vm.filterType);">
                         </i>
@@ -150,24 +150,20 @@
                         </div>
                     </dd>
 
-                    <div ng-if="vm.torrentType=='aggregate'">
-                        <dt class="h-line">{{'CA_RESOURCE_TYPE' | translate}}</dt>
-                        <dd class="h-line margin-top-10">
-                            <div class="radio radio-type">
-                                <label class="radio-inline" ng-class="{checked: vm.filterType == 'aggregate'}">
-                                    <input type="radio" ng-model="vm.filterType" value="aggregate"
-                                           ng-change="vm.onTorrentTypeChanged();"> {{'TORRENT_TYPE_ALL' | translate}}
-                                </label>
-                                <label class="radio-inline" ng-class="{checked: vm.filterType == t.value}"
-                                       ng-repeat="t in vm.torrentTypeConfig.value | filter:{enable: true, role: 'user'}">
-                                    <input type="radio" ng-model="vm.filterType" value="{{t.value}}"
-                                           ng-change="vm.onTorrentTypeChanged();"> {{'MENU_TORRENTS_SUB.'+t.name | translate}}
-                                </label>
-                            </div>
-                        </dd>
-                    </div>
-
                     <div class="more-tags panel-collapsed padding-top-10" style="display: none; margin-bottom: 20px;">
+                        <div ng-if="vm.torrentType=='aggregate'">
+                            <dt class="h-line">{{'CA_RESOURCE_TYPE' | translate}}</dt>
+                            <dd class="h-line margin-top-10">
+                                <div class="radio radio-type">
+                                    <label class="radio-inline" ng-class="{checked: vm.filterType == t.value}"
+                                           ng-repeat="t in vm.torrentTypeConfig.value | filter:{enable: true, role: 'user'}">
+                                        <input type="radio" ng-model="vm.filterType" value="{{t.value}}"
+                                               ng-change="vm.onTorrentTypeChanged();"> {{'MENU_TORRENTS_SUB.'+t.name | translate}}
+                                    </label>
+                                </div>
+                            </dd>
+                        </div>
+
                         <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
                         <dd class="h-line">
                             <div class="checkbox checkbox-hnr">
diff --git a/modules/vip/client/controllers/vip.client.controller.js b/modules/vip/client/controllers/vip.client.controller.js
index 08161f9d..fc90ae67 100644
--- a/modules/vip/client/controllers/vip.client.controller.js
+++ b/modules/vip/client/controllers/vip.client.controller.js
@@ -40,11 +40,11 @@
 
     vm.torrentTypeConfig = MeanTorrentConfig.meanTorrentConfig.torrentType;
     vm.resourcesTags = MeanTorrentConfig.meanTorrentConfig.resourcesTags;
-    vm.torrentType = localStorageService.get('vip_last_selected_type') || 'movie';
 
     vm.searchTags = [];
     vm.searchKey = '';
     vm.releaseYear = undefined;
+    vm.filterType = undefined;
     vm.filterHnR = false;
     vm.filterTop = false;
     vm.filterUnique = false;
@@ -53,6 +53,9 @@
 
     uibButtonConfig.activeClass = 'btn-success';
 
+    vm.torrentType = 'aggregate';
+    vm.filterType = localStorageService.get('vip_last_selected_type') || 'aggregate';
+
     /**
      * getTemplateFileContent
      * @param file
@@ -265,7 +268,7 @@
         skip: (p - 1) * vm.itemsPerPage,
         limit: vm.itemsPerPage,
         sort: vm.sort,
-        torrent_type: vm.torrentType,
+        torrent_type: (vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
         torrent_status: 'reviewed',
         torrent_vip: true,
         keys: vm.searchKey.trim(),
@@ -293,7 +296,7 @@
       vm.rssUrl += '?language=' + localStorageService.get('storage_user_lang');
       vm.rssUrl += '&limit=' + vm.rssConfig.pageItemsNumber;
       vm.rssUrl += vm.searchKey.trim() ? '&keys=' + vm.searchKey.trim() : '';
-      vm.rssUrl += '&torrent_type=' + vm.torrentType;
+      vm.rssUrl += '&torrent_type=' + ((vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType));
       vm.rssUrl += vm.releaseYear ? '&torrent_release=' + vm.releaseYear : '';
       vm.rssUrl += vm.searchTags.length ? '&torrent_tags=' + vm.searchTags : '';
       vm.rssUrl += '&torrent_hnr=' + vm.filterHnR;
@@ -326,7 +329,28 @@
      */
     vm.onTorrentTypeChanged = function () {
       vm.buildPager();
-      localStorageService.set('vip_last_selected_type', vm.torrentType);
+      localStorageService.set('vip_last_selected_type', vm.filterType);
+    };
+
+    /**
+     * tagsFilter
+     * @param item
+     * @returns {boolean}
+     */
+    vm.tagsFilter = function (item) {
+      var res = false;
+
+      if (vm.filterType === 'aggregate') {
+        angular.forEach(vm.torrentTypeConfig.value, function (t) {
+          if (t.enable && item.cats.includes(t.value))
+            res = true;
+        });
+      } else {
+        if (item.cats.includes(vm.filterType))
+          res = true;
+      }
+
+      return res;
     };
 
     /**
@@ -393,6 +417,7 @@
       vm.filterUnique = false;
       vm.filterSale = false;
       vm.torrentRLevel = 'level0';
+      vm.filterType = 'aggregate';
 
       vm.buildPager();
     };
@@ -420,6 +445,19 @@
       vm.buildPager();
     };
 
+    /**
+     * onTorrentTypeClicked
+     * @param t
+     */
+    vm.onTorrentTypeClicked = function (t) {
+      if (vm.filterType === t) {
+        vm.filterType = vm.torrentType;
+      } else {
+        vm.filterType = t;
+      }
+      vm.buildPager();
+    };
+
     /**
      * onReleaseClicked
      * @param y
diff --git a/modules/vip/client/views/vip.client.view.html b/modules/vip/client/views/vip.client.view.html
index 1b221c8c..5fa66144 100644
--- a/modules/vip/client/views/vip.client.view.html
+++ b/modules/vip/client/views/vip.client.view.html
@@ -33,12 +33,17 @@
             <div class="col-md-12 torrent-list" id="top_of_torrent_list" ng-show="vm.pagedItems">
                 <div class="panel panel-default">
                     <div class="panel-heading text-center">
-                        <h3 class="panel-title">{{'VIP.TORRENTS_LIST' | translate}} - {{'TAGS_SEARCH' | translate}} - {{'MENU_TORRENTS_SUB.' + vm.torrentType.toUpperCase() | translate}}</h3>
+                        <h3 class="panel-title">{{'VIP.TORRENTS_LIST' | translate}} - {{'TAGS_SEARCH' | translate}}</h3>
                     </div>
                     <div class="panel-body">
                         <div class="row filter-tags text-center"
-                             ng-if="vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
+                             ng-if="vm.filterType!='aggregate' || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
                             <div class="col-md-6 col-md-offset-3">
+                                <span class="filter-tag-item label-tag" ng-if="vm.filterType!='aggregate'">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
+                                    <i class="fa fa-times-circle-o"
+                                       ng-click="vm.onTorrentTypeClicked(vm.filterType);">
+                                    </i>
+                                </span>
                                 <span class="filter-tag-item label-tag" ng-if="vm.releaseYear">{{vm.releaseYear}}
                                     <i class="fa fa-times-circle-o"
                                        ng-click="vm.onReleaseClicked(vm.releaseYear);">
@@ -110,18 +115,18 @@
                                     </div>
                                 </dd>
 
-                                <dt class="h-line margin-top-10">{{'CA_RESOURCE_TYPE' | translate}}</dt>
-                                <dd class="h-line margin-top-10">
-                                    <div class="radio radio-type margin-top-5">
-                                        <label class="radio-inline" ng-class="{checked: vm.torrentType == t.value}"
-                                               ng-repeat="t in vm.torrentTypeConfig.value | filter:{enable: true} | orderBy: 'position'">
-                                            <input type="radio" ng-model="vm.torrentType" value="{{t.value}}"
-                                                   ng-change="vm.onTorrentTypeChanged();"> {{'MENU_TORRENTS_SUB.'+t.name | translate}}
-                                        </label>
-                                    </div>
-                                </dd>
-
                                 <div class="more-tags panel-collapsed padding-top-10" style="display: none; margin-bottom: 20px;">
+                                    <dt class="h-line margin-top-10">{{'CA_RESOURCE_TYPE' | translate}}</dt>
+                                    <dd class="h-line margin-top-10">
+                                        <div class="radio radio-type margin-top-5">
+                                            <label class="radio-inline" ng-class="{checked: vm.filterType == t.value}"
+                                                   ng-repeat="t in vm.torrentTypeConfig.value | filter:{enable: true} | orderBy: 'position'">
+                                                <input type="radio" ng-model="vm.filterType" value="{{t.value}}"
+                                                       ng-change="vm.onTorrentTypeChanged();"> {{'MENU_TORRENTS_SUB.'+t.name | translate}}
+                                            </label>
+                                        </div>
+                                    </dd>
+
                                     <dt class="h-line">{{ 'CA_TORRENT_ATTR' | translate}}:</dt>
                                     <dd class="h-line">
                                         <div class="checkbox checkbox-hnr">
@@ -144,7 +149,7 @@
                                         </div>
                                     </dd>
 
-                                    <div ng-repeat="item in vm.resourcesTags.radio | filter:vm.torrentType">
+                                    <div ng-repeat="item in vm.resourcesTags.radio | filter: vm.tagsFilter">
                                         <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}:</dt>
                                         <dd class="h-line">
                                             <div class="btn-group btn-group-xs" role="group">
@@ -160,7 +165,7 @@
 
                                     <div style="margin-top: 20px;"></div>
 
-                                    <div ng-repeat="item in vm.resourcesTags.checkbox | filter:vm.torrentType">
+                                    <div ng-repeat="item in vm.resourcesTags.checkbox | filter: vm.tagsFilter">
                                         <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}:</dt>
                                         <dd class="h-line">
                                             <div class="btn-group btn-group-xs" role="group">

From 160ebc2a0b47744231b4c226425fb396e95b6d40 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 21 May 2018 22:41:58 +0800
Subject: [PATCH 89/96] feat(torrents): new tags search logic

---
 config/env/torrents.js                           |  2 +-
 .../controllers/about.client.controller.js       |  9 +++++++++
 .../client/config/torrents.client.menus.js       | 16 ++++++++--------
 .../client/controllers/vip.client.controller.js  |  9 +++++++++
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/config/env/torrents.js b/config/env/torrents.js
index 27a2e9d1..72b71236 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -728,7 +728,7 @@ module.exports = {
           role: 'user',
           faIcon: 'fa-film',
           faClass: 'text-mt',
-          divider: true,
+          divider: false,
           position: 1,
           state: 'torrents.movie',
           url: '/movie',
diff --git a/modules/about/client/controllers/about.client.controller.js b/modules/about/client/controllers/about.client.controller.js
index 48a4f94d..7528754c 100644
--- a/modules/about/client/controllers/about.client.controller.js
+++ b/modules/about/client/controllers/about.client.controller.js
@@ -63,6 +63,15 @@
       isOpen: false
     };
 
+    /**
+     * scope watch vm.filterType
+     */
+    $scope.$watch('vm.filterType', function (newValue, oldValue) {
+      if (newValue) {
+        localStorageService.set('maker_last_selected_type', newValue);
+      }
+    });
+
     /**
      * getTemplateFileContent
      * @param file
diff --git a/modules/torrents/client/config/torrents.client.menus.js b/modules/torrents/client/config/torrents.client.menus.js
index 45ffb93c..9426ae08 100644
--- a/modules/torrents/client/config/torrents.client.menus.js
+++ b/modules/torrents/client/config/torrents.client.menus.js
@@ -26,14 +26,14 @@
       position: 3
     });
 
-    menuService.addSubMenuItem('topbar', 'torrents', {
-      title: 'MENU_TORRENTS_SUB.AGGREGATE',
-      state: 'torrents.aggregate',
-      roles: ['*'],
-      faIcon: 'fa-ellipsis-h',
-      faClass: 'text-mt',
-      position: 0
-    });
+    // menuService.addSubMenuItem('topbar', 'torrents', {
+    //   title: 'MENU_TORRENTS_SUB.AGGREGATE',
+    //   state: 'torrents.aggregate',
+    //   roles: ['*'],
+    //   faIcon: 'fa-ellipsis-h',
+    //   faClass: 'text-mt',
+    //   position: 0
+    // });
 
     // Add the dropdown list item
     angular.forEach(torrentTypeConfig.value, function (cfg) {
diff --git a/modules/vip/client/controllers/vip.client.controller.js b/modules/vip/client/controllers/vip.client.controller.js
index fc90ae67..df05b5a4 100644
--- a/modules/vip/client/controllers/vip.client.controller.js
+++ b/modules/vip/client/controllers/vip.client.controller.js
@@ -56,6 +56,15 @@
     vm.torrentType = 'aggregate';
     vm.filterType = localStorageService.get('vip_last_selected_type') || 'aggregate';
 
+    /**
+     * scope watch vm.filterType
+     */
+    $scope.$watch('vm.filterType', function (newValue, oldValue) {
+      if (newValue) {
+        localStorageService.set('vip_last_selected_type', newValue);
+      }
+    });
+
     /**
      * getTemplateFileContent
      * @param file

From 621f168491114f3bd6910f5fd31112b0a7808f8a Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 21 May 2018 22:42:25 +0800
Subject: [PATCH 90/96] fix(translate): fixed trans issue on zh-TW language

---
 modules/core/client/app/trans-string-zh-tw.js | 98 ++++++++++++++++---
 1 file changed, 87 insertions(+), 11 deletions(-)

diff --git a/modules/core/client/app/trans-string-zh-tw.js b/modules/core/client/app/trans-string-zh-tw.js
index 2f75bf46..d0ef1539 100644
--- a/modules/core/client/app/trans-string-zh-tw.js
+++ b/modules/core/client/app/trans-string-zh-tw.js
@@ -132,6 +132,15 @@
       }
     },
 
+    CHECK: {
+      BTN_CHECK_IN: '我要簽到',
+      CHECK_TOOLTIP: '#### `mine.pt` 邀請您參加每日簽到，現在簽到可獲得 `{{todayScore}}` 積分，明日續簽可獲得 `{{tomorrowScore}}` 積分哦！ ',
+      CHECK_TODAY_NOT: '#### 您今日還未簽到，上次簽到：`{{checkTime | date: "yyyy-MM-dd HH:mm"}}`，現在簽到可獲得`{{todayScore}}` 積分，明日續簽到可獲得`{{tomorrowScore}}` 積分哦！ ',
+      CHECK_TODAY_DONE: '#### 您已連續簽到`{{keepDays}}` 天，今日簽到時間：`{{checkTime | date: "yyyy-MM-dd HH:mm"}}`，已經獲得`{{todayScore}}` 積分，明日續簽到可獲得`{{tomorrowScore}}` 積分，請注意不要中斷哦!',
+      CHECK_SUCCESSFULLY: '簽到成功',
+      CHECK_ERROR: '簽到失敗'
+    },
+
     //element title/alt
     TITLE_ALT: {
       SEEDS: '做種使用者數',
@@ -333,13 +342,15 @@
     TAGS_SEARCH_GLOBAL: '種子搜尋 - 全域性',
     CA_KEYWORD: '關鍵字',
     CA_TORRENT_STATUS: '種子狀態',
-    CA_TORRENT_HNR: 'Hit and Run',
+    CA_TORRENT_ATTR: '種子屬性',
+    CA_TORRENT_HNR: 'H&R 黑種',
     CA_TORRENT_SALE_STATUS: '促銷狀態',
     CA_TORRENT_SALE_NOW: '正在促銷',
     CA_TORRENT_VIP: 'VIP 資源',
     CA_TORRENT_TOP: '置頂狀態',
+    CA_TORRENT_UNIQUE: '禁轉狀態',
     CA_RESOURCE_TYPE: '資源型別',
-    DESC_MAKE_RSS_URL: '這個 RSS 地址是通過上面的過濾條件生成的，您可以使用支援 RSS 訂閱功能的BT客戶端（如uTorrent）來自動下載您想要的這些種子和資原始檔.',
+    DESC_MAKE_RSS_URL: '根據當前檢索條件生成的 RSS 地址, 點擊複製到粘貼版.',
     COPY_TO_CLIPBOARD: '複製到剪下板',
     COPY_LINK_TO_CLIPBOARD: '複製種子檔案下載連線到剪下板',
     COPY_LINK_TEXT: '複製種子檔案地址',
@@ -370,6 +381,12 @@
     TORRENT_RATING_SUCCESSFULLY: '為種子投票成功',
     TORRENT_RATING_FAILED: '為種子投票失敗',
     EDIT_THIS_OVERVIEW: '編輯詳情介紹',
+    VIEW_ORIGINAL_MEDIA_INFO: '查看原始的媒體信息',
+    VIEW_FORMATTED_MEDIA_INFO: '查看格式化的媒體信息',
+    EDIT_THIS_MEDIA_INFO: '編輯媒體信息',
+    SAVE_THIS_MEDIA_INFO: '保存媒體信息',
+    EDIT_TORRENT_NFO_SUCCESSFULLY: '種子媒體信息編輯成功',
+    EDIT_TORRENT_NFO_FAILED: '種子媒體信息編輯失敗',
     IMG_PAGE_INFO: '當前頁: {{index}} / {{total}}',
 
     ANNOUNCE_URL: 'Tracker 地址',
@@ -382,7 +399,10 @@
     UPLOAD_TIME: '上傳時間',
     SALE_EXPIRES_TIME: '過期',
     TORRENT_STATUS_TOP_TITLE: '置頂推薦',
+    TORRENT_STATUS_UNIQUE: '禁轉資源',
+    TORRENT_STATUS_UNIQUE_TITLE: '禁轉資源，禁止轉發',
     STATUS_TOP_KEY: '置頂',
+    STATUS_UNIQUE_KEY: '禁轉',
     UPLOAD_SUBTITLE: '上傳字幕檔案',
     SUBTITLE_LIST: '字幕列表',
     SUBTITLE_RULES: {
@@ -419,6 +439,8 @@
     ADMIN_BASIC_UNSET_VIP: '取消VIP',
     ADMIN_BASIC_SET_TOP: '設為置頂',
     ADMIN_BASIC_UNSET_TOP: '取消置頂',
+    ADMIN_BASIC_SET_UNIQUE: '設為禁轉',
+    ADMIN_BASIC_UNSET_UNIQUE: '取消禁轉',
     ADMIN_BASIC_TYPE_SET: '設定促銷',
     ADMIN_SALE_TYPE_SET: '種子促銷型別',
     ADMIN_BASIC_RLEVEL_SET: '推薦級別',
@@ -462,6 +484,8 @@
     TORRENT_TOGGLE_VIP_FAILED: '改變種子VIP標籤失敗',
     TORRENT_TOGGLE_TOP_SUCCESSFULLY: '改變種子置頂狀態成功',
     TORRENT_TOGGLE_TOP_FAILED: '改變種子置頂狀態失敗',
+    TORRENT_TOGGLE_UNIQUE_SUCCESSFULLY: '改變種子禁轉狀態成功',
+    TORRENT_TOGGLE_UNIQUE_FAILED: '改變種子禁轉狀態失敗',
     TORRENT_SETTAGS_SUCCESSFULLY: '種子屬性標籤設定成功',
     TORRENT_SETTAGS_ERROR: '種子屬性標籤設定失敗',
 
@@ -1063,7 +1087,7 @@
     MESSAGE_SEND_FAILED: '訊息傳送失敗',
     MESSAGE_DELETED_SUCCESSFULLY: '訊息刪除成功',
     MESSAGE_DELETED_ERROR: '訊息刪除失敗',
-    MESSAGE_SERVER_TOOLTIP: '<h4>伺服器事件通知</h4> 當您做了一些重要的操作或者您的帳戶狀態發生變化以及某些重要事情與您有關時，伺服器會自動傳送訊息給您，這種訊息可能會很多，所以請及時檢視及刪除，系統只保留最近 {{30}} 天的訊息。',
+    MESSAGE_SERVER_TOOLTIP: '<h4>伺服器事件通知</h4> 當您做了一些重要的操作或者您的帳戶狀態發生變化以及某些重要事情與您有關時，伺服器會自動傳送訊息給您，這種訊息可能會很多，所以請及時檢視及刪除，系統只保留最近 {{days}} 天的訊息。',
 
     MESSAGE_DELETE_CONFIRM_OK: '刪除',
     MESSAGE_DELETE_CONFIRM_CANCEL: '取消',
@@ -1434,15 +1458,15 @@
     RESOURCESTAGS: {
       TYPE: {
         SELF: '型別',
-        BLU_RAY: 'BLU_RAY',
-        WEB_DL: 'WEB_DL',
-        REMUX: 'REMUX',
-        ENCODE: 'ENCODE',
+        BLU_RAY: 'Blu-ray',
+        WEB_DL: 'WEB',
+        REMUX: 'Remux',
+        ENCODE: 'Encode',
         HDTV: 'HDTV'
       },
 
       RESOLUTION: {
-        SELF: '解析度',
+        SELF: '分辨率',
         S4K: '4K',
         S1080P: '1080p',
         S1080I: '1080i',
@@ -1457,14 +1481,23 @@
         X265: 'x265'
       },
 
+      VISION: {
+        SELF: '視頻色彩',
+        DOLBY: 'DolbyVision',
+        HDR10PLUS: 'HDR10+',
+        HDR10: 'HDR10',
+        HDR: 'HDR',
+        SDR: 'SDR'
+      },
+
       AUDIO: {
         SELF: '音訊編碼',
         DTS_X: 'DTS:X',
         ATMOS: 'Atmos',
         DTS_HD: 'DTS-HD',
-        TRUE_HD: 'TRUE-HD',
+        TRUE_HD: 'True-HD',
         DTS: 'DTS',
-        AC3: 'AC3',
+        AC3: 'AC-3',
         AAC: 'AAC'
       },
 
@@ -1569,6 +1602,45 @@
       }
     },
 
+    MEDIAINFO: {
+      GENERAL: {
+        SELF: '資源通用信息',
+        FILESIZE: '總體積',
+        RUNTIME: '總時長',
+        DURATION: '總時長',
+        OVERALLBITRATE: '總碼率'
+      },
+      VIDEO: {
+        SELF: '視頻信息',
+        FORMAT: '格式',
+        DURATION: '時長',
+        BITRATE: '碼率',
+        WIDTH: '分辨率.寬',
+        HEIGHT: '分辨率.高',
+        FRAMERATEMODE: '幀率模式',
+        FRAMERATE: '幀率',
+        BITDEPTH: '位深',
+        STREAMSIZE: '體積',
+        WRITINGLIBRARY: '編碼方式',
+        RESOLUTION: '分辨率',
+        CODEC: '編碼'
+      },
+      AUDIO: {
+        SELF: '音頻信息',
+        FORMAT: '格式',
+        BITRATEMODE: '碼率模式',
+        BITRATE: '碼率',
+        CHANNEL: '聲道',
+        LANGUAGE: '音軌',
+        INFO: '音軌信息',
+        CODEC: '編碼'
+      },
+      TEXT: {
+        SELF: '字幕信息',
+        LANGUAGE: '語言'
+      }
+    },
+
     //server returned string
     SERVER: {
       USER_IS_NOT_AUTHORIZED: '使用者身份驗證未通過',
@@ -1607,7 +1679,8 @@
       FILE_ALREADY_EXISTS: '該種子檔名已經存在, {{filename}}',
       UPLOAD_ACCESS_DENY: '當前系統只接受資源製作小組上傳種子',
       READ_TORRENT_FILE_FAILD: '種子檔案解析錯誤，請檢查您的種子檔案，看是否缺少某些必要資訊',
-      MOVE_TORRENT_FILE_ERROR: '種子檔案移動錯誤，請不要快速重複進行提交操作或者上傳的種子檔案已丟失'
+      MOVE_TORRENT_FILE_ERROR: '種子檔案移動錯誤，請不要快速重複進行提交操作或者上傳的種子檔案已丟失',
+      YOU_ALREADY_CHECK_IN: '您今天已經簽過到了，不能重複簽到'
     },
 
     //server message string, content string support markdown and emoji
@@ -1680,6 +1753,9 @@
       TITLE_TORRENT_TOP_CHANGED: '上傳的種子 置頂 狀態改變',
       CONTENT_TORRENT_TOP_CHANGED: '### 置頂 狀態改變! \n 您上傳的種子 [{{torrent_file_name}}](/torrents/{{torrent_id}}) 置頂 狀態已經由管理員使用者 [{{by_name}}](/userinfo/{{by_id}}) 修改, 當前狀態為: **{{top_status}}**.',
 
+      TITLE_TORRENT_UNIQUE_CHANGED: '上傳的種子 禁轉 狀態改變',
+      CONTENT_TORRENT_UNIQUE_CHANGED: '### 禁轉狀態改變! \n 您上傳的種子[{{torrent_file_name}}](/torrents/{{torrent_id}}) 禁轉狀態已經由管理員用戶[{{by_name}}]( /userinfo/{{by_id}}) 修改, 當前狀態為: **{{unique_status}}**.',
+
       TITLE_TORRENT_SALE_CHANGED: '上傳的種子促銷狀態改變',
       CONTENT_TORRENT_SALE_CHANGED: '### 促銷狀態改變! \n 您上傳的種子 [{{torrent_file_name}}](/torrents/{{torrent_id}}) 促銷狀態已經由管理員使用者 [{{by_name}}](/userinfo/{{by_id}}) 修改, 當前狀態為: **{{sale_status}}**.',
 

From e6834243c22dbd810529c0ad9502d4dcad980cec Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 21 May 2018 23:11:56 +0800
Subject: [PATCH 91/96] fix(torrents): fixed torrent tags filter issue

---
 .../about/client/controllers/about.client.controller.js   | 2 +-
 modules/about/client/views/maker-view.client.view.html    | 4 ++--
 .../client/controllers/torrents.client.controller.js      | 8 ++++++--
 .../torrents/client/views/list-torrents.client.view.html  | 4 ++--
 modules/vip/client/controllers/vip.client.controller.js   | 4 ++--
 modules/vip/client/views/vip.client.view.html             | 4 ++--
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/modules/about/client/controllers/about.client.controller.js b/modules/about/client/controllers/about.client.controller.js
index 7528754c..8ac7ca33 100644
--- a/modules/about/client/controllers/about.client.controller.js
+++ b/modules/about/client/controllers/about.client.controller.js
@@ -313,7 +313,7 @@
         skip: (p - 1) * vm.itemsPerPage,
         limit: vm.itemsPerPage,
         sort: vm.sort,
-        torrent_type: (vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
+        torrent_type: (vm.filterType && vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
         torrent_status: 'reviewed',
         maker: vm.maker._id,
         keys: vm.searchKey,
diff --git a/modules/about/client/views/maker-view.client.view.html b/modules/about/client/views/maker-view.client.view.html
index 27f0997d..a6a1e212 100644
--- a/modules/about/client/views/maker-view.client.view.html
+++ b/modules/about/client/views/maker-view.client.view.html
@@ -119,9 +119,9 @@
                     </div>
                     <div class="panel-body">
                         <div class="row filter-tags text-center"
-                             ng-if="vm.filterType!='aggregate' || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
+                             ng-if="(vm.filterType && vm.filterType!='aggregate') || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
                             <div class="col-md-6 col-md-offset-3">
-                                <span class="filter-tag-item label-tag" ng-if="vm.filterType!='aggregate'">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
+                                <span class="filter-tag-item label-tag" ng-if="vm.filterType && vm.filterType!='aggregate'">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
                                     <i class="fa fa-times-circle-o"
                                        ng-click="vm.onTorrentTypeClicked(vm.filterType);">
                                     </i>
diff --git a/modules/torrents/client/controllers/torrents.client.controller.js b/modules/torrents/client/controllers/torrents.client.controller.js
index f72e9c01..4f30c5fc 100644
--- a/modules/torrents/client/controllers/torrents.client.controller.js
+++ b/modules/torrents/client/controllers/torrents.client.controller.js
@@ -48,6 +48,7 @@
       } else {
         vm.filterType = vm.torrentType;
       }
+      console.log('vm.filterType = ' + vm.filterType);
     });
 
     /**
@@ -311,6 +312,9 @@
       //if searchKey or searchTags has value, the skip=0
       var skip = 0;
 
+      console.log(vm.filterType);
+      console.log(vm.torrentType);
+
       TorrentsService.get({
         skip: (p - 1) * vm.torrentItemsPerPage + skip,
         limit: vm.torrentItemsPerPage,
@@ -318,7 +322,7 @@
         keys: vm.searchKey.trim(),
         torrent_status: 'reviewed',
         torrent_rlevel: vm.torrentRLevel,
-        torrent_type: (vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
+        torrent_type: (vm.filterType && vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
         torrent_vip: false,
         torrent_release: vm.releaseYear,
         torrent_tags: vm.searchTags,
@@ -350,7 +354,7 @@
       vm.rssUrl += '?language=' + vm.lang;
       vm.rssUrl += '&limit=' + vm.rssConfig.pageItemsNumber;
       vm.rssUrl += vm.searchKey.trim() ? '&keys=' + vm.searchKey.trim() : '';
-      vm.rssUrl += '&torrent_type=' + ((vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType));
+      vm.rssUrl += '&torrent_type=' + ((vm.filterType && vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType));
       vm.rssUrl += vm.releaseYear ? '&torrent_release=' + vm.releaseYear : '';
       vm.rssUrl += vm.searchTags.length ? '&torrent_tags=' + vm.searchTags : '';
       vm.rssUrl += '&torrent_hnr=' + vm.filterHnR;
diff --git a/modules/torrents/client/views/list-torrents.client.view.html b/modules/torrents/client/views/list-torrents.client.view.html
index de0714e7..5416b2ea 100644
--- a/modules/torrents/client/views/list-torrents.client.view.html
+++ b/modules/torrents/client/views/list-torrents.client.view.html
@@ -72,9 +72,9 @@
         </div>
         <div class="panel-body">
             <div class="row filter-tags text-center"
-                 ng-if="(vm.filterType!='aggregate' && vm.filterType!=vm.torrentType) || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
+                 ng-if="(vm.filterType && vm.filterType!='aggregate' && vm.filterType!=vm.torrentType) || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
                 <div class="col-md-6 col-md-offset-3">
-                    <span class="filter-tag-item label-tag" ng-if="vm.filterType!='aggregate' && vm.filterType!=vm.torrentType">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
+                    <span class="filter-tag-item label-tag" ng-if="vm.filterType && vm.filterType!='aggregate' && vm.filterType!=vm.torrentType">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
                         <i class="fa fa-times-circle-o"
                            ng-click="vm.onTorrentTypeClicked(vm.filterType);">
                         </i>
diff --git a/modules/vip/client/controllers/vip.client.controller.js b/modules/vip/client/controllers/vip.client.controller.js
index df05b5a4..3d176525 100644
--- a/modules/vip/client/controllers/vip.client.controller.js
+++ b/modules/vip/client/controllers/vip.client.controller.js
@@ -277,7 +277,7 @@
         skip: (p - 1) * vm.itemsPerPage,
         limit: vm.itemsPerPage,
         sort: vm.sort,
-        torrent_type: (vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
+        torrent_type: (vm.filterType && vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
         torrent_status: 'reviewed',
         torrent_vip: true,
         keys: vm.searchKey.trim(),
@@ -305,7 +305,7 @@
       vm.rssUrl += '?language=' + localStorageService.get('storage_user_lang');
       vm.rssUrl += '&limit=' + vm.rssConfig.pageItemsNumber;
       vm.rssUrl += vm.searchKey.trim() ? '&keys=' + vm.searchKey.trim() : '';
-      vm.rssUrl += '&torrent_type=' + ((vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType));
+      vm.rssUrl += '&torrent_type=' + ((vm.filterType && vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType));
       vm.rssUrl += vm.releaseYear ? '&torrent_release=' + vm.releaseYear : '';
       vm.rssUrl += vm.searchTags.length ? '&torrent_tags=' + vm.searchTags : '';
       vm.rssUrl += '&torrent_hnr=' + vm.filterHnR;
diff --git a/modules/vip/client/views/vip.client.view.html b/modules/vip/client/views/vip.client.view.html
index 5fa66144..c0d3dc6e 100644
--- a/modules/vip/client/views/vip.client.view.html
+++ b/modules/vip/client/views/vip.client.view.html
@@ -37,9 +37,9 @@
                     </div>
                     <div class="panel-body">
                         <div class="row filter-tags text-center"
-                             ng-if="vm.filterType!='aggregate' || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
+                             ng-if="(vm.filterType && vm.filterType!='aggregate') || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
                             <div class="col-md-6 col-md-offset-3">
-                                <span class="filter-tag-item label-tag" ng-if="vm.filterType!='aggregate'">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
+                                <span class="filter-tag-item label-tag" ng-if="vm.filterType && vm.filterType!='aggregate'">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
                                     <i class="fa fa-times-circle-o"
                                        ng-click="vm.onTorrentTypeClicked(vm.filterType);">
                                     </i>

From af9cb20fc007d2fa5672a620d4adc9116675d363 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 21 May 2018 23:36:49 +0800
Subject: [PATCH 92/96] fix(torrents): fixed torrent tags filter issue in user
 status page

---
 .../torrents/client/controllers/torrents.client.controller.js | 4 ----
 .../controllers/admin/user-uploaded.client.controller.js      | 2 +-
 .../client/controllers/status/uploaded.client.controller.js   | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/torrents/client/controllers/torrents.client.controller.js b/modules/torrents/client/controllers/torrents.client.controller.js
index 4f30c5fc..6852dbc3 100644
--- a/modules/torrents/client/controllers/torrents.client.controller.js
+++ b/modules/torrents/client/controllers/torrents.client.controller.js
@@ -48,7 +48,6 @@
       } else {
         vm.filterType = vm.torrentType;
       }
-      console.log('vm.filterType = ' + vm.filterType);
     });
 
     /**
@@ -312,9 +311,6 @@
       //if searchKey or searchTags has value, the skip=0
       var skip = 0;
 
-      console.log(vm.filterType);
-      console.log(vm.torrentType);
-
       TorrentsService.get({
         skip: (p - 1) * vm.torrentItemsPerPage + skip,
         limit: vm.torrentItemsPerPage,
diff --git a/modules/users/client/controllers/admin/user-uploaded.client.controller.js b/modules/users/client/controllers/admin/user-uploaded.client.controller.js
index afcd3b0d..eb9bf214 100644
--- a/modules/users/client/controllers/admin/user-uploaded.client.controller.js
+++ b/modules/users/client/controllers/admin/user-uploaded.client.controller.js
@@ -83,7 +83,7 @@
         skip: (p - 1) * vm.itemsPerPage,
         limit: vm.itemsPerPage,
         userid: $state.params.userId,
-        torrent_type: vm.filterType ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
+        torrent_type: (vm.filterType && vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
         torrent_status: 'all',
         torrent_vip: vm.filterVIP ? vm.filterVIP : undefined,
         torrent_rlevel: vm.torrentRLevel,
diff --git a/modules/users/client/controllers/status/uploaded.client.controller.js b/modules/users/client/controllers/status/uploaded.client.controller.js
index ae348a8f..c347491e 100644
--- a/modules/users/client/controllers/status/uploaded.client.controller.js
+++ b/modules/users/client/controllers/status/uploaded.client.controller.js
@@ -83,7 +83,7 @@
         skip: (p - 1) * vm.itemsPerPage,
         limit: vm.itemsPerPage,
         userid: vm.user._id,
-        torrent_type: vm.filterType ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
+        torrent_type: (vm.filterType && vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
         torrent_status: 'all',
         torrent_vip: vm.filterVIP ? vm.filterVIP : undefined,
         torrent_rlevel: vm.torrentRLevel,

From d7a48c56416af71c5c885c0ef6e8ac06da839a18 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Tue, 22 May 2018 00:27:22 +0800
Subject: [PATCH 93/96] fix(torrents): remove console.log

---
 .../client/directives/torrent-progress.client.directive.js    | 4 ----
 .../client/controllers/torrent-info.client.controller.js      | 2 --
 2 files changed, 6 deletions(-)

diff --git a/modules/core/client/directives/torrent-progress.client.directive.js b/modules/core/client/directives/torrent-progress.client.directive.js
index ffb37ed5..b81c46e3 100644
--- a/modules/core/client/directives/torrent-progress.client.directive.js
+++ b/modules/core/client/directives/torrent-progress.client.directive.js
@@ -22,8 +22,6 @@
       scope.$watch(attrs.torrentProgress, function (p) {
         var pt = Array.isArray(p) ? (p.length > 0 ? p[0] : undefined) : p;
         if (pt) {
-          mtDebug.info(pt);
-
           var t_progressbar = ngProgressFactory.createInstance();
           t_progressbar.setParent(element[0]);
           t_progressbar.setAbsolute();
@@ -69,8 +67,6 @@
       scope.$watch(attrs.cardProgress, function (p) {
         if (p && p.length > 0) {
           var pt = p[0];
-          //mtDebug.info(pt);
-
           var t_progressbar = ngProgressFactory.createInstance();
           t_progressbar.setParent(element[0]);
           t_progressbar.setAbsolute();
diff --git a/modules/torrents/client/controllers/torrent-info.client.controller.js b/modules/torrents/client/controllers/torrent-info.client.controller.js
index 9018ca79..05dedd2d 100644
--- a/modules/torrents/client/controllers/torrent-info.client.controller.js
+++ b/modules/torrents/client/controllers/torrent-info.client.controller.js
@@ -189,7 +189,6 @@
      * toggleVIP
      */
     vm.toggleVIP = function () {
-      console.log(vm.torrentLocalInfo);
       vm.torrentLocalInfo.$toggleVIPStatus(function (res) {
         mtDebug.info(res);
         vm.torrentLocalInfo = res;
@@ -638,7 +637,6 @@
         vm.scrollToId = vm.comment_to_id;
         vm.submitInit();
         vm.torrentLocalInfo = res;
-        console.log(res);
       }
 
       function errorCallback(res) {

From 6c1f8c152052412ca7b7ef6f1c9bf454dfc81563 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Tue, 22 May 2018 00:47:40 +0800
Subject: [PATCH 94/96] fix(torrents): fixed tags issue

---
 .../client/controllers/requests-view.client.controller.js      | 1 +
 .../controllers/admin/user-leeching.client.controller.js       | 1 +
 .../client/controllers/admin/user-seeding.client.controller.js | 3 ++-
 .../client/controllers/admin/user-warning.client.controller.js | 1 +
 .../client/controllers/status/downloading.client.controller.js | 1 +
 .../client/controllers/status/seeding.client.controller.js     | 1 +
 .../client/controllers/status/warning.client.controller.js     | 1 +
 7 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/requests/client/controllers/requests-view.client.controller.js b/modules/requests/client/controllers/requests-view.client.controller.js
index 0c8ebc02..ba51ab90 100644
--- a/modules/requests/client/controllers/requests-view.client.controller.js
+++ b/modules/requests/client/controllers/requests-view.client.controller.js
@@ -22,6 +22,7 @@
     vm.TGI = TorrentGetInfoServices;
     vm.RTS = ResourcesTagsServices;
     vm.show_desc_help = localStorageService.get('requests_view_show_help') || 'yes';
+    vm.torrentType = 'aggregate';
 
     vm.searchTags = [];
     vm.comment = {};
diff --git a/modules/users/client/controllers/admin/user-leeching.client.controller.js b/modules/users/client/controllers/admin/user-leeching.client.controller.js
index ef0cabf7..a2706013 100644
--- a/modules/users/client/controllers/admin/user-leeching.client.controller.js
+++ b/modules/users/client/controllers/admin/user-leeching.client.controller.js
@@ -17,6 +17,7 @@
     vm.authUser = Authentication.user;
     vm.RTS = ResourcesTagsServices;
     vm.itemsPerPageConfig = MeanTorrentConfig.meanTorrentConfig.itemsPerPage;
+    vm.torrentType = 'aggregate';
 
     vm.searchTags = [];
 
diff --git a/modules/users/client/controllers/admin/user-seeding.client.controller.js b/modules/users/client/controllers/admin/user-seeding.client.controller.js
index 2a800c73..fc257723 100644
--- a/modules/users/client/controllers/admin/user-seeding.client.controller.js
+++ b/modules/users/client/controllers/admin/user-seeding.client.controller.js
@@ -9,7 +9,7 @@
     'MeanTorrentConfig', '$window', '$filter', 'DownloadService', 'DebugConsoleService', 'TorrentGetInfoServices', 'ResourcesTagsServices'];
 
   function UserSeedingController($scope, $state, $translate, user, $timeout, Authentication, Notification, PeersService, MeanTorrentConfig,
-                                  $window, $filter, DownloadService, mtDebug, TorrentGetInfoServices, ResourcesTagsServices) {
+                                 $window, $filter, DownloadService, mtDebug, TorrentGetInfoServices, ResourcesTagsServices) {
     var vm = this;
     vm.DLS = DownloadService;
     vm.TGI = TorrentGetInfoServices;
@@ -17,6 +17,7 @@
     vm.authUser = Authentication.user;
     vm.RTS = ResourcesTagsServices;
     vm.itemsPerPageConfig = MeanTorrentConfig.meanTorrentConfig.itemsPerPage;
+    vm.torrentType = 'aggregate';
 
     vm.searchTags = [];
 
diff --git a/modules/users/client/controllers/admin/user-warning.client.controller.js b/modules/users/client/controllers/admin/user-warning.client.controller.js
index 361439d2..e4ebe449 100644
--- a/modules/users/client/controllers/admin/user-warning.client.controller.js
+++ b/modules/users/client/controllers/admin/user-warning.client.controller.js
@@ -18,6 +18,7 @@
     vm.user = user;
     vm.authUser = Authentication.user;
     vm.RTS = ResourcesTagsServices;
+    vm.torrentType = 'aggregate';
 
     vm.searchTags = [];
 
diff --git a/modules/users/client/controllers/status/downloading.client.controller.js b/modules/users/client/controllers/status/downloading.client.controller.js
index bd48f37c..b516e29a 100644
--- a/modules/users/client/controllers/status/downloading.client.controller.js
+++ b/modules/users/client/controllers/status/downloading.client.controller.js
@@ -16,6 +16,7 @@
     vm.user = Authentication.user;
     vm.RTS = ResourcesTagsServices;
     vm.itemsPerPageConfig = MeanTorrentConfig.meanTorrentConfig.itemsPerPage;
+    vm.torrentType = 'aggregate';
 
     vm.searchTags = [];
 
diff --git a/modules/users/client/controllers/status/seeding.client.controller.js b/modules/users/client/controllers/status/seeding.client.controller.js
index 27093d45..cba63c44 100644
--- a/modules/users/client/controllers/status/seeding.client.controller.js
+++ b/modules/users/client/controllers/status/seeding.client.controller.js
@@ -16,6 +16,7 @@
     vm.user = Authentication.user;
     vm.RTS = ResourcesTagsServices;
     vm.itemsPerPageConfig = MeanTorrentConfig.meanTorrentConfig.itemsPerPage;
+    vm.torrentType = 'aggregate';
 
     vm.searchTags = [];
 
diff --git a/modules/users/client/controllers/status/warning.client.controller.js b/modules/users/client/controllers/status/warning.client.controller.js
index 1c89f61c..f5240e44 100644
--- a/modules/users/client/controllers/status/warning.client.controller.js
+++ b/modules/users/client/controllers/status/warning.client.controller.js
@@ -35,6 +35,7 @@
     vm.examinationConfig = MeanTorrentConfig.meanTorrentConfig.examination;
     vm.chatConfig = MeanTorrentConfig.meanTorrentConfig.chat;
     vm.accessConfig = MeanTorrentConfig.meanTorrentConfig.access;
+    vm.torrentType = 'aggregate';
 
     vm.lang = getStorageLangService.getLang();
 

From 4ff296a9368881fecdba39e8bf7be248f419e272 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Tue, 22 May 2018 01:22:23 +0800
Subject: [PATCH 95/96] fix(core): fixed menu nav issue

---
 .../controllers/header.client.controller.js   | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/modules/core/client/controllers/header.client.controller.js b/modules/core/client/controllers/header.client.controller.js
index 79471835..3647e687 100644
--- a/modules/core/client/controllers/header.client.controller.js
+++ b/modules/core/client/controllers/header.client.controller.js
@@ -56,12 +56,9 @@
         $('div.navbar-mt ul.nav li.dropdown').off('mouseenter mouseleave').hover(function (evt) {
           if (!$(this).hasClass('open')) {
             $(this).find('.dropdown-toggle', this).trigger('click');
-            $(this).off('click').on('click', function (e) {
-              var sta = $(this).find('.dropdown-toggle', this).attr('alt');
-              if (sta) {
-                $state.go(sta);
-              }
-            });
+            bindClick($(this));
+          } else {
+            bindClick($(this));
           }
         }, function (evt) {
           $(this).off('click');
@@ -73,8 +70,18 @@
         $('div.navbar-mt ul.nav li.dropdown ul.dropdown-menu').off('mouseenter mouseleave').hover(function (evt) {
           $(this).parent().off('click');
         }, function (evt) {
+          bindClick($(this).parent());
         });
       }, 0);
+
+      function bindClick(ele) {
+        ele.off('click').on('click', function (e) {
+          var sta = ele.find('.dropdown-toggle', ele).attr('alt');
+          if (sta) {
+            $state.go(sta);
+          }
+        });
+      }
     };
 
     /**

From 626b80766401ef265d42edc438e0f0791a5f95b5 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Tue, 22 May 2018 01:37:49 +0800
Subject: [PATCH 96/96] fix(messages): fixed message box tooltip issue

---
 modules/messages/client/views/box.client.view.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/messages/client/views/box.client.view.html b/modules/messages/client/views/box.client.view.html
index 9180de57..eee8db13 100644
--- a/modules/messages/client/views/box.client.view.html
+++ b/modules/messages/client/views/box.client.view.html
@@ -26,7 +26,7 @@
 
             <div class="alert alert-warning" ng-if="vm.messageType=='server'" role="alert" style="padding: 20px 50px;">
                 <span translate="MESSAGE_SERVER_TOOLTIP"
-                      translate-values="{days: vm.messageConfig.serverMessageExpiresDays_str}"></span>
+                      translate-values="{days: vm.messageConfig.serverMessageExpires_str}"></span>
             </div>
 
             <div class="pagination-div-top">