From 3211398c78b1b28b76a46427ee07874bbf84a85d Mon Sep 17 00:00:00 2001
From: Yassine Doghri <yassine@doghri.fr>
Date: Mon, 20 Dec 2021 16:31:03 +0000
Subject: [PATCH] fix(import): set episode and season numbers to null when not
present in item tag
update getid3 to latest dev branch
---
app/Controllers/Admin/PodcastImportController.php | 4 ++--
composer.json | 2 +-
composer.lock | 14 +++++++-------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/app/Controllers/Admin/PodcastImportController.php b/app/Controllers/Admin/PodcastImportController.php
index 8d568395df..e8ca842ba6 100644
--- a/app/Controllers/Admin/PodcastImportController.php
+++ b/app/Controllers/Admin/PodcastImportController.php
@@ -365,10 +365,10 @@ class PodcastImportController extends BaseController
'number' =>
$this->request->getPost('force_renumber') === 'yes'
? $itemNumber
- : $nsItunes->episode,
+ : ((string) $nsItunes->episode === '' ? null : (int) $nsItunes->episode),
'season_number' =>
$this->request->getPost('season_number') === ''
- ? $nsItunes->season
+ ? ((string) $nsItunes->season === '' ? null : (int) $nsItunes->season)
: (int) $this->request->getPost('season_number'),
'type' => property_exists($nsItunes, 'episodeType') && $nsItunes->episodeType !== null
? (string) $nsItunes->episodeType
diff --git a/composer.json b/composer.json
index 60a3c4df1c..62865d88ec 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
"license": "AGPL-3.0-or-later",
"require": {
"php": "^8.0",
- "james-heinrich/getid3": "~2.0.0-dev",
+ "james-heinrich/getid3": "^2.0.x-dev",
"whichbrowser/parser": "^v2.1.1",
"geoip2/geoip2": "^v2.11.0",
"myth/auth": "dev-develop",
diff --git a/composer.lock b/composer.lock
index 9258e2efa1..0646c92fc3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "49719de3dd6af8c394ea0553e2180b5a",
+ "content-hash": "af4a438816f7adbbd6950d93ed333e9f",
"packages": [
{
"name": "brick/math",
@@ -494,16 +494,16 @@
},
{
"name": "james-heinrich/getid3",
- "version": "v2.0.0-beta4",
+ "version": "2.0.x-dev",
"source": {
"type": "git",
"url": "https://github.com/JamesHeinrich/getID3.git",
- "reference": "5ad79104e937e7d9c8a9141a97e1f063dd1123f8"
+ "reference": "ee238d552571c6029898b087d5fc95df826418d6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/JamesHeinrich/getID3/zipball/5ad79104e937e7d9c8a9141a97e1f063dd1123f8",
- "reference": "5ad79104e937e7d9c8a9141a97e1f063dd1123f8",
+ "url": "https://api.github.com/repos/JamesHeinrich/getID3/zipball/ee238d552571c6029898b087d5fc95df826418d6",
+ "reference": "ee238d552571c6029898b087d5fc95df826418d6",
"shasum": ""
},
"require": {
@@ -562,9 +562,9 @@
"keywords": ["audio", "codecs", "id3", "metadata", "tags", "video"],
"support": {
"issues": "https://github.com/JamesHeinrich/getID3/issues",
- "source": "https://github.com/JamesHeinrich/getID3/tree/v2.0.0-beta4"
+ "source": "https://github.com/JamesHeinrich/getID3/tree/2.0"
},
- "time": "2021-10-06T16:23:45+00:00"
+ "time": "2021-12-15T17:29:14+00:00"
},
{
"name": "kint-php/kint",
--
GitLab