Skip to content
Extraits de code Groupes Projets

AMADEUS: Implementation of lkt-lib

Fusionnées Kubat a demandé de fusionner amadeus-rs vers master
9 fichiers
+ 89
61
Comparer les modifications
  • Côte à côte
  • En ligne
Fichiers
9
@@ -107,18 +107,23 @@ impl Deamon for CommandDeamon {
return_when_flagged!(quit_deamon, joined_deamon);
match commands_recv.recv() {
Ok(command) => {
let maybe_res = connexion.send_query(command);
if maybe_res.is_err() {
error!("Failed to send query to lektor: {}", maybe_res.unwrap_err());
continue;
}
let res = maybe_res.unwrap();
let response = lkt_lib::response::LektorFormatedResponse::from(res);
if let Err(e) = responses_send.send(response) {
error!("Failed to send response to amadeus: {e}")
let res = match connexion.send_query(command) {
Ok(ok) => ok,
Err(e) => {
error!("failed to send query to lektor: {e}");
continue;
}
};
match lkt_lib::response::LektorFormatedResponse::try_from(res) {
Ok(response) => {
if let Err(e) = responses_send.send(response) {
error!("failed to send response to amadeus: {e}")
}
}
Err(e) => error!("failed to format the response: {e}"),
}
}
Err(e) => error!("Failed to get command from amadeus: {e}"),
Err(e) => error!("failed to get command from amadeus: {e}"),
};
});
@@ -153,31 +158,36 @@ impl Deamon for StatusDeamon {
return_when_flagged!(quit_deamon, joined_deamon);
let status = {
let maybe_res = connexion.send_query(lkt_lib::query::LektorQuery::PlaybackStatus);
if maybe_res.is_err() {
error!(
"Failed to send the playback status command to lektor: {}",
maybe_res.unwrap_err()
);
continue;
let res = match connexion.send_query(lkt_lib::query::LektorQuery::PlaybackStatus) {
Ok(res) => res,
Err(e) => {
error!("failed to send the playback status command to lektor: {e}");
continue;
}
};
match lkt_lib::response::LektorFormatedResponse::try_from(res) {
Err(e) => panic!("{e}"),
Ok(mut response) => lkt_lib::response::PlaybackStatus::consume(&mut response),
}
let res = maybe_res.unwrap();
let mut response = lkt_lib::response::LektorFormatedResponse::from(res);
lkt_lib::response::PlaybackStatus::consume(&mut response)
};
let current = if status.state != lkt_lib::types::LektorState::Stopped {
let maybe_res = connexion.send_query(lkt_lib::query::LektorQuery::CurrentKara);
if maybe_res.is_err() {
error!(
"Failed to send the current kara command to lektor: {}",
maybe_res.unwrap_err()
);
continue;
let res = match connexion.send_query(lkt_lib::query::LektorQuery::CurrentKara) {
Ok(res) => res,
Err(e) => {
error!("failed to send the current kara command to lektor: {e}",);
continue;
}
};
match lkt_lib::response::LektorFormatedResponse::try_from(res) {
Ok(mut response) => {
Some(lkt_lib::response::CurrentKara::consume(&mut response))
}
Err(e) => {
error!("failed to format response from lektor: {e}");
None
}
}
let res = maybe_res.unwrap();
let mut response = lkt_lib::response::LektorFormatedResponse::from(res);
Some(lkt_lib::response::CurrentKara::consume(&mut response))
} else {
None
};
Chargement en cours