Download files from url & fix cropdetect (#10)

Tschucki · Dec 22, 2024 · 6d45ba4 · 6d45ba4
1 parent 8cdd05e
commit 6d45ba4
Show file tree

Hide file tree

Showing 28 changed files with 455 additions and 49 deletions.
diff --git a/.env.example b/.env.example
@@ -71,3 +71,5 @@ FFPROBE_BINARIES=/usr/bin/ffprobe
 REVERB_APP_ID=my-app-id
 REVERB_APP_KEY=my-app-key
 REVERB_APP_SECRET=my-app-secret
+
+YT_DLP_PATH=
diff --git a/app/Conversion/MediaOperations/AudioQualityFilterOperation.php b/app/Conversion/MediaOperations/AudioQualityFilterOperation.php
@@ -13,7 +13,7 @@ class AudioQualityFilterOperation implements MediaFormatOperation
 {
     public Conversion $conversion;
 
-    private int $currentBitrate;
+    private ?int $currentBitrate;
 
     public function __construct(Conversion $conversion)
     {
@@ -23,6 +23,10 @@ public function __construct(Conversion $conversion)
 
     public function applyToFormat(DefaultVideo $format): DefaultVideo
     {
+        if ($this->conversion->audio === false || $this->currentBitrate === null) {
+            return $format;
+        }
+
         $maxQuality = $this->conversion->audio_quality;
 
         if ($maxQuality < 0 || $maxQuality > 1) {
@@ -44,7 +48,7 @@ public function applyToFormat(DefaultVideo $format): DefaultVideo
     private function prepareData(): void
     {
         $probe = app(FFProbe::class);
-
+        $this->currentBitrate = null;
         $streams = $probe->streams(Storage::disk($this->conversion->file->disk)->path($this->conversion->file->filename));
         foreach ($streams as $stream) {
             if ($stream->get('codec_type') === 'audio') {

diff --git a/app/Conversion/MediaOperations/AutoCropFilterOperation.php b/app/Conversion/MediaOperations/AutoCropFilterOperation.php
@@ -32,7 +32,7 @@ private function prepareData(): void
         $path = Storage::disk($this->conversion->file->disk)->path($this->conversion->file->filename);
         $ffmpeg = config('laravel-ffmpeg.ffmpeg.binaries');
 
-        $process = Process::run("{$ffmpeg} -flags2 +export_mvs -i {$path} -vf cropdetect=mode=mvedges -f null - 2>&1 | awk '/crop/ { print \$NF }' | tail -1");
+        $process = Process::run("{$ffmpeg} -flags2 +export_mvs -i {$path} -vf cropdetect -f null - 2>&1 | awk '/crop/ { print \$NF }' | tail -1");
 
         $this->crop = trim($process->output());
     }

diff --git a/app/Conversion/MediaOperations/MaxSizeOperation.php b/app/Conversion/MediaOperations/MaxSizeOperation.php
@@ -36,7 +36,7 @@ public function applyToFormat(DefaultVideo $format): DefaultVideo
         $maxSizeInBits = $maxSizeInMB * 1024 * 1024 * 8;
         $videoBitrate = floor(($maxSizeInBits / $duration) - floor($audioBitrateInKiloBits));
 
-        if ($videoBitrate > $this->format->get('bit_rate')) {
+        if (($videoBitrate * $duration) >= $this->format->get('bit_rate')) {
             return $format;
         }
 

diff --git a/app/Enums/ConversionStatus.php b/app/Enums/ConversionStatus.php
@@ -4,6 +4,8 @@
 
 enum ConversionStatus
 {
+    public const DOWNLOADING = 'downloading';
+
     public const PREPARING = 'preparing';
 
     public const PENDING = 'pending';

diff --git a/app/Events/ConversionFinished.php b/app/Events/ConversionFinished.php
@@ -5,10 +5,11 @@
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
-class ConversionFinished implements ShouldBroadcast
+class ConversionFinished implements ShouldBroadcast, ShouldQueue
 {
     use Dispatchable;
     use InteractsWithSockets;

diff --git a/app/Events/ConversionProgressEvent.php b/app/Events/ConversionProgressEvent.php
@@ -6,10 +6,11 @@
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
-class ConversionProgressEvent implements ShouldBroadcast
+class ConversionProgressEvent implements ShouldBroadcast, ShouldQueue
 {
     use Dispatchable;
     use InteractsWithSockets;
@@ -35,7 +36,7 @@ public function __construct(
         $this->percentage = $percentage;
         $this->remaining = $remaining;
         $this->rate = $rate;
-        $this->sessionId = Conversion::find($conversionId)->file->session_id;
+        $this->sessionId = Conversion::find($conversionId)->session_id;
     }
 
     public function broadcastOn(): array

diff --git a/app/Events/ConversionUpdated.php b/app/Events/ConversionUpdated.php
@@ -6,10 +6,11 @@
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
-class ConversionUpdated implements ShouldBroadcast
+class ConversionUpdated implements ShouldBroadcast, ShouldQueue
 {
     use Dispatchable;
     use InteractsWithSockets;
@@ -26,7 +27,7 @@ public function __construct(string $conversionId)
         $this->conversionId = $conversionId;
         $conversion = Conversion::with('file')->where('id', $conversionId)->first();
         $this->conversion = $conversion->toArray();
-        $this->sessionId = Conversion::find($conversionId)->file->session_id;
+        $this->sessionId = Conversion::find($conversionId)->session_id;
     }
 
     public function broadcastOn(): array

diff --git a/app/Events/DownloadProgress.php b/app/Events/DownloadProgress.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Events;
+
+use App\Models\Conversion;
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class DownloadProgress implements ShouldBroadcast, ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithSockets;
+    use SerializesModels;
+
+    public ?string $conversionId;
+
+    public ?string $sessionId;
+
+    public ?string $progressTarget;
+
+    public ?string $percentage;
+
+    public ?string $size;
+
+    public ?string $speed;
+
+    public ?string $eta;
+
+    private ?string $totalTime;
+
+    public function __construct(string $conversionId, ?string $progressTarget = null, ?string $percentage = null, ?string $size = null, ?string $speed = null, ?string $eta = null, ?string $totalTime = null)
+    {
+        $this->conversionId = $conversionId;
+        $conversion = Conversion::find($this->conversionId);
+        $this->sessionId = $conversion->session_id;
+        $this->progressTarget = $progressTarget;
+        $this->percentage = $percentage;
+        $this->size = $size;
+        $this->speed = $speed;
+        $this->eta = $eta;
+        $this->totalTime = $totalTime;
+    }
+
+    public function broadcastOn(): array
+    {
+        return [
+            new Channel('session.' . $this->sessionId),
+        ];
+    }
+}
diff --git a/app/Events/FileUploadFailed.php b/app/Events/FileUploadFailed.php
@@ -5,22 +5,18 @@
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
-class FileUploadFailed implements ShouldBroadcast
+class FileUploadFailed implements ShouldBroadcast, ShouldQueue
 {
     use Dispatchable;
     use InteractsWithSockets;
     use SerializesModels;
 
     public function __construct(public string $sessionId) {}
 
-    /**
-     * Get the channels the event should broadcast on.
-     *
-     * @return array<int, \Illuminate\Broadcasting\Channel>
-     */
     public function broadcastOn(): array
     {
         return [

diff --git a/app/Events/FileUploadSuccessful.php b/app/Events/FileUploadSuccessful.php
@@ -5,10 +5,11 @@
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
-class FileUploadSuccessful implements ShouldBroadcast
+class FileUploadSuccessful implements ShouldBroadcast, ShouldQueue
 {
     use Dispatchable;
     use InteractsWithSockets;

diff --git a/app/Events/PreviousFilesDeleted.php b/app/Events/PreviousFilesDeleted.php
@@ -5,10 +5,11 @@
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
-class PreviousFilesDeleted implements ShouldBroadcast
+class PreviousFilesDeleted implements ShouldBroadcast, ShouldQueue
 {
     use Dispatchable;
     use InteractsWithSockets;

diff --git a/app/Http/Controllers/ListConverterController.php b/app/Http/Controllers/ListConverterController.php
@@ -18,20 +18,16 @@ public function __construct(Request $request)
 
     public function index(Request $request): Response
     {
-        $conversions = Conversion::with('file')->whereHas('file', function ($query) {
-            $query->where('session_id', $this->sessionId);
-        })->get();
+        $conversions = Conversion::with('file')->where('session_id', $this->sessionId)->get();
 
         return Inertia::render('Converter/List', [
-            'conversions' => $conversions,
+            'conversions' => $conversions->toArray(),
         ]);
     }
 
     public function myConversions(Request $request): array
     {
-        $conversions = Conversion::with('file')->whereHas('file', function ($query) {
-            $query->where('session_id', $this->sessionId);
-        })->get();
+        $conversions = Conversion::with('file')->where('session_id', $this->sessionId)->get();
 
         return $conversions->toArray();
     }

diff --git a/app/Http/Controllers/StartConverterController.php b/app/Http/Controllers/StartConverterController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Conversion\ConversionSettings;
+use App\Enums\ConversionStatus;
 use App\Events\FileUploadFailed;
 use App\Events\FileUploadSuccessful;
 use App\Events\PreviousFilesDeleted;
@@ -28,29 +29,32 @@ public function __invoke(StartConverterRequest $request)
 
         $this->deleteOldFiles();
 
-        $file = $this->handleUploadedFile($request);
+        if ($request->hasFile('file')) {
+            $file = $this->handleUploadedFile($request);
+        }
 
         $conversionSettings = ConversionSettings::fromRequest($validated);
 
         $conversion = Conversion::create([
             ...$conversionSettings->toArray(),
-            'file_id' => $file->id,
+            'status' => ConversionStatus::PENDING,
+            'session_id' => $this->sessionId,
+            'file_id' => $file->id ?? null,
+            'url' => $validated['url'] ?? null,
         ]);
 
         //ConversionJob::dispatchSync($conversion->id);
 
-        ConversionJob::dispatch($conversion->id)->onQueue('converter');
+        if ($request->hasFile('file')) {
+            ConversionJob::dispatch($conversion->id)->onQueue('converter');
+        }
 
         return redirect()->route('conversions.list');
     }
 
     private function handleUploadedFile(StartConverterRequest $request): File
     {
-        $file = null;
-
-        if ($request->hasFile('file')) {
-            $file = $this->storeUploadedFile($request->file('file'));
-        }
+        $file = $this->storeUploadedFile($request->file('file'));
 
         if ($file === null) {
             FileUploadFailed::dispatch($this->sessionId);
@@ -87,6 +91,7 @@ private function deleteOldFiles(): void
     {
         $countOldFiles = File::where('session_id', $this->sessionId)->count();
 
+        Conversion::where('session_id', $this->sessionId)->delete();
         File::where('session_id', $this->sessionId)->delete();
 
         if ($countOldFiles > 0) {

diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php
@@ -3,7 +3,6 @@
 namespace App\Http\Middleware;
 
 use App\Models\Conversion;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 use Inertia\Middleware;
 
@@ -42,9 +41,7 @@ public function share(Request $request): array
             'session' => [
                 'id' => $request->session()->getId(),
             ],
-            'conversions' => fn () => Conversion::whereHas('file', static function (Builder $query) use ($request) {
-                $query->where('session_id', $request->session()->getId());
-            })->select('id')->get(),
+            'conversions' => fn () => Conversion::where('session_id', $request->session()->getId())->select('id')->get(),
         ]);
     }
 }
diff --git a/app/Jobs/ConversionJob.php b/app/Jobs/ConversionJob.php
@@ -7,6 +7,7 @@
 use FFMpeg\Format\Video\X264;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Foundation\Queue\Queueable;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
@@ -15,6 +16,7 @@
 
 class ConversionJob implements ShouldBeUnique, ShouldQueue
 {
+    use Dispatchable;
     use Queueable;
 
     private string $conversionId;