Jingga/oms-Media
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Media.git synced 2026-01-25 23:38:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add app to installer

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-06-24 00:03:34 +02:00
parent 871ed769d6
commit b0833bebc4
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Admin/Install/Navigation.php
View File

@ -14,7 +14,7 @@ declare(strict_types=1);
namespace Modules\Media\Admin\Install;
use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Application\ApplicationAbstract;
/**
* Navigation class.
@ -30,14 +30,14 @@ class Navigation
* Install navigation providing
*
* @param string $path Module path
* @param DatabasePool $dbPool Database pool for database interaction
* @param ApplicationAbstract $app Application
*
* @return void
*
* @since 1.0.0
*/
public static function install(string $path, DatabasePool $dbPool) : void
public static function install(string $path, ApplicationAbstract $app) : void
{
\Modules\Navigation\Admin\Installer::installExternal($dbPool, ['path' => __DIR__ . '/Navigation.install.json']);
\Modules\Navigation\Admin\Installer::installExternal($app, ['path' => __DIR__ . '/Navigation.install.json']);
}
}

15
Admin/Installer.php
View File

@ -26,6 +26,7 @@ use phpOMS\Module\InstallerAbstract;
use phpOMS\System\File\Local\Directory;
use phpOMS\System\File\Local\File;
use phpOMS\System\File\PathException;
use phpOMS\Application\ApplicationAbstract;
/**
* Installer class.
@ -40,7 +41,7 @@ final class Installer extends InstallerAbstract
/**
* Install data from providing modules.
*
* @param DatabasePool $dbPool Database pool
* @param ApplicationAbstract $app Application
* @param array $data Module info
*
* @return array
@ -50,10 +51,10 @@ final class Installer extends InstallerAbstract
*
* @since 1.0.0
*/
public static function installExternal(DatabasePool $dbPool, array $data) : array
public static function installExternal(ApplicationAbstract $app, array $data) : array
{
try {
$dbPool->get()->con->query('select 1 from `media`');
$app->dbPool->get()->con->query('select 1 from `media`');
} catch (\Exception $e) {
return []; // @codeCoverageIgnore
}
@ -85,10 +86,10 @@ final class Installer extends InstallerAbstract
foreach ($mediaData as $media) {
switch ($media['type']) {
case 'collection':
$result['collection'][] = self::createCollection($dbPool, $media);
$result['collection'][] = self::createCollection($app->dbPool, $media);
break;
case 'upload':
$result['upload'][] = self::uploadMedia($dbPool, $media);
$result['upload'][] = self::uploadMedia($app->dbPool, $media);
break;
default:
}
@ -181,7 +182,9 @@ final class Installer extends InstallerAbstract
}
$upload = new UploadFile();
$upload->setOutputDir(empty($data['path'] ?? '') ? ApiController::createMediaPath() : __DIR__ . '/../../..' . $data['path']);
$upload->outputDir = empty($data['path'] ?? '')
? ApiController::createMediaPath()
: __DIR__ . '/../../..' . $data['path'];
$status = $upload->upload($files, $data['name'], true);