use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Tools\Utils;
+use Wallabag\CoreBundle\Helper\ContentProxy;
+
class WallabagV1Import implements ImportInterface
{
protected $user;
protected $em;
protected $logger;
+ private $contentProxy;
protected $skippedEntries = 0;
protected $importedEntries = 0;
protected $filepath;
- public function __construct(EntityManager $em)
+ public function __construct(EntityManager $em, ContentProxy $contentProxy)
{
$this->em = $em;
$this->logger = new NullLogger();
+ $this->contentProxy = $contentProxy;
}
public function setLogger(LoggerInterface $logger)
protected function parseEntries($entries)
{
$i = 1;
+ /**
+ * Untitled in all languages from v1. This should never have been translated
+ */
+ $untitled = array('Untitled','Sans titre','podle nadpisu','Sin título','با عنوان','per titolo','Sem título','Без названия','po naslovu','Без назви');
foreach ($entries as $importedEntry) {
$existingEntry = $this->em
// @see ContentProxy->updateEntry
$entry = new Entry($this->user);
$entry->setUrl($importedEntry['url']);
- $entry->setTitle($importedEntry['title']);
+ if (in_array($importedEntry['title'],$untitled)) {
+ $entry = $this->contentProxy->updateEntry($entry, $entry->getUrl());
+ } else {
+ $entry->setContent($importedEntry['content']);
+ $entry->setTitle($importedEntry['title']);
+ $entry->setReadingTime(Utils::getReadingTime($importedEntry['content']));
+ $entry->setDomainName(parse_url($importedEntry['url'], PHP_URL_HOST));
+ }
$entry->setArchived($importedEntry['is_read']);
$entry->setStarred($importedEntry['is_fav']);
- $entry->setContent($importedEntry['content']);
- $entry->setReadingTime(Utils::getReadingTime($importedEntry['content']));
- $entry->setDomainName(parse_url($importedEntry['url'], PHP_URL_HOST));
$this->em->persist($entry);
++$this->importedEntries;
class: Wallabag\ImportBundle\Import\WallabagV1Import
arguments:
- "@doctrine.orm.entity_manager"
+ - "@wallabag_core.content_proxy"
calls:
- [ setLogger, [ "@logger" ]]
tags:
class: Wallabag\ImportBundle\Import\WallabagV2Import
arguments:
- "@doctrine.orm.entity_manager"
+ - "@wallabag_core.content_proxy"
calls:
- [ setLogger, [ "@logger" ]]
tags:
protected $user;
protected $em;
protected $logHandler;
+ protected $contentProxy;
+
private function getWallabagV1Import($unsetUser = false)
{
->disableOriginalConstructor()
->getMock();
- $wallabag = new WallabagV1Import($this->em);
+ $this->contentProxy = $this->getMockBuilder('Wallabag\CoreBundle\Helper\ContentProxy')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $wallabag = new WallabagV1Import($this->em,$this->contentProxy);
$this->logHandler = new TestHandler();
$logger = new Logger('test', array($this->logHandler));
protected $user;
protected $em;
protected $logHandler;
+ protected $contentProxy;
private function getWallabagV2Import($unsetUser = false)
{
->disableOriginalConstructor()
->getMock();
- $wallabag = new WallabagV2Import($this->em);
+ $this->contentProxy = $this->getMockBuilder('Wallabag\CoreBundle\Helper\ContentProxy')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $wallabag = new WallabagV2Import($this->em,$this->contentProxy);
$this->logHandler = new TestHandler();
$logger = new Logger('test', array($this->logHandler));