Skip to content

fix: Temporary fix for wayland capturing #1496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Temporary fix for wayland capturing #1496

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
140 changes: 89 additions & 51 deletions screenpipe-vision/src/core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,51 +283,23 @@ pub async fn process_ocr_task(
let mut total_confidence = 0.0;
let mut window_count = 0;

for captured_window in window_images {
let app_name = captured_window.app_name.clone();
let browser_url = if cfg!(target_os = "macos")
&& captured_window.is_focused
&& BROWSER_NAMES
.iter()
.any(|&browser| app_name.to_lowercase().contains(browser))
{
match tokio::task::spawn_blocking(move || {
get_active_browser_url_sync(&app_name, captured_window.process_id)
})
.await
{
Ok(Ok(url)) => Some(url),
Ok(Err(_)) => {
// error!("Failed to get browser URL: {}", e);
None
}
Err(e) => {
error!("Failed to spawn blocking task: {}", e);
None
}
}
} else {
None
};

let (window_text, window_json_output, confidence) = match ocr_engine {
OcrEngine::Unstructured => perform_ocr_cloud(&captured_window.image, languages.clone())
if window_images.is_empty() {
// If no windows, perform OCR on full screen
// xcap could not capture screen by screen due to the xwayland bridge, so this is a temporary solution until we implement pipewire capturing.
let (full_text, full_json, confidence) = match ocr_engine {
OcrEngine::Unstructured => perform_ocr_cloud(&image, languages.clone())
.await
.map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?,
OcrEngine::Tesseract => {
perform_ocr_tesseract(&captured_window.image, languages.clone())
}
OcrEngine::Tesseract => perform_ocr_tesseract(&image, languages.clone()),
#[cfg(target_os = "windows")]
OcrEngine::WindowsNative => perform_ocr_windows(&captured_window.image)
OcrEngine::WindowsNative => perform_ocr_windows(&image)
.await
.map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?,
#[cfg(target_os = "macos")]
OcrEngine::AppleNative => perform_ocr_apple(&captured_window.image, &languages),
OcrEngine::Custom(config) => {
perform_ocr_custom(&captured_window.image, languages.clone(), config)
.await
.map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?
}
OcrEngine::AppleNative => perform_ocr_apple(&image, &languages),
OcrEngine::Custom(config) => perform_ocr_custom(&image, languages.clone(), config)
.await
.map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?,
_ => {
return Err(std::io::Error::new(
std::io::ErrorKind::Other,
Expand All @@ -336,21 +308,87 @@ pub async fn process_ocr_task(
}
};

if let Some(conf) = confidence {
total_confidence += conf;
window_count += 1;
}

window_ocr_results.push(WindowOcrResult {
image: captured_window.image,
window_name: captured_window.window_name,
app_name: captured_window.app_name,
text: window_text,
text_json: parse_json_output(&window_json_output),
focused: captured_window.is_focused,
image: image.clone(),
window_name: "Full Screen".to_string(),
app_name: "Screen Capture".to_string(),
text: full_text,
text_json: parse_json_output(&full_json),
focused: true,
confidence: confidence.unwrap_or(0.0),
browser_url: browser_url.clone(),
browser_url: None,
});
} else {
// Process individual windows as before
for captured_window in window_images {
let app_name = captured_window.app_name.clone();
let browser_url = if cfg!(target_os = "macos")
&& captured_window.is_focused
&& BROWSER_NAMES
.iter()
.any(|&browser| app_name.to_lowercase().contains(browser))
{
match tokio::task::spawn_blocking(move || {
get_active_browser_url_sync(&app_name, captured_window.process_id)
})
.await
{
Ok(Ok(url)) => Some(url),
Ok(Err(_)) => {
// error!("Failed to get browser URL: {}", e);
None
}
Err(e) => {
error!("Failed to spawn blocking task: {}", e);
None
}
}
} else {
None
};

let (window_text, window_json_output, confidence) = match ocr_engine {
OcrEngine::Unstructured => perform_ocr_cloud(&captured_window.image, languages.clone())
.await
.map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?,
OcrEngine::Tesseract => {
perform_ocr_tesseract(&captured_window.image, languages.clone())
}
#[cfg(target_os = "windows")]
OcrEngine::WindowsNative => perform_ocr_windows(&captured_window.image)
.await
.map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?,
#[cfg(target_os = "macos")]
OcrEngine::AppleNative => perform_ocr_apple(&captured_window.image, &languages),
OcrEngine::Custom(config) => {
perform_ocr_custom(&captured_window.image, languages.clone(), config)
.await
.map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?
}
_ => {
return Err(std::io::Error::new(
std::io::ErrorKind::Other,
"Unsupported OCR engine",
))
}
};

if let Some(conf) = confidence {
total_confidence += conf;
window_count += 1;
}

window_ocr_results.push(WindowOcrResult {
image: captured_window.image,
window_name: captured_window.window_name,
app_name: captured_window.app_name,
text: window_text,
text_json: parse_json_output(&window_json_output),
focused: captured_window.is_focused,
confidence: confidence.unwrap_or(0.0),
browser_url: browser_url.clone(),
});
}
}

let capture_result = CaptureResult {
Expand Down