fix(import): save media files during podcast import + set missing media fields (a9989d84) · Commits · Ad Aures / Castopod

app/Database/Migrations/2020-05-29-120000_add_media.php

+1 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ class AddMedia extends Migration
		'language_code' => [
		'type' => 'VARCHAR',
		'constraint' => 2,
		'null' => true,
		],
		'uploaded_by' => [
		'type' => 'INT',

app/Entities/Episode.php

+15 −8

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ use App\Models\PersonModel;
		use App\Models\PodcastModel;
		use App\Models\PostModel;
		use CodeIgniter\Entity\Entity;
		use CodeIgniter\Files\File;
		use CodeIgniter\HTTP\Files\UploadedFile;
		use CodeIgniter\I18n\Time;
		use League\CommonMark\CommonMarkConverter;
		@@ -165,9 +166,9 @@ class Episode extends Entity
		'updated_by' => 'integer',
		];

		public function setCover(?UploadedFile $file): self
		public function setCover(UploadedFile \| File $file = null): self
		{
		if ($file === null \|\| ! $file->isValid()) {
		if ($file === null \|\| ($file instanceof UploadedFile && ! $file->isValid())) {
		return $this;
		}

		@@ -212,9 +213,9 @@ class Episode extends Entity
		return $this->cover;
		}

		public function setAudio(?UploadedFile $file): self
		public function setAudio(UploadedFile \| File $file = null): self
		{
		if ($file === null \|\| ! $file->isValid()) {
		if ($file === null \|\| ($file instanceof UploadedFile && ! $file->isValid())) {
		return $this;
		}

		@@ -228,6 +229,8 @@ class Episode extends Entity
		$audio = new Audio([
		'file_name' => $this->attributes['slug'],
		'file_directory' => 'podcasts/' . $this->getPodcast()->handle,
		'language_code' => $this->getPodcast()
		->language_code,
		'uploaded_by' => user_id(),
		'updated_by' => user_id(),
		]);
		@@ -248,9 +251,9 @@ class Episode extends Entity
		return $this->audio;
		}

		public function setTranscript(?UploadedFile $file): self
		public function setTranscript(UploadedFile \| File $file = null): self
		{
		if ($file === null \|\| ! $file->isValid()) {
		if ($file === null \|\| ($file instanceof UploadedFile && ! $file->isValid())) {
		return $this;
		}

		@@ -264,6 +267,8 @@ class Episode extends Entity
		$transcript = new Transcript([
		'file_name' => $this->attributes['slug'] . '-transcript',
		'file_directory' => 'podcasts/' . $this->getPodcast()->handle,
		'language_code' => $this->getPodcast()
		->language_code,
		'uploaded_by' => user_id(),
		'updated_by' => user_id(),
		]);
		@@ -284,9 +289,9 @@ class Episode extends Entity
		return $this->transcript;
		}

		public function setChapters(?UploadedFile $file): self
		public function setChapters(UploadedFile \| File $file = null): self
		{
		if ($file === null \|\| ! $file->isValid()) {
		if ($file === null \|\| ($file instanceof UploadedFile && ! $file->isValid())) {
		return $this;
		}

		@@ -300,6 +305,8 @@ class Episode extends Entity
		$chapters = new Chapters([
		'file_name' => $this->attributes['slug'] . '-chapters',
		'file_directory' => 'podcasts/' . $this->getPodcast()->handle,
		'language_code' => $this->getPodcast()
		->language_code,
		'uploaded_by' => user_id(),
		'updated_by' => user_id(),
		]);

app/Entities/Media/Audio.php

+2 −2

Original line number	Diff line number	Diff line
		@@ -44,8 +44,8 @@ class Audio extends BaseMedia
		$this->attributes['file_mimetype'] = $audioMetadata['mime_type'];
		$this->attributes['file_size'] = $audioMetadata['filesize'];
		// @phpstan-ignore-next-line
		$this->attributes['description'] = @$audioMetadata['id3v2']['comments']['comment'];
		$this->attributes['file_metadata'] = json_encode($audioMetadata);
		$this->attributes['description'] = @$audioMetadata['id3v2']['comments']['comment'][0];
		$this->attributes['file_metadata'] = json_encode($audioMetadata, JSON_INVALID_UTF8_SUBSTITUTE);

		return $this;
		}

app/Entities/Media/BaseMedia.php

+1 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ class BaseMedia extends Entity
		{
		helper('media');

		$this->attributes['type'] = $this->type;
		$this->attributes['file_mimetype'] = $file->getMimeType();
		$this->attributes['file_metadata'] = json_encode(lstat((string) $file));
		$this->attributes['file_path'] = save_media(

app/Entities/Media/Image.php

+11 −4

Original line number	Diff line number	Diff line
		@@ -54,14 +54,21 @@ class Image extends BaseMedia
		{
		parent::setFile($file);

		$metadata = exif_read_data(media_path($this->file_path), null, true);

		if ($metadata) {
		if ($this->file_mimetype === 'image/jpeg' && $metadata = exif_read_data(
		media_path($this->file_path),
		null,
		true
		)) {
		$metadata['sizes'] = $this->sizes;
		$this->attributes['file_size'] = $metadata['FILE']['FileSize'];
		$this->attributes['file_metadata'] = json_encode($metadata);
		} else {
		$metadata = [
		'sizes' => $this->sizes,
		];
		}

		$this->attributes['file_metadata'] = json_encode($metadata);

		$this->initFileProperties();
		$this->saveSizes();