X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FCommand%2FExportCommand.php;h=e3d3b399506ff4e3986a84b044f032c882732783;hb=3b0380f049d408f0721e28218170c562153a56e5;hp=0cf5de488fa62ee9f8312e076ab58fd4ea307122;hpb=a607b7a9c0870bcdfb4b4e7920d20b5ed39f14fe;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Command/ExportCommand.php b/src/Wallabag/CoreBundle/Command/ExportCommand.php
index 0cf5de48..e3d3b399 100644
--- a/src/Wallabag/CoreBundle/Command/ExportCommand.php
+++ b/src/Wallabag/CoreBundle/Command/ExportCommand.php
@@ -7,7 +7,6 @@ use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Output\StreamOutput;
class ExportCommand extends ContainerAwareCommand
{
@@ -33,11 +32,13 @@ class ExportCommand extends ContainerAwareCommand
protected function execute(InputInterface $input, OutputInterface $output)
{
try {
- $user = $this->getUser($input->getArgument('username'));
+ $user = $this->getDoctrine()->getRepository('WallabagUserBundle:User')->findOneByUserName($input->getArgument('username'));
} catch (NoResultException $e) {
$output->writeln(sprintf('User "%s" not found.', $input->getArgument('username')));
+
return 1;
}
+
$entries = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry')
->getBuilderForAllByUser($user->getId())
@@ -47,9 +48,11 @@ class ExportCommand extends ContainerAwareCommand
$output->write(sprintf('Exporting %d entrie(s) for user « %s »... ', count($entries), $user->getUserName()));
$filePath = $input->getArgument('filepath');
+
if (!$filePath) {
- $filePath = $this->getContainer()->getParameter('kernel.root_dir') . '/../' . sprintf('%s-export', $user->getUsername());
+ $filePath = $this->getContainer()->getParameter('kernel.root_dir').'/../'.sprintf('%s-export.json', $user->getUsername());
}
+
try {
$data = $this->getContainer()->get('wallabag_core.helper.entries_export')
->setEntries($entries)
@@ -58,21 +61,13 @@ class ExportCommand extends ContainerAwareCommand
file_put_contents($filePath, $data);
} catch (\InvalidArgumentException $e) {
$output->writeln(sprintf('Error: "%s"', $e->getMessage()));
+
+ return 1;
}
$output->writeln('Done.');
- }
- /**
- * Fetches a user from its username.
- *
- * @param string $username
- *
- * @return \Wallabag\UserBundle\Entity\User
- */
- private function getUser($username)
- {
- return $this->getDoctrine()->getRepository('WallabagUserBundle:User')->findOneByUserName($username);
+ return 0;
}
private function getDoctrine()