devol/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-16 18:30:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

#136 error during readability import

Browse Source
This commit is contained in:
Nicolas Lœuillet 2013-08-15 11:29:28 +02:00
parent 20ced8a806
commit c0d321c1bf
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
inc/poche/Poche.class.php
View File

@ -211,6 +211,7 @@ class Poche
} }
break; break;
default: default:
Tools::logm('action ' . $action . 'doesn\'t exist');
break; break;
} }
} }
@ -440,9 +441,11 @@ class Poche
$str_data = file_get_contents("./readability"); $str_data = file_get_contents("./readability");
$data = json_decode($str_data,true); $data = json_decode($str_data,true);
Tools::logm('starting import from Readability'); Tools::logm('starting import from Readability');
$count = 0;
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
$url = ''; $url = NULL;
$favorite = FALSE;
$archive = FALSE;
foreach ($value as $attr => $attr_value) { foreach ($value as $attr => $attr_value) {
if ($attr == 'article__url') { if ($attr == 'article__url') {
$url = new Url(base64_encode($attr_value)); $url = new Url(base64_encode($attr_value));
@ -451,20 +454,30 @@ class Poche
if (STORAGE == 'postgres') { if (STORAGE == 'postgres') {
$sequence = 'entries_id_seq'; $sequence = 'entries_id_seq';
} }
// if ($attr_value == 'favorite' && $attr_value == 'true') { if ($attr_value == 'true') {
// $last_id = $this->store->getLastId($sequence); if ($attr == 'favorite') {
// $this->store->favoriteById($last_id); $favorite = TRUE;
// $this->action('toogle_fav', $url, $last_id, TRUE); }
// } if ($attr == 'archive') {
if ($attr_value == 'archive' && $attr_value == 'true') { $archive = TRUE;
}
}
}
# we can add the url
if (!is_null($url) && $url->isCorrect()) {
$this->action('add', $url, 0, TRUE);
$count++;
if ($favorite) {
$last_id = $this->store->getLastId($sequence);
$this->action('toggle_fav', $url, $last_id, TRUE);
}
if ($archive) {
$last_id = $this->store->getLastId($sequence); $last_id = $this->store->getLastId($sequence);
$this->action('toggle_archive', $url, $last_id, TRUE); $this->action('toggle_archive', $url, $last_id, TRUE);
} }
} }
if ($url->isCorrect())
$this->action('add', $url, 0, TRUE);
} }
$this->messages->add('s', _('import from Readability completed')); $this->messages->add('s', _('import from Readability completed. ' . $count . ' new links.'));
Tools::logm('import from Readability completed'); Tools::logm('import from Readability completed');
Tools::redirect(); Tools::redirect();
} }