From 47a671c493140bfc5edc9f03cd25dd090933aa6f Mon Sep 17 00:00:00 2001
From: Alexey Skobkin <skobkin-ru@ya.ru>
Date: Tue, 29 Jan 2019 20:09:58 +0300
Subject: [PATCH] MagnetExtension for Twig refactored: MagnetGenerator
 extracted to separate service.

---
 src/Magnet/MagnetGenerator.php   | 36 ++++++++++++++++++++++++++++++++
 src/Twig/MagnetExtension.php     | 33 ++++++++++-------------------
 templates/torrent_list.html.twig |  2 +-
 templates/torrent_show.html.twig |  2 +-
 4 files changed, 49 insertions(+), 24 deletions(-)
 create mode 100644 src/Magnet/MagnetGenerator.php

diff --git a/src/Magnet/MagnetGenerator.php b/src/Magnet/MagnetGenerator.php
new file mode 100644
index 0000000..3482971
--- /dev/null
+++ b/src/Magnet/MagnetGenerator.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Magnet;
+
+class MagnetGenerator
+{
+    private const MAGNET_TEMPLATE = 'magnet:?xt=urn:btih:%s';
+
+    /** @var string[] Array of public trackers which will be added to the magnet link */
+    private $publicTrackers = [];
+
+    /**
+     * @param string[] $publicTrackers
+     */
+    public function __construct(array $publicTrackers = [])
+    {
+        $this->publicTrackers = $publicTrackers;
+    }
+
+    public function generate(string $infoHash, ?string $name = null, bool $withTrackers = true): string
+    {
+        $url = sprintf(self::MAGNET_TEMPLATE, urlencode($infoHash));
+
+        if (null !== $name) {
+            $url .= '&dn='.urlencode($name);
+        }
+
+        if ($withTrackers) {
+            foreach ($this->publicTrackers as $tracker) {
+                $url .= '&tr='.urlencode($tracker);
+            }
+        }
+
+        return $url;
+    }
+}
\ No newline at end of file
diff --git a/src/Twig/MagnetExtension.php b/src/Twig/MagnetExtension.php
index f935919..2d7bff3 100644
--- a/src/Twig/MagnetExtension.php
+++ b/src/Twig/MagnetExtension.php
@@ -2,42 +2,31 @@
 
 namespace App\Twig;
 
+use App\Magnet\MagnetGenerator;
 use Twig\Extension\AbstractExtension;
-use Twig\TwigFunction;
+use Twig\{TwigFilter, TwigFunction};
 
 class MagnetExtension extends AbstractExtension
 {
-    private const MAGNET_TEMPLATE = 'magnet:?xt=urn:btih:%s&dn=%s';
+    /** @var MagnetGenerator */
+    private $magnetGenerator;
 
-    /** @var string[] Array of public trackers which will be added to the magnet link */
-    private $publicTrackers = [];
-
-    /**
-     * @param string[] $publicTrackers
-     */
-    public function __construct(array $publicTrackers = [])
+    public function __construct(MagnetGenerator $magnetGenerator)
     {
-        $this->publicTrackers = $publicTrackers;
+        $this->magnetGenerator = $magnetGenerator;
     }
 
-
     public function getFunctions(): array
     {
         return [
-            new TwigFunction('magnet', [$this, 'createMagnet']),
+            new TwigFunction('magnet', [$this->magnetGenerator, 'generate']),
         ];
     }
 
-    public function createMagnet(string $name, string $infoHash, bool $addPublicTrackers = true): string
+    public function getFilters()
     {
-        $magnetUrl = sprintf(self::MAGNET_TEMPLATE, urlencode($infoHash), urlencode($name));
-
-        if ($addPublicTrackers) {
-            foreach ($this->publicTrackers as $tracker) {
-                $magnetUrl .= '&tr='.urlencode($tracker);
-            }
-        }
-
-        return $magnetUrl;
+        return [
+            new TwigFilter('magnet', [$this->magnetGenerator, 'generate']),
+        ];
     }
 }
\ No newline at end of file
diff --git a/templates/torrent_list.html.twig b/templates/torrent_list.html.twig
index 1654d4d..6a6fe01 100644
--- a/templates/torrent_list.html.twig
+++ b/templates/torrent_list.html.twig
@@ -19,7 +19,7 @@
         {# @var torrent \App\Magnetico\Entity\Torrent #}
         {% for torrent in torrents %}
         <tr>
-            <td><a href="{{ magnet(torrent.name, torrent.infoHash) }}">&#128279;</a></td>
+            <td><a href="{{ magnet(torrent.infoHash, torrent.name) }}">&#128279;</a></td>
             <td><a href="{{ path('torrents_show', {'id': torrent.id}) }}">{{ torrent.name }}</a></td>
             <td>{{ torrent.totalSize | readable_size }}</td>
             <td>{{ torrent.discoveredOn | date('Y-m-d H:i:s')}}</td>
diff --git a/templates/torrent_show.html.twig b/templates/torrent_show.html.twig
index 3c49c47..eaa6964 100644
--- a/templates/torrent_show.html.twig
+++ b/templates/torrent_show.html.twig
@@ -10,7 +10,7 @@
         <tr>
             <td>Hash</td>
             <td>
-                <a href="{{ magnet(torrent.name, torrent.infoHash) }}">{{ torrent.infoHash }}</a>
+                <a href="{{ magnet(torrent.infoHash, torrent.name) }}">{{ torrent.infoHash }}</a>
             </td>
         </tr>
         <tr>