oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-31 18:31:02 +00:00
Code Wiki Activity

Change flash message for queued articles

Browse source
This commit is contained in:
Jeremy Benoist 2016-09-13 21:09:05 +02:00
parent e01a3c98d6
commit c80cc01afa
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
22 changed files with 65 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Wallabag/ImportBundle/Controller/PocketController.php
View file

@ -102,6 +102,12 @@ class PocketController extends Controller
'%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(

6
src/Wallabag/ImportBundle/Controller/ReadabilityController.php
View file

@ -46,6 +46,12 @@ class ReadabilityController extends Controller
'%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);
}

6
src/Wallabag/ImportBundle/Controller/WallabagController.php
View file

@ -60,6 +60,12 @@ abstract class WallabagController extends Controller
'%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);
}

15
src/Wallabag/ImportBundle/Import/AbstractImport.php
View file

@ -21,6 +21,7 @@ abstract class AbstractImport implements ImportInterface
protected $markAsRead;
protected $skippedEntries = 0;
protected $importedEntries = 0;
protected $queuedEntries = 0;
public function __construct(EntityManager $em, ContentProxy $contentProxy)
{
@ -145,12 +146,24 @@ abstract class AbstractImport implements ImportInterface
$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.
*

11
src/Wallabag/ImportBundle/Import/PocketImport.php
View file

@ -172,17 +172,6 @@ class PocketImport extends AbstractImport
return true;
}
/**
* {@inheritdoc}
*/
public function getSummary()
{
return [
'skipped' => $this->skippedEntries,
'imported' => $this->importedEntries,
];
}
/**
* Set the Guzzle client.
*

11
src/Wallabag/ImportBundle/Import/ReadabilityImport.php
View file

@ -44,17 +44,6 @@ class ReadabilityImport extends AbstractImport
return $this;
}
/**
* {@inheritdoc}
*/
public function getSummary()
{
return [
'skipped' => $this->skippedEntries,
'imported' => $this->importedEntries,
];
}
/**
* {@inheritdoc}
*/

11
src/Wallabag/ImportBundle/Import/WallabagImport.php
View file

@ -72,17 +72,6 @@ abstract class WallabagImport extends AbstractImport
return true;
}
/**
* {@inheritdoc}
*/
public function getSummary()
{
return [
'skipped' => $this->skippedEntries,
'imported' => $this->importedEntries,
];
}
/**
* Set file path to the json file.
*