wip #5700 @1.5

diff --git a/.docker/config/rclone.conf b/.docker/config/rclone.conf
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 2f868d7e3bf6db4a8279ed76d266a8bee5779551..4699a24d3dd6a4e5ced898eeb922416154d3f1fc 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -67,6 +67,7 @@ services:
       - '/home/toolbox/www/.docker/config/passwords:/root/passwords'
       # Cron
       - '/home/toolbox/www/.docker/config/cron/crontab:/etc/crontab'
+      - '/home/toolbox/www/.docker/config/rclone.conf:/application/.config/rclone/rclone.conf'
       # PHP
       - '/home/toolbox/www/.docker/config/php.ini:/etc/php/8.1/fpm/conf.d/99-overrides.ini'
       # Files

diff --git a/.docker/images/php/Dockerfile b/.docker/images/php/Dockerfile
index 526bf537a2e8f5cff139421241a12d0e5446d24b..8a965e60548557629b4363e689917f3587d9825d 100644 (file)
--- a/.docker/images/php/Dockerfile
+++ b/.docker/images/php/Dockerfile
@@ -42,7 +42,6 @@ RUN apt update && apt -y --no-install-recommends install \
         php8.1-intl \
         php8.1-memcached \
         php8.1-mysql \
-        php8.1-sqlite \
         php8.1-redis \
         php8.1-soap \
         php8.1-ssh2 \

diff --git a/app/Fluidbook/Packager/Download.php b/app/Fluidbook/Packager/Download.php
index e2fe01d4df1c9eb1e68da3692abd3435862529b1..4a9a893d6a021e5d1c101aeed9654bc0e8c3c21e 100644 (file)
--- a/app/Fluidbook/Packager/Download.php
+++ b/app/Fluidbook/Packager/Download.php
@@ -100,7 +100,8 @@ class Download extends DownloadBase
                 $path = $this->_compileandpackage(false);
 
                 $driver = $server->getTransferDriver();
-                $driver->copy($path, $dest, false, true);
+                $cmd = $driver->copy($path, $dest, false, true);
+                $cmd->dd();
 
                 $url = $server->makeURL($dest);
                 if (null !== $url) {

diff --git a/app/Fluidbook/Packager/Online.php b/app/Fluidbook/Packager/Online.php
index 9d4dcd58b0b39b95d0419e553504567ac47ce85f..a584dc61da180d398eaccc0c57657f1dc431a715 100644 (file)
--- a/app/Fluidbook/Packager/Online.php
+++ b/app/Fluidbook/Packager/Online.php
@@ -2,10 +2,7 @@
 
 namespace App\Fluidbook\Packager;
 
-use App\Jobs\FluidbookCompiler;
 use App\Models\FluidbookPublication;
-use Cubist\Util\CommandLine;
-
 class Online extends Packager
 {
     protected $origHTML;
@@ -13,11 +10,7 @@ class Online extends Packager
     protected $_allowNeworking = 'all';
     protected $_ext = 'html';
     public $type = 'html';
-
     protected $_compileOnConstruct = false;
-
-
-
     protected function preparePackage()
     {
         parent::preparePackage();
@@ -29,8 +22,6 @@ class Online extends Packager
 
         $this->prepareFluidbook();
     }
-
-
     public function prepareFluidbook()
     {
         $dest = $this->vdir;
@@ -61,7 +52,6 @@ class Online extends Packager
         }
 
     }
-
     public function makePackage($zip)
     {
         parent::makePackage($zip);
@@ -73,6 +63,4 @@ class Online extends Packager
         $this->setFinalPath($this->getFinalPackageDir());
         return $this->getFinalPackageDir();
     }
-
-
 }

diff --git a/app/Models/FluidbookExternalInstallServer.php b/app/Models/FluidbookExternalInstallServer.php
index 2d6809ab25df809db4da6b4d41ad64d62a257f99..f0e2eb57588acbe9d8c40cdadf2d1ba81ff40fff 100644 (file)
--- a/app/Models/FluidbookExternalInstallServer.php
+++ b/app/Models/FluidbookExternalInstallServer.php
@@ -33,6 +33,9 @@ class FluidbookExternalInstallServer extends ExternalServer
         return parent::getProtocols() + ['hosting' => 'Hosting'];
     }
 
+    /**
+     * @return \Cubist\Net\Transfer\Driver
+     */
     public function getTransferDriver()
     {
         $res = parent::getTransferDriver();