From 0f777ef139eafc82abfe9a0a34b41eb003f1dd29 Mon Sep 17 00:00:00 2001
From: trilader <trilader@schroedingers-bit.net>
Date: Tue, 1 Dec 2020 20:37:08 +0100
Subject: [PATCH] Return number of new (unwatched) videos when fetching updates

---
 main.cpp | 8 +++++---
 yt.cpp   | 6 ++++--
 yt.h     | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/main.cpp b/main.cpp
index a19dde1..1346e83 100644
--- a/main.cpp
+++ b/main.cpp
@@ -143,7 +143,7 @@ void load_videos_for_channel(const Channel &channel, bool force=false)
         selected_video = 0;
 }
 
-void fetch_videos_for_channel(Channel &channel, bool name_in_title=false)
+int fetch_videos_for_channel(Channel &channel, bool name_in_title=false)
 {
     if(channel.is_virtual) {
         std::vector<Video> &channelVideos = videos[channel.id];
@@ -151,7 +151,7 @@ void fetch_videos_for_channel(Channel &channel, bool name_in_title=false)
         for(Video &video: channelVideos) {
             video.tui_title_width = string_width(video.title);
         }
-        return;
+        return channelVideos.size();
     }
 
     std::string title("Refreshing");
@@ -159,10 +159,12 @@ void fetch_videos_for_channel(Channel &channel, bool name_in_title=false)
         title.append(" ").append(channel.name);
     title.append("…");
     progress_info *info = begin_progress(title, 30);
-    channel.fetch_new_videos(db, info);
+    const int new_video_count = channel.fetch_new_videos(db, info);
     end_progress(info);
     load_videos_for_channel(channels[selected_channel], true);
     channel.load_info(db);
+
+    return new_video_count;
 }
 
 bool startswith(const std::string &str, const std::string &with)
diff --git a/yt.cpp b/yt.cpp
index 581c236..d23bcde 100644
--- a/yt.cpp
+++ b/yt.cpp
@@ -174,7 +174,7 @@ void add_video(sqlite3 *db, const json &snippet, const std::string &channel_id)
 }
 
 
-void Channel::fetch_new_videos(sqlite3 *db, progress_info *info, std::optional<std::string> after, std::optional<int> max_count)
+int Channel::fetch_new_videos(sqlite3 *db, progress_info *info, std::optional<std::string> after, std::optional<int> max_count)
 {
     const std::string playlist_id = upload_playlist();
     std::map<std::string, std::string> params = {
@@ -217,7 +217,7 @@ void Channel::fetch_new_videos(sqlite3 *db, progress_info *info, std::optional<s
 
             add_video(db, snippet, channel_id);
             //fprintf(stderr, "New video: '%s': %s.\r\n", title.c_str(), video_id.c_str());
-            processed += 1;
+            processed++;
             if(max_count && processed >= *max_count) {
                 abort = true;
                 break;
@@ -236,6 +236,8 @@ void Channel::fetch_new_videos(sqlite3 *db, progress_info *info, std::optional<s
             break;
         }
     }
+
+    return processed;
 }
 
 void Channel::load_info(sqlite3 *db)
diff --git a/yt.h b/yt.h
index 0b37ab8..16b7e0c 100644
--- a/yt.h
+++ b/yt.h
@@ -36,7 +36,7 @@ public:
     static std::vector<Channel> get_all(sqlite3 *db);
 
     std::string upload_playlist() const;
-    void fetch_new_videos(sqlite3 *db, progress_info *info=nullptr, std::optional<std::string> after={}, std::optional<int> max_count={});
+    int fetch_new_videos(sqlite3 *db, progress_info *info=nullptr, std::optional<std::string> after={}, std::optional<int> max_count={});
     void load_info(sqlite3 *db);
     bool is_valid() const;