album_disk data not being set

ampache · Oct 20, 2023 · 1f2183e · 1f2183e
1 parent fc3f105
commit 1f2183e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Repository/Model/AlbumDisk.php b/src/Repository/Model/AlbumDisk.php
@@ -312,15 +312,21 @@ public function isNew(): bool
      * @param int $album_id
      * @param int $disk
      * @param int $catalog
+     * @param string|null $disksubtitle
      */
-    public static function check($album_id, $disk, $catalog)
+    public static function check($album_id, $disk, $catalog, $disksubtitle)
     {
         // create the album_disk (if missing)
         $sql = "INSERT IGNORE INTO `album_disk` (`album_id`, `disk`, `catalog`) VALUES(?, ?, ?)";
         Dba::write($sql, array($album_id, $disk, $catalog));
         // count a new song on the disk right away
         $sql = "UPDATE `album_disk` SET `song_count` = `song_count` + 1 WHERE `album_id` = ? AND `disk` = ? AND `catalog` = ?";
         Dba::write($sql, array($album_id, $disk, $catalog));
+        if (!empty($disksubtitle)) {
+            // set the subtitle on insert too
+            $sql = "UPDATE `album_disk` SET `disksubtitle` = ? WHERE `album_id` = ? AND `disk` = ? AND `catalog` = ?";
+            Dba::write($sql, array($disksubtitle, $album_id, $disk, $catalog));
+        }
     }
 
     /**

diff --git a/src/Repository/Model/Song.php b/src/Repository/Model/Song.php
@@ -450,7 +450,7 @@ public static function insert(array $results)
         $artist_mbid      = $results['mb_artistid'];
         $albumartist_mbid = $results['mb_albumartistid'];
         $disk             = (Album::sanitize_disk($results['disk']) > 0) ? Album::sanitize_disk($results['disk']) : 1;
-        $disksubtitle     = $results['disksubtitle'];
+        $disksubtitle     = $results['disksubtitle'] ?? null;
         $year             = Catalog::normalize_year($results['year'] ?? 0);
         $comment          = $results['comment'];
         $tags             = $results['genre']; // multiple genre support makes this an array
@@ -556,7 +556,7 @@ public static function insert(array $results)
         $artists = array((int)$artist_id, (int)$albumartist_id);
 
         // create the album_disk (if missing)
-        AlbumDisk::check($album_id, $disk, $catalog);
+        AlbumDisk::check($album_id, $disk, $catalog, $disksubtitle);
 
         // map the song to catalog album and artist maps
         Catalog::update_map((int)$catalog, 'song', $song_id);