Tags were not imported in wallabag v2 import

Also, simplify exportAs matching format
This commit is contained in:
Jeremy Benoist
2016-03-27 23:32:55 +02:00
parent 4d0ec0e721
commit 8f336fda64
6 changed files with 58 additions and 54 deletions

View File

@ -47,25 +47,29 @@ class WallabagV2Import extends WallabagV1Import implements ImportInterface
continue;
}
// @see ContentProxy->updateEntry
$entry = new Entry($this->user);
$entry->setUrl($importedEntry['url']);
$entry->setTitle($importedEntry['title']);
$entry->setArchived($importedEntry['is_archived'] || $this->markAsRead);
$entry->setStarred($importedEntry['is_starred']);
$entry->setContent($importedEntry['content']);
$entry->setReadingTime($importedEntry['reading_time']);
$entry->setDomainName($importedEntry['domain_name']);
if (isset($importedEntry['mimetype'])) {
$entry->setMimetype($importedEntry['mimetype']);
}
if (isset($importedEntry['language'])) {
$entry->setLanguage($importedEntry['language']);
$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;