Push changes that support creations of service packs and basic listing

app/Repositories/ServiceRepository/Pack.php

@@ -0,0 +1,105 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+namespace Pterodactyl\Repositories\ServiceRepository;
+
+use DB;
+use Storage;
+use Uuid;
+use Validator;
+
+use Pterodactyl\Models;
+use Pterodactyl\Services\UuidService;
+use Pterodactyl\Exceptions\DisplayException;
+use Pterodactyl\Exceptions\DisplayValidationException;
+
+class Pack
+{
+
+    public function __construct()
+    {
+        //
+    }
+
+    public function create(array $data)
+    {
+        $validator = Validator::make($data, [
+            'name' => 'required|string',
+            'version' => 'required|string',
+            'description' => 'string',
+            'option' => 'required|exists:service_options,id',
+            'selectable' => 'sometimes|boolean',
+            'visible' => 'sometimes|boolean',
+            'build_memory' => 'required|integer|min:0',
+            'build_swap' => 'required|integer|min:0',
+            'build_cpu' => 'required|integer|min:0',
+            'build_io' => 'required|integer|min:10|max:1000',
+            'build_container' => 'required|string',
+            'build_script' => 'sometimes|string'
+        ]);
+
+        if ($validator->fails()) {
+            throw new DisplayValidationException($validator->errors());
+        }
+
+        if (isset($data['file_upload'])) {
+            if (!$data['file_upload']->isValid()) {
+                throw new DisplayException('The file provided does not appear to be valid.');
+            }
+
+            if (!in_array($data['file_upload']->getMimeType(), [
+                'application/zip',
+                'application/gzip'
+            ])) {
+                throw new DisplayException('The file provided does not meet the required filetypes of application/zip or application/gzip.');
+            }
+        }
+
+        DB::transaction(function () use ($data) {
+            $uuid = new UuidService;
+            $pack = Models\ServicePack::create([
+                'option' => $data['option'],
+                'uuid' => $uuid->generate('servers', 'uuid'),
+                'build_memory' => $data['build_memory'],
+                'build_swap' => $data['build_swap'],
+                'build_cpu' => $data['build_swap'],
+                'build_io' => $data['build_io'],
+                'build_script' => (empty($data['build_script'])) ? null : $data['build_script'],
+                'build_container' => $data['build_container'],
+                'name' => $data['name'],
+                'version' => $data['version'],
+                'description' => (empty($data['description'])) ? null : $data['description'],
+                'selectable' => isset($data['selectable']),
+                'visible' => isset($data['visible'])
+            ]);
+
+            $filename = ($data['file_upload']->getMimeType() === 'application/zip') ? 'archive.zip' : 'archive.tar.gz';
+            $data['file_upload']->storeAs('packs/' . $pack->uuid, $filename);
+
+            $pack->save();
+
+            return $pack->id;
+        });
+    }
+
+}

app/Repositories/ServiceRepository/Service.php

@@ -101,6 +101,8 @@ class Service
 
         DB::beginTransaction();
         try {
+            Storage::deleteDirectory('services/' . $service->file);
+
             Models\ServiceVariables::whereIn('option_id', $options->get()->toArray())->delete();
             $options->delete();
             $service->delete();
@@ -128,23 +130,10 @@ class Service
         $filepath = 'services/' . $service->file . '/' . $filename;
         $backup = 'services/.bak/' . str_random(12) . '.bak';
 
-        DB::beginTransaction();
-
         try {
             Storage::move($filepath, $backup);
             Storage::put($filepath, $data['contents']);
-
-            $checksum = Models\Checksum::firstOrNew([
-                'service' => $service->id,
-                'filename' => $filename
-            ]);
-
-            $checksum->checksum = sha1_file(storage_path('app/' . $filepath));
-            $checksum->save();
-
-            DB::commit();
         } catch(\Exception $ex) {
-            DB::rollback();
             Storage::move($backup, $filepath);
             throw $ex;
         }