From 77a7752a592af9ac821621a34d9955533baf40a0 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Wed, 30 Dec 2015 10:06:45 +0100
Subject: Update after previous merge

PR #1443 was merged into this branch to handle all import type in the same place.
---
 .../CoreBundle/Controller/ImportController.php     | 64 ----------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 src/Wallabag/CoreBundle/Controller/ImportController.php

(limited to 'src/Wallabag/CoreBundle/Controller/ImportController.php')

diff --git a/src/Wallabag/CoreBundle/Controller/ImportController.php b/src/Wallabag/CoreBundle/Controller/ImportController.php
deleted file mode 100644
index 33087710..00000000
--- a/src/Wallabag/CoreBundle/Controller/ImportController.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Controller;
-
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Output\NullOutput;
-use Symfony\Component\HttpFoundation\Request;
-use Wallabag\CoreBundle\Command\ImportCommand;
-use Wallabag\CoreBundle\Form\Type\UploadImportType;
-
-class ImportController extends Controller
-{
-    /**
-     * @param Request $request
-     *
-     * @Route("/import", name="import")
-     */
-    public function importAction(Request $request)
-    {
-        $importForm = $this->createForm(new UploadImportType());
-        $importForm->handleRequest($request);
-        $user = $this->getUser();
-        $importConfig = $this->container->getParameter('wallabag_core.import');
-
-        if ($importForm->isValid()) {
-            $file = $importForm->get('file')->getData();
-            $name = $user->getId().'.json';
-            $dir = __DIR__.'/../../../../web/uploads/import';
-
-            if (in_array($file->getMimeType(), $importConfig['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('WallabagCoreBundle:Import:index.html.twig', array(
-            'form' => array(
-                'import' => $importForm->createView(), ),
-        ));
-    }
-}
-- 
cgit v1.2.3