mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-18 13:24:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Import/Export: use transactions

Browse Source 
List of articles must be iterated twice since feeds must be in DB before
using transaction for articles. It may be improved?

See https://github.com/marienfressinaud/FreshRSS/issues/591
This commit is contained in:
Marien Fressinaud
2014-09-15 15:34:56 +02:00
parent 0214576571
commit b7b05ca3ce
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Controllers/importExportController.php
View File

@@ -237,16 +237,28 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
strpos($article_object['id'], 'com.google') !== false
);
$error = false;
$prepared_statement = $this->entryDAO->addEntryPrepare();
$article_to_feed = array();
// First, we check feeds of articles are in DB (and add them if needed).
foreach ($article_object['items'] as $item) {
$feed = $this->addFeedArticles($item['origin'], $google_compliant);
if (is_null($feed)) {
$error = true;
} else {
$article_to_feed[$item['id']] = $feed->id();
}
}
// Then, articles are imported.
$prepared_statement = $this->entryDAO->addEntryPrepare();
$this->entryDAO->beginTransaction();
foreach ($article_object['items'] as $item) {
if (!isset($article_to_feed[$item['id']])) {
continue;
}
$feed_id = $article_to_feed[$item['id']];
$author = isset($item['author']) ? $item['author'] : '';
$key_content = ($google_compliant && !isset($item['content'])) ?
'summary' : 'content';
@@ -258,16 +270,13 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
}
$entry = new FreshRSS_Entry(
$feed->id(), $item['id'], $item['title'], $author,
$feed_id, $item['id'], $item['title'], $author,
$item[$key_content]['content'], $item['alternate'][0]['href'],
$item['published'], $is_read, $starred
);
$entry->_id(min(time(), $entry->date(true)) . uSecString());
$entry->_tags($tags);
// FIXME
// Do not call entryDAO->listLastGuidsByFeed() for each entry.
// Consider using a transaction.
$values = $entry->toArray();
$id = $this->entryDAO->addEntry($values, $prepared_statement);
@@ -275,6 +284,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
$error = true;
}
}
$this->entryDAO->commit();
return $error;
}