Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 20:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

switch to managers: wip

Browse Source
This commit is contained in:
Aiden McClelland
2021-07-13 16:55:05 -06:00
committed by Aiden McClelland
parent e2b77b23f8
commit 34e4c12af3
26 changed files with 783 additions and 803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
appmgr/src/db/model.rs
View File

@@ -11,7 +11,6 @@ use serde_json::Value;
use crate::config::spec::{PackagePointerSpecVariant, SystemPointerSpec};
use crate::install::progress::InstallProgress;
use crate::net::interface::InterfaceId;
use crate::net::Network;
use crate::s9pk::manifest::{Manifest, ManifestModel, PackageId};
use crate::status::health_check::HealthCheckId;
use crate::status::Status;
@@ -26,8 +25,6 @@ pub struct Database {
#[model]
pub package_data: AllPackageData,
pub broken_packages: Vec<PackageId>,
#[model]
pub network: Network,
pub ui: Value,
}
impl Database {
@@ -48,7 +45,6 @@ impl Database {
},
package_data: AllPackageData::default(),
broken_packages: Vec::new(),
network: Network::default(),
ui: Value::Object(Default::default()),
}
}
@@ -160,7 +156,7 @@ pub struct InstalledPackageDataEntry {
#[model]
pub current_dependencies: IndexMap<PackageId, CurrentDependencyInfo>,
#[model]
pub interface_info: InterfaceInfo,
pub interface_addresses: InterfaceAddressMap,
}
impl InstalledPackageDataEntryModel {
pub fn manifest(self) -> ManifestModel {
@@ -177,14 +173,6 @@ pub struct CurrentDependencyInfo {
pub health_checks: IndexSet<HealthCheckId>,
}
#[derive(Debug, Deserialize, Serialize, HasModel)]
#[serde(rename_all = "kebab-case")]
pub struct InterfaceInfo {
pub ip: Ipv4Addr,
#[model]
pub addresses: InterfaceAddressMap,
}
#[derive(Debug, Deserialize, Serialize)]
pub struct InterfaceAddressMap(pub IndexMap<InterfaceId, InterfaceAddresses>);
impl Map for InterfaceAddressMap {