aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Helper/ContentProxy.php
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2017-05-27 22:08:14 +0200
committerThomas Citharel <tcit@tcit.fr>2017-05-27 22:08:14 +0200
commit6bc6fb1f60e7b81a21f844dca025671a2f4a4564 (patch)
treefde672650c6a2ef2ccb611a6a29989a7c944ea00 /src/Wallabag/CoreBundle/Helper/ContentProxy.php
parent35941d57ee4d06ec3557d4b126d5f6fd263bcf3a (diff)
downloadwallabag-6bc6fb1f60e7b81a21f844dca025671a2f4a4564.tar.gz
wallabag-6bc6fb1f60e7b81a21f844dca025671a2f4a4564.tar.zst
wallabag-6bc6fb1f60e7b81a21f844dca025671a2f4a4564.zip
Move Tags assigner to a separate file
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Diffstat (limited to 'src/Wallabag/CoreBundle/Helper/ContentProxy.php')
-rw-r--r--src/Wallabag/CoreBundle/Helper/ContentProxy.php56
1 files changed, 3 insertions, 53 deletions
diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
index 9a08db3d..076135c7 100644
--- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php
+++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
@@ -4,10 +4,9 @@ namespace Wallabag\CoreBundle\Helper;
4 4
5use Graby\Graby; 5use Graby\Graby;
6use Psr\Log\LoggerInterface; 6use Psr\Log\LoggerInterface;
7use Symfony\Component\EventDispatcher\EventDispatcher;
7use Wallabag\CoreBundle\Entity\Entry; 8use Wallabag\CoreBundle\Entity\Entry;
8use Wallabag\CoreBundle\Entity\Tag;
9use Wallabag\CoreBundle\Tools\Utils; 9use Wallabag\CoreBundle\Tools\Utils;
10use Wallabag\CoreBundle\Repository\TagRepository;
11use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeExtensionGuesser; 10use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeExtensionGuesser;
12 11
13/** 12/**
@@ -19,16 +18,15 @@ class ContentProxy
19 protected $graby; 18 protected $graby;
20 protected $tagger; 19 protected $tagger;
21 protected $logger; 20 protected $logger;
22 protected $tagRepository;
23 protected $mimeGuesser; 21 protected $mimeGuesser;
24 protected $fetchingErrorMessage; 22 protected $fetchingErrorMessage;
23 protected $eventDispatcher;
25 24
26 public function __construct(Graby $graby, RuleBasedTagger $tagger, TagRepository $tagRepository, LoggerInterface $logger, $fetchingErrorMessage) 25 public function __construct(Graby $graby, RuleBasedTagger $tagger, LoggerInterface $logger, $fetchingErrorMessage)
27 { 26 {
28 $this->graby = $graby; 27 $this->graby = $graby;
29 $this->tagger = $tagger; 28 $this->tagger = $tagger;
30 $this->logger = $logger; 29 $this->logger = $logger;
31 $this->tagRepository = $tagRepository;
32 $this->mimeGuesser = new MimeTypeExtensionGuesser(); 30 $this->mimeGuesser = new MimeTypeExtensionGuesser();
33 $this->fetchingErrorMessage = $fetchingErrorMessage; 31 $this->fetchingErrorMessage = $fetchingErrorMessage;
34 } 32 }
@@ -122,54 +120,6 @@ class ContentProxy
122 } 120 }
123 121
124 /** 122 /**
125 * Assign some tags to an entry.
126 *
127 * @param Entry $entry
128 * @param array|string $tags An array of tag or a string coma separated of tag
129 * @param array $entitiesReady Entities from the EntityManager which are persisted but not yet flushed
130 * It is mostly to fix duplicate tag on import @see http://stackoverflow.com/a/7879164/569101
131 */
132 public function assignTagsToEntry(Entry $entry, $tags, array $entitiesReady = [])
133 {
134 if (!is_array($tags)) {
135 $tags = explode(',', $tags);
136 }
137
138 // keeps only Tag entity from the "not yet flushed entities"
139 $tagsNotYetFlushed = [];
140 foreach ($entitiesReady as $entity) {
141 if ($entity instanceof Tag) {
142 $tagsNotYetFlushed[$entity->getLabel()] = $entity;
143 }
144 }
145
146 foreach ($tags as $label) {
147 $label = trim($label);
148
149 // avoid empty tag
150 if (0 === strlen($label)) {
151 continue;
152 }
153
154 if (isset($tagsNotYetFlushed[$label])) {
155 $tagEntity = $tagsNotYetFlushed[$label];
156 } else {
157 $tagEntity = $this->tagRepository->findOneByLabel($label);
158
159 if (is_null($tagEntity)) {
160 $tagEntity = new Tag();
161 $tagEntity->setLabel($label);
162 }
163 }
164
165 // only add the tag on the entry if the relation doesn't exist
166 if (false === $entry->getTags()->contains($tagEntity)) {
167 $entry->addTag($tagEntity);
168 }
169 }
170 }
171
172 /**
173 * Validate that the given content as enough value to be used 123 * Validate that the given content as enough value to be used
174 * instead of fetch the content from the url. 124 * instead of fetch the content from the url.
175 * 125 *