From 27993cbefe8faa176bdf4f0fe9cbf73554620d0e Mon Sep 17 00:00:00 2001 From: DariusIII Date: Mon, 21 Aug 2017 10:41:18 +0200 Subject: [PATCH] Add AudioData model and use it in ReleaseExtra class --- Changelog | 3 ++- app/Models/AudioData.php | 41 ++++++++++++++++++++++++++++++++++++++++ nntmux/ReleaseExtra.php | 27 ++++++++++++++++++++------ 3 files changed, 64 insertions(+), 7 deletions(-) create mode 100644 app/Models/AudioData.php diff --git a/Changelog b/Changelog index 4f098be0f..145bb3720 100755 --- a/Changelog +++ b/Changelog @@ -1,5 +1,6 @@ 2017-08-20 DariusIII - * Chg: Add VideoData model and use it ib ReleaseExtra class + * Chg: Add AudioData model and use it in ReleaseExtra class + * Chg: Add VideoData model and use it in ReleaseExtra class * Chg: Add primaryKey property to ReleaseExtraFull model * Chg: Add ReleaseExtraFull model and use it in ReleaseExtra class 2017-08-19 DariusIII diff --git a/app/Models/AudioData.php b/app/Models/AudioData.php new file mode 100644 index 000000000..d9fcc06c3 --- /dev/null +++ b/app/Models/AudioData.php @@ -0,0 +1,41 @@ +pdo->query(sprintf('SELECT * from audio_data WHERE releases_id = %d ORDER BY audioid ASC', $id)); + return AudioData::query()->where('releases_id', $id)->orderBy('audioid')->get(); } /** @@ -129,7 +130,7 @@ class ReleaseExtra */ public function delete($id) { - $this->pdo->queryExec(sprintf('DELETE FROM audio_data WHERE releases_id = %d', $id)); + AudioData::query()->where('releases_id', $id)->delete(); $this->pdo->queryExec(sprintf('DELETE FROM release_subtitles WHERE releases_id = %d', $id)); VideoData::query()->where('releases_id', $id)->delete(); } @@ -290,9 +291,23 @@ class ReleaseExtra */ public function addAudio($releaseID, $audioID, $audioformat, $audiomode, $audiobitratemode, $audiobitrate, $audiochannels, $audiosamplerate, $audiolibrary, $audiolanguage, $audiotitle) { - $ckid = $this->pdo->queryOneRow(sprintf('SELECT releases_id FROM audio_data WHERE releases_id = %s', $releaseID)); - if (!isset($ckid['releases_id'])) { - return $this->pdo->queryExec(sprintf('INSERT INTO audio_data (releases_id, audioid, audioformat, audiomode, audiobitratemode, audiobitrate, audiochannels, audiosamplerate, audiolibrary ,audiolanguage, audiotitle) VALUES (%d, %d, %s, %s, %s, %s, %s, %s, %s, %s, %s)', $releaseID, $audioID, $this->pdo->escapeString($audioformat), $this->pdo->escapeString($audiomode), $this->pdo->escapeString($audiobitratemode), $this->pdo->escapeString(substr($audiobitrate, 0, 10)), $this->pdo->escapeString($audiochannels), $this->pdo->escapeString(substr($audiosamplerate, 0, 25)), $this->pdo->escapeString(substr($audiolibrary, 0, 50)), $this->pdo->escapeString($audiolanguage), $this->pdo->escapeString(substr($audiotitle, 0, 50)))); + $ckid = AudioData::query()->where('releases_id', $releaseID)->value('release_id'); + if (!isset($ckid)) { + return AudioData::query()->insert( + [ + 'releases_id' => $releaseID, + 'audioid' => $audioID, + 'audioformat' => $audioformat, + 'audiomode' => $audiomode, + 'audiobitratemode' => $audiobitratemode, + 'audiobitrate' => substr($audiobitrate, 0, 10), + 'audiochannels' => $audiochannels, + 'audiosamplerate' => substr($audiosamplerate, 0, 25), + 'audiolibrary' => substr($audiolibrary, 0, 50), + 'audiolanguage' => $audiolanguage, + 'audiotitle' => substr($audiotitle, 0, 50) + ] + ); } }