oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-07-22 17:18:37 +00:00
Code Wiki Activity

bring chrome and firefox as separate imports

Browse source
This commit is contained in:
Thomas Citharel 2016-09-21 17:47:47 +02:00 • committed by Jeremy Benoist
parent f7c55b3812
commit 59201088b4
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
29 changed files with 1266 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/Wallabag/ImportBundle/Controller/BrowserController.php
View file

@ -8,27 +8,21 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Wallabag\ImportBundle\Form\Type\UploadImportType;
class BrowserController extends Controller
abstract class BrowserController extends Controller
{
/**
* Return the service to handle the import.
*
* @return \Wallabag\ImportBundle\Import\ImportInterface
*/
protected function getImportService()
{
return $this->get('wallabag_import.browser.import');
}
abstract protected function getImportService();
/**
* Return the template used for the form.
*
* @return string
*/
protected function getImportTemplate()
{
return 'WallabagImportBundle:Browser:index.html.twig';
}
abstract protected function getImportTemplate();
/**
* @Route("/browser", name="import_browser")
@ -43,15 +37,15 @@ class BrowserController extends Controller
$form->handleRequest($request);
$wallabag = $this->getImportService();
$wallabag->setUser($this->getUser());
if ($form->isValid()) {
$file = $form->get('file')->getData();
$markAsRead = $form->get('mark_as_read')->getData();
$name = $this->getUser()->getId().'.json';
if (in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes')) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
if (null !== $file && in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes')) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
$res = $wallabag
->setUser($this->getUser())
->setFilepath($this->getParameter('wallabag_import.resource_dir').'/'.$name)
->setMarkAsRead($markAsRead)
->import();
@ -60,12 +54,17 @@ class BrowserController extends Controller
if (true === $res) {
$summary = $wallabag->getSummary();
// TODO : Pluralize these messages
$message = $this->get('translator')->trans('flashes.import.notice.summary', [
'%imported%' => $summary['imported'],
'%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);
}