From 66a812ddd692e59a514c72249770dc889b15565b Mon Sep 17 00:00:00 2001
From: mcinj <98779161+mcinj@users.noreply.github.com>
Date: Tue, 14 Jun 2022 20:49:56 -0400
Subject: [PATCH] separate out won job function

---
 src/bot/evaluate_won_giveaways.py |  1 -
 src/bot/giveaway_thread.py        | 23 +++++++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/bot/evaluate_won_giveaways.py b/src/bot/evaluate_won_giveaways.py
index 4304fc7..e565213 100644
--- a/src/bot/evaluate_won_giveaways.py
+++ b/src/bot/evaluate_won_giveaways.py
@@ -75,7 +75,6 @@ class EvaluateWonGiveaways:
             txt = f"🟡 No won games to evaluate"
             logger.info(txt)
 
-        logger.info("Evaluating won giveaways")
         for item in won_game_list:
             won_giveaway = WonEntry(item)
             w = GiveawayHelper.get_by_giveaway_id(won_giveaway.giveaway_game_id)
diff --git a/src/bot/giveaway_thread.py b/src/bot/giveaway_thread.py
index 50e4708..0a1e77b 100644
--- a/src/bot/giveaway_thread.py
+++ b/src/bot/giveaway_thread.py
@@ -50,12 +50,13 @@ class GiveawayThread(threading.Thread):
             sleep(10)
             exit(-1)
 
-        self._won_page_job_function = EvaluateWonGiveaways(cookie, user_agent, notification).start
         won_giveaway_job = self._scheduler.get_job(job_id=self.won_giveaway_job_id)
         if won_giveaway_job:
             logger.debug("Previous won giveaway evaluator job exists. Removing.")
             won_giveaway_job.remove()
-        self._scheduler.add_job(self._won_page_job_function,
+        won_runner = GiveawayThread.WonRunner(EvaluateWonGiveaways(cookie, user_agent, notification),
+                                              self.won_giveaway_job_id)
+        self._scheduler.add_job(won_runner.run,
                                 id=self.won_giveaway_job_id,
                                 trigger='interval',
                                 max_instances=1,
@@ -95,6 +96,24 @@ class GiveawayThread(threading.Thread):
         if self.exc:
             raise self.exc
 
+    class WonRunner:
+        def __init__(self, won_page, job_id):
+            self._won_page = won_page
+            self._job_id = job_id
+
+        def run(self):
+            logger.info(" 💍 Evaluating won giveaways. 💍")
+            if self._won_page:
+                self._won_page.start()
+            logger.info(" 💍 All won giveaways evaluated.  💍")
+            scheduler = Scheduler()
+            evaluate_giveaway_job = scheduler.get_job(job_id=self._job_id)
+            if evaluate_giveaway_job:
+                when_to_start_again = evaluate_giveaway_job.next_run_time
+                logger.info(f"💍 Going to sleep. Will start again at {when_to_start_again}")
+            else:
+                logger.info("No set time to evaluate won giveaways again.")
+
     class GiveawayRunner:
 
         def __init__(self, wishlist_page, all_page, job_id):