From b7b295b2dbe30710429201a13ae5e16e1165e619 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Wed, 30 May 2018 20:59:25 +0800
Subject: [PATCH] feat(torrents): show resource screenshots image on torrent
 detail page

---
 .../torrent-info.client.controller.js            |  2 +-
 modules/torrents/client/less/torrents.less       |  2 +-
 .../services/torrent-get-info.client.service.js  |  7 +++++++
 .../client/views/view-torrent.client.view.html   | 16 ++++++++--------
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/modules/torrents/client/controllers/torrent-info.client.controller.js b/modules/torrents/client/controllers/torrent-info.client.controller.js
index a0effe67..9c33a514 100644
--- a/modules/torrents/client/controllers/torrent-info.client.controller.js
+++ b/modules/torrents/client/controllers/torrent-info.client.controller.js
@@ -1317,7 +1317,7 @@
      * @returns {*}
      */
     vm.getOverviewMarkedContent = function (c) {
-      return marked(c, {sanitize: true});
+      return marked(c, {sanitize: false});
     };
 
     /**
diff --git a/modules/torrents/client/less/torrents.less b/modules/torrents/client/less/torrents.less
index d6cb6faa..edf184a3 100644
--- a/modules/torrents/client/less/torrents.less
+++ b/modules/torrents/client/less/torrents.less
@@ -112,7 +112,7 @@
 
 .img-container {
     display: none;
-    margin-top: 30px;
+    margin-top: 10px;
     @media (min-width: @screen-md) {
         margin-left: 60px;
     }
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 e8775fea..8e2923f8 100644
--- a/modules/torrents/client/services/torrent-get-info.client.service.js
+++ b/modules/torrents/client/services/torrent-get-info.client.service.js
@@ -307,6 +307,13 @@
 
       if (item && item.resource_detail_info) {
         result = item.resource_detail_info.overview || item.resource_detail_info.detail || null;
+
+        if (item.screenshots_image && item.screenshots_image.length > 0) {
+          angular.forEach(item.screenshots_image, function (si) {
+            var str = '<br/>![' + si + '](' + si + ')';
+            result += str;
+          });
+        }
       }
       return result;
     }
diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html
index bccf858e..44d5db77 100644
--- a/modules/torrents/client/views/view-torrent.client.view.html
+++ b/modules/torrents/client/views/view-torrent.client.view.html
@@ -178,10 +178,10 @@
                             <div id="top_of_overview" ng-if="vm.TGI.getTorrentOverview(vm.torrentLocalInfo)">
                                 <dt class="h-line">{{ 'TMDB_FIELDS.OVERVIEW' | translate}}：</dt>
                                 <dd class="h-line">
-                                    <div ng-if="vm.torrentLocalInfo.torrent_type=='movie' || vm.torrentLocalInfo.torrent_type=='tvserial'">
-                                        {{vm.TGI.getTorrentOverview(vm.torrentLocalInfo)}}
-                                    </div>
-                                    <div ng-if="vm.torrentLocalInfo.torrent_type!='movie' && vm.torrentLocalInfo.torrent_type!='tvserial'">
+                                    <!--<div ng-if="vm.torrentLocalInfo.torrent_type=='movie' || vm.torrentLocalInfo.torrent_type=='tvserial'">-->
+                                        <!--{{vm.TGI.getTorrentOverview(vm.torrentLocalInfo)}}-->
+                                    <!--</div>-->
+                                    <div>
                                         <div torrent-image-list="true"
                                              img-container="img_container_{{vm.torrentLocalInfo._id}}"
                                              img-click-event="vm.onImageClick(event)">
@@ -201,10 +201,6 @@
                             </div>
                         </dl>
 
-                        <div id="img_container_{{vm.torrentLocalInfo._id}}" class="img-container">
-                            <legend class="xsmall-legend strong-legend" translate="TMDB_FIELDS.IMAGE_OVERVIEW"></legend>
-                        </div>
-
                         <div class="cast-list" ng-if="vm.torrentLocalInfo.resource_detail_info.credits.cast.length > 0">
                             <legend class="xsmall-legend strong-legend" translate="TMDB_FIELDS.CAST"></legend>
                             <div class="row">
@@ -222,6 +218,10 @@
                                 </div>
                             </div>
                         </div>
+
+                        <div id="img_container_{{vm.torrentLocalInfo._id}}" class="img-container">
+                            <legend class="xsmall-legend strong-legend" translate="TMDB_FIELDS.IMAGE_OVERVIEW"></legend>
+                        </div>
                     </div>
                 </div>
             </div>