]> Raphaël G. Git Repositories - airbundle/blobdiff - Command/CalendarCommand.php
Rapsys Git / airbundle / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Improve modified computing
[airbundle] / Command / CalendarCommand.php
diff --git a/Command/CalendarCommand.php b/Command/CalendarCommand.php
index 3951bb94fcdc8248525a6281a00678de9855f436..dca096bf368d6b286ef01e6c2117ee3855f099cb 100644 (file)
--- a/Command/CalendarCommand.php
+++ b/Command/CalendarCommand.php
@@ -1,81 +1,52 @@
-<?php
+<?php declare(strict_types=1);
+
+/*
+ * This file is part of the Rapsys AirBundle package.
+ *
+ * (c) Raphaël Gertz <symfony@rapsys.eu>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace Rapsys\AirBundle\Command;
 
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 
 namespace Rapsys\AirBundle\Command;
 
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 use Twig\Extra\Markdown\DefaultMarkdown;
 
 use Twig\Extra\Markdown\DefaultMarkdown;
 
+use Rapsys\AirBundle\Command;
 use Rapsys\AirBundle\Entity\Session;
 
 use Rapsys\AirBundle\Entity\Session;
 
-class CalendarCommand extends Command {
-       //Set failure constant
-       const FAILURE = 1;
-
-       ///Set success constant
-       const SUCCESS = 0;
-
-       ///Config array
-       protected $config;
-
-       /**
-        * Doctrine instance
-        *
-        * @var ManagerRegistry
-        */
-       protected $doctrine;
-
-       ///Locale
-       protected $locale;
-
-       ///Translator instance
-       protected $translator;
+use Rapsys\PackBundle\Util\SluggerUtil;
 
 
+class CalendarCommand extends Command {
        /**
        /**
-        * Inject doctrine, container and translator interface
+        * Creates new calendar command
         *
         *
-        * @param ContainerInterface $container The container instance
         * @param ManagerRegistry $doctrine The doctrine instance
         * @param ManagerRegistry $doctrine The doctrine instance
+        * @param string $locale The default locale
         * @param RouterInterface $router The router instance
         * @param RouterInterface $router The router instance
+        * @param SluggerUtil $slugger The slugger instance
         * @param TranslatorInterface $translator The translator instance
         * @param TranslatorInterface $translator The translator instance
+        * @param string $namespace The cache namespace
+        * @param int $lifetime The cache lifetime
+        * @param string $path The cache path
         */
         */
-    public function __construct(ContainerInterface $container, ManagerRegistry $doctrine, RouterInterface $router, TranslatorInterface $translator) {
+       public function __construct(protected ManagerRegistry $doctrine, protected string $locale, protected RouterInterface $router, protected SluggerUtil $slugger, protected TranslatorInterface $translator, protected string $namespace, protected int $lifetime, protected string $path) {
                //Call parent constructor
                //Call parent constructor
-               parent::__construct();
-
-               //Retrieve config
-               $this->config = $container->getParameter($this->getAlias());
-
-               //Retrieve locale
-               $this->locale = $container->getParameter('kernel.default_locale');
-
-               //Store doctrine
-        $this->doctrine = $doctrine;
-
-               //Store router
-        $this->router = $router;
-
-               //Get router context
-               $context = $this->router->getContext();
-
-               //Set host
-               $context->setHost('airlibre.eu');
-
-               //Set scheme
-               $context->setScheme('https');
-
-               //Set the translator
-               $this->translator = $translator;
+               parent::__construct($this->doctrine, $this->locale, $this->router, $this->slugger, $this->translator);
        }
 
        }
 
-       ///Configure attribute command
+       /**
+        * Configure attribute command
+        */
        protected function configure() {
                //Configure the class
                $this
        protected function configure() {
                //Configure the class
                $this
@@ -87,8 +58,10 @@ class CalendarCommand extends Command {
                        ->setHelp('This command synchronize sessions in google calendar');
        }
 
                        ->setHelp('This command synchronize sessions in google calendar');
        }
 
-       ///Process the attribution
-       protected function execute(InputInterface $input, OutputInterface $output) {
+       /**
+        * Process the attribution
+        */
+       protected function execute(InputInterface $input, OutputInterface $output): int {
                //Compute period
                $period = new \DatePeriod(
                        //Start from last week
                //Compute period
                $period = new \DatePeriod(
                        //Start from last week
@@ -108,7 +81,7 @@ class CalendarCommand extends Command {
                //Retrieve cache object
                //XXX: by default stored in /tmp/symfony-cache/@/W/3/6SEhFfeIW4UMDlAII+Dg
                //XXX: stored in %kernel.project_dir%/var/cache/airlibre/0/P/IA20X0K4dkMd9-+Ohp9Q
                //Retrieve cache object
                //XXX: by default stored in /tmp/symfony-cache/@/W/3/6SEhFfeIW4UMDlAII+Dg
                //XXX: stored in %kernel.project_dir%/var/cache/airlibre/0/P/IA20X0K4dkMd9-+Ohp9Q
-               $cache = new FilesystemAdapter($this->config['cache']['namespace'], $this->config['cache']['lifetime'], $this->config['path']['cache']);
+               $cache = new FilesystemAdapter($this->namespace, $this->lifetime, $this->path);
 
                //Retrieve calendars
                $cacheCalendars = $cache->getItem('calendars');
 
                //Retrieve calendars
                $cacheCalendars = $cache->getItem('calendars');
@@ -178,6 +151,8 @@ class CalendarCommand extends Command {
                                                $cache->save($cacheCalendars);
 
                                                //Drop token and report
                                                $cache->save($cacheCalendars);
 
                                                //Drop token and report
+                                               //XXX: submit app to avoid expiration
+                                               //XXX: see https://console.cloud.google.com/apis/credentials/consent?project=calendar-317315
                                                echo 'Token '.$tokenId.' for calendar '.$token['calendar'].' has expired and is not refreshable'."\n";
 
                                                //Return failure
                                                echo 'Token '.$tokenId.' for calendar '.$token['calendar'].' has expired and is not refreshable'."\n";
 
                                                //Return failure
@@ -281,18 +256,23 @@ class CalendarCommand extends Command {
                                foreach($sessions as $sessionId => $session) {
                                        //Init shared properties
                                        //TODO: validate for constraints here ??? https://developers.google.com/calendar/api/guides/extended-properties
                                foreach($sessions as $sessionId => $session) {
                                        //Init shared properties
                                        //TODO: validate for constraints here ??? https://developers.google.com/calendar/api/guides/extended-properties
+                                       //TODO: drop shared as unused ???
                                        $shared = [
                                                'gps' => $session['l_latitude'].','.$session['l_longitude']
                                        ];
 
                                        //Init source
                                        $source = [
                                        $shared = [
                                                'gps' => $session['l_latitude'].','.$session['l_longitude']
                                        ];
 
                                        //Init source
                                        $source = [
-                                               'title' => $this->translator->trans('Session %id% by %pseudonym%', ['%id%' => $sessionId, '%pseudonym%' => $session['au_pseudonym']]).' '.$this->translator->trans('at '.$session['l_title']),
-                                               'url' => $this->router->generate('rapsys_air_session_view', ['id' => $sessionId], UrlGeneratorInterface::ABSOLUTE_URL)
+                                               'title' => $this->translator->trans('%dance% %id% by %pseudonym%', ['%id%' => $sessionId, '%dance%' => $this->translator->trans($session['ad_name'].' '.lcfirst($session['ad_type'])), '%pseudonym%' => $session['au_pseudonym']]).' '.$this->translator->trans('at '.$session['l_title']),
+                                               'url' => $this->router->generate('rapsysair_session_view', ['id' => $sessionId, 'location' => $this->slugger->slug($this->translator->trans($session['l_title'])), 'dance' => $this->slugger->slug($this->translator->trans($session['ad_name'].' '.lcfirst($session['ad_type']))), 'user' => $this->slugger->slug($session['au_pseudonym'])], UrlGeneratorInterface::ABSOLUTE_URL)
                                        ];
 
                                        ];
 
-                                       //Init description
-                                       $description = 'Description :'."\n".strip_tags(preg_replace('!<a href="([^"]+)"(?: title="[^"]+")?'.'>([^<]+)</a>!', '\1', $markdown->convert(strip_tags($session['p_description']))));
+                                       //Init location
+                                       $description = 'Emplacement :'."\n".$this->translator->trans($session['l_description']);
+                                       $shared['location'] = $markdown->convert(strip_tags($session['l_description']));
+
+                                       //Add description
+                                       $description .= "\n\n".'Description :'."\n".strip_tags(preg_replace('!<a href="([^"]+)"(?: title="[^"]+")?'.'>([^<]+)</a>!', '\1', $markdown->convert(strip_tags($session['p_description']))));
                                        $shared['description'] = $markdown->convert(strip_tags($session['p_description']));
 
                                        //Add class when available
                                        $shared['description'] = $markdown->convert(strip_tags($session['p_description']));
 
                                        //Add class when available
@@ -351,7 +331,8 @@ class CalendarCommand extends Command {
                                                                //TODO: replace 'airlibre' with $this->config['calendar']['prefix'] when possible with prefix validating [a-v0-9]{5,}
                                                                //XXX: see https://developers.google.com/calendar/api/v3/reference/events/insert#id
                                                                'id' => $token['prefix'].$sessionId,
                                                                //TODO: replace 'airlibre' with $this->config['calendar']['prefix'] when possible with prefix validating [a-v0-9]{5,}
                                                                //XXX: see https://developers.google.com/calendar/api/v3/reference/events/insert#id
                                                                'id' => $token['prefix'].$sessionId,
-                                                               'summary' => $session['au_pseudonym'].' '.$this->translator->trans('at '.$session['l_short']),
+                                                               #'summary' => $session['au_pseudonym'].' '.$this->translator->trans('at '.$session['l_title']),
+                                                               'summary' => $source['title'],
                                                                #'description' => $markdown->convert(strip_tags($session['p_description'])),
                                                                'description' => $description,
                                                                'status' => empty($session['a_canceled'])?'confirmed':'cancelled',
                                                                #'description' => $markdown->convert(strip_tags($session['p_description'])),
                                                                'description' => $description,
                                                                'status' => empty($session['a_canceled'])?'confirmed':'cancelled',
@@ -392,7 +373,8 @@ class CalendarCommand extends Command {
                                                //With updated event
                                                if ($session['updated'] >= (new \DateTime($event->getUpdated()))) {
                                                        //Set summary
                                                //With updated event
                                                if ($session['updated'] >= (new \DateTime($event->getUpdated()))) {
                                                        //Set summary
-                                                       $event->setSummary($session['au_pseudonym'].' '.$this->translator->trans('at '.$session['l_short']));
+                                                       #$event->setSummary($session['au_pseudonym'].' '.$this->translator->trans('at '.$session['l_title']));
+                                                       $event->setSummary($source['title']);
 
                                                        //Set description
                                                        $event->setDescription($description);
 
                                                        //Set description
                                                        $event->setDescription($description);
@@ -481,13 +463,4 @@ class CalendarCommand extends Command {
                //Return success
                return self::SUCCESS;
        }
                //Return success
                return self::SUCCESS;
        }
-
-       /**
-        * Return the bundle alias
-        *
-        * {@inheritdoc}
-        */
-       public function getAlias(): string {
-               return 'rapsys_air';
-       }
 }
 }
Symfony bundle rapsys/airbundle used to handle libre air features