use Wallabag\CoreBundle\Repository\EntryRepository;
use Wallabag\CoreBundle\Repository\TagRepository;
use Wallabag\UserBundle\Entity\User;
+use Psr\Log\LoggerInterface;
class RuleBasedTagger
{
private $rulerz;
private $tagRepository;
private $entryRepository;
+ private $logger;
- public function __construct(RulerZ $rulerz, TagRepository $tagRepository, EntryRepository $entryRepository)
+ public function __construct(RulerZ $rulerz, TagRepository $tagRepository, EntryRepository $entryRepository, LoggerInterface $logger)
{
$this->rulerz = $rulerz;
$this->tagRepository = $tagRepository;
$this->entryRepository = $entryRepository;
+ $this->logger = $logger;
}
/**
* Add tags from rules defined by the user.
*
- * @param Entry $entry Entry to tag.
+ * @param Entry $entry Entry to tag
*/
public function tag(Entry $entry)
{
continue;
}
+ $this->logger->info('Matching rule.', [
+ 'rule' => $rule->getRule(),
+ 'tags' => $rule->getTags(),
+ ]);
+
foreach ($rule->getTags() as $label) {
- $tag = $this->getTag($entry->getUser(), $label);
+ $tag = $this->getTag($label);
$entry->addTag($tag);
}
*
* @param User $user
*
- * @return array<Entry> A list of modified entries.
+ * @return array<Entry> A list of modified entries
*/
public function tagAllForUser(User $user)
{
$rules = $this->getRulesForUser($user);
- $entries = array();
+ $entries = [];
+ $tagsCache = [];
foreach ($rules as $rule) {
$qb = $this->entryRepository->getBuilderForAllByUser($user->getId());
foreach ($entries as $entry) {
foreach ($rule->getTags() as $label) {
- $tag = $this->getTag($user, $label);
+ // avoid new tag duplicate by manually caching them
+ if (!isset($tagsCache[$label])) {
+ $tagsCache[$label] = $this->getTag($label);
+ }
+
+ $tag = $tagsCache[$label];
$entry->addTag($tag);
}
}
/**
- * Fetch a tag for a user.
+ * Fetch a tag.
*
- * @param User $user
- * @param string $label The tag's label.
+ * @param string $label The tag's label
*
* @return Tag
*/
- private function getTag(User $user, $label)
+ private function getTag($label)
{
- $tag = $this->tagRepository->findOneByLabelAndUserId($label, $user->getId());
+ $tag = $this->tagRepository->findOneByLabel($label);
if (!$tag) {
- $tag = new Tag($user);
+ $tag = new Tag();
$tag->setLabel($label);
}