update artist_songs to browse

* set priority of joins a bit clearer so they are ordered by importance when there are more than one
ampache · May 14, 2024 · c9676aa · c9676aa
1 parent 01961a6
commit c9676aa
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 16 deletions.
diff --git a/src/Module/Api/Method/ArtistSongsMethod.php b/src/Module/Api/Method/ArtistSongsMethod.php
@@ -31,7 +31,6 @@
 use Ampache\Module\Api\Api;
 use Ampache\Module\Api\Json_Data;
 use Ampache\Module\Api\Xml_Data;
-use Ampache\Repository\SongRepositoryInterface;
 
 /**
  * Class ArtistSongsMethod
@@ -65,9 +64,24 @@ public static function artist_songs(array $input, User $user): bool
 
             return false;
         }
-        $results = (array_key_exists('top50', $input) && (int)$input['top50'] == 1)
-            ? static::getSongRepository()->getTopSongsByArtist($artist)
-            : static::getSongRepository()->getByArtist($object_id);
+
+        $browse = Api::getBrowse();
+        $browse->reset_filters();
+        $browse->set_type('song');
+        if (array_key_exists('top50', $input) && (int)$input['top50'] == 1) {
+            $browse->set_start(0);
+            $browse->set_offset(50);
+            $browse->set_is_simple(true);
+            $browse->set_sort('object_count', 'DESC');
+            $type = 'top50';
+        } else {
+            $browse->set_sort('name', 'ASC');
+            $type = 'artist';
+        }
+
+        $browse->set_filter($type, $object_id);
+
+        $results = $browse->get_objects();
         if (empty($results)) {
             Api::empty('song', $input['api_format']);
 
@@ -89,11 +103,4 @@ public static function artist_songs(array $input, User $user): bool
 
         return true;
     }
-
-    private static function getSongRepository(): SongRepositoryInterface
-    {
-        global $dic;
-
-        return $dic->get(SongRepositoryInterface::class);
-    }
 }
diff --git a/src/Module/Database/Query/AlbumDiskQuery.php b/src/Module/Database/Query/AlbumDiskQuery.php
@@ -127,7 +127,7 @@ public function get_sorts(): array
     public function get_sql_filter($query, $filter, $value): string
     {
         $filter_sql = '';
-        $query->set_join('LEFT', '`album`', '`album_disk`.`album_id`', '`album`.`id`', 100);
+        $query->set_join('LEFT', '`album`', '`album_disk`.`album_id`', '`album`.`id`', 10);
         switch ($filter) {
             case 'tag':
                 $query->set_join('LEFT', '`tag_map`', '`tag_map`.`object_id`', '`album`.`id`', 100);
@@ -246,7 +246,7 @@ public function get_sql_sort($query, $field, $order): string
                 break;
             case 'artist':
                 $sql = "`artist`.`name`";
-                $query->set_join('LEFT', '`song`', '`song`.`album`', '`album`.`id`', 100);
+                $query->set_join('LEFT', '`song`', '`song`.`album`', '`album`.`id`', 50);
                 $query->set_join('LEFT', '`artist`', '`song`.`artist`', '`artist`.`id`', 100);
                 break;
             case 'rating':

diff --git a/src/Module/Database/Query/AlbumQuery.php b/src/Module/Database/Query/AlbumQuery.php
@@ -224,7 +224,7 @@ public function get_sql_sort($query, $field, $order): string
                 break;
             case 'generic_artist':
                 $sql = "`artist`.`name`";
-                $query->set_join('LEFT', '`song`', '`song`.`album`', '`album`.`id`', 100);
+                $query->set_join('LEFT', '`song`', '`song`.`album`', '`album`.`id`', 50);
                 $query->set_join(
                     'LEFT',
                     '`artist`',
@@ -239,7 +239,7 @@ public function get_sql_sort($query, $field, $order): string
                 break;
             case 'artist':
                 $sql = "`artist`.`name`";
-                $query->set_join('LEFT', '`song`', '`song`.`album`', '`album`.`id`', 100);
+                $query->set_join('LEFT', '`song`', '`song`.`album`', '`album`.`id`', 50);
                 $query->set_join('LEFT', '`artist`', '`song`.`artist`', '`artist`.`id`', 100);
                 break;
             case 'rating':

diff --git a/src/Module/Database/Query/ArtistQuery.php b/src/Module/Database/Query/ArtistQuery.php
@@ -181,7 +181,7 @@ public function get_sql_filter($query, $filter, $value): string
                 if ($query->get_filter('song_artist')) {
                     $type = '\'song_artist\'';
                 }
-                $query->set_join_and('LEFT', '`catalog_map`', '`catalog_map`.`object_id`', '`artist`.`id`', '`catalog_map`.`object_type`', $type, 100);
+                $query->set_join_and('LEFT', '`catalog_map`', '`catalog_map`.`object_id`', '`artist`.`id`', '`catalog_map`.`object_type`', $type, 50);
                 $query->set_join('LEFT', '`catalog`', '`catalog`.`id`', '`catalog_map`.`catalog_id`', 100);
                 $filter_sql = " `catalog`.`enabled` = '1' AND ";
                 break;