pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Avoid losing entry when fetching fail

Browse Source 
Instead of just say “Failed to save entry” we’ll save the entry at all cost and try to fetch content. If fetching content failed, the entry will still be saved at least, but without content.
This commit is contained in:
Jeremy Benoist
2016-09-17 07:40:56 +02:00
parent fbb319f064
commit 59b97fae99
18 changed files with 73 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Wallabag/ImportBundle/Import/PocketImport.php
View File

@ -199,24 +199,16 @@ class PocketImport extends AbstractImport
}
$entry = new Entry($this->user);
$entry->setUrl($url);
// update entry with content (in case fetching failed, the given entry will be return)
$entry = $this->fetchContent($entry, $url);
// jump to next entry in case of problem while getting content
if (false === $entry) {
++$this->skippedEntries;
return;
}
// 0, 1, 2 - 1 if the item is archived - 2 if the item should be deleted
if ($importedEntry['status'] == 1 || $this->markAsRead) {
$entry->setArchived(true);
}
$entry->setArchived($importedEntry['status'] == 1 || $this->markAsRead);
// 0 or 1 - 1 If the item is starred
if ($importedEntry['favorite'] == 1) {
$entry->setStarred(true);
}
$entry->setStarred($importedEntry['favorite'] == 1);
$title = 'Untitled';
if (isset($importedEntry['resolved_title']) && $importedEntry['resolved_title'] != '') {
@ -226,7 +218,6 @@ class PocketImport extends AbstractImport
}
$entry->setTitle($title);
$entry->setUrl($url);
// 0, 1, or 2 - 1 if the item has images in it - 2 if the item is an image
if (isset($importedEntry['has_image']) && $importedEntry['has_image'] > 0 && isset($importedEntry['images'][1])) {