Merge pull request #68 from urbantrout/develop-v4

Fix progress URLs and send application/json response

Author: khalwat

src/controllers/DefaultController.php

@@ -12,12 +12,13 @@
 
 use Craft;
 use craft\errors\AssetDisallowedExtensionException;
-use craft\helpers\Json as JsonHelper;
 use craft\helpers\Path as PathHelper;
 use craft\web\Controller;
+use craft\web\Response;
 use nystudio107\transcoder\Transcoder;
 use yii\base\ExitException;
 use yii\web\BadRequestHttpException;
+
 use function count;
 use function is_array;
 
@@ -28,7 +29,6 @@
  */
 class DefaultController extends Controller
 {
-
     // Protected Properties
     // =========================================================================
 
@@ -100,9 +100,9 @@ public function actionDownloadFile($url): void
      *
      * @param $filename
      *
-     * @return string
+     * @return Response
      */
-    public function actionProgress($filename): string
+    public function actionProgress($filename): Response
     {
         $result = [];
         $progressFile = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $filename . '.progress';
@@ -173,6 +173,6 @@ public function actionProgress($filename): string
             }
         }
 
-        return JsonHelper::encode($result);
+        return $this->asJson($result);
     }
 }

src/services/Transcode.php

@@ -536,13 +536,13 @@ public function getFileInfo(Asset|string $filePath, bool $summary = false): ?arr
     /**
      * Get the name of a video file from a path and options
      *
-     * @param string $filePath
+     * @param Asset|string $filePath
      * @param array $videoOptions
      *
      * @return string
      * @throws InvalidConfigException
      */
-    public function getVideoFilename(string $filePath, array $videoOptions): string
+    public function getVideoFilename(Asset|string $filePath, array $videoOptions): string
     {
         $settings = Transcoder::$plugin->getSettings();
         $videoOptions = $this->coalesceOptions('defaultVideoOptions', $videoOptions);
@@ -559,13 +559,13 @@ public function getVideoFilename(string $filePath, array $videoOptions): string
     /**
      * Get the name of an audio file from a path and options
      *
-     * @param string $filePath
+     * @param Asset|string $filePath
      * @param array $audioOptions
      *
      * @return string
      * @throws InvalidConfigException
      */
-    public function getAudioFilename(string $filePath, array $audioOptions): string
+    public function getAudioFilename(Asset|string $filePath, array $audioOptions): string
     {
         $settings = Transcoder::$plugin->getSettings();
         $audioOptions = $this->coalesceOptions('defaultAudioOptions', $audioOptions);
@@ -582,13 +582,13 @@ public function getAudioFilename(string $filePath, array $audioOptions): string
     /**
      * Get the name of a gif video file from a path and options
      *
-     * @param string $filePath
+     * @param Asset|string $filePath
      * @param array $gifOptions
      *
      * @return string
      * @throws InvalidConfigException
      */
-    public function getGifFilename(string $filePath, array $gifOptions): string
+    public function getGifFilename(Asset|string $filePath, array $gifOptions): string
     {
         $settings = Transcoder::$plugin->getSettings();
         $gifOptions = $this->coalesceOptions('defaultGifOptions', $gifOptions);
@@ -721,13 +721,13 @@ public function getGifUrl(Asset|string $filePath, array $gifOptions): string|fal
     /**
      * Get the name of a file from a path and options
      *
-     * @param string $filePath
+     * @param Asset|string $filePath
      * @param array $options
      *
      * @return string
      * @throws InvalidConfigException
      */
-    protected function getFilename(string $filePath, array $options): string
+    protected function getFilename(Asset|string $filePath, array $options): string
     {
         $settings = Transcoder::$plugin->getSettings();
         $filePath = $this->getAssetPath($filePath);