e33418f716
Resolves a batch of bugs and feature requests across songs, services, settings and export: Songs & sections - Every song now carries permanent, empty, locked PREFIX (COPYRIGHT) and POSTFIX (BLANK) sections, deduplicated on import; locked sections cannot be edited or deleted via UI or API. - Song edit modal: explicit Speichern/Schließen with dirty-tracking, editable section headline (combobox + custom values), and a fix for the 419 CSRF errors after CCLI "Importieren & Bearbeiten" (token read fresh per request). - CCLI bookmarklet "Importieren & Bearbeiten" now opens the edit dialog. Service schedule & arrangements - Fixed assigned songs showing no sections (slides loaded for all arrangements, not just the default). - Added "Song entfernen / neu zuordnen" to reassign an assigned song. - Worship-leader arrangement is created/selected lazily when the arrangement dialog opens (only when not user-overridden); the leader is resolved from the "Lobpreis" agenda item, and manual create/clone names are prefixed with the leader name. Navigation - "/" redirects to the next upcoming service's edit page (or the list). - Service titles link to the edit page. Settings - Renamed "Makro-Import"/"Label-Import" menu items; fixed drag-and-drop imports (were downloading the dropped file); added label-import hint; made the panel scrollable. - Nametag now uses a single MacroPicker; added song prefix/postfix label defaults (COPYRIGHT #24B34C / BLANK #000000); new "Export-Dateien" menu to upload prefix/postfix .pro files added to every export. Export - Filenames/playlist names are date-first ("YYYY-MM-DD <Title>"). - Keyvisual slide only for the first content-less item after real content; all other content-less items render as headlines. - New "Vorschau herunterladen" for non-finalized services (filename and import name prefixed "Vorschau" with export timestamp). - Uploaded prefix/postfix .pro files wrap every export. Tests updated to the new behavior; full suite green (569 passed).
72 lines
2.3 KiB
PHP
72 lines
2.3 KiB
PHP
<?php
|
|
|
|
namespace App\Http\Controllers;
|
|
|
|
use App\Models\Song;
|
|
use App\Services\ProExportService;
|
|
use App\Services\ProImportService;
|
|
use Illuminate\Http\JsonResponse;
|
|
use Illuminate\Http\Request;
|
|
use Symfony\Component\HttpFoundation\BinaryFileResponse;
|
|
|
|
class ProFileController extends Controller
|
|
{
|
|
public function importPro(Request $request): JsonResponse
|
|
{
|
|
$request->validate([
|
|
'file' => ['required', 'file', 'max:51200'],
|
|
]);
|
|
|
|
$file = $request->file('file');
|
|
$extension = strtolower($file->getClientOriginalExtension());
|
|
|
|
if (! in_array($extension, ['pro', 'zip'])) {
|
|
return response()->json([
|
|
'message' => 'Nur .pro und .zip Dateien sind erlaubt.',
|
|
], 422);
|
|
}
|
|
|
|
try {
|
|
$service = app(ProImportService::class);
|
|
$songs = $service->import($file);
|
|
|
|
return response()->json([
|
|
'message' => count($songs) === 1
|
|
? "Song \"{$songs[0]->title}\" erfolgreich importiert."
|
|
: count($songs).' Songs erfolgreich importiert.',
|
|
'songs' => collect($songs)->map(fn (Song $song) => [
|
|
'id' => $song->id,
|
|
'title' => $song->title,
|
|
'ccli_id' => $song->ccli_id,
|
|
]),
|
|
]);
|
|
} catch (\InvalidArgumentException $e) {
|
|
return response()->json(['message' => $e->getMessage()], 422);
|
|
} catch (\RuntimeException $e) {
|
|
return response()->json(['message' => $e->getMessage()], 422);
|
|
}
|
|
}
|
|
|
|
public function downloadPro(Song $song): BinaryFileResponse
|
|
{
|
|
if ($this->countSongLabels($song) === 0) {
|
|
abort(422, 'Song hat keine Gruppen oder Slides zum Exportieren.');
|
|
}
|
|
|
|
$exportService = app(ProExportService::class);
|
|
$tempPath = $exportService->generateProFile($song);
|
|
|
|
$filename = preg_replace('/[^a-zA-Z0-9äöüÄÖÜß\-_ ]/', '', $song->title).'.pro';
|
|
|
|
return response()->download($tempPath, $filename)->deleteFileAfterSend(true);
|
|
}
|
|
|
|
private function countSongLabels(Song $song): int
|
|
{
|
|
return $song->arrangements()
|
|
->withCount('arrangementLabels')
|
|
->get()
|
|
->sum('arrangement_labels_count');
|
|
}
|
|
}
|