feat(torrent/tags): Add tags show in page torrent_detail,torrents_list

Rhilip · Jul 19, 2019 · f621685 · f621685
1 parent e198704
commit f621685
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 5 deletions.
diff --git a/apps/controllers/TorrentsController.php b/apps/controllers/TorrentsController.php
@@ -27,11 +27,15 @@ public function actionIndex()
         return $this->render('torrents/list', [
             'torrents' => $torrents
         ]);
-
     }
 
     public function actionSearch()
     {
+        // TODO
+    }
 
+    public function actionTags()
+    {
+        // TODO
     }
 }
diff --git a/apps/models/Torrent.php b/apps/models/Torrent.php
@@ -35,6 +35,9 @@ class Torrent
     private $descr;
     private $uplver;
 
+    /** @var array */
+    private $tags;
+
     private $torrent_name;
     private $torrent_type;
     private $torrent_size;
@@ -258,4 +261,23 @@ public function getCategory()
     {
         return (new Category())->setId($this->category);
     }
+
+    /**
+     * @return array
+     */
+    public function getTags(): array
+    {
+        if (is_null($this->tags)) {
+            $this->tags = app()->pdo->createCommand('
+                SELECT tag, class_name, pinned FROM tags 
+                  INNER JOIN map_torrents_tags mtt on tags.id = mtt.tag_id 
+                  INNER JOIN torrents t on mtt.torrent_id = t.id 
+                WHERE t.id = :tid ORDER BY tags.pinned DESC')->bindParams([
+                'tid' => $this->id
+            ])->queryAll();
+            app()->redis->hSet('Torrent:' . $this->id . ':base_content', 'tags', $this->tags);
+        }
+
+        return $this->tags;
+    }
 }
diff --git a/apps/public/static/js/main.js b/apps/public/static/js/main.js
@@ -294,7 +294,7 @@ jQuery(document).ready(function () {
             let exist_tag_set = new Set(exist_tag_value.split(' '));
             if (exist_tag_set.has(add_tag)) {
                 exist_tag_set.delete(add_tag);
-            } else {
+            } else if (exist_tag_set.size < 10 /* Max tags size */) {
                 exist_tag_set.add(add_tag);
             }
             tags_input.val(Array.from(exist_tag_set).join(' '));

diff --git a/apps/views/torrent/details.php b/apps/views/torrent/details.php
@@ -86,7 +86,19 @@
                         <b>Peers:</b> <span style="color: green;"><i class="fas fa-arrow-up fa-fw"></i> <?= $torrent->getComplete() ?></span> / <span style="color: red;"><i class="fas fa-arrow-down fa-fw"></i> <?= $torrent->getIncomplete() ?></span> / <span><i class="fas fa-check fa-fw"></i> <?= $torrent->getDownloaded() ?></span>
                     </div>
                     <div data-field="info_hash" data-infohash="<?= $torrent->getInfoHash() ?>"><b>Info Hash:</b> <kbd><?= $torrent->getInfoHash() ?></kbd></div>
-
+                </div>
+            </div>
+            <div class="panel" id="torrent_tags_panel">
+                <div class="panel-heading"><b>Torrent Tags</b></div>
+                <div class="panel-body" id="torrent_tags">
+                    <?php $tags = $torrent->getTags(); ?>
+                    <?php if (count($tags) > 0) : ?>
+                        <?php foreach ($tags as $tag): ?>
+                            <a href="/torrents/tags?tag=<?= $tag['tag'] ?>" class="label label-outline <?= $tag['class_name'] ?>"><?= $tag['tag'] ?></a>
+                        <?php endforeach; ?>
+                    <?php else: ?>
+                        No tags for this torrent
+                    <?php endif; ?>
                 </div>
             </div>
         </div>

diff --git a/apps/views/torrents/list.php b/apps/views/torrents/list.php
@@ -45,8 +45,18 @@
                         <!--suppress HtmlUnknownTarget -->
                         <a href="/torrent/details?id=<?= $torrent->getId() ?>" target="_blank"><b><?= $torrent->getTitle() ?></b></a>
                     </div>
-                    <div data-item="t-sub-info" data-subtitle="<?= $this->e($torrent->getSubtitle()) ?>">
-                        <?= $torrent->getSubtitle() ?>
+                    <div data-item="t-sub-info">
+                        <?php $tags = $torrent->getTags(); ?>
+                        <?php if (count($tags) > 0) : ?>
+                            <span data-item="t-tags">
+                                <?php foreach ($torrent->getTags() as $tag): ?>
+                                    <?php if ($tag['pinned']): // Only show pinned tag in torrent list ?>
+                                        <a href="/torrents/tags?tag=<?= $tag['tag'] ?>" class="label label-outline <?= $tag['class_name'] ?>"><?= $tag['tag'] ?></a>
+                                    <?php endif; ?>
+                                <?php endforeach; ?>
+                            </span>&nbsp;
+                        <?php endif; ?>
+                        <span data-item="subtitle" data-subtitle="<?= $this->e($torrent->getSubtitle()) ?>"><?= $torrent->getSubtitle() ?></span>
                     </div>
                 </div>
                 <div class="pull-right">