X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FCommand%2FInstallCommand.php;h=e134ced52b2cc5116bb97c7f6dc01bc5895d002a;hb=5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3;hp=8b702c958b1cea05a44a318f7525aa7e0dd3ee38;hpb=8a493541fa4911233fe9186e88371d17cb9fd7db;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 8b702c95..e134ced5 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -3,16 +3,16 @@
 namespace Wallabag\CoreBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Output\NullOutput;
-use Symfony\Component\Console\Question\Question;
+use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
-use Symfony\Component\Console\Helper\Table;
-use Wallabag\UserBundle\Entity\User;
+use Symfony\Component\Console\Question\Question;
 use Wallabag\CoreBundle\Entity\Config;
+use Craue\ConfigBundle\Entity\Setting;
 
 class InstallCommand extends ContainerAwareCommand
 {
@@ -26,6 +26,14 @@ class InstallCommand extends ContainerAwareCommand
      */
     protected $defaultOutput;
 
+    /**
+     * @var array
+     */
+    protected $functionExists = [
+        'curl_exec',
+        'curl_multi_init',
+    ];
+
     protected function configure()
     {
         $this
@@ -52,11 +60,11 @@ class InstallCommand extends ContainerAwareCommand
             ->checkRequirements()
             ->setupDatabase()
             ->setupAdmin()
-            ->setupAsset()
+            ->setupConfig()
         ;
 
         $output->writeln('<info>Wallabag has been successfully installed.</info>');
-        $output->writeln('<comment>Just execute `php app/console server:run` for using wallabag: http://localhost:8000</comment>');
+        $output->writeln('<comment>Just execute `php bin/console server:run --env=prod` for using wallabag: http://localhost:8000</comment>');
     }
 
     protected function checkRequirements()
@@ -65,32 +73,36 @@ class InstallCommand extends ContainerAwareCommand
 
         $fulfilled = true;
 
-        // @TODO: find a better way to check requirements
-        $label = '<comment>PCRE</comment>';
-        if (extension_loaded('pcre')) {
-            $status = '<info>OK!</info>';
-            $help = '';
-        } else {
+        $label = '<comment>PDO Driver</comment>';
+        $status = '<info>OK!</info>';
+        $help = '';
+
+        if (!extension_loaded($this->getContainer()->getParameter('database_driver'))) {
             $fulfilled = false;
             $status = '<error>ERROR!</error>';
-            $help = 'You should enabled PCRE extension';
+            $help = 'Database driver "'.$this->getContainer()->getParameter('database_driver').'" is not installed.';
         }
-        $rows[] = array($label, $status, $help);
 
-        $label = '<comment>DOM</comment>';
-        if (extension_loaded('DOM')) {
+        $rows = [];
+        $rows[] = [$label, $status, $help];
+
+        foreach ($this->functionExists as $functionRequired) {
+            $label = '<comment>'.$functionRequired.'</comment>';
             $status = '<info>OK!</info>';
             $help = '';
-        } else {
-            $fulfilled = false;
-            $status = '<error>ERROR!</error>';
-            $help = 'You should enabled DOM extension';
+
+            if (!function_exists($functionRequired)) {
+                $fulfilled = false;
+                $status = '<error>ERROR!</error>';
+                $help = 'You need the '.$functionRequired.' function activated';
+            }
+
+            $rows[] = [$label, $status, $help];
         }
-        $rows[] = array($label, $status, $help);
 
         $table = new Table($this->defaultOutput);
         $table
-            ->setHeaders(array('Checked', 'Status', 'Recommendation'))
+            ->setHeaders(['Checked', 'Status', 'Recommendation'])
             ->setRows($rows)
             ->render();
 
@@ -111,14 +123,17 @@ class InstallCommand extends ContainerAwareCommand
 
         // user want to reset everything? Don't care about what is already here
         if (true === $this->defaultInput->getOption('reset')) {
-            $this->defaultOutput->writeln('Droping database, creating database and schema');
+            $this->defaultOutput->writeln('Droping database, creating database and schema, clearing the cache');
 
             $this
-                ->runCommand('doctrine:database:drop', array('--force' => true))
+                ->runCommand('doctrine:database:drop', ['--force' => true])
                 ->runCommand('doctrine:database:create')
                 ->runCommand('doctrine:schema:create')
+                ->runCommand('cache:clear')
             ;
 
+            $this->defaultOutput->writeln('');
+
             return $this;
         }
 
@@ -131,6 +146,8 @@ class InstallCommand extends ContainerAwareCommand
                 ->runCommand('cache:clear')
             ;
 
+            $this->defaultOutput->writeln('');
+
             return $this;
         }
 
@@ -141,7 +158,7 @@ class InstallCommand extends ContainerAwareCommand
             $this->defaultOutput->writeln('Droping database, creating database and schema');
 
             $this
-                ->runCommand('doctrine:database:drop', array('--force' => true))
+                ->runCommand('doctrine:database:drop', ['--force' => true])
                 ->runCommand('doctrine:database:create')
                 ->runCommand('doctrine:schema:create')
             ;
@@ -151,7 +168,7 @@ class InstallCommand extends ContainerAwareCommand
                 $this->defaultOutput->writeln('Droping schema and creating schema');
 
                 $this
-                    ->runCommand('doctrine:schema:drop', array('--force' => true))
+                    ->runCommand('doctrine:schema:drop', ['--force' => true])
                     ->runCommand('doctrine:schema:create')
                 ;
             }
@@ -176,7 +193,7 @@ class InstallCommand extends ContainerAwareCommand
         $this->defaultOutput->writeln('<info><comment>Step 3 of 4.</comment> Administration setup.</info>');
 
         $questionHelper = $this->getHelperSet()->get('question');
-        $question = new ConfirmationQuestion('Would you like to create a new user ? (y/N)', false);
+        $question = new ConfirmationQuestion('Would you like to create a new admin user (recommended) ? (Y/n)', true);
 
         if (!$questionHelper->ask($this->defaultInput, $this->defaultOutput, $question)) {
             return $this;
@@ -197,32 +214,159 @@ class InstallCommand extends ContainerAwareCommand
         $user->setEmail($questionHelper->ask($this->defaultInput, $this->defaultOutput, $question));
 
         $user->setEnabled(true);
+        $user->addRole('ROLE_SUPER_ADMIN');
 
         $em->persist($user);
 
         $config = new Config($user);
-        $config->setTheme($this->getContainer()->getParameter('theme'));
-        $config->setItemsPerPage($this->getContainer()->getParameter('items_on_page'));
-        $config->setRssLimit($this->getContainer()->getParameter('rss_limit'));
-        $config->setLanguage($this->getContainer()->getParameter('language'));
+        $config->setTheme($this->getContainer()->getParameter('wallabag_core.theme'));
+        $config->setItemsPerPage($this->getContainer()->getParameter('wallabag_core.items_on_page'));
+        $config->setRssLimit($this->getContainer()->getParameter('wallabag_core.rss_limit'));
+        $config->setReadingSpeed($this->getContainer()->getParameter('wallabag_core.reading_speed'));
+        $config->setLanguage($this->getContainer()->getParameter('wallabag_core.language'));
 
         $em->persist($config);
 
-        $em->flush();
-
         $this->defaultOutput->writeln('');
 
         return $this;
     }
 
-    protected function setupAsset()
+    protected function setupConfig()
     {
-        $this->defaultOutput->writeln('<info><comment>Step 4 of 4.</comment> Installing assets.</info>');
+        $this->defaultOutput->writeln('<info><comment>Step 4 of 4.</comment> Config setup.</info>');
+        $em = $this->getContainer()->get('doctrine.orm.entity_manager');
 
-        $this
-            ->runCommand('assets:install')
-            ->runCommand('assetic:dump')
-        ;
+        // cleanup before insert new stuff
+        $em->createQuery('DELETE FROM CraueConfigBundle:Setting')->execute();
+
+        $settings = [
+            [
+                'name' => 'carrot',
+                'value' => '1',
+                'section' => 'entry',
+            ],
+            [
+                'name' => 'share_diaspora',
+                'value' => '1',
+                'section' => 'entry',
+            ],
+            [
+                'name' => 'diaspora_url',
+                'value' => 'http://diasporapod.com',
+                'section' => 'entry',
+            ],
+            [
+                'name' => 'share_shaarli',
+                'value' => '1',
+                'section' => 'entry',
+            ],
+            [
+                'name' => 'shaarli_url',
+                'value' => 'http://myshaarli.com',
+                'section' => 'entry',
+            ],
+            [
+                'name' => 'share_mail',
+                'value' => '1',
+                'section' => 'entry',
+            ],
+            [
+                'name' => 'share_twitter',
+                'value' => '1',
+                'section' => 'entry',
+            ],
+            [
+                'name' => 'export_epub',
+                'value' => '1',
+                'section' => 'export',
+            ],
+            [
+                'name' => 'export_mobi',
+                'value' => '1',
+                'section' => 'export',
+            ],
+            [
+                'name' => 'export_pdf',
+                'value' => '1',
+                'section' => 'export',
+            ],
+            [
+                'name' => 'export_csv',
+                'value' => '1',
+                'section' => 'export',
+            ],
+            [
+                'name' => 'export_json',
+                'value' => '1',
+                'section' => 'export',
+            ],
+            [
+                'name' => 'export_txt',
+                'value' => '1',
+                'section' => 'export',
+            ],
+            [
+                'name' => 'export_xml',
+                'value' => '1',
+                'section' => 'export',
+            ],
+            [
+                'name' => 'pocket_consumer_key',
+                'value' => null,
+                'section' => 'import',
+            ],
+            [
+                'name' => 'show_printlink',
+                'value' => '1',
+                'section' => 'entry',
+            ],
+            [
+                'name' => 'wallabag_support_url',
+                'value' => 'https://www.wallabag.org/pages/support.html',
+                'section' => 'misc',
+            ],
+            [
+                'name' => 'wallabag_url',
+                'value' => 'http://v2.wallabag.org',
+                'section' => 'misc',
+            ],
+            [
+                'name' => 'piwik_enabled',
+                'value' => '0',
+                'section' => 'analytics',
+            ],
+            [
+                'name' => 'piwik_host',
+                'value' => 'http://v2.wallabag.org',
+                'section' => 'analytics',
+            ],
+            [
+                'name' => 'piwik_site_id',
+                'value' => '1',
+                'section' => 'analytics',
+            ],
+            [
+                'name' => 'demo_mode_enabled',
+                'value' => '0',
+                'section' => 'misc',
+            ],
+            [
+                'name' => 'demo_mode_username',
+                'value' => 'wallabag',
+                'section' => 'misc',
+            ],
+        ];
+
+        foreach ($settings as $setting) {
+            $newSetting = new Setting();
+            $newSetting->setName($setting['name']);
+            $newSetting->setValue($setting['value']);
+            $newSetting->setSection($setting['section']);
+            $em->persist($newSetting);
+        }
+
+        $em->flush();
 
         $this->defaultOutput->writeln('');
 
@@ -235,19 +379,19 @@ class InstallCommand extends ContainerAwareCommand
      * @param string $command
      * @param array  $parameters Parameters to this command (usually 'force' => true)
      */
-    protected function runCommand($command, $parameters = array())
+    protected function runCommand($command, $parameters = [])
     {
         $parameters = array_merge(
-            array('command' => $command),
+            ['command' => $command],
             $parameters,
-            array(
+            [
                 '--no-debug' => true,
                 '--env' => $this->defaultInput->getOption('env') ?: 'dev',
-            )
+            ]
         );
 
         if ($this->defaultInput->getOption('no-interaction')) {
-            $parameters = array_merge($parameters, array('--no-interaction' => true));
+            $parameters = array_merge($parameters, ['--no-interaction' => true]);
         }
 
         $this->getApplication()->setAutoExit(false);
@@ -307,7 +451,13 @@ class InstallCommand extends ContainerAwareCommand
             return false;
         }
 
-        return in_array($databaseName, $schemaManager->listDatabases());
+        try {
+            return in_array($databaseName, $schemaManager->listDatabases());
+        } catch (\Doctrine\DBAL\Exception\DriverException $e) {
+            // it means we weren't able to get database list, assume the database doesn't exist
+
+            return false;
+        }
     }
 
     /**