Revise thumbnailcreator module to not require external ImageMagick

Author: Jamie Snape

composer.json

@@ -15,6 +15,7 @@
         "ext-gd": "*",
         "ext-json": "*",
         "francodacosta/phMagick": "0.4.*@dev",
+        "intervention/image": "~2.0.12",
         "leafo/scssphp": "~0.1.1",
         "maennchen/zipstream-php": "~0.2.2",
         "michelf/php-markdown": "~1.4.1",

core/database/mysql/3.2.16.sql renamed to core/database/mysql/3.2.17.sql

@@ -1,6 +1,6 @@
 -- MIDAS Server. Copyright Kitware SAS. Licensed under the Apache License 2.0.
 
--- MySQL core database, version 3.2.16
+-- MySQL core database, version 3.2.17
 
 CREATE TABLE IF NOT EXISTS `activedownload` (
     `activedownload_id` bigint(20) NOT NULL AUTO_INCREMENT,

core/database/pgsql/3.2.16.sql renamed to core/database/pgsql/3.2.17.sql

@@ -1,6 +1,6 @@
 -- MIDAS Server. Copyright Kitware SAS. Licensed under the Apache License 2.0.
 
--- PostgreSQL core database, version 3.2.16
+-- PostgreSQL core database, version 3.2.17
 
 SET client_encoding = 'UTF8';
 SET default_with_oids = FALSE;

core/database/sqlite/3.2.16.sql renamed to core/database/sqlite/3.2.17.sql

@@ -1,6 +1,6 @@
 -- MIDAS Server. Copyright Kitware SAS. Licensed under the Apache License 2.0.
 
--- SQLite core database, version 3.2.16
+-- SQLite core database, version 3.2.17
 
 CREATE TABLE IF NOT EXISTS "activedownload" (
     "activedownload_id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,

core/models/base/ItemModelBase.php

@@ -576,4 +576,25 @@ public function replaceThumbnail($item, $tempThumbnailFile)
         $item->setThumbnailId($thumb->getKey());
         $this->save($item);
     }
+
+    /**
+     * Return the latest bitstream from the latest item revision of the given item.
+     *
+     * @param ItemDao $itemDao item DAO
+     * @return BitstreamDao bitstream DAO
+     * @throws Zend_Exception
+     */
+    public function getLatestBitstream($itemDao)
+    {
+        /** @var ItemRevisionModel $itemRevisionModel */
+        $itemRevisionModel = MidasLoader::loadModel('ItemRevision');
+
+        try {
+            $itemRevisionDao = $this->getLastRevision($itemDao);
+        } catch (Zend_Exception $exception) {
+            throw new Zend_Exception('Item does not contain any item revisions');
+        }
+
+        return $itemRevisionModel->getLatestBitstream($itemRevisionDao);
+    }
 }

core/models/base/ItemRevisionModelBase.php

@@ -176,4 +176,22 @@ public function save($dao)
         }
         parent::save($dao);
     }
+
+    /**
+     * Return the latest bitstream from the given item revision.
+     *
+     * @param ItemRevisionDao $itemRevisionDao item revision DAO
+     * @return BitstreamDao
+     * @throws Zend_Exception
+     */
+    public function getLatestBitstream($itemRevisionDao)
+    {
+        $bitstreamDaos = $itemRevisionDao->getBitstreams();
+
+        if (count($bitstreamDaos) === 0) {
+            throw new Zend_Exception('Item revision does not contain any bitstreams');
+        }
+
+        return $bitstreamDaos[0];
+    }
 }

core/views/rest/index/index.phtml

@@ -33,8 +33,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/rest/rest.index.j
 <link type="text/css" rel="stylesheet" href="<?php echo $this->coreWebroot ?>/public/css/rest/rest.index.css"/>
 
 <div class="viewMain">
-    <pre>Web API URL = Base URL (<?php echo $this->serverURL.$this->webroot ?>
-        /rest) + API method URL<br/><br/>e.g. <?php echo $this->serverURL.$this->webroot ?>/rest/system/login</pre>
+    <pre>Web API URL = Base URL (<?php echo $this->serverURL.$this->webroot ?>/rest)+ API method URL<br/><br/>e.g. <?php echo $this->serverURL.$this->webroot ?>/rest/system/login</pre>
     <br/>
     To authenticate requests, you can provide a parameter of
     <b>token</b> with an authentication token value obtained by calling

modules/api/library/KwWebApiCore.php

@@ -18,6 +18,7 @@
  limitations under the License.
 =========================================================================*/
 
+require_once 'XML/Serializer.php';
 require_once BASE_PATH.'/modules/api/library/KwUploadAPI.php';
 
 /** Midas API core functionalities */

modules/thumbnailcreator/AppController.php

@@ -21,5 +21,6 @@
 /** App controller for the thumbnailcreator module */
 class Thumbnailcreator_AppController extends MIDAS_GlobalModule
 {
+    /** @var string */
     public $moduleName = 'thumbnailcreator';
 }

modules/thumbnailcreator/Bootstrap.php

@@ -0,0 +1,24 @@
+<?php
+/*=========================================================================
+ MIDAS Server
+ Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
+ All rights reserved.
+ More information http://www.kitware.com
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0.txt
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+=========================================================================*/
+
+/** Bootstrap for the thumbnailcreator module. */
+class Thumbnailcreator_Bootstrap extends Zend_Application_Module_Bootstrap
+{
+}