Skip to content

Commit 8681ea9

Browse files
dancergrahamdancergraham
committed
refactor: tidy up
1 parent 133e3a0 commit 8681ea9

File tree

6 files changed

+122
-122
lines changed

6 files changed

+122
-122
lines changed

‎chapter07_adapter_facade/__init__.py

Whitespace-only changes.

‎chapter07_adapter_facade/facade/__init__.py

Whitespace-only changes.

‎chapter07_adapter_facade/facade/home_theatre_facade.py

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
class HomeTheaterFacade:
2+
3+
def __init__(self, amp, tuner,
4+
# player,
5+
# projector,
6+
# screen,
7+
# lights,
8+
# popper
9+
):
10+
self.amp = amp
11+
self.tuner = tuner
12+
# self.player = player
13+
# self.projector = projector
14+
# self.screen = screen
15+
# self.lights = lights
16+
# self.popper = popper
17+
18+
def watch_movie(self, movie):
19+
print("Get ready to watch a movie...")
20+
# self.popper.on()
21+
# self.popper.pop()
22+
# self.lights.dim(10)
23+
# self.screen.down()
24+
# self.projector.on()
25+
# self.projector.wideScreenMode()
26+
self.amp.on()
27+
# self.amp.set_streaming_player(self.player)
28+
self.amp.set_surround_sound()
29+
self.amp.set_volume(5)
30+
# self.player.on()
31+
# self.player.play(movie)
32+
33+
def end_movie(self):
34+
print("Shutting movie theater down...")
35+
# self.popper.off()
36+
# self.lights.on()
37+
# self.screen.up()
38+
# self.projector.off()
39+
self.amp.off()
40+
# self.player.stop()
41+
# self.player.off()
42+
43+
def listen_to_radio(self, frequency):
44+
print("Tuning in the airwaves...")
45+
self.tuner.on()
46+
self.tuner.setFrequency(frequency)
47+
self.amp.on()
48+
self.amp.setVolume(5)
49+
self.amp.setTuner(self.tuner)
50+
51+
def end_radio(self):
52+
print("Shutting down the tuner...")
53+
self.tuner.off()
54+
self.amp.off()

‎chapter07_adapter_facade/home_theatre.py

+11-122
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,5 @@
1-
class Amplifier:
2-
def __init__(self, description):
3-
self.description = description
4-
self.tuner = None
5-
self.player = None
6-
7-
def __str__(self):
8-
return self.description
9-
10-
def on(self):
11-
print(f"{self.description} on")
12-
13-
def off(self):
14-
print(f"{self.description} off")
15-
16-
def set_stereo_sound(self):
17-
print(f"{self.description} stereo mode on")
18-
19-
def set_surround_sound(self):
20-
print(f"{self.description} surround sound on (5 speakers, 1 subwoofer)")
21-
22-
def set_volume(self, level):
23-
print(f"{self.description} setting volume to {level}")
24-
25-
def set_tuner(self, tuner):
26-
print(f"{self.description} setting tuner to {tuner}")
27-
self.tuner = tuner
28-
29-
def set_streaming_player(self, player):
30-
print(f"{self.description} setting Streaming player to {player}")
31-
self.player = player
32-
33-
34-
class Tuner:
35-
def __init__(self, description, amplifier):
36-
self.description = description
37-
self.amplifier = amplifier
38-
self.frequency = None
39-
40-
def __str__(self):
41-
return self.description
42-
43-
def on(self):
44-
print(f"{self.description} on")
45-
46-
def off(self):
47-
print(f"{self.description} off")
48-
49-
def set_frequency(self, frequency):
50-
print(f"{self.description} setting frequency to {frequency}")
51-
self.tuner = frequency
52-
53-
def set_am(self):
54-
print(f"{self.description} setting AM mode")
55-
56-
def set_fm(self):
57-
print(f"{self.description} setting FM mode")
58-
59-
60-
class HomeTheaterFacade:
61-
62-
def __init__(self, amp, tuner,
63-
# player,
64-
# projector,
65-
# screen,
66-
# lights,
67-
# popper
68-
):
69-
self.amp = amp
70-
self.tuner = tuner
71-
# self.player = player
72-
# self.projector = projector
73-
# self.screen = screen
74-
# self.lights = lights
75-
# self.popper = popper
76-
77-
def watchMovie(self, movie):
78-
print("Get ready to watch a movie...")
79-
# self.popper.on()
80-
# self.popper.pop()
81-
# self.lights.dim(10)
82-
# self.screen.down()
83-
# self.projector.on()
84-
# self.projector.wideScreenMode()
85-
self.amp.on()
86-
# self.amp.set_streaming_player(self.player)
87-
self.amp.set_surround_sound()
88-
self.amp.set_volume(5)
89-
# self.player.on()
90-
# self.player.play(movie)
91-
92-
def endMovie(self):
93-
print("Shutting movie theater down...")
94-
# self.popper.off()
95-
# self.lights.on()
96-
# self.screen.up()
97-
# self.projector.off()
98-
self.amp.off()
99-
# self.player.stop()
100-
# self.player.off()
101-
102-
def listenToRadio(self, frequency):
103-
print("Tuning in the airwaves...")
104-
self.tuner.on()
105-
self.tuner.setFrequency(frequency)
106-
self.amp.on()
107-
self.amp.setVolume(5)
108-
self.amp.setTuner(self.tuner)
109-
110-
def endRadio(self):
111-
print("Shutting down the tuner...")
112-
self.tuner.off()
113-
self.amp.off()
1+
from facade.home_theatre_facade import HomeTheaterFacade
2+
from separates.separates import Amplifier, Tuner
1143

1154

1165
def theatre_test_drive():
@@ -123,16 +12,16 @@ def theatre_test_drive():
12312
# screen = Screen("Theater Screen")
12413
# popper = PopcornPopper("Popcorn Popper")
12514

126-
homeTheater = HomeTheaterFacade(amp, tuner,
127-
# player,
128-
# projector,
129-
# screen,
130-
# lights,
131-
# popper
132-
)
15+
home_theater = HomeTheaterFacade(amp, tuner,
16+
# player,
17+
# projector,
18+
# screen,
19+
# lights,
20+
# popper
21+
)
13322

134-
homeTheater.watchMovie("Raiders of the Lost Ark")
135-
homeTheater.endMovie()
23+
home_theater.watch_movie("Raiders of the Lost Ark")
24+
home_theater.end_movie()
13625

13726

13827
if __name__ == '__main__':

‎chapter07_adapter_facade/separates/__init__.py

Whitespace-only changes.

‎chapter07_adapter_facade/separates/separates.py

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
class Amplifier:
2+
def __init__(self, description):
3+
self.description = description
4+
self.tuner = None
5+
self.player = None
6+
7+
def __str__(self):
8+
return self.description
9+
10+
def on(self):
11+
print(f"{self.description} on")
12+
13+
def off(self):
14+
print(f"{self.description} off")
15+
16+
def set_stereo_sound(self):
17+
print(f"{self.description} stereo mode on")
18+
19+
def set_surround_sound(self):
20+
print(f"{self.description} surround sound on (5 speakers, 1 subwoofer)")
21+
22+
def set_volume(self, level):
23+
print(f"{self.description} setting volume to {level}")
24+
25+
def set_tuner(self, tuner):
26+
print(f"{self.description} setting tuner to {tuner}")
27+
self.tuner = tuner
28+
29+
def set_streaming_player(self, player):
30+
print(f"{self.description} setting Streaming player to {player}")
31+
self.player = player
32+
33+
34+
class Tuner:
35+
def __init__(self, description, amplifier):
36+
self.description = description
37+
self.amplifier = amplifier
38+
self.frequency = None
39+
40+
def __str__(self):
41+
return self.description
42+
43+
def on(self):
44+
print(f"{self.description} on")
45+
46+
def off(self):
47+
print(f"{self.description} off")
48+
49+
def set_frequency(self, frequency):
50+
print(f"{self.description} setting frequency to {frequency}")
51+
self.frequency = frequency
52+
53+
def set_am(self):
54+
print(f"{self.description} setting AM mode")
55+
56+
def set_fm(self):
57+
print(f"{self.description} setting FM mode")

0 commit comments

Comments
 (0)