Compare commits
2 Commits
8c796b1590
...
1957ff7f9f
Author | SHA1 | Date | |
---|---|---|---|
|
1957ff7f9f | ||
|
2e84b06a91 |
@ -4,11 +4,14 @@ version = "0.1.0"
|
|||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
chrono = "0.4.41"
|
||||||
env_logger = "0.11.8"
|
env_logger = "0.11.8"
|
||||||
futures-lite = "2.6.0"
|
futures-lite = "2.6.0"
|
||||||
iced = {"git"= "https://github.com/iced-rs/iced.git", "features"=["tokio", "auto-detect-theme", "fira-sans", "tiny-skia", "wgpu", "sipper"]}
|
iced = {"git"= "https://github.com/iced-rs/iced.git", "features"=["tokio", "auto-detect-theme", "fira-sans", "tiny-skia", "wgpu", "sipper"]}
|
||||||
lazy_static = "1.5.0"
|
lazy_static = "1.5.0"
|
||||||
nusb = "0.1.13"
|
nusb = "0.1.13"
|
||||||
|
reqwest = { version = "0.12.15", features = ["json", "multipart", "http2", "cookies"] }
|
||||||
|
reqwest-middleware = "0.4.2"
|
||||||
serde = {version = "1.0.219", features=["derive"]}
|
serde = {version = "1.0.219", features=["derive"]}
|
||||||
serde_json = "1.0.140"
|
serde_json = "1.0.140"
|
||||||
tokio = {version = "1.45.0", features=["time", "fs", "io-util", "macros"]}
|
tokio = {version = "1.45.0", features=["time", "fs", "io-util", "macros"]}
|
||||||
|
8
POC_in_rust/config.json
Normal file
8
POC_in_rust/config.json
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"DURATION": 600,
|
||||||
|
"SAVING_INTERVAL": 60,
|
||||||
|
"STATION_ID": 2,
|
||||||
|
"HOST": "https://beta.alkator.cz",
|
||||||
|
"LOGIN": "station_register@alkator.cz",
|
||||||
|
"PASSWORD": "password_heslo"
|
||||||
|
}
|
25
POC_in_rust/src/approx_time.rs
Normal file
25
POC_in_rust/src/approx_time.rs
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
|
||||||
|
use std::time::{Instant, SystemTime};
|
||||||
|
use serde::{Serialize, Serializer, Deserialize, Deserializer, de::Error};
|
||||||
|
|
||||||
|
pub fn serialize<S>(instant: &Instant, serializer: S) -> Result<S::Ok, S::Error>
|
||||||
|
where
|
||||||
|
S: Serializer,
|
||||||
|
{
|
||||||
|
let system_now = SystemTime::now();
|
||||||
|
let instant_now = Instant::now();
|
||||||
|
let approx = system_now - (instant_now - *instant);
|
||||||
|
approx.serialize(serializer)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn deserialize<'de, D>(deserializer: D) -> Result<Instant, D::Error>
|
||||||
|
where
|
||||||
|
D: Deserializer<'de>,
|
||||||
|
{
|
||||||
|
let de = SystemTime::deserialize(deserializer)?;
|
||||||
|
let system_now = SystemTime::now();
|
||||||
|
let instant_now = Instant::now();
|
||||||
|
let duration = system_now.duration_since(de).map_err(Error::custom)?;
|
||||||
|
let approx = instant_now - duration;
|
||||||
|
Ok(approx)
|
||||||
|
}
|
66
POC_in_rust/src/card_reader.rs
Normal file
66
POC_in_rust/src/card_reader.rs
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
use iced::task::{Never, Sipper, sipper};
|
||||||
|
use tokio::time::sleep;
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use nusb::{transfer::{ RequestBuffer, TransferError }, Interface};
|
||||||
|
|
||||||
|
static USB_VENDOR: u16 = 0xffff;
|
||||||
|
static USB_PRODUCT: u16 = 0x0035;
|
||||||
|
|
||||||
|
|
||||||
|
fn get_interface() -> Option<Interface> {
|
||||||
|
let dev = nusb::list_devices().ok()?.find(|dev| dev.vendor_id() == USB_VENDOR && dev.product_id() == USB_PRODUCT)?;
|
||||||
|
let device = dev.open().ok()?;
|
||||||
|
device.detach_and_claim_interface(0).ok()
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
pub fn connect() -> impl Sipper<Never, Event> {
|
||||||
|
sipper(async |mut output|{
|
||||||
|
loop {
|
||||||
|
let interface = loop {
|
||||||
|
if let Some(interface) = get_interface(){
|
||||||
|
break interface;
|
||||||
|
}
|
||||||
|
sleep(Duration::new(0, 100)).await;
|
||||||
|
};
|
||||||
|
output.send(Event::Connected).await;
|
||||||
|
let mut card_id = 0;
|
||||||
|
loop {
|
||||||
|
let buf = RequestBuffer::new(8);
|
||||||
|
let data = interface.interrupt_in(0x81, buf).await;
|
||||||
|
match data.status {
|
||||||
|
Err(TransferError::Disconnected) => {
|
||||||
|
output.send(Event::Disconnected).await;
|
||||||
|
break;
|
||||||
|
},
|
||||||
|
Ok(()) => {
|
||||||
|
let code = data.data[2];
|
||||||
|
match code {
|
||||||
|
40 => {
|
||||||
|
output.send(Event::ReadedCardId(card_id)).await;
|
||||||
|
card_id = 0;
|
||||||
|
},
|
||||||
|
0 => (),
|
||||||
|
x @ 30..=38 => {
|
||||||
|
card_id *= 10;
|
||||||
|
card_id += x as usize - 29;
|
||||||
|
},
|
||||||
|
39 => {
|
||||||
|
card_id *= 10;
|
||||||
|
},
|
||||||
|
_ => panic!(),
|
||||||
|
}
|
||||||
|
},
|
||||||
|
_ => todo!(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub enum Event{
|
||||||
|
Disconnected,
|
||||||
|
Connected,
|
||||||
|
ReadedCardId(usize),
|
||||||
|
}
|
33
POC_in_rust/src/config.rs
Normal file
33
POC_in_rust/src/config.rs
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
use std::fs::File;
|
||||||
|
use std::io::BufReader;
|
||||||
|
use std::error::Error;
|
||||||
|
use std::path::Path;
|
||||||
|
use serde::{Deserialize};
|
||||||
|
use lazy_static::lazy_static;
|
||||||
|
|
||||||
|
#[allow(non_snake_case)]
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct Config {
|
||||||
|
pub DURATION: u64,
|
||||||
|
pub SAVING_INTERVAL: u64,
|
||||||
|
pub STATION_ID: usize,
|
||||||
|
pub HOST: String,
|
||||||
|
pub LOGIN: String,
|
||||||
|
pub PASSWORD: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn read_config_from_file<P: AsRef<Path>>(path: P) -> Result<Config, Box<dyn Error>> {
|
||||||
|
// Open the file in read-only mode with buffer.
|
||||||
|
let file = File::open(path)?;
|
||||||
|
let reader = BufReader::new(file);
|
||||||
|
|
||||||
|
// Read the JSON contents of the file as an instance of `User`.
|
||||||
|
let config = serde_json::from_reader(reader)?;
|
||||||
|
|
||||||
|
// Return the `User`.
|
||||||
|
Ok(config)
|
||||||
|
}
|
||||||
|
|
||||||
|
lazy_static! {
|
||||||
|
pub static ref CONFIG: Config = read_config_from_file("config.json").unwrap();
|
||||||
|
}
|
0
POC_in_rust/src/db_update.rs
Normal file
0
POC_in_rust/src/db_update.rs
Normal file
@ -6,10 +6,15 @@ use iced::widget::{center, column, row, text};
|
|||||||
use iced::{Element, Subscription, Theme, Center, Task};
|
use iced::{Element, Subscription, Theme, Center, Task};
|
||||||
use tokio::fs::File;
|
use tokio::fs::File;
|
||||||
use tokio::io::AsyncWriteExt;
|
use tokio::io::AsyncWriteExt;
|
||||||
|
use std::fs::read_to_string;
|
||||||
|
use reqwest::Client;
|
||||||
|
use chrono::{DateTime, Local};
|
||||||
|
|
||||||
|
|
||||||
mod card_reader;
|
mod card_reader;
|
||||||
mod approx_time;
|
mod approx_time;
|
||||||
mod config;
|
mod config;
|
||||||
|
mod db_update;
|
||||||
use config::CONFIG;
|
use config::CONFIG;
|
||||||
|
|
||||||
|
|
||||||
@ -31,7 +36,7 @@ struct State{
|
|||||||
impl Default for State {
|
impl Default for State {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Self {
|
Self {
|
||||||
racers: vec![RacerTime{time: Instant::now(), racer: Racer{starting_number:11,racer_id: 0, card_id: 0}}],
|
racers: vec![RacerTime{time: Instant::now(), racer: Racer{starting_number:11, card_id: 0}}],
|
||||||
db: Default::default(),
|
db: Default::default(),
|
||||||
time: Instant::now(),
|
time: Instant::now(),
|
||||||
}
|
}
|
||||||
@ -44,6 +49,39 @@ async fn dump_state(json: String) -> Result<(), tokio::io::Error> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
struct RegisterRacer{
|
||||||
|
card_id: usize,
|
||||||
|
time: String,
|
||||||
|
station_id: usize,
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn station_register(card_id: usize, time: DateTime::<Local>) -> Result<(), reqwest::Error>{
|
||||||
|
let client = reqwest::Client::builder()
|
||||||
|
.cookie_store(true)
|
||||||
|
.build()
|
||||||
|
.unwrap();
|
||||||
|
let result = client
|
||||||
|
.post(CONFIG.HOST.clone() + "/api/login")
|
||||||
|
.form(&[
|
||||||
|
("login", CONFIG.LOGIN.as_str()),
|
||||||
|
("password", CONFIG.PASSWORD.as_str()),
|
||||||
|
]);
|
||||||
|
.send()
|
||||||
|
.await?;
|
||||||
|
let register_racer = RegisterRacer{
|
||||||
|
card_id: card_id,
|
||||||
|
station_id: CONFIG.STATION_ID,
|
||||||
|
time: format!("{}", time.format("%d.%m.%Y %H:%M:%S.%f")),
|
||||||
|
};
|
||||||
|
client
|
||||||
|
.post(CONFIG.HOST.clone() + "/api/station/register")
|
||||||
|
.json(®ister_racer)
|
||||||
|
.send()
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
impl State{
|
impl State{
|
||||||
fn update(&mut self, message: Message) -> Task<Message>{
|
fn update(&mut self, message: Message) -> Task<Message>{
|
||||||
match message {
|
match message {
|
||||||
@ -66,12 +104,15 @@ impl State{
|
|||||||
},
|
},
|
||||||
Message::Nothing => Task::none(),
|
Message::Nothing => Task::none(),
|
||||||
Message::CardReader(card_reader::Event::ReadedCardId(card_id)) => {
|
Message::CardReader(card_reader::Event::ReadedCardId(card_id)) => {
|
||||||
|
let time = Instant::now();
|
||||||
|
let datetime = Local::now();
|
||||||
if let Some(racer) = self.db.get(&card_id){
|
if let Some(racer) = self.db.get(&card_id){
|
||||||
self.racers.push(RacerTime{time: Instant::now(), racer: racer.clone()})
|
let racer_time = RacerTime{time, racer: racer.clone()};
|
||||||
|
self.racers.push(racer_time);
|
||||||
}else{
|
}else{
|
||||||
println!("Racer {} not found in db!", card_id)
|
println!("Racer {} not found in db!", card_id)
|
||||||
};
|
}
|
||||||
Task::none()
|
Task::perform(station_register(card_id, datetime), |_| Message::Nothing)
|
||||||
},
|
},
|
||||||
Message::CardReader(card_reader::Event::Connected) => {
|
Message::CardReader(card_reader::Event::Connected) => {
|
||||||
println!("Card Reader Connected!");
|
println!("Card Reader Connected!");
|
||||||
@ -154,8 +195,9 @@ impl std::fmt::Debug for Message {
|
|||||||
|
|
||||||
|
|
||||||
pub fn main() -> iced::Result {
|
pub fn main() -> iced::Result {
|
||||||
|
let init_state = || -> State {read_to_string("state.json").ok().map(|s| serde_json::from_str(&s).ok()).flatten().unwrap_or_else(||Default::default())} ;
|
||||||
env_logger::init();
|
env_logger::init();
|
||||||
iced::application(State::default, State::update, State::view)
|
iced::application(init_state, State::update, State::view)
|
||||||
.subscription(State::subscription)
|
.subscription(State::subscription)
|
||||||
.theme(State::theme)
|
.theme(State::theme)
|
||||||
.run()
|
.run()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user