display-ambient-light/desktop
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects 1 Releases Wiki Activity

feat: 电脑睡眠后唤醒，支持重新开始捕捉屏幕内容。

Browse Source
This commit is contained in:
Ivan Li 2023-06-17 17:36:32 +08:00
parent bab3b8941e
commit 91983e6728
1 changed files with 42 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src-tauri/src/screenshot_manager.rs
View File

@ -1,14 +1,16 @@
use std::time::Duration;
use std::{collections::HashMap, sync::Arc}; use std::{collections::HashMap, sync::Arc};
use core_graphics::display::{ use core_graphics::display::{
kCGNullWindowID, kCGWindowImageDefault, kCGWindowListOptionOnScreenOnly, CGDisplay, kCGNullWindowID, kCGWindowImageDefault, kCGWindowListOptionOnScreenOnly, CGDisplay,
}; };
use core_graphics::geometry::{CGPoint, CGRect, CGSize}; use core_graphics::geometry::{CGPoint, CGRect, CGSize};
use paris::warn; use paris::{info, warn};
use rust_swift_screencapture::display::CGDisplayId; use rust_swift_screencapture::display::CGDisplayId;
use tauri::async_runtime::RwLock; use tauri::async_runtime::RwLock;
use tokio::sync::{broadcast, watch, Mutex, OnceCell}; use tokio::sync::{broadcast, watch, Mutex, OnceCell};
use tokio::task::yield_now; use tokio::task::yield_now;
use tokio::time::sleep;
use crate::screenshot::LedSamplePoints; use crate::screenshot::LedSamplePoints;
use crate::{ambient_light::SamplePointMapper, led_color::LedColor, screenshot::Screenshot}; use crate::{ambient_light::SamplePointMapper, led_color::LedColor, screenshot::Screenshot};
@ -81,7 +83,7 @@ pub fn get_display_colors(
} }
pub struct ScreenshotManager { pub struct ScreenshotManager {
pub channels: Arc<RwLock<HashMap<u32, Arc::<RwLock<watch::Sender<Screenshot>>>>>>, pub channels: Arc<RwLock<HashMap<u32, Arc<RwLock<watch::Sender<Screenshot>>>>>>,
merged_screenshot_tx: Arc<RwLock<broadcast::Sender<Screenshot>>>, merged_screenshot_tx: Arc<RwLock<broadcast::Sender<Screenshot>>>,
} }
@ -110,6 +112,7 @@ impl ScreenshotManager {
.unwrap_or_else(|err| { .unwrap_or_else(|err| {
warn!("start_one failed: display_id: {}, err: {}", display.id, err); warn!("start_one failed: display_id: {}, err: {}", display.id, err);
}); });
info!("start_one finished: display_id: {}", display.id);
}); });
futures::future::join_all(futures).await; futures::future::join_all(futures).await;
@ -117,13 +120,7 @@ impl ScreenshotManager {
} }
async fn start_one(&self, display_id: u32, scale_factor: f32) -> anyhow::Result<()> { async fn start_one(&self, display_id: u32, scale_factor: f32) -> anyhow::Result<()> {
let mut channels = self.channels.write().await;
let merged_screenshot_tx = self.merged_screenshot_tx.clone(); let merged_screenshot_tx = self.merged_screenshot_tx.clone();
let display = rust_swift_screencapture::display::Display::new(display_id);
display.start_capture(30).await;
let mut frame_rx = display.subscribe_frame().await;
let (tx, _) = watch::channel(Screenshot::new( let (tx, _) = watch::channel(Screenshot::new(
display_id, display_id,
@ -135,9 +132,18 @@ impl ScreenshotManager {
scale_factor, scale_factor,
)); ));
let tx = Arc::new(RwLock::new(tx)); let tx = Arc::new(RwLock::new(tx));
let mut channels = self.channels.write().await;
channels.insert(display_id, tx.clone()); channels.insert(display_id, tx.clone());
drop(channels); drop(channels);
loop {
let display = rust_swift_screencapture::display::Display::new(display_id);
let mut frame_rx = display.subscribe_frame().await;
display.start_capture(30).await;
let tx_for_send = tx.read().await; let tx_for_send = tx.read().await;
while frame_rx.changed().await.is_ok() { while frame_rx.changed().await.is_ok() {
@ -156,15 +162,19 @@ impl ScreenshotManager {
// log::warn!("merged_screenshot_tx.send failed: {}", err); // log::warn!("merged_screenshot_tx.send failed: {}", err);
} }
if let Err(err) = tx_for_send.send(screenshot.clone()) { if let Err(err) = tx_for_send.send(screenshot.clone()) {
// log::warn!("display {} screenshot_tx.send failed: {}", display_id, err); log::warn!("display {} screenshot_tx.send failed: {}", display_id, err);
} else { } else {
log::debug!("screenshot: {:?}", screenshot); log::debug!("screenshot: {:?}", screenshot);
} }
yield_now().await; yield_now().await;
} }
sleep(Duration::from_secs(5)).await;
Ok(()) info!(
"display {} frame_rx.changed() failed, try to restart",
display_id
);
}
} }
pub fn get_sorted_colors(colors: &Vec<u8>, mappers: &Vec<SamplePointMapper>) -> Vec<u8> { pub fn get_sorted_colors(colors: &Vec<u8>, mappers: &Vec<SamplePointMapper>) -> Vec<u8> {