allow an explicit limit as well

simple browse is weird
ampache · May 14, 2024 · f7db6e6 · f7db6e6
1 parent 2365006
commit f7db6e6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/Module/Api/Method/ArtistSongsMethod.php b/src/Module/Api/Method/ArtistSongsMethod.php
@@ -69,9 +69,7 @@ public static function artist_songs(array $input, User $user): bool
         $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_limit(50);
             $browse->set_sort('object_count', 'DESC');
             $type = 'top50';
         } else {

diff --git a/src/Repository/Model/Query.php b/src/Repository/Model/Query.php
@@ -110,6 +110,7 @@ class Query
         'join' => null,
         'mashup' => null,
         'offset' => 0,
+        'limit' => 0,
         'song_artist' => null, // Used by $browse->set_type() to filter artists
         'select' => array(),
         'simple' => false,
@@ -709,6 +710,16 @@ public function set_offset($offset): void
         $this->_state['offset'] = abs($offset);
     }
 
+    /**
+     * set_limit
+     * This sets the current offset of this query
+     * @param int $limit
+     */
+    public function set_limit($limit): void
+    {
+        $this->_state['limit'] = abs($limit);
+    }
+
     /**
      * set_catalog
      * @param int $catalog_number
@@ -1056,6 +1067,13 @@ private function _get_limit_sql(): string
     {
         $start  = $this->get_start();
         $offset = $this->get_offset();
+        if ($this->_state['limit'] > 0) {
+            if ($offset > 0) {
+                return ' LIMIT ' . (string)($this->_state['limit']) . ', ' . (string)($offset);
+            } else {
+                return ' LIMIT ' . (string)($this->_state['limit']);
+            }
+        }
         if (!$this->is_simple() || $start < 0 || ($start == 0 && $offset == 0)) {
             return '';
         }