Timer cycle working. Can be used as a mob timer now.

Author: DeadlyApps

Frames/MobTimerController.py

@@ -1,4 +1,5 @@
 from tkinter import *
+from Infrastructure.CountdownManager import CountdownManager
 from Infrastructure.MobberManager import MobberManager
 from Infrastructure.TimeOptionsManager import TimeOptionsManager
 from Frames.ScreenBlockerFrame import ScreenBlockerFrame
@@ -16,26 +17,33 @@ def __init__(self, *args, **kwargs):
 
         time_options_manager = TimeOptionsManager()
         mobber_manager = MobberManager()
+        countdown_manager = CountdownManager(container)
 
         self.frames = {}
         for F in (ScreenBlockerFrame, TransparentCountdownFrame):
-            frame = F(container, self, time_options_manager, mobber_manager)
+            frame = F(container, self, time_options_manager, mobber_manager, countdown_manager)
             self.frames[F] = frame
             frame.grid(row=0, column=0, sticky="nsew")
-
+        self.last_frame = None
         self.show_screen_blocker_frame()
 
     def show_frame(self, frame_class):
-        frame = self.frames[frame_class]
-        frame.tkraise()
+        switched_frames = False
+        if self.last_frame != frame_class:
+            frame = self.frames[frame_class]
+            frame.tkraise()
+            print(frame_class)
+            switched_frames = True
+        self.last_frame = frame_class
+        return switched_frames
 
     def show_screen_blocker_frame(self):
-        self.set_full_screen_always_on_top()
-        self.show_frame(ScreenBlockerFrame)
+        if self.show_frame(ScreenBlockerFrame):
+            self.set_full_screen_always_on_top()
 
     def show_transparent_countdown_frame(self):
-        self.show_frame(TransparentCountdownFrame)
-        self.set_partial_screen_transparent()
+        if self.show_frame(TransparentCountdownFrame):
+            self.set_partial_screen_transparent()
 
     def get_current_window_geometry(self):
         return "{0}x{1}+0+0".format(
@@ -73,7 +81,7 @@ def set_partial_screen_transparent(self):
         window_width = int(screenwidth * 0.3)
         window_height = int(screenheight * 0.3)
         window_size = "{0}x{1}+0+0".format(window_width, window_height)
-        bottom_left_screen = "+{}+{}".format(screenwidth - window_width,screenheight - window_height)
+        bottom_left_screen = "+{}+{}".format(screenwidth - window_width, screenheight - window_height)
         controller.geometry(window_size)
         controller.geometry(bottom_left_screen)
         controller.attributes("-alpha", 0.3)

Frames/ScreenBlockerFrame.py

@@ -1,14 +1,12 @@
 from tkinter import *
-
 from Frames.TransparentCountdownFrame import TransparentCountdownFrame
 
 
 class ScreenBlockerFrame(Frame):
-    def __init__(self, parent, controller, time_options_manager, mobber_manager, **kwargs):
-        super().__init__(parent,**kwargs)
+    def __init__(self, parent, controller, time_options_manager, mobber_manager, countdown_manager, **kwargs):
+        super().__init__(parent, **kwargs)
         self.controller = controller
-
-
+        self.countdown_manager = countdown_manager
         self.time_options_manager = time_options_manager
         self.mobber_manager = mobber_manager
         self.build_window_content()
@@ -110,6 +108,7 @@ def build_window_content(self):
         center_frame.pack(anchor=CENTER, pady=60)
 
     def launch_transparent_countdown(self, event):
+        self.countdown_manager.set_countdown_duration(self.time_options_manager.minutes, self.time_options_manager.seconds)
         self.controller.show_transparent_countdown_frame()
 
     def move_mobber_down_left_click(self, event):

Frames/TransparentCountdownFrame.py

@@ -2,11 +2,18 @@
 
 
 class TransparentCountdownFrame(Frame):
-    def __init__(self, parent, controller, time_options_manager, mobber_manager, **kwargs):
+    def __init__(self, parent, controller, time_options_manager, mobber_manager, countdown_manager, **kwargs):
         super().__init__(parent, **kwargs)
         self.master = parent
-
+        self.controller = controller
         self.create_frame_content()
+        countdown_manager.subscribe_to_time_changes(self.update_time_change_callback)
+
+    def update_time_change_callback(self, days, minutes, seconds):
+        if days< 0 or minutes < 0 or seconds < 0:
+            self.controller.show_screen_blocker_frame()
+        self.label_minutes['text'] = "{0:0>2}".format(minutes)
+        self.label_seconds['text'] = "{0:0>2}".format(seconds)
 
     def create_frame_content(self):
         row_index = 0

Infrastructure/CountdownManager.py

@@ -8,12 +8,13 @@ def __init__(self, root_tk_app):
         self.minutes = 0
         self.seconds = 0
         self.time_change_callbacks = []
-        self.count_down_total = datetime.timedelta(minutes=0, seconds=0)
+        self.count_down_total = datetime.timedelta(minutes=10, seconds=0)
 
         self.root_tk_app = root_tk_app
         self.refresh_timer()
 
     def set_countdown_duration(self, minutes, seconds):
+        self.start_time = time.time()
         self.minutes = minutes
         self.seconds = seconds
         self.count_down_total = datetime.timedelta(minutes=minutes, seconds=seconds)
@@ -26,11 +27,12 @@ def fire_time_change_callbacks(self):
         end_time = time.time()
         up_time = end_time - self.start_time
         remaining_time = self.count_down_total - datetime.timedelta(seconds=(int(up_time)))
+        print(remaining_time.days)
         for callback in self.time_change_callbacks:
             if callback:
-                callback((remaining_time.seconds // 60) % 60, self.seconds)
+                callback(remaining_time.days, (remaining_time.seconds // 60) % 60, remaining_time.seconds % 60)
 
     def refresh_timer(self):
         if self.root_tk_app:
             self.fire_time_change_callbacks()
-            self.root_tk_app.after(1000, self.refresh_timer)
+            self.root_tk_app.after(500, self.refresh_timer)

tests/Infrastructure/CountdownManager/TestsCountdownManager.py

@@ -5,19 +5,10 @@
 from approvaltests import Approvals
 from approvaltests.TextDiffReporter import TextDiffReporter
 
-from Infrastructure.CountdownManager.TestsCountdownManager import CountdownManager
+from Infrastructure.CountdownManager import CountdownManager
 
 
 class TestsCountdownManager(unittest.TestCase):
-    def test_time(self):
-        start_time = time.time()
-        time.sleep(2)
-        end_time = time.time()
-
-        uptime = end_time - start_time
-
-        self.assertEqual(datetime.timedelta(seconds=int(uptime)).__str__(), (
-            datetime.timedelta(seconds=15, minutes=1) - datetime.timedelta(seconds=(int(uptime)))).__str__())
 
     def test_set_countdown_timer(self):
         countdown_manager = CountdownManager(None)
@@ -34,7 +25,7 @@ def test_subscribe_to_time_changes(self):
         countdown_manager = CountdownManager(None)
         result = {"result": "Times changed to\n", "increment": 0}
 
-        def time_change_callback(minutes, seconds):
+        def time_change_callback(days, minutes, seconds):
             result["increment"] += 1
             result["result"] += "Action " + result["increment"].__str__() + ":"
             result["result"] += "    {0:0>2}:{1:0>2}".format(minutes, seconds) + "\n"

tests/Infrastructure/CountdownManager/tests.Infrastructure.CountdownManager.TestsCountdownManager.test_subscribe_to_time_changes.approved.txt

@@ -1,6 +1,6 @@
 Times changed to
 Action 1:    04:42
-Action 2:    603:52
+Action 2:    03:52
 Action 3:    01:03
-Action 4:    853:32
-Action 5:    03:62
+Action 4:    13:32
+Action 5:    04:02