From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 21 Feb 2023 19:25:50 +0000 (+0100)
Subject: wip #5524 @0.25
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=5e4982c6013e5c7fb7bf97b717685373c090f014;p=fluidbook_processfarm.git

wip #5524 @0.25
---

diff --git a/app/bin/mount b/app/bin/mount
index a28be43..5b5a04d 100755
--- a/app/bin/mount
+++ b/app/bin/mount
@@ -13,9 +13,9 @@ else
     sshfs -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=3 -o uid=33 -o gid=33 -o allow_other fluidbook@kingkong.cubedesigners.com:/home/fluidbook/data/docs /usfiles
 fi
 
-mkdir -p /toolbox
-if mountpoint -q "/toolbox"; then
+mkdir -p /application/protected/fluidbookpublication
+if mountpoint -q "/application/protected/fluidbookpublication"; then
     :
 else
-    sshfs -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=3 -p 58745 -o uid=33 -o gid=33 -o allow_other toolbox@toolbox.fluidbook.com:/application/protected/fluidbookpublication /toolbox
+    sshfs -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=3 -p 58745 -o uid=33 -o gid=33 -o allow_other toolbox@toolbox.fluidbook.com:/application/protected/fluidbookpublication /application/protected/fluidbookpublication
 fi
\ No newline at end of file
diff --git a/app/ping.php b/app/ping.php
index 07583b4..9733643 100644
--- a/app/ping.php
+++ b/app/ping.php
@@ -1,2 +1,2 @@
 <?php
-die(file_exists('/files/status') && file_exists('/usfiles/status') && file_exists('/toolbox/stats') ? '1' : '0');
\ No newline at end of file
+die(file_exists('/files/status') && file_exists('/usfiles/status') && file_exists('/toolbox/status') ? '1' : '0');
\ No newline at end of file
diff --git a/app/process.php b/app/process.php
index 7dbde92..87ab21c 100644
--- a/app/process.php
+++ b/app/process.php
@@ -1,8 +1,15 @@
 <?php
 
 use Fluidbook\Farmer\ProcessFile;
+use Fluidbook\Farmer\ProcessFileNoMapping;
 
 require_once __DIR__ . "/vendor/autoload.php";
 
-$p = new ProcessFile($_POST['out'], $_POST['page'], $_POST['resolutionRatio'], $_POST['mobileRatio'], $_POST['format'], $_POST['resolution'], $_POST['withGraphics'], $_POST['withText'], $_POST['version'], $_POST['force']);
+
+if (isset($_POST['toolbox'])) {
+	$class = ProcessFileNoMapping::class;
+} else {
+	$class = ProcessFile::class;
+}
+$p = new $class($_POST['out'], $_POST['page'], $_POST['resolutionRatio'], $_POST['mobileRatio'], $_POST['format'], $_POST['resolution'], $_POST['withGraphics'], $_POST['withText'], $_POST['version'], $_POST['force']);
 die($p->process());
\ No newline at end of file
diff --git a/app/src/ProcessFileNoMapping.php b/app/src/ProcessFileNoMapping.php
new file mode 100644
index 0000000..d48c05e
--- /dev/null
+++ b/app/src/ProcessFileNoMapping.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Fluidbook\Farmer;
+
+
+class ProcessFileNoMapping extends ProcessFile{
+	public function getOut() {
+		$this->getDistantOut();
+	}
+
+	public function process() {
+		$this->getPath($this->isForce());
+	}
+}
\ No newline at end of file