Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-01 21:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename symbols about dependencies

Browse Source
This commit is contained in:
Aiden McClelland
2021-12-16 18:45:57 -07:00
committed by Aiden McClelland
parent bef09b0fb3
commit 331ca17fb4
4 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
appmgr/src/config/mod.rs
View File

@@ -18,10 +18,10 @@ use crate::context::RpcContext;
use crate::db::model::CurrentDependencyInfo; use crate::db::model::CurrentDependencyInfo;
use crate::db::util::WithRevision; use crate::db::util::WithRevision;
use crate::dependencies::{ use crate::dependencies::{
add_current_dependents, break_transitive, heal_all_dependents_transitive, BreakageRes, add_dependent_to_current_dependents_lists, break_transitive, heal_all_dependents_transitive,
DependencyError, DependencyErrors, TaggedDependencyError, BreakageRes, DependencyError, DependencyErrors, TaggedDependencyError,
}; };
use crate::install::cleanup::remove_current_dependents; use crate::install::cleanup::remove_from_current_dependents_lists;
use crate::s9pk::manifest::{Manifest, PackageId}; use crate::s9pk::manifest::{Manifest, PackageId};
use crate::util::display_none; use crate::util::display_none;
use crate::util::serde::{display_serializable, parse_stdin_deserializable, IoFormat}; use crate::util::serde::{display_serializable, parse_stdin_deserializable, IoFormat};
@@ -435,8 +435,8 @@ pub fn configure_rec<'a, Db: DbHandle>(
// update dependencies // update dependencies
let mut deps = pkg_model.clone().current_dependencies().get_mut(db).await?; let mut deps = pkg_model.clone().current_dependencies().get_mut(db).await?;
remove_current_dependents(db, id, deps.keys()).await?; // remove previous remove_from_current_dependents_lists(db, id, deps.keys()).await?; // remove previous
add_current_dependents(db, id, &current_dependencies).await?; // add new add_dependent_to_current_dependents_lists(db, id, &current_dependencies).await?; // add new
current_dependencies.remove(id); current_dependencies.remove(id);
*deps = current_dependencies.clone(); *deps = current_dependencies.clone();
deps.save(db).await?; deps.save(db).await?;

2
appmgr/src/dependencies.rs
View File

@@ -649,7 +649,7 @@ pub async fn configure_logic(
} }
#[instrument(skip(db, current_dependencies))] #[instrument(skip(db, current_dependencies))]
pub async fn add_current_dependents< pub async fn add_dependent_to_current_dependents_lists<
'a, 'a,
Db: DbHandle, Db: DbHandle,
I: IntoIterator<Item = (&'a PackageId, &'a CurrentDependencyInfo)>, I: IntoIterator<Item = (&'a PackageId, &'a CurrentDependencyInfo)>,

16
appmgr/src/install/cleanup.rs
View File

@@ -14,7 +14,11 @@ use crate::util::{Apply, Version};
use crate::Error; use crate::Error;
#[instrument(skip(ctx, db, deps))] #[instrument(skip(ctx, db, deps))]
pub async fn update_dependents<'a, Db: DbHandle, I: IntoIterator<Item = &'a PackageId>>( pub async fn update_dependency_errors_of_dependents<
'a,
Db: DbHandle,
I: IntoIterator<Item = &'a PackageId>,
>(
ctx: &RpcContext, ctx: &RpcContext,
db: &mut Db, db: &mut Db,
id: &PackageId, id: &PackageId,
@@ -193,7 +197,11 @@ pub async fn cleanup_failed<Db: DbHandle>(
} }
#[instrument(skip(db, current_dependencies))] #[instrument(skip(db, current_dependencies))]
pub async fn remove_current_dependents<'a, Db: DbHandle, I: IntoIterator<Item = &'a PackageId>>( pub async fn remove_from_current_dependents_lists<
'a,
Db: DbHandle,
I: IntoIterator<Item = &'a PackageId>,
>(
db: &mut Db, db: &mut Db,
id: &'a PackageId, id: &'a PackageId,
current_dependencies: I, current_dependencies: I,
@@ -245,13 +253,13 @@ pub async fn uninstall(
.package_data() .package_data()
.remove(&mut tx, id) .remove(&mut tx, id)
.await?; .await?;
remove_current_dependents( remove_from_current_dependents_lists(
&mut tx, &mut tx,
&entry.manifest.id, &entry.manifest.id,
entry.current_dependencies.keys(), entry.current_dependencies.keys(),
) )
.await?; .await?;
update_dependents( update_dependency_errors_of_dependents(
ctx, ctx,
&mut tx, &mut tx,
&entry.manifest.id, &entry.manifest.id,

30
appmgr/src/install/mod.rs
View File

@@ -23,7 +23,7 @@ use tokio::process::Command;
use tokio_stream::wrappers::ReadDirStream; use tokio_stream::wrappers::ReadDirStream;
use tracing::instrument; use tracing::instrument;
use self::cleanup::{cleanup_failed, remove_current_dependents}; use self::cleanup::{cleanup_failed, remove_from_current_dependents_lists};
use crate::context::{CliContext, RpcContext}; use crate::context::{CliContext, RpcContext};
use crate::core::rpc_continuations::{RequestGuid, RpcContinuation}; use crate::core::rpc_continuations::{RequestGuid, RpcContinuation};
use crate::db::model::{ use crate::db::model::{
@@ -32,10 +32,10 @@ use crate::db::model::{
}; };
use crate::db::util::WithRevision; use crate::db::util::WithRevision;
use crate::dependencies::{ use crate::dependencies::{
add_current_dependents, break_all_dependents_transitive, BreakageRes, DependencyError, add_dependent_to_current_dependents_lists, break_all_dependents_transitive, BreakageRes,
DependencyErrors, DependencyError, DependencyErrors,
}; };
use crate::install::cleanup::{cleanup, update_dependents}; use crate::install::cleanup::{cleanup, update_dependency_errors_of_dependents};
use crate::install::progress::{InstallProgress, InstallProgressTracker}; use crate::install::progress::{InstallProgress, InstallProgressTracker};
use crate::notifications::NotificationLevel; use crate::notifications::NotificationLevel;
use crate::s9pk::manifest::{Manifest, PackageId}; use crate::s9pk::manifest::{Manifest, PackageId};
@@ -996,9 +996,10 @@ pub async fn install_s9pk<R: AsyncRead + AsyncSeek + Unpin>(
*main_status = prev.status.main; *main_status = prev.status.main;
main_status.save(&mut tx).await?; main_status.save(&mut tx).await?;
} }
remove_current_dependents(&mut tx, pkg_id, prev.current_dependencies.keys()).await?; // remove previous remove_from_current_dependents_lists(&mut tx, pkg_id, prev.current_dependencies.keys())
add_current_dependents(&mut tx, pkg_id, &current_dependencies).await?; // add new .await?; // remove previous
update_dependents( add_dependent_to_current_dependents_lists(&mut tx, pkg_id, &current_dependencies).await?; // add new
update_dependency_errors_of_dependents(
ctx, ctx,
&mut tx, &mut tx,
pkg_id, pkg_id,
@@ -1024,8 +1025,9 @@ pub async fn install_s9pk<R: AsyncRead + AsyncSeek + Unpin>(
&manifest.volumes, &manifest.volumes,
) )
.await?; .await?;
add_current_dependents(&mut tx, pkg_id, &current_dependencies).await?; add_dependent_to_current_dependents_lists(&mut tx, pkg_id, &current_dependencies).await?;
update_dependents(ctx, &mut tx, pkg_id, current_dependents.keys()).await?; update_dependency_errors_of_dependents(ctx, &mut tx, pkg_id, current_dependents.keys())
.await?;
} else if let Some(recovered) = crate::db::DatabaseModel::new() } else if let Some(recovered) = crate::db::DatabaseModel::new()
.recovered_packages() .recovered_packages()
.idx_model(pkg_id) .idx_model(pkg_id)
@@ -1034,11 +1036,13 @@ pub async fn install_s9pk<R: AsyncRead + AsyncSeek + Unpin>(
.into_owned() .into_owned()
{ {
handle_recovered_package(recovered, manifest, ctx, pkg_id, version, &mut tx).await?; handle_recovered_package(recovered, manifest, ctx, pkg_id, version, &mut tx).await?;
add_current_dependents(&mut tx, pkg_id, &current_dependencies).await?; add_dependent_to_current_dependents_lists(&mut tx, pkg_id, &current_dependencies).await?;
update_dependents(ctx, &mut tx, pkg_id, current_dependents.keys()).await?; update_dependency_errors_of_dependents(ctx, &mut tx, pkg_id, current_dependents.keys())
.await?;
} else { } else {
add_current_dependents(&mut tx, pkg_id, &current_dependencies).await?; add_dependent_to_current_dependents_lists(&mut tx, pkg_id, &current_dependencies).await?;
update_dependents(ctx, &mut tx, pkg_id, current_dependents.keys()).await?; update_dependency_errors_of_dependents(ctx, &mut tx, pkg_id, current_dependents.keys())
.await?;
} }
crate::db::DatabaseModel::new() crate::db::DatabaseModel::new()