From d2edc44283fe2f4015c1933730ab8efeb714ba52 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Thu, 7 Sep 2017 13:05:41 +0800
Subject: [PATCH] feat(torrent): show torrent H&R tag label in list and detail
 page

---
 modules/core/client/less/mt.less                   | 10 ++++++++++
 .../admin/admin-list.client.controller.js          | 12 +++++++++++-
 .../controllers/torrents.client.controller.js      | 14 ++++++++++++--
 .../client/views/admin/admin-list.client.view.html |  4 ++++
 .../client/views/movie-list.client.view.html       |  4 ++++
 .../client/views/view-torrent.client.view.html     |  3 +++
 .../controllers/torrents.server.controller.js      |  7 +++++++
 .../views/status/downloading.client.view.html      |  4 ++++
 .../client/views/status/seeding.client.view.html   |  4 ++++
 .../client/views/status/uploaded.client.view.html  |  4 ++++
 10 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less
index f0180b36..85fd734f 100644
--- a/modules/core/client/less/mt.less
+++ b/modules/core/client/less/mt.less
@@ -631,6 +631,16 @@ body {
     }
 }
 
+.label-hnr-info {
+    color: #eee;
+    background-color: #333;
+    &:hover {
+        cursor: pointer;
+        color: #f00;
+        background-color: #000;
+    }
+}
+
 .label-se-info {
     color: @mt-base-color;
     background-color: #f1f8ff;
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 a8c2546b..e2994762 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.searchTags = [];
     vm.searchKey = '';
     vm.releaseYear = undefined;
+    vm.filterHnR = false;
     vm.torrentStatus = 'reviewed';
     vm.torrentRLevel = 'none';
 
@@ -185,7 +186,8 @@
         torrent_rlevel: vm.torrentRLevel,
         torrent_type: vm.selectedType,
         torrent_release: vm.releaseYear,
-        torrent_tags: vm.searchTags
+        torrent_tags: vm.searchTags,
+        torrent_hnr: vm.filterHnR
       }, function (items) {
         if (items.length === 0) {
           Notification.error({
@@ -266,6 +268,14 @@
       vm.torrentBuildPager();
     };
 
+    /**
+     * onHnRClicked
+     */
+    vm.onHnRClicked = function () {
+      vm.filterHnR = !vm.filterHnR;
+      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 8bc40deb..d32d9d2a 100644
--- a/modules/torrents/client/controllers/torrents.client.controller.js
+++ b/modules/torrents/client/controllers/torrents.client.controller.js
@@ -23,6 +23,7 @@
     vm.searchTags = [];
     vm.searchKey = '';
     vm.releaseYear = undefined;
+    vm.filterHnR = false;
     vm.topItems = 6;
 
     vm.torrentType = $state.current.data.torrentType;
@@ -159,7 +160,7 @@
     vm.getResourcePageInfo = function (p, callback) {
       //if searchKey or searchTags has value, the skip=0
       var skip = vm.topItems;
-      if (vm.searchKey.trim().length > 0 || vm.searchTags.length > 0 || vm.releaseYear) {
+      if (vm.searchKey.trim().length > 0 || vm.searchTags.length > 0 || vm.releaseYear || vm.filterHnR) {
         skip = 0;
       }
 
@@ -170,7 +171,8 @@
         torrent_status: 'reviewed',
         torrent_type: vm.torrentType,
         torrent_release: vm.releaseYear,
-        torrent_tags: vm.searchTags
+        torrent_tags: vm.searchTags,
+        torrent_hnr: vm.filterHnR
       }, function (items) {
         if (items.length === 0) {
           Notification.error({
@@ -251,6 +253,14 @@
       vm.torrentBuildPager();
     };
 
+    /**
+     * onHnRClicked
+     */
+    vm.onHnRClicked = function () {
+      vm.filterHnR = !vm.filterHnR;
+      vm.torrentBuildPager();
+    };
+
     /**
      * getSaleTypeDesc
      */
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 982a14f6..d049171e 100644
--- a/modules/torrents/client/views/admin/admin-list.client.view.html
+++ b/modules/torrents/client/views/admin/admin-list.client.view.html
@@ -185,6 +185,10 @@
                                         </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-click="vm.onHnRClicked(); $event.stopPropagation();">H&R</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();">
diff --git a/modules/torrents/client/views/movie-list.client.view.html b/modules/torrents/client/views/movie-list.client.view.html
index 0a344dcb..1cfee7bb 100644
--- a/modules/torrents/client/views/movie-list.client.view.html
+++ b/modules/torrents/client/views/movie-list.client.view.html
@@ -190,6 +190,10 @@
                                         </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 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();">
diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html
index b9668c76..55c22f73 100644
--- a/modules/torrents/client/views/view-torrent.client.view.html
+++ b/modules/torrents/client/views/view-torrent.client.view.html
@@ -360,6 +360,7 @@
                 <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 class="label label-hnr-info" ng-if="vm.torrentLocalInfo.torrent_hnr">H&R</span>
                         <span ng-repeat="t in vm.torrentLocalInfo.torrent_tags">
                             <span class="label label-tag">
                                 {{ 'RESOURCESTAGS.' + vm.getTagTitle(t) + '.' + t | translate}}
@@ -589,6 +590,8 @@
                                         </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 ng-repeat="t in item.torrent_tags">
                                             <span class="label label-tag" ng-click="$event.stopPropagation();">
                                                 {{ 'RESOURCESTAGS.' + vm.getTagTitle(t) + '.' + t | translate}}
diff --git a/modules/torrents/server/controllers/torrents.server.controller.js b/modules/torrents/server/controllers/torrents.server.controller.js
index b93385d2..cdc5916a 100644
--- a/modules/torrents/server/controllers/torrents.server.controller.js
+++ b/modules/torrents/server/controllers/torrents.server.controller.js
@@ -757,6 +757,7 @@ exports.list = function (req, res) {
   var rlevel = 'none';
   var stype = 'movie';
   var newest = false;
+  var hnr = false;
   var release = undefined;
   var userid = undefined;
   var tagsA = [];
@@ -782,6 +783,9 @@ exports.list = function (req, res) {
   if (req.query.torrent_release !== undefined) {
     release = req.query.torrent_release;
   }
+  if (req.query.torrent_hnr !== undefined) {
+    hnr = req.query.torrent_hnr;
+  }
   if (req.query.newest !== undefined) {
     newest = (req.query.newest === 'true');
   }
@@ -823,6 +827,9 @@ exports.list = function (req, res) {
   if (stype !== 'all') {
     condition.torrent_type = stype;
   }
+  if (hnr === 'true') {
+    condition.torrent_hnr = hnr;
+  }
 
   if (tagsA.length > 0) {
     condition.torrent_tags = {$all: tagsA};
diff --git a/modules/users/client/views/status/downloading.client.view.html b/modules/users/client/views/status/downloading.client.view.html
index e9770c61..d8688f50 100644
--- a/modules/users/client/views/status/downloading.client.view.html
+++ b/modules/users/client/views/status/downloading.client.view.html
@@ -88,6 +88,10 @@
                                             </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 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();">
diff --git a/modules/users/client/views/status/seeding.client.view.html b/modules/users/client/views/status/seeding.client.view.html
index 88eff7dd..44fb9998 100644
--- a/modules/users/client/views/status/seeding.client.view.html
+++ b/modules/users/client/views/status/seeding.client.view.html
@@ -88,6 +88,10 @@
                                             </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 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();">
diff --git a/modules/users/client/views/status/uploaded.client.view.html b/modules/users/client/views/status/uploaded.client.view.html
index a3aff3e0..80977d07 100644
--- a/modules/users/client/views/status/uploaded.client.view.html
+++ b/modules/users/client/views/status/uploaded.client.view.html
@@ -88,6 +88,10 @@
                                             </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 ng-repeat="t in item.torrent_tags">
                                                 <span class="label label-tag" ng-class="{'used': vm.searchTags.indexOf(t) !== -1}"
                                                       ng-click="$event.stopPropagation();">