From 679a73ab63c86e0a77cd3da2e872cb37d5ab263d Mon Sep 17 00:00:00 2001
From: Paul van Tilburg <paul@luon.net>
Date: Sat, 28 May 2022 09:29:31 +0200
Subject: [PATCH] Refactor limit handling to be more readable

---
 src/mixcloud.rs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/mixcloud.rs b/src/mixcloud.rs
index b8deacb..0a073f9 100644
--- a/src/mixcloud.rs
+++ b/src/mixcloud.rs
@@ -163,20 +163,16 @@ pub(crate) async fn cloudcasts(username: &str, limit: Option<usize>) -> Result<V
         let count = cloudcasts_res.items.len();
         cloudcasts.extend(cloudcasts_res.items);
 
-        // Continue onto the next URL in the paging, if there is one.
+        // Continue onto the next URL in the paging, if there is one and the limit was not reached.
         limit = limit.saturating_sub(count);
         offset += count;
-        match cloudcasts_res.paging.next {
-            Some(next_url) => {
+        match (limit, cloudcasts_res.paging.next) {
+            (0, Some(_)) => break,
+            (_, Some(next_url)) => {
                 url = Url::parse(&next_url)?;
                 set_paging_query(&mut url, limit, offset);
             }
-            None => break,
-        }
-
-        // We have reached the limit.
-        if limit == 0 {
-            break;
+            (_, None) => break,
         }
     }