TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-04-18 11:31:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: remote printer (#11270)

Browse Source 
* fix: remote printer, log

Signed-off-by: fufesou <linlong1266@gmail.com>

* fix: remote printer, avoid double sign

Signed-off-by: fufesou <linlong1266@gmail.com>

* Spawn a new thread to handle the print job.

Signed-off-by: fufesou <linlong1266@gmail.com>

---------

Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou
2025-03-28 10:36:42 +08:00
committed by GitHub
parent f4bbf82363
commit ee2478168c
2 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/client/io_loop.rs
View File

@@ -1550,8 +1550,14 @@ impl<T: InvokeUiSession> Remote<T> {
fs::JobType::Generic => { fs::JobType::Generic => {
self.handle_job_status(d.id, d.file_num, err); self.handle_job_status(d.id, d.file_num, err);
} }
fs::JobType::Printer => fs::JobType::Printer => {
{ if let Some(err) = err {
log::error!("Received printer job failed, error {err}");
} else {
log::info!(
"Received printer job done, data len: {:?}",
printer_data.as_ref().map(|d| d.len()).unwrap_or(0)
);
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
if let Some(data) = printer_data { if let Some(data) = printer_data {
let printer_name = self let printer_name = self
@@ -1560,11 +1566,16 @@ impl<T: InvokeUiSession> Remote<T> {
.write() .write()
.unwrap() .unwrap()
.remove(&d.id); .remove(&d.id);
// Spawn a new thread to handle the print job.
// Or print job will block the ui thread.
std::thread::spawn(move || {
crate::platform::send_raw_data_to_printer( crate::platform::send_raw_data_to_printer(
printer_name, printer_name,
data, data,
) )
.ok(); .ok();
});
}
} }
} }
} }

10
src/server/connection.rs
View File

@@ -2427,13 +2427,15 @@ impl Connection {
fs::DataSource::FilePath(PathBuf::from(&path)); fs::DataSource::FilePath(PathBuf::from(&path));
} }
JobType::Printer => { JobType::Printer => {
if let Some(pd) = if let Some((_, _, data)) = self
self.printer_data.iter().find(|(_, p, _)| *p == path) .printer_data
.iter()
.position(|(_, p, _)| *p == path)
.map(|index| self.printer_data.remove(index))
{ {
data_source = fs::DataSource::MemoryCursor( data_source = fs::DataSource::MemoryCursor(
std::io::Cursor::new(pd.2.clone()), std::io::Cursor::new(data),
); );
self.printer_data.retain(|f| f.1 != path);
} else { } else {
// Ignore this message if the printer data is not found // Ignore this message if the printer data is not found
return true; return true;