mirror of
https://github.com/ilya-zlobintsev/LACT.git
synced 2025-02-25 18:55:26 -06:00
refactor: move lact-client to a separate crate
This commit is contained in:
14
Cargo.lock
generated
14
Cargo.lock
generated
@@ -564,6 +564,18 @@ version = "1.0.5"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
|
checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "lact-client"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"anyhow",
|
||||||
|
"lact-schema",
|
||||||
|
"nix",
|
||||||
|
"serde",
|
||||||
|
"serde_json",
|
||||||
|
"tracing",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lact-daemon"
|
name = "lact-daemon"
|
||||||
version = "0.2.0"
|
version = "0.2.0"
|
||||||
@@ -589,7 +601,7 @@ version = "0.2.0"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"gtk",
|
"gtk",
|
||||||
"lact-schema",
|
"lact-client",
|
||||||
"nix",
|
"nix",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
[workspace]
|
[workspace]
|
||||||
resolver = "2"
|
resolver = "2"
|
||||||
members = ["lact-daemon", "lact-schema", "lact-gui"]
|
members = ["lact-*"]
|
||||||
|
|||||||
12
lact-client/Cargo.toml
Normal file
12
lact-client/Cargo.toml
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
[package]
|
||||||
|
name = "lact-client"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2021"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
lact-schema = { path = "../lact-schema" }
|
||||||
|
anyhow = "1.0.68"
|
||||||
|
nix = { version = "0.26.1", default-features = false }
|
||||||
|
serde = "1.0.152"
|
||||||
|
tracing = "0.1.37"
|
||||||
|
serde_json = "1.0.91"
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
|
pub use lact_schema as schema;
|
||||||
|
|
||||||
use anyhow::{anyhow, Context};
|
use anyhow::{anyhow, Context};
|
||||||
use lact_schema::{DeviceInfo, DeviceListEntry, DeviceStats, FanCurveMap, Request, Response};
|
|
||||||
use nix::unistd::getuid;
|
use nix::unistd::getuid;
|
||||||
|
use schema::{DeviceInfo, DeviceListEntry, DeviceStats, FanCurveMap, Request, Response};
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use std::{
|
use std::{
|
||||||
io::{BufRead, BufReader, Write},
|
io::{BufRead, BufReader, Write},
|
||||||
@@ -5,7 +5,7 @@ authors = ["Ilya Zlobintsev <ilya.zl@protonmail.com>"]
|
|||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
lact-schema = { path = "../lact-schema" }
|
lact-client = { path = "../lact-client" }
|
||||||
gtk = "0.16"
|
gtk = "0.16"
|
||||||
# pango = "0.16"
|
# pango = "0.16"
|
||||||
tracing = "0.1"
|
tracing = "0.1"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
use gtk::prelude::*;
|
use gtk::prelude::*;
|
||||||
use gtk::*;
|
use gtk::*;
|
||||||
use lact_schema::DeviceListEntry;
|
use lact_client::schema::DeviceListEntry;
|
||||||
use pango::EllipsizeMode;
|
use pango::EllipsizeMode;
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
|
|||||||
@@ -7,14 +7,14 @@ use std::sync::{Arc, RwLock};
|
|||||||
use std::thread;
|
use std::thread;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
use crate::client::DaemonClient;
|
|
||||||
use anyhow::Context;
|
use anyhow::Context;
|
||||||
use apply_revealer::ApplyRevealer;
|
use apply_revealer::ApplyRevealer;
|
||||||
use glib::clone;
|
use glib::clone;
|
||||||
use gtk::prelude::*;
|
use gtk::prelude::*;
|
||||||
use gtk::*;
|
use gtk::*;
|
||||||
use header::Header;
|
use header::Header;
|
||||||
use lact_schema::DeviceStats;
|
use lact_client::schema::DeviceStats;
|
||||||
|
use lact_client::DaemonClient;
|
||||||
use root_stack::RootStack;
|
use root_stack::RootStack;
|
||||||
use tracing::{debug, error, info, trace};
|
use tracing::{debug, error, info, trace};
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ mod vulkan_info;
|
|||||||
|
|
||||||
use gtk::prelude::*;
|
use gtk::prelude::*;
|
||||||
use gtk::*;
|
use gtk::*;
|
||||||
use lact_schema::{DeviceInfo, DeviceStats};
|
use lact_client::schema::{DeviceInfo, DeviceStats};
|
||||||
use vulkan_info::VulkanInfoFrame;
|
use vulkan_info::VulkanInfoFrame;
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
use glib::clone;
|
use glib::clone;
|
||||||
use gtk::prelude::*;
|
use gtk::prelude::*;
|
||||||
use gtk::*;
|
use gtk::*;
|
||||||
use lact_schema::VulkanInfo;
|
use lact_client::schema::VulkanInfo;
|
||||||
use tracing::trace;
|
use tracing::trace;
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ mod warning_frame;
|
|||||||
use glib::clone;
|
use glib::clone;
|
||||||
use gtk::prelude::*;
|
use gtk::prelude::*;
|
||||||
use gtk::*;
|
use gtk::*;
|
||||||
use lact_schema::{DeviceInfo, DeviceStats, PerformanceLevel, PowerStats};
|
use lact_client::schema::{DeviceInfo, DeviceStats, PerformanceLevel, PowerStats};
|
||||||
use performance_level_frame::PowerProfileFrame;
|
use performance_level_frame::PowerProfileFrame;
|
||||||
use power_cap_frame::PowerCapFrame;
|
use power_cap_frame::PowerCapFrame;
|
||||||
use stats_grid::StatsGrid;
|
use stats_grid::StatsGrid;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
use gtk::prelude::*;
|
use gtk::prelude::*;
|
||||||
use gtk::*;
|
use gtk::*;
|
||||||
use lact_schema::PerformanceLevel;
|
use lact_client::schema::PerformanceLevel;
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct PowerProfileFrame {
|
pub struct PowerProfileFrame {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
use gtk::prelude::*;
|
use gtk::prelude::*;
|
||||||
use gtk::*;
|
use gtk::*;
|
||||||
use lact_schema::{ClockspeedStats, DeviceStats, PowerStats, VoltageStats, VramStats};
|
use lact_client::schema::{ClockspeedStats, DeviceStats, PowerStats, VoltageStats, VramStats};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct StatsGrid {
|
pub struct StatsGrid {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
use gtk::prelude::*;
|
use gtk::prelude::*;
|
||||||
use gtk::*;
|
use gtk::*;
|
||||||
use lact_schema::FanCurveMap;
|
use lact_client::schema::FanCurveMap;
|
||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
use tracing::debug;
|
use tracing::debug;
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
use glib::clone;
|
use glib::clone;
|
||||||
use gtk::prelude::*;
|
use gtk::prelude::*;
|
||||||
use gtk::*;
|
use gtk::*;
|
||||||
use lact_schema::DeviceStats;
|
use lact_client::schema::DeviceStats;
|
||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
use tracing::trace;
|
use tracing::trace;
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
mod app;
|
mod app;
|
||||||
mod client;
|
|
||||||
|
|
||||||
use anyhow::{anyhow, Context};
|
use anyhow::{anyhow, Context};
|
||||||
use app::App;
|
use app::App;
|
||||||
use client::DaemonClient;
|
use lact_client::DaemonClient;
|
||||||
use tracing::metadata::LevelFilter;
|
use tracing::metadata::LevelFilter;
|
||||||
use tracing_subscriber::EnvFilter;
|
use tracing_subscriber::EnvFilter;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user