fix(media): init file properties in setAttributes' Model method + set defaults to pathinfo data

modules/Media/Entities/Audio.php

@@ -21,14 +21,11 @@ class Audio extends BaseMedia
 {
     protected string $type = 'audio';
 
-    /**
+    public function initFileProperties(): void
-     * @param array<string, mixed>|null $data
-     */
-    public function __construct(array $data = null)
     {
-        parent::__construct($data);
+        parent::initFileProperties();
 
-        if ($this->file_metadata) {
+        if ($this->file_metadata !== null) {
             $this->duration = (float) $this->file_metadata['playtime_seconds'];
             $this->header_size = (int) $this->file_metadata['avdataoffset'];
         }

modules/Media/Entities/BaseMedia.php

@@ -56,29 +56,30 @@ class BaseMedia extends Entity
     ];
 
     /**
-     * @param array<string, mixed>|null $data
+     * @param array<string, mixed> $data
      */
-    public function __construct(array $data = null)
+    public function setAttributes(array $data): self
     {
-        parent::__construct($data);
+        parent::setAttributes($data);
 
         $this->initFileProperties();
+
+        return $this;
     }
 
     public function initFileProperties(): void
     {
-        if ($this->file_key !== '') {
+        $pathInfo = pathinfo($this->file_key) + [
-            [
+            'filename'  => '',
-                'filename'  => $filename,
+            'dirname'   => '',
-                'dirname'   => $dirname,
+            'extension' => '',
-                'extension' => $extension,
+        ];
-            ] = pathinfo($this->file_key);
 
-            $this->attributes['file_url'] = service('file_manager')->getUrl($this->file_key);
+        $this->file_url = service('file_manager')
-            $this->attributes['file_name'] = $filename;
+            ->getUrl($this->file_key);
-            $this->attributes['file_directory'] = $dirname;
+        $this->file_name = $pathInfo['filename'];
-            $this->attributes['file_extension'] = $extension;
+        $this->file_directory = $pathInfo['dirname'];
-        }
+        $this->file_extension = $pathInfo['extension'];
     }
 
     public function setFile(File $file): self

modules/Media/Entities/Image.php

@@ -29,10 +29,7 @@ class Image extends BaseMedia
     {
         parent::initFileProperties();
 
-        if ($this->file_key !== '' && $this->file_metadata !== null && array_key_exists(
+        if ($this->file_metadata && array_key_exists('sizes', $this->file_metadata)) {
-            'sizes',
-            $this->file_metadata
-        )) {
             $this->sizes = $this->file_metadata['sizes'];
             $this->initSizeProperties();
         }

modules/Media/Entities/Transcript.php

@@ -21,11 +21,11 @@ class Transcript extends BaseMedia
 
     protected string $type = 'transcript';
 
-    public function __construct(?array $data = null)
+    public function initFileProperties(): void
     {
-        parent::__construct($data);
+        parent::initFileProperties();
 
-        if ($this->file_key && $this->file_metadata && array_key_exists('json_key', $this->file_metadata)) {
+        if ($this->file_metadata !== null && array_key_exists('json_key', $this->file_metadata)) {
             helper('media');
 
             $this->json_key = $this->file_metadata['json_key'];

modules/Media/Models/MediaModel.php

@@ -102,14 +102,7 @@ class MediaModel extends Model
     {
         $cacheName = "media#{$mediaId}";
         if (! ($found = cache($cacheName))) {
-            $builder = $this->where([
+            $found = $this->find($mediaId);
-                'id' => $mediaId,
-            ]);
-
-            /** @var object $result */
-            $result = $builder->first();
-            $mediaClass = $this->returnType;
-            $found = new $mediaClass($result->toArray(false, true));
 
             cache()
                 ->save($cacheName, $found, DECADE);

modules/PodcastImport/Commands/PodcastImport.php

@@ -168,6 +168,10 @@ class PodcastImport extends BaseCommand
             $this->importTask->pass();
         } catch (Exception $exception) {
             $this->error($exception->getMessage());
+            log_message(
+                'critical',
+                'Error when importing ' . $this->importTask->feed_url . PHP_EOL . $exception->getTraceAsString()
+            );
         }
     }