From 298c4b31d8380fa58b3487f10af93f235c62165d Mon Sep 17 00:00:00 2001
From: paranarimasu <33796518+paranarimasu@users.noreply.github.com>
Date: Tue, 16 Aug 2022 10:00:10 -0500
Subject: [PATCH] fix(admin): add missing config for FFProbe to resolve binary
 (#437)

---
 .env.example                                    | 4 ++++
 app/Actions/Models/Wiki/Video/UploadResults.php | 4 ++--
 app/Rules/Wiki/Submission/SubmissionRule.php    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.env.example b/.env.example
index ab8129d03..01d91616a 100644
--- a/.env.example
+++ b/.env.example
@@ -85,6 +85,10 @@ ELASTIC_SCOUT_DRIVER_REFRESH_DOCUMENTS=false
 # elastic migrations
 ELASTIC_MIGRATIONS_TABLE=elastic_migrations
 
+# ffmpeg
+FFMPEG_BINARIES=
+FFPROBE_BINARIES=
+
 # filesystems
 FILESYSTEM_DISK=local
 
diff --git a/app/Actions/Models/Wiki/Video/UploadResults.php b/app/Actions/Models/Wiki/Video/UploadResults.php
index 7de0ae9c5..738b3779d 100644
--- a/app/Actions/Models/Wiki/Video/UploadResults.php
+++ b/app/Actions/Models/Wiki/Video/UploadResults.php
@@ -61,13 +61,13 @@ class UploadResults
         if ($failed->isNotEmpty()) {
             return new ActionResult(
                 ActionStatus::FAILED(),
-                "Failed to upload to disks {$failed->keys()->join(', ', '& ')}."
+                "Failed to upload to disks {$failed->keys()->join(', ', ' & ')}."
             );
         }
 
         return new ActionResult(
             ActionStatus::PASSED(),
-            "Uploaded '{$passed->values()->first()}' to disks {$passed->keys()->join(', ', '& ')}."
+            "Uploaded '{$passed->values()->first()}' to disks {$passed->keys()->join(', ', ' & ')}."
         );
     }
 }
diff --git a/app/Rules/Wiki/Submission/SubmissionRule.php b/app/Rules/Wiki/Submission/SubmissionRule.php
index 6ea8946e3..ba5a60df5 100644
--- a/app/Rules/Wiki/Submission/SubmissionRule.php
+++ b/app/Rules/Wiki/Submission/SubmissionRule.php
@@ -89,7 +89,7 @@ abstract class SubmissionRule implements DataAwareRule, Rule, ValidatorAwareRule
             '-show_chapters',
         ];
 
-        $output = FFProbe::create()
+        $output = FFProbe::create(app('laravel-ffmpeg-configuration'))
             ->getFFProbeDriver()
             ->command($commands);