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

Refacto wallabag import

Browse source 
Use an abstract class to store all common action from wallabag vX import.
Move specificity in v1 & v2 import.
This commit is contained in:
Jeremy Benoist 2016-03-28 16:43:33 +02:00
parent 0e49487bb0
commit b787a7757e
6 changed files with 353 additions and 308 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/Wallabag/ImportBundle/Controller/WallabagV2Controller.php
View file

@ -2,64 +2,32 @@
namespace Wallabag\ImportBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Component\HttpFoundation\Request;
use Wallabag\ImportBundle\Form\Type\UploadImportType;
class WallabagV2Controller extends Controller
class WallabagV2Controller extends WallabagController
{
/**
* {@inheritdoc}
*/
protected function getImportService()
{
return $this->get('wallabag_import.wallabag_v2.import');
}
/**
* {@inheritdoc}
*/
protected function getImportTemplate()
{
return 'WallabagImportBundle:WallabagV2:index.html.twig';
}
/**
* @Route("/wallabag-v2", name="import_wallabag_v2")
*/
public function indexAction(Request $request)
{
$form = $this->createForm(UploadImportType::class);
$form->handleRequest($request);
$wallabag = $this->get('wallabag_import.wallabag_v2.import');
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)) {
$res = $wallabag
->setUser($this->getUser())
->setFilepath($this->getParameter('wallabag_import.resource_dir').'/'.$name)
->setMarkAsRead($markAsRead)
->import();
$message = 'flashes.import.notice.failed';
if (true === $res) {
$summary = $wallabag->getSummary();
$message = $this->get('translator')->trans('flashes.import.notice.summary', array(
'%imported%' => $summary['imported'],
'%skipped%' => $summary['skipped'],
));
unlink($this->getParameter('wallabag_import.resource_dir').'/'.$name);
}
$this->get('session')->getFlashBag()->add(
'notice',
$message
);
return $this->redirect($this->generateUrl('homepage'));
} else {
$this->get('session')->getFlashBag()->add(
'notice',
'flashes.import.notice.failed_on_file'
);
}
}
return $this->render('WallabagImportBundle:WallabagV2:index.html.twig', [
'form' => $form->createView(),
'import' => $wallabag,
]);
return parent::indexAction($request);
}
}