clippy-fix

This commit is contained in:
Chris Cochrun 2024-06-25 23:04:30 -05:00
parent 3f2f57f8e7
commit cbf5fe3d9d
14 changed files with 166 additions and 184 deletions

View file

@ -3,13 +3,14 @@ use cxx_qt::CxxQtType;
use cxx_qt_lib::{QString, QStringList};
use obws::responses::scenes::Scenes;
use obws::Client;
use std::thread::sleep;
use std::time::Duration;
use std::{error::Error, pin::Pin};
use tracing::{debug, error};
use crate::obs::qobject::QList_QString;
#[derive(Default)]
pub struct Obs {
scenes: Scenes,
client: Option<Client>,
@ -35,15 +36,7 @@ impl Clone for Obs {
}
}
impl Default for Obs {
fn default() -> Self {
Self {
scenes: Scenes::default(),
client: None,
current_program_scene: None,
}
}
}
impl Obs {
pub async fn new() -> Result<Self, Box<dyn Error>> {
@ -68,7 +61,7 @@ impl Obs {
.iter()
.map(|x| x.name.clone())
.collect::<Vec<String>>();
if scenes.len() > 0 {
if !scenes.is_empty() {
Ok(scenes)
} else {
Err(format!("Scenes found: {}", scenes.len()))?
@ -80,19 +73,19 @@ impl Obs {
scene: String,
) -> Result<(), Box<dyn Error>> {
// debug!("Starting function");
if let Some(client) = &self.client {
if let Some(_client) = &self.client {
debug!(scene, "setting scene in obs");
let client = make_client();
let runtime = tokio::runtime::Runtime::new()?;
let handle = runtime.spawn(async move {
let _handle = runtime.spawn(async move {
debug!("in spawn: before setting");
let res = client
.scenes()
.set_current_program_scene(&scene)
.await;
match res {
Ok(o) => {
Ok(_o) => {
debug!("in spawn: after setting: success")
}
Err(e) => error!(?e, "in spawn: after setting"),
@ -118,8 +111,8 @@ impl Obs {
fn make_client() -> Client {
let runtime = tokio::runtime::Runtime::new().unwrap();
let future = Client::connect("localhost", 4455, Some(""));
let client = runtime.block_on(future).unwrap();
client
runtime.block_on(future).unwrap()
}
#[cxx_qt::bridge]