Refacto wallabag import

Use an abstract class to store all common action from wallabag vX import.
Move specificity in v1 & v2 import.
This commit is contained in:
Jeremy Benoist
2016-03-28 16:43:33 +02:00
parent 0e49487bb0
commit b787a7757e
6 changed files with 353 additions and 308 deletions

View File

@ -2,9 +2,7 @@
namespace Wallabag\ImportBundle\Import;
use Wallabag\CoreBundle\Entity\Entry;
class WallabagV2Import extends WallabagV1Import implements ImportInterface
class WallabagV2Import extends WallabagImport
{
/**
* {@inheritdoc}
@ -31,55 +29,14 @@ class WallabagV2Import extends WallabagV1Import implements ImportInterface
}
/**
* @param $entries
* {@inheritdoc}
*/
protected function parseEntries($entries)
protected function prepareEntry($entry = [], $markAsRead = false)
{
$i = 1;
foreach ($entries as $importedEntry) {
$existingEntry = $this->em
->getRepository('WallabagCoreBundle:Entry')
->findByUrlAndUserId($importedEntry['url'], $this->user->getId());
if (false !== $existingEntry) {
++$this->skippedEntries;
continue;
}
$importedEntry['html'] = $importedEntry['content'];
$importedEntry['content_type'] = $importedEntry['mimetype'];
$entry = $this->contentProxy->updateEntry(
new Entry($this->user),
$importedEntry['url'],
$importedEntry
);
if (array_key_exists('tags', $importedEntry) && !empty($importedEntry['tags'])) {
$this->contentProxy->assignTagsToEntry(
$entry,
$importedEntry['tags']
);
}
if (isset($importedEntry['preview_picture'])) {
$entry->setPreviewPicture($importedEntry['preview_picture']);
}
$entry->setArchived($importedEntry['is_archived'] || $this->markAsRead);
$entry->setStarred($importedEntry['is_starred']);
$this->em->persist($entry);
++$this->importedEntries;
// flush every 20 entries
if (($i % 20) === 0) {
$this->em->flush();
}
++$i;
}
$this->em->flush();
return [
'html' => $entry['content'],
'content_type' => $entry['mimetype'],
'is_archived' => ($entry['is_archived'] || $markAsRead),
] + $entry;
}
}