Skip to content

Commit 62caeca

Browse files
committed
Fixing infrastructure folder name git issue:
1 parent 062113e commit 62caeca

File tree

3 files changed

+52
-12
lines changed

3 files changed

+52
-12
lines changed

Frames/MobTimerController.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from Infrastructure.SessionManager import SessionManager
1414
from Infrastructure.SettingsManager import SettingsManager
1515
from Infrastructure.ThemeManager import ThemeManager
16-
from Infrastructure.TimeOptionsManager import TimeOptionsManager
16+
from Infrastructure.TimeSettingsManager import TimeSettingsManager
1717
from Infrastructure.TipsManager import TipsManager
1818

1919

@@ -24,7 +24,7 @@ def __init__(self, *args, **kwargs):
2424
self.transparent_frame_position_index = 0
2525
self.settings_manager = SettingsManager()
2626
self.tips_manager = TipsManager()
27-
self.time_options_manager = TimeOptionsManager()
27+
self.time_options_manager = TimeSettingsManager()
2828
self.mobber_manager = MobberManager(self.settings_manager.get_randomize_randomize_next_driver())
2929
self.countdown_manager = CountdownManager(self)
3030
self.session_manager = SessionManager(uuid)
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
class TimeSettingsManager(object):
2+
def __init__(self):
3+
self.minutes = 10
4+
self.seconds = 0
5+
self.time_change_callbacks = []
6+
7+
def get_time_string(self):
8+
return "{0:0>2}:{1:0>2}".format(self.minutes, self.seconds)
9+
10+
def increment_minutes(self):
11+
self.minutes += 1
12+
self.fire_time_change_callbacks()
13+
14+
def decrement_minutes(self):
15+
self.minutes -= 1
16+
if self.minutes < 0:
17+
self.minutes = 0
18+
self.fire_time_change_callbacks()
19+
20+
def increment_seconds(self, increment = 15):
21+
self.seconds = (self.seconds + increment) % 60
22+
self.fire_time_change_callbacks()
23+
24+
def decrement_seconds(self, decriment=60):
25+
self.seconds = ((self.seconds + decriment) - 15) % 60
26+
self.fire_time_change_callbacks()
27+
28+
def subscribe_to_timechange(self, time_change_callback):
29+
self.time_change_callbacks.append(time_change_callback)
30+
self.fire_time_change_callbacks()
31+
32+
def fire_time_change_callbacks(self):
33+
for time_change_callback in self.time_change_callbacks:
34+
if time_change_callback:
35+
time_change_callback(self.get_time_string(), self.minutes, self.seconds)
36+
37+
def set_countdown_time(self, minutes, seconds):
38+
self.minutes = minutes
39+
self.seconds = seconds
40+
self.fire_time_change_callbacks()

tests/Infrastructure/TimeOptionsManager/TestsTimeOptionsManager.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,35 @@
44
from approvaltests import Approvals
55
from approvaltests.TextDiffReporter import TextDiffReporter
66

7-
from Infrastructure.TimeOptionsManager import TimeOptionsManager
7+
from Infrastructure.TimeSettingsManager import TimeSettingsManager
88

99

1010
class TestsTimeOptionsManager(unittest.TestCase):
1111
def test_default_time_10_minutes(self):
12-
time_options_manager = TimeOptionsManager()
12+
time_options_manager = TimeSettingsManager()
1313
result = time_options_manager.get_time_string()
1414
self.assertEqual(result, "10:00")
1515

1616
def test_increment_minutes_once_is_11_minutes(self):
17-
time_options_manager = TimeOptionsManager()
17+
time_options_manager = TimeSettingsManager()
1818
time_options_manager.increment_minutes()
1919
result = time_options_manager.get_time_string()
2020
self.assertEqual(result, "11:00")
2121

2222
def test_decrement_minutes_once_is_9_minutes(self):
23-
time_options_manager = TimeOptionsManager()
23+
time_options_manager = TimeSettingsManager()
2424
time_options_manager.decrement_minutes()
2525
result = time_options_manager.get_time_string()
2626
self.assertEqual(result, "09:00")
2727

2828
def test_increment_seconds_once_is_10_minutes_15_seconds(self):
29-
time_options_manager = TimeOptionsManager()
29+
time_options_manager = TimeSettingsManager()
3030
time_options_manager.increment_seconds()
3131
result = time_options_manager.get_time_string()
3232
self.assertEqual(result, "10:15")
3333

3434
def test_increment_seconds_4_times_is_10_minutes(self):
35-
time_options_manager = TimeOptionsManager()
35+
time_options_manager = TimeSettingsManager()
3636
time_options_manager.increment_seconds()
3737
time_options_manager.increment_seconds(1)
3838
time_options_manager.increment_seconds()
@@ -41,21 +41,21 @@ def test_increment_seconds_4_times_is_10_minutes(self):
4141
self.assertEqual(result, "10:46")
4242

4343
def test_decrement_seconds_once_is_10_minutes_45_seconds(self):
44-
time_options_manager = TimeOptionsManager()
44+
time_options_manager = TimeSettingsManager()
4545
time_options_manager.decrement_seconds()
4646
result = time_options_manager.get_time_string()
4747
self.assertEqual(result, "10:45")
4848

4949
def test_decrement_seconds_3_times_is_10_minutes_45_seconds(self):
50-
time_options_manager = TimeOptionsManager()
50+
time_options_manager = TimeSettingsManager()
5151
time_options_manager.decrement_seconds()
5252
time_options_manager.decrement_seconds(1)
5353
time_options_manager.decrement_seconds()
5454
result = time_options_manager.get_time_string()
5555
self.assertEqual(result, "10:16")
5656

5757
def test_subscribe_to_time_changes(self):
58-
time_options_manager = TimeOptionsManager()
58+
time_options_manager = TimeSettingsManager()
5959
result = {"result": "time"}
6060

6161
def time_change_callback(time, minutes, seconds):
@@ -68,7 +68,7 @@ def time_change_callback(time, minutes, seconds):
6868
self.assertEqual(result["result"], "time 10:00 10:15")
6969

7070
def test_subscribe_to_time_changes_complex(self):
71-
time_options_manager = TimeOptionsManager()
71+
time_options_manager = TimeSettingsManager()
7272
result = {"result": "Time Options after Change:", "increment" : 0}
7373

7474
def time_change_callback(time, minutes, seconds):

0 commit comments

Comments
 (0)