Merge branch 'development' into codex/add-all-episodes-page

Signed-off-by: Josh Brickner <15388+leftouterjoins@users.noreply.github.com>

Author: leftouterjoins

conf/podsumer.conf

@@ -8,6 +8,7 @@ base_template = base
 state_file = state/podsumer.sqlite3
 sql_dir = sql
 per_item_art_download = 33
+items_per_page = 10
 ssl = false
 
 # File Storage Method

conf/test.conf

@@ -8,6 +8,7 @@ base_template = base
 state_file = state/podsumer-test.sqlite3
 sql_dir = sql
 per_item_art_download = 33
+items_per_page = 10
 ssl = false
 
 media_dir = /opt/media

src/Brickner/Podsumer/State.php

@@ -205,13 +205,33 @@ public function getFeedItems(int $feed_id): array
         return (false === $result) ? [] : $result;
     }
 
+
     public function getAllItems(): array
     {
         $sql = 'SELECT items.name, items.feed_id, items.id, items.guid, items.audio_url, items.audio_file, COALESCE(items.image, feeds.image) AS image, items.size, items.published, items.description, items.playback_position, feeds.name AS feed_name FROM items JOIN feeds ON feeds.id = items.feed_id ORDER BY items.published DESC';
 
         $result = $this->query($sql);
 
         return (false === $result) ? [] : $result;
+     }
+
+    public function getFeedItemsPage(int $feed_id, int $limit, int $page = 1): array
+    {
+        $offset = ($page - 1) * $limit;
+        $sql = 'SELECT items.name, items.feed_id, items.id, items.guid, items.audio_url, items.audio_file, COALESCE(items.image, feeds.image) AS image, items.size, items.published, items.description, items.playback_position FROM items JOIN feeds ON feeds.id = items.feed_id WHERE items.feed_id = :id ORDER BY items.published DESC LIMIT :limit OFFSET :offset';
+        $params = ['id' => $feed_id, 'limit' => $limit, 'offset' => $offset];
+        $result = $this->query($sql, $params);
+
+
+        return (false === $result) ? [] : $result;
+    }
+
+    public function countFeedItems(int $feed_id): int
+    {
+        $sql = 'SELECT COUNT(*) AS count FROM items WHERE feed_id = :id';
+        $result = $this->query($sql, ['id' => $feed_id]);
+
+        return intval($result[0]['count'] ?? 0);
     }
 
     public function getFeedByHash(string $hash): array

templates/feed.html.php

@@ -32,4 +32,14 @@
         <?= substr(strip_tags($item['description']), 0, 360); ?>
     </div>
     <? endforeach ?>
+    <div class="py-4 font-bold">
+        <? if ($page > 1) { ?>
+            <a href="/feed?id=<?= $feed['id'] ?>&page=<?= $page - 1 ?>">Previous</a>
+        <? } ?>
+        <? if ($page < $page_count) { ?>
+            <? if ($page > 1) { ?>&nbsp;|&nbsp;<? } ?>
+            <a href="/feed?id=<?= $feed['id'] ?>&page=<?= $page + 1 ?>">Next</a>
+        <? } ?>
+        <span>&nbsp;&nbsp;Page <?= $page ?> of <?= $page_count ?></span>
+    </div>
 </div>

tests/Brickner/Podsumer/ConfigTest.php

@@ -22,6 +22,14 @@ public function testGet(): void
         $this->assertEquals($user, 'user');
     }
 
+    public function testGetItemsPerPage(): void
+    {
+        $config = new Config($this->root . DIRECTORY_SEPARATOR . 'conf/test.conf');
+        $per_page = $config->get('podsumer', 'items_per_page');
+
+        $this->assertEquals(10, $per_page);
+    }
+
     public function testGetGroup(): void
     {
         $config = new Config($this->root . DIRECTORY_SEPARATOR . 'conf/test.conf');

tests/Brickner/Podsumer/StateTest.php

@@ -92,6 +92,14 @@ public function testGetAllItems()
         $this->assertEquals(4, count($items));
     }
 
+    public function testGetFeedItemsPage()
+    {
+        $this->feed = new Feed(self::TEST_FEED_URL);
+        $this->state->addFeed($this->feed);
+        $items = $this->state->getFeedItemsPage(1, 2, 1);
+        $this->assertEquals(2, count($items));
+    }
+
     public function testGetFeedByHash()
     {
         $this->feed = new Feed(self::TEST_FEED_URL);

www/index.php

@@ -95,9 +95,15 @@ function feed(array $args): void
 {
     global $main;
 
+    $page = isset($args['page']) ? max(1, intval($args['page'])) : 1;
+    $per_page = intval($main->getConf('podsumer', 'items_per_page')) ?: 10;
+    $feed_id = intval($args['id']);
+
     $vars = [
-        'feed' => $main->getState()->getFeed(intval($args['id'])),
-        'items' => $main->getState()->getFeedItems(intval($args['id']))
+        'feed' => $main->getState()->getFeed($feed_id),
+        'items' => $main->getState()->getFeedItemsPage($feed_id, $per_page, $page),
+        'page' => $page,
+        'page_count' => max(1, ceil($main->getState()->countFeedItems($feed_id) / $per_page))
     ];
 
     if (empty($vars['feed']) || empty($vars['items'])) {