diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2015-12-30 10:06:45 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-01-02 23:27:41 +0100 |
commit | 77a7752a592af9ac821621a34d9955533baf40a0 (patch) | |
tree | 304b29f1d01a93a61f75f3206aabf845ff3fbe35 /src/Wallabag/ImportBundle/Controller | |
parent | 7ec2897ee0ad190dcb9f77032d785f2f9661b754 (diff) | |
download | wallabag-77a7752a592af9ac821621a34d9955533baf40a0.tar.gz wallabag-77a7752a592af9ac821621a34d9955533baf40a0.tar.zst wallabag-77a7752a592af9ac821621a34d9955533baf40a0.zip |
Update after previous merge
PR #1443 was merged into this branch to handle all import type in the same place.
Diffstat (limited to 'src/Wallabag/ImportBundle/Controller')
-rw-r--r-- | src/Wallabag/ImportBundle/Controller/ImportController.php | 48 |
1 files changed, 46 insertions, 2 deletions
diff --git a/src/Wallabag/ImportBundle/Controller/ImportController.php b/src/Wallabag/ImportBundle/Controller/ImportController.php index 3569793b..6ebd6a0a 100644 --- a/src/Wallabag/ImportBundle/Controller/ImportController.php +++ b/src/Wallabag/ImportBundle/Controller/ImportController.php | |||
@@ -4,14 +4,58 @@ namespace Wallabag\ImportBundle\Controller; | |||
4 | 4 | ||
5 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; | 5 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
6 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; | 6 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
7 | use Symfony\Component\Console\Input\ArrayInput; | ||
8 | use Symfony\Component\Console\Output\NullOutput; | ||
9 | use Symfony\Component\HttpFoundation\Request; | ||
10 | use Wallabag\ImportBundle\Command\ImportCommand; | ||
11 | use Wallabag\ImportBundle\Form\Type\UploadImportType; | ||
7 | 12 | ||
8 | class ImportController extends Controller | 13 | class ImportController extends Controller |
9 | { | 14 | { |
10 | /** | 15 | /** |
11 | * @Route("/import", name="import") | 16 | * @Route("/import", name="import") |
12 | */ | 17 | */ |
13 | public function importAction() | 18 | public function importAction(Request $request) |
14 | { | 19 | { |
15 | return $this->render('WallabagImportBundle:Import:index.html.twig', array()); | 20 | $importForm = $this->createForm(new UploadImportType()); |
21 | $importForm->handleRequest($request); | ||
22 | $user = $this->getUser(); | ||
23 | |||
24 | if ($importForm->isValid()) { | ||
25 | $file = $importForm->get('file')->getData(); | ||
26 | $name = $user->getId().'.json'; | ||
27 | $dir = __DIR__.'/../../../../web/uploads/import'; | ||
28 | |||
29 | if (in_array($file->getMimeType(), $this->getParameter('wallabag_import.allow_mimetypes')) && $file->move($dir, $name)) { | ||
30 | $command = new ImportCommand(); | ||
31 | $command->setContainer($this->container); | ||
32 | $input = new ArrayInput(array('userId' => $user->getId())); | ||
33 | $return = $command->run($input, new NullOutput()); | ||
34 | |||
35 | if ($return == 0) { | ||
36 | $this->get('session')->getFlashBag()->add( | ||
37 | 'notice', | ||
38 | 'Import successful' | ||
39 | ); | ||
40 | } else { | ||
41 | $this->get('session')->getFlashBag()->add( | ||
42 | 'notice', | ||
43 | 'Import failed' | ||
44 | ); | ||
45 | } | ||
46 | |||
47 | return $this->redirect('/'); | ||
48 | } else { | ||
49 | $this->get('session')->getFlashBag()->add( | ||
50 | 'notice', | ||
51 | 'Error while processing import. Please verify your import file.' | ||
52 | ); | ||
53 | } | ||
54 | } | ||
55 | |||
56 | return $this->render('WallabagImportBundle:Import:index.html.twig', array( | ||
57 | 'form' => array( | ||
58 | 'import' => $importForm->createView(), ), | ||
59 | )); | ||
16 | } | 60 | } |
17 | } | 61 | } |