Add ability to update an Egg by re-uploading a file.

app/Exceptions/Service/Egg/BadJsonFormatException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Pterodactyl\Exceptions\Service\Egg;
+
+use Pterodactyl\Exceptions\DisplayException;
+
+class BadJsonFormatException extends DisplayException
+{
+}

app/Exceptions/Service/InvalidFileUploadException.php

@@ -7,7 +7,7 @@
  * https://opensource.org/licenses/MIT
  */
 
-namespace Pterodactyl\Exceptions\Service\Pack;
+namespace Pterodactyl\Exceptions\Service;
 
 use Pterodactyl\Exceptions\DisplayException;
 

app/Http/Controllers/Admin/Nests/EggShareController.php

@@ -17,6 +17,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Pterodactyl\Services\Eggs\Sharing\EggExporterService;
 use Pterodactyl\Services\Eggs\Sharing\EggImporterService;
 use Pterodactyl\Http\Requests\Admin\Egg\EggImportFormRequest;
+use Pterodactyl\Services\Eggs\Sharing\EggUpdateImporterService;
 
 class EggShareController extends Controller
 {
@@ -35,21 +36,29 @@ class EggShareController extends Controller
      */
     protected $importerService;
 
+    /**
+     * @var \Pterodactyl\Services\Eggs\Sharing\EggUpdateImporterService
+     */
+    protected $updateImporterService;
+
     /**
      * OptionShareController constructor.
      *
-     * @param \Prologue\Alerts\AlertsMessageBag                     $alert
-     * @param \Pterodactyl\Services\Eggs\Sharing\EggExporterService $exporterService
-     * @param \Pterodactyl\Services\Eggs\Sharing\EggImporterService $importerService
+     * @param \Prologue\Alerts\AlertsMessageBag                           $alert
+     * @param \Pterodactyl\Services\Eggs\Sharing\EggExporterService       $exporterService
+     * @param \Pterodactyl\Services\Eggs\Sharing\EggImporterService       $importerService
+     * @param \Pterodactyl\Services\Eggs\Sharing\EggUpdateImporterService $updateImporterService
      */
     public function __construct(
         AlertsMessageBag $alert,
         EggExporterService $exporterService,
-        EggImporterService $importerService
+        EggImporterService $importerService,
+        EggUpdateImporterService $updateImporterService
     ) {
         $this->alert = $alert;
         $this->exporterService = $exporterService;
         $this->importerService = $importerService;
+        $this->updateImporterService = $updateImporterService;
     }
 
     /**
@@ -76,7 +85,8 @@ class EggShareController extends Controller
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
      */
     public function import(EggImportFormRequest $request): RedirectResponse
     {
@@ -85,4 +95,24 @@ class EggShareController extends Controller
 
         return redirect()->route('admin.nests.egg.view', ['egg' => $egg->id]);
     }
+
+    /**
+     * Update an existing Egg using a new imported file.
+     *
+     * @param \Pterodactyl\Http\Requests\Admin\Egg\EggImportFormRequest $request
+     * @param int                                                       $egg
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
+     */
+    public function update(EggImportFormRequest $request, int $egg): RedirectResponse
+    {
+        $this->updateImporterService->handle($egg, $request->file('import_file'));
+        $this->alert->success(trans('admin/nests.eggs.notices.updated_via_import'))->flash();
+
+        return redirect()->route('admin.nests.egg.view', ['egg' => $egg]);
+    }
 }

app/Http/Controllers/Admin/PackController.php

@@ -156,7 +156,7 @@ class PackController extends Controller
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException
-     * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidPackArchiveFormatException
      * @throws \Pterodactyl\Exceptions\Service\Pack\UnreadableZipArchiveException
      * @throws \Pterodactyl\Exceptions\Service\Pack\ZipExtractionException

app/Http/Requests/Admin/Egg/EggImportFormRequest.php

@@ -18,9 +18,14 @@ class EggImportFormRequest extends AdminFormRequest
      */
     public function rules()
     {
-        return [
+        $rules = [
             'import_file' => 'bail|required|file|max:1000|mimetypes:application/json,text/plain',
-            'import_to_nest' => 'bail|required|integer|exists:nests,id',
         ];
+
+        if ($this->method() !== 'PUT') {
+            $rules['import_to_nest'] = 'bail|required|integer|exists:nests,id';
+        }
+
+        return $rules;
     }
 }

app/Services/Eggs/Sharing/EggImporterService.php

@@ -15,7 +15,8 @@ use Illuminate\Http\UploadedFile;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
-use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
+use Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException;
+use Pterodactyl\Exceptions\Service\InvalidFileUploadException;
 use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
 
 class EggImporterService
@@ -69,7 +70,8 @@ class EggImporterService
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
      */
     public function handle(UploadedFile $file, int $nest): Egg
     {
@@ -78,6 +80,11 @@ class EggImporterService
         }
 
         $parsed = json_decode($file->openFile()->fread($file->getSize()));
+        if (json_last_error() !== 0) {
+            throw new BadJsonFormatException(trans('exceptions.nest.importer.json_error', [
+                'error' => json_last_error_msg(),
+            ]));
+        }
 
         if (object_get($parsed, 'meta.version') !== 'PTDL_v1') {
             throw new InvalidFileUploadException(trans('exceptions.nest.importer.invalid_json_provided'));

app/Services/Eggs/Sharing/EggUpdateImporterService.php

@@ -0,0 +1,113 @@
+<?php
+
+namespace Pterodactyl\Services\Eggs\Sharing;
+
+use Illuminate\Http\UploadedFile;
+use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
+use Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException;
+use Pterodactyl\Exceptions\Service\InvalidFileUploadException;
+use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
+
+class EggUpdateImporterService
+{
+    /**
+     * @var \Illuminate\Database\ConnectionInterface
+     */
+    protected $connection;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggRepositoryInterface
+     */
+    protected $repository;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface
+     */
+    protected $variableRepository;
+
+    /**
+     * EggUpdateImporterService constructor.
+     *
+     * @param \Illuminate\Database\ConnectionInterface                         $connection
+     * @param \Pterodactyl\Contracts\Repository\EggRepositoryInterface         $repository
+     * @param \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface $variableRepository
+     */
+    public function __construct(
+        ConnectionInterface $connection,
+        EggRepositoryInterface $repository,
+        EggVariableRepositoryInterface $variableRepository
+    ) {
+        $this->connection = $connection;
+        $this->repository = $repository;
+        $this->variableRepository = $variableRepository;
+    }
+
+    /**
+     * Update an existing Egg using an uploaded JSON file.
+     *
+     * @param int                           $egg
+     * @param \Illuminate\Http\UploadedFile $file
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
+     */
+    public function handle(int $egg, UploadedFile $file)
+    {
+        if (! $file->isValid() || ! $file->isFile()) {
+            throw new InvalidFileUploadException(trans('exceptions.nest.importer.file_error'));
+        }
+
+        $parsed = json_decode($file->openFile()->fread($file->getSize()));
+        if (json_last_error() !== 0) {
+            throw new BadJsonFormatException(trans('exceptions.nest.importer.json_error', [
+                'error' => json_last_error_msg(),
+            ]));
+        }
+
+        if (object_get($parsed, 'meta.version') !== 'PTDL_v1') {
+            throw new InvalidFileUploadException(trans('exceptions.nest.importer.invalid_json_provided'));
+        }
+
+        $this->connection->beginTransaction();
+        $this->repository->update($egg, [
+            'author' => object_get($parsed, 'author'),
+            'name' => object_get($parsed, 'name'),
+            'description' => object_get($parsed, 'description'),
+            'docker_image' => object_get($parsed, 'image'),
+            'config_files' => object_get($parsed, 'config.files'),
+            'config_startup' => object_get($parsed, 'config.startup'),
+            'config_logs' => object_get($parsed, 'config.logs'),
+            'config_stop' => object_get($parsed, 'config.stop'),
+            'startup' => object_get($parsed, 'startup'),
+            'script_install' => object_get($parsed, 'scripts.installation.script'),
+            'script_entry' => object_get($parsed, 'scripts.installation.entrypoint'),
+            'script_container' => object_get($parsed, 'scripts.installation.container'),
+        ], true, true);
+
+        // Update Existing Variables
+        collect($parsed->variables)->each(function ($variable) use ($egg) {
+            $this->variableRepository->withoutFresh()->updateOrCreate([
+                'egg_id' => $egg,
+                'env_variable' => $variable->env_variable,
+            ], collect($variable)->except(['egg_id', 'env_variable'])->toArray());
+        });
+
+        $imported = collect($parsed->variables)->pluck('env_variable')->toArray();
+        $existing = $this->variableRepository->withColumns(['id', 'env_variable'])->findWhere([['egg_id', '=', $egg]]);
+
+        // Delete variables not present in the import.
+        collect($existing)->each(function ($variable) use ($egg, $imported) {
+            if (! in_array($variable->env_variable, $imported)) {
+                $this->variableRepository->deleteWhere([
+                    ['egg_id', '=', $egg],
+                    ['env_variable', '=', $variable->env_variable],
+                ]);
+            }
+        });
+
+        $this->connection->commit();
+    }
+}

app/Services/Packs/PackCreationService.php

@@ -13,8 +13,8 @@ use Ramsey\Uuid\Uuid;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Contracts\Repository\PackRepositoryInterface;
+use Pterodactyl\Exceptions\Service\InvalidFileUploadException;
 use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;
-use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
 use Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException;
 
 class PackCreationService
@@ -65,7 +65,7 @@ class PackCreationService
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException
-     * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
      */
     public function handle(array $data, UploadedFile $file = null)
     {

app/Services/Packs/TemplateUploadService.php

@@ -11,8 +11,8 @@ namespace Pterodactyl\Services\Packs;
 
 use ZipArchive;
 use Illuminate\Http\UploadedFile;
+use Pterodactyl\Exceptions\Service\InvalidFileUploadException;
 use Pterodactyl\Exceptions\Service\Pack\ZipExtractionException;
-use Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException;
 use Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException;
 use Pterodactyl\Exceptions\Service\Pack\UnreadableZipArchiveException;
 use Pterodactyl\Exceptions\Service\Pack\InvalidPackArchiveFormatException;
@@ -58,7 +58,7 @@ class TemplateUploadService
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Service\Pack\ZipExtractionException
-     * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException
      * @throws \Pterodactyl\Exceptions\Service\Pack\UnreadableZipArchiveException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidPackArchiveFormatException
@@ -94,7 +94,7 @@ class TemplateUploadService
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Service\Pack\ZipExtractionException
-     * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileUploadException
+     * @throws \Pterodactyl\Exceptions\Service\InvalidFileUploadException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidFileMimeTypeException
      * @throws \Pterodactyl\Exceptions\Service\Pack\UnreadableZipArchiveException
      * @throws \Pterodactyl\Exceptions\Service\Pack\InvalidPackArchiveFormatException