Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 98 additions & 5 deletions apps/desktop/src-tauri/src/deeplink_actions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,17 @@ pub enum DeepLinkAction {
mode: RecordingMode,
},
StopRecording,
#[cfg(debug_assertions)]
PauseRecording,
#[cfg(debug_assertions)]
ResumeRecording,
TogglePauseRecording,
RestartRecording,
SwitchMicrophone {
mic_label: Option<String>,
},
SwitchCamera {
camera: Option<DeviceOrModelID>,
},
TakeScreenshot,
#[cfg(debug_assertions)]
OpenCamera {
camera: DeviceOrModelID,
Expand Down Expand Up @@ -244,14 +251,35 @@ impl DeepLinkAction {
DeepLinkAction::StopRecording => {
crate::recording::stop_recording(app.clone(), app.state()).await
}
#[cfg(debug_assertions)]
DeepLinkAction::PauseRecording => {
crate::recording::pause_recording(app.clone(), app.state()).await
}
#[cfg(debug_assertions)]
DeepLinkAction::ResumeRecording => {
crate::recording::resume_recording(app.clone(), app.state()).await
}
DeepLinkAction::TogglePauseRecording => {
crate::recording::toggle_pause_recording(app.clone(), app.state()).await
}
DeepLinkAction::RestartRecording => {
crate::recording::restart_recording(app.clone(), app.state())
.await
.map(|_| ())
}
DeepLinkAction::SwitchMicrophone { mic_label } => {
crate::set_mic_input(app.state(), mic_label).await
}
DeepLinkAction::SwitchCamera { camera } => {
crate::set_camera_input(app.clone(), app.state::<ArcLock<App>>(), camera, None)
.await?;
Ok(())
}
DeepLinkAction::TakeScreenshot => {
let id = scap_targets::Display::primary().id();
let capture_target = ScreenCaptureTarget::Display { id };
crate::recording::take_screenshot(app.clone(), capture_target)
.await
.map(|_| ())
}
#[cfg(debug_assertions)]
DeepLinkAction::OpenCamera { camera } => {
crate::set_camera_input(
Expand Down Expand Up @@ -358,7 +386,6 @@ mod tests {
);
}

#[cfg(debug_assertions)]
#[test]
fn parses_pause_and_resume_action_urls() {
let pause_url = Url::parse("cap-desktop://action?value=%22pause_recording%22").unwrap();
Expand All @@ -374,6 +401,72 @@ mod tests {
);
}

#[test]
fn parses_toggle_pause_action_url() {
let url = Url::parse("cap-desktop://action?value=%22toggle_pause_recording%22").unwrap();

assert_eq!(
DeepLinkAction::try_from(&url),
Ok(DeepLinkAction::TogglePauseRecording)
);
}

#[test]
fn parses_restart_action_url() {
let url = Url::parse("cap-desktop://action?value=%22restart_recording%22").unwrap();

assert_eq!(
DeepLinkAction::try_from(&url),
Ok(DeepLinkAction::RestartRecording)
);
}

#[test]
fn parses_switch_microphone_action_url() {
let value = serde_json::json!({
"switch_microphone": {
"mic_label": "Built-in Microphone"
}
})
.to_string();
let url = Url::parse_with_params("cap-desktop://action", &[("value", value)]).unwrap();

assert_eq!(
DeepLinkAction::try_from(&url),
Ok(DeepLinkAction::SwitchMicrophone {
mic_label: Some("Built-in Microphone".to_string())
})
);
}

#[test]
fn parses_switch_camera_action_url() {
let value = serde_json::json!({
"switch_camera": {
"camera": { "DeviceID": "camera-1" }
}
})
.to_string();
let url = Url::parse_with_params("cap-desktop://action", &[("value", value)]).unwrap();

assert_eq!(
DeepLinkAction::try_from(&url),
Ok(DeepLinkAction::SwitchCamera {
camera: Some(DeviceOrModelID::DeviceID("camera-1".to_string()))
})
);
}

#[test]
fn parses_take_screenshot_action_url() {
let url = Url::parse("cap-desktop://action?value=%22take_screenshot%22").unwrap();

assert_eq!(
DeepLinkAction::try_from(&url),
Ok(DeepLinkAction::TakeScreenshot)
);
}

#[cfg(debug_assertions)]
#[test]
fn parses_area_recording_action_url() {
Expand Down
5 changes: 3 additions & 2 deletions packages/sdk-recorder/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,10 @@ export class CapRecorder {
this.listeners.set(event, new Set());
}
const set = this.listeners.get(event);
if (set) set.add(handler as EventHandler<keyof RecorderEventMap>);
const castHandler = handler as unknown as EventHandler<keyof RecorderEventMap>;
if (set) set.add(castHandler);
return () => {
this.listeners.get(event)?.delete(handler);
this.listeners.get(event)?.delete(castHandler);
};
Comment on lines 84 to 89

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works, but it’s a bit hard to read (and pretty long). You can hoist the cast once and reuse it for add/remove.

Suggested change
const set = this.listeners.get(event);
if (set) set.add(handler as EventHandler<keyof RecorderEventMap>);
if (set) set.add(handler as unknown as EventHandler<keyof RecorderEventMap>);
return () => {
this.listeners.get(event)?.delete(handler);
this.listeners.get(event)?.delete(handler as unknown as EventHandler<keyof RecorderEventMap>);
};
const set = this.listeners.get(event);
const castHandler =
handler as unknown as EventHandler<keyof RecorderEventMap>;
if (set) set.add(castHandler);
return () => {
this.listeners.get(event)?.delete(castHandler);
};

}

Expand Down