Add build script for optimized perl interpreter

Cleanup Makefile a bit
Make built in perl the default for linux x86

.gitignore

@@ -1,2 +1,5 @@
 /vendor/
-/build/
+/build/artifacts
+/build/*tar.gz
+/build/tools/perl-build/build/exiftool.bin
+/build/tools/perl-build/build/staticperl

Makefile

@@ -41,11 +41,11 @@
 
 app_name=$(notdir $(CURDIR))
 build_tools_directory=$(CURDIR)/build/tools
+vendor_directory=$(CURDIR)/vendor
 source_build_directory=$(CURDIR)/build/artifacts/source
 source_package_name=$(source_build_directory)/$(app_name)
 appstore_build_directory=$(CURDIR)/build/artifacts/appstore
 appstore_package_name=$(appstore_build_directory)/$(app_name)
-npm=$(shell which npm 2> /dev/null)
 composer=$(shell which composer 2> /dev/null)
 
 all: build
@@ -61,9 +61,6 @@ endif
 ifneq (,$(wildcard $(CURDIR)/package.json))
 	make npm
 endif
-ifneq (,$(wildcard $(CURDIR)/js/package.json))
-	make npm
-endif
 
 # Installs and updates the composer dependencies. If composer is not installed
 # a copy is fetched from the web
@@ -81,35 +78,25 @@ else
 	composer update --prefer-dist
 endif
 
-# Installs npm dependencies
-.PHONY: npm
-npm:
-ifeq (,$(wildcard $(CURDIR)/package.json))
-	cd js && $(npm) run build
-else
-	npm run build
-endif
-
 # Removes the appstore build
 .PHONY: clean
 clean:
-	rm -rf ./build
-
-# Same as clean but also removes dependencies installed by composer, bower and
-# npm
-.PHONY: distclean
-distclean: clean
-	rm -rf vendor
-	rm -rf node_modules
-	rm -rf js/vendor
-	rm -rf js/node_modules
+	rm -rf ./build/artifacts
+	rm -rf ./build/camerarawpreviews*tar.gz
 
 # Builds the source and appstore package
 .PHONY: dist
 dist:
-	make source
+	composer install --prefer-dist
+	test -s $vendor_directory/exiftool/exiftool/exiftool.bin || make perl
+	make tests
 	make appstore
 
+# Builds the source package
+.PHONY: perl
+perl:
+	$(build_tools_directory)/perl-build/build.sh
+
 # Builds the source package
 .PHONY: source
 source:

README.md

@@ -9,7 +9,6 @@ This app also gives you preview of Adobe Indesign files (.INDD).
 * Probably **memory_limit** quite high.
 * **imagick** or **gd** module. If imagick is available, it will use that for performance.
 * For files with a TIFF preview (at least some DNG files), **imagick** is required
-* Perl installed. ~~A deprecated fallback is used now that will be removed in a future version.~~
 
 ## Installation
 Install in Nextcloud App store.
@@ -21,3 +20,7 @@ https://marketplace.owncloud.com/apps/camerarawpreviews
 ## Building locally
 - Run "make"
 - Place this app in **./apps/**
+
+## Information about the perl binary
+- To avoid lots of issues and problems for users I am bundling a static build of perl for x86_64
+- The binary is built using an isolated docker container with this: http://software.schmorp.de/pkg/App-Staticperl.html

appinfo/info.xml

@@ -16,7 +16,6 @@
     <bugs>https://github.com/ariselseng/camerarawpreviews/issues</bugs>
     <dependencies>
         <php min-version="7.2"></php>
-        <command>perl</command>
         <owncloud min-version="10.0.9" max-version="10"/>
         <nextcloud min-version="17" max-version="19"/>
     </dependencies>

build/tools/perl-build/build.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+docker_build_mount="$(realpath "$(dirname "$0")"/build)"
+app_dir="$(realpath "$docker_build_mount"/../../../..)"
+exiftool_dir="$app_dir"/vendor/exiftool/exiftool
+
+docker run -ti  --workdir /build --rm -v "$docker_build_mount":/build i386/alpine:3.9 ./build-perl.sh
+
+if [ -e "$docker_build_mount"/exiftool.bin ];then
+  sudo chown $(id -u):$(id -g) "$docker_build_mount"/exiftool.bin
+
+  chmod +x "$docker_build_mount"/exiftool.bin
+  if [ -e "$exiftool_dir"/exiftool.bin ];then
+    rm "$exiftool_dir"/exiftool.bin
+  fi
+
+  mv "$docker_build_mount"/exiftool.bin "$exiftool_dir"/
+fi

build/tools/perl-build/build/build-perl.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+[ -e ./exiftool.bin ] && rm ./exiftool.bin
+[ -e ./staticperl ] && rm ./staticperl
+
+apk -U add upx curl wget alpine-sdk &&
+ curl http://cvs.schmorp.de/App-Staticperl/bin/staticperl -o ./staticperl && chmod +x ./staticperl && \
+ ./staticperl mkapp exiftool.bin --boot exiftool_wrapper.pl perl.bundle && \
+upx exiftool.bin
+
+[ -e ./staticperl ] && rm ./staticperl

build/tools/perl-build/build/exiftool_wrapper.pl

@@ -0,0 +1,2 @@
+use FindBin;
+require "$FindBin::Bin/exiftool";

build/tools/perl-build/build/perl.bundle

@@ -0,0 +1,16 @@
+static
+usepacklists
+strip pod
+use FindBin
+use File::Glob
+use Archive::Zip
+use Compress::Zlib
+use Digest::MD5
+use Digest::SHA
+use IO::Compress::Bzip2
+use Time::HiRes
+use Time::Piece
+use IO::Compress::RawDeflate
+use IO::Uncompress::RawInflate
+use IO::String
+use Encode

lib/RawPreviewBase.php

@@ -36,7 +36,11 @@ public function __construct(ILogger $logger, string $appName)
 
         try {
             $perlBin = $this->getPerlExecutable();
-            $this->converter = $perlBin . ' ' . realpath(__DIR__ . '/../vendor/exiftool/exiftool/exiftool');
+            if (strpos($perlBin, 'exiftool/exiftool.bin') !== false) {
+                $this->converter = $perlBin;
+            } else {
+                $this->converter = $perlBin . ' ' . realpath(__DIR__ . '/../vendor/exiftool/exiftool/exiftool');
+            }
             $this->perlFound = true;
         } catch (Exception $e) {
             $this->logger->logException($e, ['app' => $this->appName]);
@@ -58,8 +62,10 @@ public function getMimeType()
      */
     protected function getBestPreviewTag($tmpPath)
     {
+        $cmd = $this->converter . " -json -preview:all -FileType " . escapeshellarg($tmpPath);
+        $json = shell_exec($cmd);
         // get all available previews and the file type
-        $previewData = json_decode(shell_exec($this->converter . " -json -preview:all -FileType " . escapeshellarg($tmpPath)), true);
+        $previewData = json_decode($json, true);
         $fileType = $previewData[0]['FileType'] ?? 'n/a';
 
         // potential tags in priority
@@ -101,7 +107,7 @@ protected function getBestPreviewTag($tmpPath)
             }
             return $tag;
         }
-        throw new Exception('Unable to find preview data: debug ' . json_encode($previewData));
+        throw new Exception('Unable to find preview data: ' . $json);
     }
 
     /**
@@ -110,6 +116,18 @@ protected function getBestPreviewTag($tmpPath)
      */
     private function getPerlExecutable()
     {
+        if (strpos(php_uname("m"), 'x86') === 0 && php_uname("s") === "Linux") {
+            $perlBin = realpath(__DIR__ . '/../vendor/exiftool/exiftool/exiftool.bin');
+            $perlBinIsExecutable = is_executable($perlBin);
+
+            if (!$perlBinIsExecutable && is_writable($perlBin)) {
+                $perlBinIsExecutable = chmod($perlBin, 0744);
+            }
+            if ($perlBinIsExecutable) {
+                return $perlBin;
+            }
+        }
+
         $perlBin = \OC_Helper::findBinaryPath('perl');
         if (!is_null($perlBin)) {
             return $perlBin;
@@ -196,6 +214,7 @@ protected function getThumbnailInternal(File $file, int $maxX, int $maxY): ?IIma
             return $image;
         } catch (Exception $e) {
             $this->logger->logException($e, ['app' => $this->appName]);
+
             $this->cleanTmpFiles();
             return null;
         }