BetterCorp/BetterFrame
1
0
Fork 0
mirror of https://github.com/BetterCorp/BetterFrame.git synced 2026-05-26 21:26:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

fix(kiosk): rename reserved keyword gen, clean warnings

Browse source 
gen is reserved in Rust 2024 edition. Also remove unused
serde_json::Value import and prefix unused end_idx variable.
This commit is contained in:
Mitchell R 2026-05-21 12:14:24 +02:00
parent 9f382775a7
commit 01a1aad2fd
No known key found for this signature in database
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
kiosk/src/onvif_events.rs
View file

@ -19,7 +19,6 @@ use std::collections::HashMap;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use std::time::Duration; use std::time::Duration;
use serde_json::Value;
use tracing::{info, warn}; use tracing::{info, warn};
use crate::bundle::BundleCamera; use crate::bundle::BundleCamera;
@ -61,14 +60,14 @@ pub fn start(
for cam in onvif_cams { for cam in onvif_cams {
let server = server_url.to_string(); let server = server_url.to_string();
let key = kiosk_key.to_string(); let key = kiosk_key.to_string();
let gen = Arc::downgrade(&generation); let weak_gen = Arc::downgrade(&generation);
let password = match (&cam.onvif_password_encrypted, cluster_key) { let password = match (&cam.onvif_password_encrypted, cluster_key) {
(Some(enc), Some(ck)) => decrypt_cluster(enc, ck), (Some(enc), Some(ck)) => decrypt_cluster(enc, ck),
_ => None, _ => None,
}; };
std::thread::spawn(move || { std::thread::spawn(move || {
run_subscription(cam, password.as_deref(), &server, &key, gen); run_subscription(cam, password.as_deref(), &server, &key, weak_gen);
}); });
} }
@ -365,7 +364,7 @@ fn extract_tag(xml: &str, tag: &str) -> Option<String> {
if rest.contains(':') && rest.ends_with(tag) || rest.split_whitespace().next()?.ends_with(&format!(":{tag}")) { if rest.contains(':') && rest.ends_with(tag) || rest.split_whitespace().next()?.ends_with(&format!(":{tag}")) {
// Found opening tag with namespace // Found opening tag with namespace
let after_close = &xml[xml.find(part)? + part.len()..]; let after_close = &xml[xml.find(part)? + part.len()..];
if let Some(end_idx) = after_close.find(&format!(":{tag}>")) { if let Some(_end_idx) = after_close.find(&format!(":{tag}>")) {
let content = &after_close[after_close.find('>')? + 1..]; let content = &after_close[after_close.find('>')? + 1..];
if let Some(close) = content.find('<') { if let Some(close) = content.find('<') {
return Some(content[..close].trim().to_string()); return Some(content[..close].trim().to_string());