Skip to content

A self-hosted media server and file management system

fix: server config types are not casted correctly

aminnausin45fc5a78fc90
diff --git a/app/Http/Controllers/Api/V1/Server/ServerConfigController.php b/app/Http/Controllers/Api/V1/Server/ServerConfigController.php
index c5496471..e6259eed 100644
--- a/app/Http/Controllers/Api/V1/Server/ServerConfigController.php
+++ b/app/Http/Controllers/Api/V1/Server/ServerConfigController.php
@@ -7,21 +7,23 @@ use App\Http\Requests\Server\UpdateMediaConfigRequest;
use App\Http\Requests\Server\UpdatePerformanceConfigRequest;
use App\Http\Requests\Server\UpdateScannerConfigRequest;
use App\Http\Requests\Server\UpdateStorageConfigRequest;
-use App\Http\Resources\Server\ServerConfigResource;
use App\Models\ServerConfig;
use App\Services\Server\QueueControlService;
use App\Services\Server\ServerConfigService;
use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Cache;
class ServerConfigController extends Controller {
- public function __construct(private ServerConfigService $config) {}
+ public function __construct(private ServerConfigService $config) {
+ }
public function index(): JsonResponse {
- Cache::forget('server_config:all');
+ $configs = ServerConfig::all()->groupBy('group');
return response()->json(
- ServerConfigResource::collection(ServerConfig::all())->groupBy('group')->map(fn ($group) => $group->keyBy('key'))
+ [
+ 'values' => $configs->map(fn($group) => $group->pluck('value', 'key')),
+ 'defaults' => $configs->map(fn($group) => $group->pluck('default_value', 'key')),
+ ]
);
}
diff --git a/app/Models/ServerConfig.php b/app/Models/ServerConfig.php
index 19731dcf..7bbcfef2 100644
--- a/app/Models/ServerConfig.php
+++ b/app/Models/ServerConfig.php
@@ -2,6 +2,7 @@
namespace App\Models;
+use App\Casts\ServerConfigValue;
use Illuminate\Database\Eloquent\Model;
class ServerConfig extends Model {
@@ -10,7 +11,7 @@ class ServerConfig extends Model {
* value -> text
* default_value -> text
* type -> enum ('string', 'boolean', 'integer', 'array', 'float')
- * group -> enum ('scanning', 'metadata', 'media', 'performance', 'storage')
+ * group -> enum ('scanner', 'metadata', 'media', 'performance', 'storage')
*
* created_at -> timestamptz (nullable)
* updated_at -> timestamptz (nullable)
@@ -23,4 +24,9 @@ class ServerConfig extends Model {
'created_at',
'updated_at',
];
+
+ protected $casts = [
+ 'value' => ServerConfigValue::class,
+ 'default_value' => ServerConfigValue::class,
+ ];
}
diff --git a/app/Services/Server/ServerConfigService.php b/app/Services/Server/ServerConfigService.php
index b7527a09..19e93519 100644
--- a/app/Services/Server/ServerConfigService.php
+++ b/app/Services/Server/ServerConfigService.php
@@ -10,32 +10,27 @@ use Illuminate\Support\Facades\DB;
class ServerConfigService {
public function all(): Collection {
return Cache::rememberForever('server_config:all', function () {
- return ServerConfig::all()->keyBy('key')->map(fn ($record) => [
- 'value' => json_decode($record->value, true) ?? $record->value,
- 'default_value' => json_decode($record->default_value, true) ?? $record->default_value,
- 'type' => $record->type,
- 'group' => $record->group,
- ]);
+ return ServerConfig::all()->keyBy('key');
});
}
public function get(string $key, mixed $default = null): mixed {
- return $this->all()->get($key)['value'] ?? $default ?? $this->getDefault($key);
+ return $this->all()->get($key)?->value ?? $default ?? $this->getDefault($key);
}
public function getDefault(string $key): mixed {
- return $this->all()->get($key)['default_value'] ?? null;
+ return $this->all()->get($key)?->default_value ?? null;
}
public function set(string $key, mixed $value): void {
- ServerConfig::update(['key' => $key], ['value' => json_encode($value ?? $this->getDefault($key))]);
+ ServerConfig::update(['key' => $key], ['value' => $value ?? $this->getDefault($key)]);
Cache::forget('server_config:all');
}
public function setMany(array $values): void {
DB::transaction(function () use ($values) {
foreach ($values as $key => $value) {
- ServerConfig::where('key', $key)->update(['value' => json_encode($value ?? $this->getDefault($key))]);
+ ServerConfig::where('key', $key)->update(['value' => $value ?? $this->getDefault($key)]);
}
});
diff --git a/database/seeders/ServerConfigSeeder.php b/database/seeders/ServerConfigSeeder.php
index e28acffa..bc084f79 100644
--- a/database/seeders/ServerConfigSeeder.php
+++ b/database/seeders/ServerConfigSeeder.php
@@ -91,7 +91,7 @@ class ServerConfigSeeder extends Seeder {
];
foreach ($configs as &$config) {
- if ($config['type'] === 'array' || $config['type'] === 'bool') {
+ if ($config['type'] === 'array') {
$config['value'] = json_encode($config['value']);
$config['default_value'] = json_encode($config['default_value']);
}
diff --git a/resources/js/contracts/server.ts b/resources/js/contracts/server.ts
new file mode 100644
index 00000000..948ae97a
--- /dev/null
+++ b/resources/js/contracts/server.ts
@@ -0,0 +1,39 @@
+export type ServerConfigGroup = 'scanner' | 'metadata' | 'media' | 'performance' | 'storage';
+export type ServerConfigType = 'string' | 'bool' | 'integer' | 'array' | 'float';
+
+export interface ServerConfig {
+ values: {
+ media: MediaConfigRequest;
+ performance: PerformanceConfigRequest;
+ storage: StorageConfigRequest;
+ scanner: ScannerConfigRequest;
+ };
+ defaults: {
+ media: MediaConfigRequest;
+ performance: PerformanceConfigRequest;
+ storage: StorageConfigRequest;
+ scanner: ScannerConfigRequest;
+ };
+}
+
+export interface ScannerConfigRequest {
+ uuid_embed: boolean;
+ uuid_write_cache: boolean;
+ attachments_extract: boolean;
+ thumbnails_generate: boolean;
+ art_extract: boolean;
+}
+
+export interface StorageConfigRequest {
+ cache_path?: string;
+ metadata_path?: string;
+}
+
+export interface PerformanceConfigRequest {
+ max_scan_workers: number;
+ max_event_workers: number;
+}
+
+export interface MediaConfigRequest {
+ media_formats: { [key: string]: string };
+}