1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-06 17:41:01 +00:00

Update after previous merge

PR #1443 was merged into this branch to handle all import type in the same place.
This commit is contained in:
Jeremy Benoist 2015-12-30 10:06:45 +01:00
parent 7ec2897ee0
commit 77a7752a59
11 changed files with 86 additions and 114 deletions

View file

@ -4,14 +4,58 @@ namespace Wallabag\ImportBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Component\Console\Input\ArrayInput;
use Symfony\Component\Console\Output\NullOutput;
use Symfony\Component\HttpFoundation\Request;
use Wallabag\ImportBundle\Command\ImportCommand;
use Wallabag\ImportBundle\Form\Type\UploadImportType;
class ImportController extends Controller
{
/**
* @Route("/import", name="import")
*/
public function importAction()
public function importAction(Request $request)
{
return $this->render('WallabagImportBundle:Import:index.html.twig', array());
$importForm = $this->createForm(new UploadImportType());
$importForm->handleRequest($request);
$user = $this->getUser();
if ($importForm->isValid()) {
$file = $importForm->get('file')->getData();
$name = $user->getId().'.json';
$dir = __DIR__.'/../../../../web/uploads/import';
if (in_array($file->getMimeType(), $this->getParameter('wallabag_import.allow_mimetypes')) && $file->move($dir, $name)) {
$command = new ImportCommand();
$command->setContainer($this->container);
$input = new ArrayInput(array('userId' => $user->getId()));
$return = $command->run($input, new NullOutput());
if ($return == 0) {
$this->get('session')->getFlashBag()->add(
'notice',
'Import successful'
);
} else {
$this->get('session')->getFlashBag()->add(
'notice',
'Import failed'
);
}
return $this->redirect('/');
} else {
$this->get('session')->getFlashBag()->add(
'notice',
'Error while processing import. Please verify your import file.'
);
}
}
return $this->render('WallabagImportBundle:Import:index.html.twig', array(
'form' => array(
'import' => $importForm->createView(), ),
));
}
}