mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-09-27 05:50:02 +00:00
Code Issues Projects Releases Wiki Activity

reimport v1 entries if they were not fetched

Browse source
This commit is contained in:
Thomas Citharel 2016-02-11 13:27:17 +01:00
parent ae5b37ef2e
commit 0783c99a19
4 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Wallabag/ImportBundle/Import/WallabagV1Import.php
View file

@ -8,20 +8,24 @@ use Doctrine\ORM\EntityManager;
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)
@ -123,6 +127,10 @@ class WallabagV1Import implements ImportInterface
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
@ -137,12 +145,16 @@ class WallabagV1Import implements ImportInterface
// @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;

2
src/Wallabag/ImportBundle/Resources/config/services.yml
View file

@ -28,6 +28,7 @@ services:
class: Wallabag\ImportBundle\Import\WallabagV1Import
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_core.content_proxy"
calls:
- [ setLogger, [ "@logger" ]]
tags:
@ -37,6 +38,7 @@ services:
class: Wallabag\ImportBundle\Import\WallabagV2Import
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_core.content_proxy"
calls:
- [ setLogger, [ "@logger" ]]
tags:

8
src/Wallabag/ImportBundle/Tests/Import/WallabagV1ImportTest.php
View file

@ -12,6 +12,8 @@ class WallabagV1ImportTest extends \PHPUnit_Framework_TestCase
protected $user;
protected $em;
protected $logHandler;
protected $contentProxy;
private function getWallabagV1Import($unsetUser = false)
{
@ -21,7 +23,11 @@ class WallabagV1ImportTest extends \PHPUnit_Framework_TestCase
->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));

7
src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php
View file

@ -12,6 +12,7 @@ class WallabagV2ImportTest extends \PHPUnit_Framework_TestCase
protected $user;
protected $em;
protected $logHandler;
protected $contentProxy;
private function getWallabagV2Import($unsetUser = false)
{
@ -21,7 +22,11 @@ class WallabagV2ImportTest extends \PHPUnit_Framework_TestCase
->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));