Skip to content
Extraits de code Groupes Projets
Vérifiée Valider b8d5ff69 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

AMADEUS: Re-structurate the amadeus crate, place all the UI stuff in its own module

parent 49d5c166
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
use serde::{Deserialize, Serialize};
/// The address of the lektord deamon.
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(tag = "type", content = "socket")]
pub enum Address {
/// Connect over TCP/IP
TCP(String, i16),
/// Connect over UNIX domain socket.
#[cfg(unix)]
UNIX(String),
}
impl std::fmt::Display for Address {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
Address::TCP(addr, port) => write!(f, "TCP://{addr}:{port}"),
Address::UNIX(path) => write!(f, "UNIX://{path}"),
}
}
}
impl Default for Address {
fn default() -> Self {
Self::TCP(String::from("127.0.0.1"), 6600)
}
}
Fichier déplacé
use crate::{action, AmadeusConfig};
use crate::{address::Address, amadeus::action, AmadeusConfig};
use commons::{log, Report};
use iced::{
futures::lock::Mutex,
......@@ -6,30 +6,8 @@ use iced::{
widget::{button, text},
Command, Element, Subscription,
};
use serde::{Deserialize, Serialize};
use std::sync::Arc;
/// The address of the lektord deamon.
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(tag = "type", content = "socket")]
pub enum Address {
/// Connect over TCP/IP
TCP(String, i16),
/// Connect over UNIX domain socket.
#[cfg(unix)]
UNIX(String),
}
impl std::fmt::Display for Address {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
Address::TCP(addr, port) => write!(f, "TCP://{addr}:{port}"),
Address::UNIX(path) => write!(f, "UNIX://{path}"),
}
}
}
#[derive(Debug, Clone)]
pub enum Message {
/// Nothing to do...
......
use crate::{action, client, queue_control, AmadeusConfig};
mod action;
mod client;
mod queue_control;
use crate::AmadeusConfig;
use iced::{
executor, subscription,
widget::{column, row},
......
use crate::action;
use crate::amadeus::action;
use iced::{widget::text, Command, Element};
#[derive(Debug, Clone, Copy)]
......
......@@ -4,14 +4,12 @@ use commons::log;
use iced::{Application, Settings};
use serde::{Deserialize, Serialize};
mod action;
mod address;
mod amadeus;
mod client;
mod queue_control;
#[derive(Debug, Deserialize, Serialize)]
pub struct AmadeusRemoteConfig {
pub address: client::Address,
pub address: address::Address,
}
#[derive(Debug, Deserialize, Serialize)]
......@@ -29,7 +27,7 @@ pub struct AmadeusConfig {
impl Default for AmadeusRemoteConfig {
fn default() -> Self {
Self {
address: client::Address::TCP(String::from("127.0.0.1"), 6600),
address: address::Address::default(),
}
}
}
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter