Merge pull request #972 from dasgarner/develop

Misc fixes for 3.0.0-alpha3
xibosignage · Sep 3, 2020 · 8d88d2c · 8d88d2c
2 parents f003363 + 9597ce1
commit 8d88d2c
Show file tree

Hide file tree

Showing 21 changed files with 1,064 additions and 167 deletions.
diff --git a/bin/locale.php b/bin/locale.php
@@ -36,7 +36,6 @@
 $twig->addExtension(new \Slim\Views\TwigExtension());
 $twig->addExtension(new \Xibo\Twig\TransExtension());
 $twig->addExtension(new \Xibo\Twig\ByteFormatterTwigExtension());
-$twig->addExtension(new \Xibo\Twig\UrlDecodeTwigExtension());
 $twig->addExtension(new \Xibo\Twig\DateFormatTwigExtension());
 
 

diff --git a/lib/Controller/Campaign.php b/lib/Controller/Campaign.php
@@ -888,18 +888,20 @@ public function preview(Request $request, Response $response, $id)
         $duration = 0 ;
         $extendedLayouts = [];
 
-        foreach($layouts as $layout)
+        foreach ($layouts as $layout)
         {
             $duration += $layout->duration;
-            $extendedLayouts[] = ['layout' => $layout,
-                                  'duration' => $layout->duration,
-                                  'previewOptions' => [
-                                      'getXlfUrl' => $this->urlFor($request,'layout.getXlf', ['id' => $layout->layoutId]),
-                                      'getResourceUrl' => $this->urlFor($request,'module.getResource', ['regionId' => ':regionId', 'id' => ':id']),
-                                      'libraryDownloadUrl' => $this->urlFor($request,'library.download'),
-                                      'layoutBackgroundDownloadUrl' => $this->urlFor($request,'layout.download.background', ['id' => ':id']),
-                                      'loaderUrl' => $this->getConfig()->uri('img/loader.gif')]
-                                 ];
+            $extendedLayouts[] = [
+                'layout' => $layout,
+                'duration' => $layout->duration,
+                'previewOptions' => [
+                    'getXlfUrl' => $this->urlFor($request,'layout.getXlf', ['id' => $layout->layoutId]),
+                    'getResourceUrl' => $this->urlFor($request,'module.getResource', ['regionId' => ':regionId', 'id' => ':id']),
+                    'libraryDownloadUrl' => $this->urlFor($request,'library.download'),
+                    'layoutBackgroundDownloadUrl' => $this->urlFor($request,'layout.download.background', ['id' => ':id']),
+                    'loaderUrl' => $this->getConfig()->uri('img/loader.gif')
+                ]
+            ];
         }
         $this->getState()->template = 'campaign-preview';
         $this->getState()->setData([

diff --git a/lib/Controller/Display.php b/lib/Controller/Display.php
@@ -2225,4 +2225,47 @@ public function checkLicence(Request $request, Response $response, $id)
 
         return $this->render($request, $response);
     }
+
+    /**
+     * @SWG\Get(
+     *  path="/display/status/{id}",
+     *  operationId="displayStatus",
+     *  tags={"display"},
+     *  summary="Display Status",
+     *  description="Get the display status window for this Display.",
+     *  @SWG\Parameter(
+     *      name="id",
+     *      in="path",
+     *      description="Display Id",
+     *      type="integer",
+     *      required=true
+     *   ),
+     *  @SWG\Response(
+     *      response=200,
+     *      description="successful operation",
+     *      @SWG\Schema(
+     *          type="array",
+     *          @SWG\Items(type="string")
+     *      )
+     *  )
+     * )
+     *
+     * @param Request $request
+     * @param Response $response
+     * @param int $id displayId
+     * @return \Psr\Http\Message\ResponseInterface|Response
+     * @throws \Xibo\Support\Exception\AccessDeniedException
+     * @throws \Xibo\Support\Exception\InvalidArgumentException
+     * @throws \Xibo\Support\Exception\NotFoundException
+     */
+    public function statusWindow(Request $request, Response $response, $id)
+    {
+        $display = $this->displayFactory->getById($id);
+
+        if (!$this->getUser()->checkViewable($display)) {
+            throw new AccessDeniedException();
+        }
+
+        return $response->withJson($display->getStatusWindow($this->pool));
+    }
 }
diff --git a/lib/Controller/Module.php b/lib/Controller/Module.php
@@ -1327,18 +1327,18 @@ public function getResource(Request $request, Response $response, $regionId, $id
 
         if ($module->getModule()->regionSpecific == 0) {
             // Non region specific module - no caching required as this is only ever called via preview.
-            $resource = $module->download($request, $response);
+            $response = $module->download($request, $response);
         } else {
             // Region-specific module, need to handle caching and locking.
             $resource = $module->getResourceOrCache();
+
+            if (!empty($resource)) {
+                $response->getBody()->write($resource);
+            }
         }
 
         $this->setNoOutput(true);
 
-        if (!empty($resource)) {
-            $response->getBody()->write($resource);
-        }
-
         return $this->render($request, $response);
     }
 

diff --git a/lib/Entity/Display.php b/lib/Entity/Display.php
@@ -1109,4 +1109,38 @@ public function setCurrentScreenShotTime($pool, $date)
 
         return $this;
     }
+
+    /**
+     * @param PoolInterface $pool
+     * @return array
+     */
+    public function getStatusWindow($pool)
+    {
+        $item = $pool->getItem('/statusWindow/' . $this->displayId);
+
+        if ($item->isMiss()) {
+            return [];
+        } else {
+            return $item->get();
+        }
+    }
+
+    /**
+     * @param PoolInterface $pool
+     * @param array $status
+     * @return $this
+     */
+    public function setStatusWindow($pool, $status)
+    {
+        // Cache it
+        $this->getLog()->debug('Caching statusWindow with Pool');
+
+        $item = $pool->getItem('/statusWindow/' . $this->displayId);
+        $item->set($status);
+        $item->expiresAfter(new \DateInterval('P1D'));
+
+        $pool->saveDeferred($item);
+
+        return $this;
+    }
 }
diff --git a/lib/Entity/Module.php b/lib/Entity/Module.php
@@ -105,7 +105,7 @@ class Module implements \JsonSerializable
     public $defaultDuration;
 
     /**
-     * @SWG\Property(description="An array of additional module specific settings")
+     * @SWG\Property(description="An array of additional module specific settings", type="array", @SWG\Items(type="string"))
      * @var array
      */
     public $settings = [];

diff --git a/lib/Entity/Schedule.php b/lib/Entity/Schedule.php
@@ -808,6 +808,9 @@ public function getEvents($fromDt, $toDt)
             $this->getLog()->debug('The main event has a start and end date within the month, no need to pull it in from the prior month. [eventId:' . $this->eventId . ']');
         }
 
+        // Keep a cache of schedule exclusions, so we look them up by eventId only one time per event
+        $scheduleExclusions = $this->scheduleExclusionFactory->query(null, ['eventId' => $this->eventId]);
+
         // Request month cache
         while ($fromDt < $toDt) {
 
@@ -823,8 +826,6 @@ public function getEvents($fromDt, $toDt)
             foreach ($this->scheduleEvents as $scheduleEvent) {
 
                 // Find the excluded recurring events
-                $scheduleExclusions = $this->scheduleExclusionFactory->query(null, ['eventId' => $this->eventId]);
-
                 $exclude = false;
                 foreach ($scheduleExclusions as $exclusion) {
                     if ($scheduleEvent->fromDt == $exclusion->fromDt &&
@@ -857,6 +858,9 @@ public function getEvents($fromDt, $toDt)
             $fromDt->addMonth();
         }
 
+        // Clear our cache of schedule exclusions
+        $scheduleExclusions = null;
+
         $this->getLog()->debug('Filtered ' . count($this->scheduleEvents) . ' to ' . count($events) . ', events: ' . json_encode($events, JSON_PRETTY_PRINT));
 
         return $events;

diff --git a/lib/Entity/User.php b/lib/Entity/User.php
@@ -1202,9 +1202,10 @@ public function routeViewable($route)
         if ($this->isSuperAdmin())
             return true;
 
-        // All users have access to the logout page
-        if ($route === '/logout')
+        // All users have access to the logout page and welcome page
+        if ($route === '/logout' || $route === '/welcome') {
             return true;
+        }
 
         try {
             if ($this->pagePermissionCache == null) {

diff --git a/lib/Factory/ContainerFactory.php b/lib/Factory/ContainerFactory.php
@@ -109,7 +109,6 @@ public static function create()
                 ]);
                 $view->addExtension(new TransExtension());
                 $view->addExtension(new ByteFormatterTwigExtension());
-                $view->addExtension(new UrlDecodeTwigExtension());
                 $view->addExtension(new DateFormatTwigExtension());
 
                 return $view;
@@ -122,25 +121,23 @@ public static function create()
             },
             'timeSeriesStore' => function(ContainerInterface $c) {
                 if ($c->get('configService')->timeSeriesStore == null) {
-                    return (new MySqlTimeSeriesStore())
-                        ->setDependencies($c->get('logService'),
-                            $c->get('layoutFactory'),
-                            $c->get('campaignFactory'))
-                        ->setStore($c->get('store'));
+                    $timeSeriesStore = new MySqlTimeSeriesStore();
                 } else {
                     $timeSeriesStore = $c->get('configService')->timeSeriesStore;
                     $timeSeriesStore = $timeSeriesStore();
+                }
 
-                    return $timeSeriesStore->setDependencies(
+                return $timeSeriesStore
+                    ->setDependencies(
                         $c->get('logService'),
                         $c->get('layoutFactory'),
                         $c->get('campaignFactory'),
                         $c->get('mediaFactory'),
                         $c->get('widgetFactory'),
                         $c->get('displayFactory'),
                         $c->get('displayGroupFactory')
-                    );
-                }
+                    )
+                    ->setStore($c->get('store'));
             },
             'state' => function() {
                 return new ApplicationState();