Skip to content

Commit ecf0e65

Browse files
committed
split proc to replay_proc and record_proc
1 parent 6096a8f commit ecf0e65

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

openadapt/widget/app.py

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ def __init__(self, **kwargs):
2424
self.window.size = (50, 50)
2525
self.window.clearcolor = (255, 255, 255)
2626
self.window.always_on_top = True
27-
self.PROC = None
27+
self.record_proc = None
28+
self.replay_proc = None
2829
self.button = Button(background_normal="assets/logo.png")
2930
self.button.bind(on_press=self.callback)
3031
self.current_state = "default"
3132
self.add_widget(self.button)
3233
# Check for active window changes every 0.5 seconds
3334
self.prev_active_window_position = None
34-
self._active_window_checker = Clock.schedule_interval(
35+
Clock.schedule_interval(
3536
self.position_above_active_window, 0.5
3637
)
3738

@@ -67,32 +68,26 @@ def callback(self, instance):
6768
self.resume_replay()
6869

6970
def start_recording(self):
70-
self.PROC = Popen(
71+
self.record_proc = Popen(
7172
"python -m openadapt.record " + "test",
7273
shell=True,
7374
)
7475

7576
def stop_recording(self):
76-
try:
77-
self.PROC.send_signal(signal.CTRL_C_EVENT)
78-
# Wait for process to terminate
79-
self.PROC.wait()
80-
except KeyboardInterrupt:
81-
# Catch the KeyboardInterrupt exception to prevent termination
82-
pass
83-
self.PROC = None
77+
self.record_proc.send_signal(signal.CTRL_C_EVENT)
78+
self.record_proc.wait()
8479

8580
def replay_recording(self):
86-
self.PROC = Popen(
81+
self.replay_proc = Popen(
8782
"python -m openadapt.replay " + "NaiveReplayStrategy",
8883
shell=True,
8984
)
9085

9186
def pause_replay(self):
92-
self.PROC.send_signal(signal.SIGSTOP)
87+
self.replay_proc.send_signal(signal.SIGSTOP)
9388

9489
def resume_replay(self):
95-
self.PROC.send_signal(signal.SIGCONT)
90+
self.replay_proc.send_signal(signal.SIGCONT)
9691

9792

9893
class OpenAdapt(App):

0 commit comments

Comments
 (0)