From bcb9441bd811bf54deb57efdbabc8f26e30fb3f6 Mon Sep 17 00:00:00 2001
From: matthewmcgarvey <matthewmcgarvey14@gmail.com>
Date: Sat, 22 Jan 2022 10:26:00 -0600
Subject: [PATCH] Extract channel refresh code from async code

---
 src/invidious/jobs/refresh_channels_job.cr | 55 ++++++++++++----------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/src/invidious/jobs/refresh_channels_job.cr b/src/invidious/jobs/refresh_channels_job.cr
index b6e1004a..d78c7a69 100644
--- a/src/invidious/jobs/refresh_channels_job.cr
+++ b/src/invidious/jobs/refresh_channels_job.cr
@@ -9,7 +9,6 @@ class Invidious::Jobs::RefreshChannelsJob < Invidious::Jobs::BaseJob
     loop do
       LOGGER.debug("RefreshChannelsJob: Refreshing all channels")
       Invidious::Database::Channels.select_all.each do |channel|
-        id = channel.id
         if active_fibers >= lim_fibers
           LOGGER.trace("RefreshChannelsJob: Fiber limit reached, waiting...")
           if active_channel.receive
@@ -18,35 +17,24 @@ class Invidious::Jobs::RefreshChannelsJob < Invidious::Jobs::BaseJob
           end
         end
 
-        LOGGER.debug("RefreshChannelsJob: #{id} : Spawning fiber")
+        LOGGER.debug("RefreshChannelsJob: #{channel.id} : Spawning fiber")
         active_fibers += 1
         spawn do
-          begin
-            LOGGER.trace("RefreshChannelsJob: #{id} fiber : Fetching channel")
-            channel = fetch_channel(id, CONFIG.full_refresh)
-
+          if refresh_channel(channel)
             lim_fibers = max_fibers
-
-            LOGGER.trace("RefreshChannelsJob: #{id} fiber : Updating DB")
-            Invidious::Database::Channels.update_author(id, channel.author)
-          rescue ex
-            LOGGER.error("RefreshChannelsJob: #{id} : #{ex.message}")
-            if ex.message == "Deleted or invalid channel"
-              Invidious::Database::Channels.update_mark_deleted(id)
+          else
+            lim_fibers = 1
+            LOGGER.error("RefreshChannelsJob: #{channel.id} fiber : backing off for #{backoff}s")
+            sleep backoff
+            if backoff < 1.days
+              backoff += backoff
             else
-              lim_fibers = 1
-              LOGGER.error("RefreshChannelsJob: #{id} fiber : backing off for #{backoff}s")
-              sleep backoff
-              if backoff < 1.days
-                backoff += backoff
-              else
-                backoff = 1.days
-              end
+              backoff = 1.days
             end
-          ensure
-            LOGGER.debug("RefreshChannelsJob: #{id} fiber : Done")
-            active_channel.send(true)
           end
+
+          LOGGER.debug("RefreshChannelsJob: #{channel.id} fiber : Done")
+          active_channel.send(true)
         end
       end
 
@@ -56,4 +44,23 @@ class Invidious::Jobs::RefreshChannelsJob < Invidious::Jobs::BaseJob
       Fiber.yield
     end
   end
+
+  private def refresh_channel(channel : InvidiousChannel) : Bool
+    id = channel.id
+
+    LOGGER.trace("RefreshChannelsJob: #{id} fiber : Fetching channel")
+    channel = fetch_channel(id, CONFIG.full_refresh)
+
+    LOGGER.trace("RefreshChannelsJob: #{id} fiber : Updating DB")
+    Invidious::Database::Channels.update_author(id, channel.author)
+    return true
+  rescue ex
+    LOGGER.error("RefreshChannelsJob: #{id} : #{ex.message}")
+    if ex.message == "Deleted or invalid channel"
+      Invidious::Database::Channels.update_mark_deleted(id) if id
+      return true
+    else
+      return false
+    end
+  end
 end