# failed: 'Import failed, please try again.'
# failed_on_file: 'Error while processing import. Please verify your import file.'
# summary: 'Import summary: %imported% imported, %skipped% already saved.'
+ # summary_with_queue: 'Import summary: %queued% queued.'
developer:
notice:
# client_created: 'New client created.'
failed: 'Import fehlgeschlagen, bitte erneut probieren.'
failed_on_file: 'Fehler während des Imports. Bitte überprüfe deine Import-Datei.'
summary: 'Import-Zusammenfassung: %imported% importiert, %skipped% bereits gespeichert.'
+ # summary_with_queue: 'Import summary: %queued% queued.'
developer:
notice:
client_created: 'Neuer Client erstellt.'
failed: 'Import failed, please try again.'
failed_on_file: 'Error while processing import. Please verify your import file.'
summary: 'Import summary: %imported% imported, %skipped% already saved.'
+ summary_with_queue: 'Import summary: %queued% queued.'
developer:
notice:
client_created: 'New client %name% created.'
tag_added: 'Etiqueta añadida'
import:
notice:
- failed: 'Importación reprobada, por favor inténtelo de nuevo.'
- failed_on_file: 'Se ocurre un error por procesar importación. Por favor verifique su archivo importado.'
- summary: 'Resúmen importado: %importado% importado, %saltados% ya guardado.'
+ failed: 'Importación reprobada, por favor inténtelo de nuevo.'
+ failed_on_file: 'Se ocurre un error por procesar importación. Por favor verifique su archivo importado.'
+ summary: 'Resúmen importado: %importado% importado, %saltados% ya guardado.'
+ # summary_with_queue: 'Import summary: %queued% queued.'
developer:
notice:
client_created: 'Nuevo cliente creado.'
failed: 'درونریزی شکست خورد. لطفاً دوباره تلاش کنید.'
failed_on_file: 'خطا هنگام پردازش پروندهٔ ورودی. آیا پروندهٔ درونریزی شده سالم است؟'
summary: 'گزارش درونریزی: %imported% وارد شد, %skipped% از قبل ذخیره شده بود.'
+ # summary_with_queue: 'Import summary: %queued% queued.'
developer:
notice:
# client_created: 'New client created.'
failed: "L'import a échoué, veuillez ré-essayer"
failed_on_file: "Erreur lors du traitement de l'import. Vérifier votre fichier."
summary: "Rapport d'import: %imported% importés, %skipped% déjà présent."
+ summary_with_queue: "Rapport d'import: %queued% en cours de traitement."
developer:
notice:
client_created: 'Nouveau client %name% créé'
failed: 'Importazione fallita, riprova.'
failed_on_file: 'Errore durante la processazione dei dati da importare. Verifica il tuo file di import.'
summary: 'Sommario di importazione: %imported% importati, %skipped% già salvati.'
+ # summary_with_queue: 'Import summary: %queued% queued.'
developer:
notice:
client_created: 'Nuovo client creato.'
failed: "L'importacion a fracassat, mercés de tornar ensajar"
failed_on_file: "Errorr pendent du tractament de l'import. Mercés de verificar vòstre fichièr."
summary: "Rapòrt d'import: %imported% importats, %skipped% ja presents."
+ # summary_with_queue: 'Import summary: %queued% queued.'
developer:
notice:
client_created: 'Novèl client creat'
failed: 'Nieudany import, prosimy spróbować ponownie.'
failed_on_file: 'Błąd podczas ptrzetwarzania pliku. Sprawdż swój importowany plik.'
summary: 'Podsumowanie importu: %imported% zaimportowane, %skipped% już zapisane.'
+ # summary_with_queue: 'Import summary: %queued% queued.'
developer:
notice:
client_created: 'Nowy klient utworzony.'
# failed: 'Import failed, please try again.'
# failed_on_file: 'Error while processing import. Please verify your import file.'
# summary: 'Import summary: %imported% imported, %skipped% already saved.'
+ # summary_with_queue: 'Import summary: %queued% queued.'
developer:
notice:
# client_created: 'New client created.'
# failed: 'Import failed, please try again.'
# failed_on_file: 'Error while processing import. Please verify your import file.'
# summary: 'Import summary: %imported% imported, %skipped% already saved.'
+ # summary_with_queue: 'Import summary: %queued% queued.'
developer:
notice:
# client_created: 'New client created.'
'%imported%' => $summary['imported'],
'%skipped%' => $summary['skipped'],
]);
+
+ if (0 < $summary['queued']) {
+ $message = $this->get('translator')->trans('flashes.import.notice.summary_with_queue', [
+ '%queued%' => $summary['queued'],
+ ]);
+ }
}
$this->get('session')->getFlashBag()->add(
'%skipped%' => $summary['skipped'],
]);
+ if (0 < $summary['queued']) {
+ $message = $this->get('translator')->trans('flashes.import.notice.summary_with_queue', [
+ '%queued%' => $summary['queued'],
+ ]);
+ }
+
unlink($this->getParameter('wallabag_import.resource_dir').'/'.$name);
}
'%skipped%' => $summary['skipped'],
]);
+ if (0 < $summary['queued']) {
+ $message = $this->get('translator')->trans('flashes.import.notice.summary_with_queue', [
+ '%queued%' => $summary['queued'],
+ ]);
+ }
+
unlink($this->getParameter('wallabag_import.resource_dir').'/'.$name);
}
protected $markAsRead;
protected $skippedEntries = 0;
protected $importedEntries = 0;
+ protected $queuedEntries = 0;
public function __construct(EntityManager $em, ContentProxy $contentProxy)
{
$importedEntry = $this->setEntryAsRead($importedEntry);
}
- ++$this->importedEntries;
+ ++$this->queuedEntries;
$this->producer->publish(json_encode($importedEntry));
}
}
+ /**
+ * {@inheritdoc}
+ */
+ public function getSummary()
+ {
+ return [
+ 'skipped' => $this->skippedEntries,
+ 'imported' => $this->importedEntries,
+ 'queued' => $this->queuedEntries,
+ ];
+ }
+
/**
* Parse one entry.
*
return true;
}
- /**
- * {@inheritdoc}
- */
- public function getSummary()
- {
- return [
- 'skipped' => $this->skippedEntries,
- 'imported' => $this->importedEntries,
- ];
- }
-
/**
* Set the Guzzle client.
*
return $this;
}
- /**
- * {@inheritdoc}
- */
- public function getSummary()
- {
- return [
- 'skipped' => $this->skippedEntries,
- 'imported' => $this->importedEntries,
- ];
- }
-
/**
* {@inheritdoc}
*/
return true;
}
- /**
- * {@inheritdoc}
- */
- public function getSummary()
- {
- return [
- 'skipped' => $this->skippedEntries,
- 'imported' => $this->importedEntries,
- ];
- }
-
/**
* Set file path to the json file.
*
$res = $pocketImport->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 1, 'imported' => 1], $pocketImport->getSummary());
+ $this->assertEquals(['skipped' => 1, 'imported' => 1, 'queued' => 0], $pocketImport->getSummary());
}
/**
$res = $pocketImport->setMarkAsRead(true)->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 2], $pocketImport->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 2, 'queued' => 0], $pocketImport->getSummary());
}
/**
$res = $pocketImport->setMarkAsRead(true)->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 1], $pocketImport->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 1], $pocketImport->getSummary());
}
/**
$res = $pocketImport->setMarkAsRead(true)->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 1], $pocketImport->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 1], $pocketImport->getSummary());
$this->assertNotEmpty($redisMock->lpop('pocket'));
}
$res = $pocketImport->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 1, 'imported' => 0], $pocketImport->getSummary());
+ $this->assertEquals(['skipped' => 1, 'imported' => 0, 'queued' => 0], $pocketImport->getSummary());
}
}
$res = $readabilityImport->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 24], $readabilityImport->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 24, 'queued' => 0], $readabilityImport->getSummary());
}
public function testImportAndMarkAllAsRead()
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 1, 'imported' => 1], $readabilityImport->getSummary());
+ $this->assertEquals(['skipped' => 1, 'imported' => 1, 'queued' => 0], $readabilityImport->getSummary());
}
public function testImportWithRabbit()
$res = $readabilityImport->setMarkAsRead(true)->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 24], $readabilityImport->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 24], $readabilityImport->getSummary());
}
public function testImportWithRedis()
$res = $readabilityImport->setMarkAsRead(true)->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 24], $readabilityImport->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 24], $readabilityImport->getSummary());
$this->assertNotEmpty($redisMock->lpop('readability'));
}
$res = $wallabagV1Import->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 1, 'imported' => 3], $wallabagV1Import->getSummary());
+ $this->assertEquals(['skipped' => 1, 'imported' => 3, 'queued' => 0], $wallabagV1Import->getSummary());
}
public function testImportAndMarkAllAsRead()
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 3], $wallabagV1Import->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 3, 'queued' => 0], $wallabagV1Import->getSummary());
}
public function testImportWithRabbit()
$res = $wallabagV1Import->setMarkAsRead(true)->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 4], $wallabagV1Import->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 4], $wallabagV1Import->getSummary());
}
public function testImportWithRedis()
$res = $wallabagV1Import->setMarkAsRead(true)->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 4], $wallabagV1Import->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 4], $wallabagV1Import->getSummary());
$this->assertNotEmpty($redisMock->lpop('wallabag_v1'));
}
$res = $wallabagV2Import->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 22, 'imported' => 2], $wallabagV2Import->getSummary());
+ $this->assertEquals(['skipped' => 22, 'imported' => 2, 'queued' => 0], $wallabagV2Import->getSummary());
}
public function testImportAndMarkAllAsRead()
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 2], $wallabagV2Import->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 2, 'queued' => 0], $wallabagV2Import->getSummary());
}
public function testImportWithRabbit()
$res = $wallabagV2Import->setMarkAsRead(true)->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 24], $wallabagV2Import->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 24], $wallabagV2Import->getSummary());
}
public function testImportWithRedis()
$res = $wallabagV2Import->setMarkAsRead(true)->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 24], $wallabagV2Import->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 24], $wallabagV2Import->getSummary());
$this->assertNotEmpty($redisMock->lpop('wallabag_v2'));
}
$res = $wallabagV2Import->import();
$this->assertFalse($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 0], $wallabagV2Import->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 0], $wallabagV2Import->getSummary());
}
public function testImportWithExceptionFromGraby()
$res = $wallabagV2Import->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 24, 'imported' => 0], $wallabagV2Import->getSummary());
+ $this->assertEquals(['skipped' => 24, 'imported' => 0, 'queued' => 0], $wallabagV2Import->getSummary());
}
}
projects / github / wallabag / wallabag.git / commitdiff
