1 files changed, 18 insertions, 89 deletions

diff --git a/src/Wallabag/ImportBundle/Command/ImportCommand.php b/src/Wallabag/ImportBundle/Command/ImportCommand.php
index 3fb8927d..dfbfc2f7 100644
--- a/src/Wallabag/ImportBundle/Command/ImportCommand.php
+++ b/src/Wallabag/ImportBundle/Command/ImportCommand.php
@@ -7,118 +7,47 @@ use Symfony\Component\Config\Definition\Exception\Exception;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Helper\ProgressBar;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Tools\Utils;
 
 class ImportCommand extends ContainerAwareCommand
 {
     protected function configure()
     {
         $this
-            ->setName('wallabag:import')
-            ->setDescription('Import entries from JSON file')
-            ->addArgument(
-                'userId',
-                InputArgument::REQUIRED,
-                'user ID to populate'
-            );
+            ->setName('wallabag:import-v1')
+            ->setDescription('Import entries from a JSON export from a wallabag v1 instance')
+            ->addArgument('userId', InputArgument::REQUIRED, 'User ID to populate')
+            ->addArgument('filepath', InputArgument::REQUIRED, 'Path to the JSON file')
+        ;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $now = new \DateTime();
-        $output->writeln('<comment>Start : '.$now->format('d-m-Y G:i:s').' ---</comment>');
-
-        // Importing CSV on DB via Doctrine ORM
-        $this->import($input, $output);
-
-        $now = new \DateTime();
-        $output->writeln('<comment>End : '.$now->format('d-m-Y G:i:s').' ---</comment>');
-    }
-
-    protected function import(InputInterface $input, OutputInterface $output)
-    {
-        // Getting php array of data from CSV
-        $data = $this->get($input, $output);
+        $output->writeln('Start : '.(new \DateTime())->format('d-m-Y G:i:s').' ---');
 
         $em = $this->getContainer()->get('doctrine')->getManager();
         // Turning off doctrine default logs queries for saving memory
         $em->getConnection()->getConfiguration()->setSQLLogger(null);
 
-        // Define the size of record, the frequency for persisting the data and the current index of records
-        $size = count($data);
-        $batchSize = 20;
-        $i = 1;
-
-        $user = $em->getRepository('WallabagUserBundle:User')
-            ->findOneById($input->getArgument('userId'));
+        $user = $em->getRepository('WallabagUserBundle:User')->findOneById($input->getArgument('userId'));
 
         if (!is_object($user)) {
-            throw new Exception('User not found');
+            throw new Exception(sprintf('User with id "%s" not found', $input->getArgument('userId')));
         }
 
-        $progress = new ProgressBar($output, $size);
-        $progress->start();
+        $wallabag = $this->getContainer()->get('wallabag_import.wallabag_v1.import');
+        $res = $wallabag
+            ->setUser($user)
+            ->setFilepath($input->getArgument('filepath'))
+            ->import();
 
-        foreach ($data as $object) {
-            $array = (array) $object;
-            $entry = $em->getRepository('WallabagCoreBundle:Entry')
-                ->findOneByUrl($array['url']);
-
-            if (!is_object($entry)) {
-                $entry = new Entry($user);
-                $entry->setUrl($array['url']);
-            }
-
-            $entry->setTitle($array['title']);
-            $entry->setArchived($array['is_read']);
-            $entry->setStarred($array['is_fav']);
-            $entry->setContent($array['content']);
-            $entry->setReadingTime(Utils::getReadingTime($array['content']));
-
-            $em->persist($entry);
-
-            if (($i % $batchSize) === 0) {
-                $em->flush();
-                $progress->advance($batchSize);
-
-                $now = new \DateTime();
-                $output->writeln(' of entries imported ... | '.$now->format('d-m-Y G:i:s'));
-            }
-            ++$i;
+        if (true === $res) {
+            $summary = $wallabag->getSummary();
+            $output->writeln('<info>'.$summary['imported'].' imported</info>');
+            $output->writeln('<comment>'.$summary['skipped'].' already saved</comment>');
         }
 
-        $em->flush();
         $em->clear();
-        $progress->finish();
-    }
-
-    protected function convert($filename)
-    {
-        if (!file_exists($filename) || !is_readable($filename)) {
-            return false;
-        }
-
-        $header = null;
-        $data = array();
-
-        if (($handle = fopen($filename, 'r')) !== false) {
-            while (($row = fgets($handle)) !== false) {
-                $data = json_decode($row);
-            }
-            fclose($handle);
-        }
-
-        return $data;
-    }
-
-    protected function get(InputInterface $input, OutputInterface $output)
-    {
-        $filename = __DIR__.'/../../../../web/uploads/import/'.$input->getArgument('userId').'.json';
-
-        $data = $this->convert($filename);
 
-        return $data;
+        $output->writeln('End : '.(new \DateTime())->format('d-m-Y G:i:s').' ---');
     }
 }