Check if dynamic icons can be used

Signed-off-by: Julius Haertl <jus@bitgrid.net>

diff --git a/apps/theming/lib/Controller/IconController.php b/apps/theming/lib/Controller/IconController.php
index 78d41d621a07607c7e8e58d07a64069897c25231..6f97fdcdaba248ace182e93975c0ca400ebd6f77 100644 (file)
--- a/apps/theming/lib/Controller/IconController.php
+++ b/apps/theming/lib/Controller/IconController.php
@@ -73,7 +73,8 @@ class IconController extends Controller {
                Util $util,
                ITimeFactory $timeFactory,
                IL10N $l,
-               IRootFolder $rootFolder
+               IRootFolder $rootFolder,
+               IconBuilder $iconBuilder
        ) {
                parent::__construct($appName, $request);
 
@@ -83,9 +84,10 @@ class IconController extends Controller {
                $this->l = $l;
                $this->config = $config;
                $this->rootFolder = $rootFolder;
-               if(extension_loaded('imagick')) {
-                       $this->iconBuilder = new IconBuilder($this->themingDefaults, $this->util);
-               }
+               $this->iconBuilder = $iconBuilder;
+               //if(extension_loaded('imagick')) {
+               //      $this->iconBuilder = new IconBuilder($this->themingDefaults, $this->util);
+               //}
        }
 
        /**
@@ -121,18 +123,13 @@ class IconController extends Controller {
                if($this->themingDefaults->shouldReplaceIcons()) {
                        $icon = $this->iconBuilder->getFavicon($app);
                        $response = new DataDisplayResponse($icon, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
-                       $response->cacheFor(86400);
-                       $response->addHeader('Expires', date(\DateTime::RFC2822, $this->timeFactory->getTime()));
-                       $response->addHeader('Pragma', 'cache');
-                       return $response;
                } else {
                        $response = new DataDisplayResponse(null, Http::STATUS_NOT_FOUND);
-                       $response->cacheFor(86400);
-                       $response->addHeader('Expires', date(\DateTime::RFC2822, $this->timeFactory->getTime()));
-                       return $response;
                }
-
-
+               $response->cacheFor(86400);
+               $response->addHeader('Expires', date(\DateTime::RFC2822, $this->timeFactory->getTime()));
+               $response->addHeader('Pragma', 'cache');
+               return $response;
        }
 
        /**
@@ -148,16 +145,13 @@ class IconController extends Controller {
                if($this->themingDefaults->shouldReplaceIcons()) {
                        $icon = $this->iconBuilder->getTouchIcon($app);
                        $response = new DataDisplayResponse($icon, Http::STATUS_OK, ['Content-Type' => 'image/png']);
-                       $response->cacheFor(86400);
-                       $response->addHeader('Expires', date(\DateTime::RFC2822, $this->timeFactory->getTime()));
-                       $response->addHeader('Pragma', 'cache');
-                       return $response;
                } else {
                        $response = new DataDisplayResponse(null, Http::STATUS_NOT_FOUND);
-                       $response->cacheFor(86400);
-                       $response->addHeader('Expires', date(\DateTime::RFC2822, $this->timeFactory->getTime()));
-                       return $response;
                }
+               $response->cacheFor(86400);
+               $response->addHeader('Expires', date(\DateTime::RFC2822, $this->timeFactory->getTime()));
+               $response->addHeader('Pragma', 'cache');
+               return $response;
        }
 
 

diff --git a/apps/theming/tests/Controller/IconControllerTest.php b/apps/theming/tests/Controller/IconControllerTest.php
index 3443be60712788d9dc3788bfa49a94bafe985e52..8c916c6cfe6e2d9bc5ad00547949d5a8501bd70d 100644 (file)
--- a/apps/theming/tests/Controller/IconControllerTest.php
+++ b/apps/theming/tests/Controller/IconControllerTest.php
@@ -23,6 +23,7 @@
 namespace OCA\Theming\Tests\Controller;
 
 use OCA\Theming\Controller\IconController;
+use OCA\Theming\IconBuilder;
 use OCA\Theming\Util;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
@@ -52,11 +53,10 @@ class IconControllerTest extends TestCase {
        private $iconController;
        /** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */
        private $rootFolder;
+       /** @var IconBuilder */
+       private $iconBuilder;
 
        public function setUp() {
-
-
-
                $this->request = $this->getMockBuilder('OCP\IRequest')->getMock();
                $this->config = $this->getMockBuilder('OCP\IConfig')->getMock();
                $this->themingDefaults = $this->getMockBuilder('OCA\Theming\ThemingDefaults')
@@ -68,6 +68,8 @@ class IconControllerTest extends TestCase {
                        ->getMock();
                $this->l10n = $this->getMockBuilder('OCP\IL10N')->getMock();
                $this->rootFolder = $this->getMockBuilder('OCP\Files\IRootFolder')->getMock();
+               $this->iconBuilder = $this->getMockBuilder('OCA\Theming\IconBuilder')
+                       ->disableOriginalConstructor()->getMock();
 
                $this->timeFactory->expects($this->any())
                        ->method('getTime')
@@ -81,10 +83,11 @@ class IconControllerTest extends TestCase {
                        $this->util,
                        $this->timeFactory,
                        $this->l10n,
-                       $this->rootFolder
+                       $this->rootFolder,
+                       $this->iconBuilder
                );
 
-               return parent::setUp();
+               parent::setUp();
        }
 
        public function testGetThemedIcon() {
@@ -111,38 +114,94 @@ class IconControllerTest extends TestCase {
                $expected = new DataDisplayResponse($svg, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
                $expected->cacheFor(86400);
                $expected->addHeader('Expires', date(\DateTime::RFC2822, $this->timeFactory->getTime()));
+               $expected->addHeader('Pragma', 'cache');
                @$this->assertEquals($expected, $this->iconController->getThemedIcon('core','filetypes/folder.svg'));
        }
 
        public function testGetFaviconDefault() {
-
-               $this->util->expects($this->once())
-                       ->method('getAppIcon')
+               if(!extension_loaded('imagick')) {
+                       $this->markTestSkipped('Imagemagick is required for dynamic icon generation.');
+               }
+               $checkImagick = new \Imagick();
+               if (count($checkImagick->queryFormats('SVG')) < 1) {
+                       $this->markTestSkipped('No SVG provider present.');
+               }
+               $this->themingDefaults->expects($this->once())
+                       ->method('shouldReplaceIcons')
+                       ->willReturn(true);
+               $expectedIcon = new \Imagick(realpath(dirname(__FILE__)) . '/../data/favicon-original.ico');
+               $this->iconBuilder->expects($this->once())
+                       ->method('getFavicon')
                        ->with('core')
-                       ->willReturn(\OC::$SERVERROOT . "/core/img/logo.svg");
-
+                       ->willReturn($expectedIcon);
                $favicon = $this->iconController->getFavicon();
-               $expectedIcon = new \Imagick(realpath(dirname(__FILE__)) . '/../data/favicon-original.ico');
+
                $expected = new DataDisplayResponse($expectedIcon, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
                $expected->cacheFor(86400);
                $expected->addHeader('Expires', date(\DateTime::RFC2822, $this->timeFactory->getTime()));
+               $expected->addHeader('Pragma', 'cache');
                $this->assertEquals($expected, $favicon);
        }
        public function testGetTouchIconDefault() {
-
-               $this->util->expects($this->once())
-                       ->method('getAppIcon')
+               if(!extension_loaded('imagick')) {
+                       $this->markTestSkipped('Imagemagick is required for dynamic icon generation.');
+               }
+               $checkImagick = new \Imagick();
+               if (count($checkImagick->queryFormats('SVG')) < 1) {
+                       $this->markTestSkipped('No SVG provider present.');
+               }
+               $this->themingDefaults->expects($this->once())
+                       ->method('shouldReplaceIcons')
+                       ->willReturn(true);
+               $expectedIcon = new \Imagick(realpath(dirname(__FILE__)) . '/../data/touch-original.png');
+               $this->iconBuilder->expects($this->once())
+                       ->method('getTouchIcon')
                        ->with('core')
-                       ->willReturn(\OC::$SERVERROOT . "/core/img/logo.svg");
+                       ->willReturn($expectedIcon);
                $favicon = $this->iconController->getTouchIcon();
-               $expectedIcon = new \Imagick(realpath(dirname(__FILE__)) . '/../data/touch-original.png');
 
                $expected = new DataDisplayResponse($expectedIcon, Http::STATUS_OK, ['Content-Type' => 'image/png']);
                $expected->cacheFor(86400);
                $expected->addHeader('Expires', date(\DateTime::RFC2822, $this->timeFactory->getTime()));
+               $expected->addHeader('Pragma', 'cache');
                $this->assertEquals($expected, $favicon);
        }
 
-
+       public function testGetFaviconFail() {
+               if(!extension_loaded('imagick')) {
+                       $this->markTestSkipped('Imagemagick is required for dynamic icon generation.');
+               }
+               $checkImagick = new \Imagick();
+               if (count($checkImagick->queryFormats('SVG')) < 1) {
+                       $this->markTestSkipped('No SVG provider present.');
+               }
+               $this->themingDefaults->expects($this->once())
+                       ->method('shouldReplaceIcons')
+                       ->willReturn(false);
+               $favicon = $this->iconController->getFavicon();
+               $expected = new DataDisplayResponse(null, Http::STATUS_NOT_FOUND);
+               $expected->cacheFor(86400);
+               $expected->addHeader('Expires', date(\DateTime::RFC2822, $this->timeFactory->getTime()));
+               $expected->addHeader('Pragma', 'cache');
+               $this->assertEquals($expected, $favicon);
+       }
+       public function testGetTouchIconFail() {
+               if(!extension_loaded('imagick')) {
+                       $this->markTestSkipped('Imagemagick is required for dynamic icon generation.');
+               }
+               $checkImagick = new \Imagick();
+               if (count($checkImagick->queryFormats('SVG')) < 1) {
+                       $this->markTestSkipped('No SVG provider present.');
+               }
+               $this->themingDefaults->expects($this->once())
+                       ->method('shouldReplaceIcons')
+                       ->willReturn(false);
+               $favicon = $this->iconController->getTouchIcon();
+               $expected = new DataDisplayResponse(null, Http::STATUS_NOT_FOUND);
+               $expected->cacheFor(86400);
+               $expected->addHeader('Expires', date(\DateTime::RFC2822, $this->timeFactory->getTime()));
+               $expected->addHeader('Pragma', 'cache');
+               $this->assertEquals($expected, $favicon);
+       }
 
 }

diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php
index 8290fcb13379a4c122275fd988b2f384bf63662f..bdf7bdafae3f1bf81b92694dfcf6c8cb78b58964 100644 (file)
--- a/lib/private/URLGenerator.php
+++ b/lib/private/URLGenerator.php
@@ -157,11 +157,11 @@ class URLGenerator implements IURLGenerator {
 
                // Check if the app is in the app folder
                $path = '';
-               if(\OCP\App::isEnabled('theming') && $image === "favicon.ico") {
+               if(\OCP\App::isEnabled('theming') && $image === "favicon.ico" && \OC::$server->getThemingDefaults()->shouldReplaceIcons()) {
                        $cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
                        if($app==="") { $app = "core"; }
                        $path = $this->linkToRoute('theming.Icon.getFavicon', [ 'app' => $app ]) . '?v='. $cacheBusterValue;
-               } elseif(\OCP\App::isEnabled('theming') && $image === "favicon-touch.png") {
+               } elseif(\OCP\App::isEnabled('theming') && $image === "favicon-touch.png" && \OC::$server->getThemingDefaults()->shouldReplaceIcons()) {
                        $cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
                        if($app==="") { $app = "core"; }
                        $path = $this->linkToRoute('theming.Icon.getTouchIcon', [ 'app' => $app ]) . '?v='. $cacheBusterValue;