From 331ca17fb4efd7a9deba2685708399b3e73d688d Mon Sep 17 00:00:00 2001 From: Aiden McClelland Date: Thu, 16 Dec 2021 18:45:57 -0700 Subject: [PATCH] rename symbols about dependencies --- appmgr/src/config/mod.rs | 10 +++++----- appmgr/src/dependencies.rs | 2 +- appmgr/src/install/cleanup.rs | 16 ++++++++++++---- appmgr/src/install/mod.rs | 30 +++++++++++++++++------------- 4 files changed, 35 insertions(+), 23 deletions(-) diff --git a/appmgr/src/config/mod.rs b/appmgr/src/config/mod.rs index 15952cad4..bf017b682 100644 --- a/appmgr/src/config/mod.rs +++ b/appmgr/src/config/mod.rs @@ -18,10 +18,10 @@ use crate::context::RpcContext; use crate::db::model::CurrentDependencyInfo; use crate::db::util::WithRevision; use crate::dependencies::{ - add_current_dependents, break_transitive, heal_all_dependents_transitive, BreakageRes, - DependencyError, DependencyErrors, TaggedDependencyError, + add_dependent_to_current_dependents_lists, break_transitive, heal_all_dependents_transitive, + 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::util::display_none; use crate::util::serde::{display_serializable, parse_stdin_deserializable, IoFormat}; @@ -435,8 +435,8 @@ pub fn configure_rec<'a, Db: DbHandle>( // update dependencies let mut deps = pkg_model.clone().current_dependencies().get_mut(db).await?; - remove_current_dependents(db, id, deps.keys()).await?; // remove previous - add_current_dependents(db, id, ¤t_dependencies).await?; // add new + remove_from_current_dependents_lists(db, id, deps.keys()).await?; // remove previous + add_dependent_to_current_dependents_lists(db, id, ¤t_dependencies).await?; // add new current_dependencies.remove(id); *deps = current_dependencies.clone(); deps.save(db).await?; diff --git a/appmgr/src/dependencies.rs b/appmgr/src/dependencies.rs index 1a30b7c8b..0e340b70d 100644 --- a/appmgr/src/dependencies.rs +++ b/appmgr/src/dependencies.rs @@ -649,7 +649,7 @@ pub async fn configure_logic( } #[instrument(skip(db, current_dependencies))] -pub async fn add_current_dependents< +pub async fn add_dependent_to_current_dependents_lists< 'a, Db: DbHandle, I: IntoIterator, diff --git a/appmgr/src/install/cleanup.rs b/appmgr/src/install/cleanup.rs index 7ba0694e9..8e6264e2a 100644 --- a/appmgr/src/install/cleanup.rs +++ b/appmgr/src/install/cleanup.rs @@ -14,7 +14,11 @@ use crate::util::{Apply, Version}; use crate::Error; #[instrument(skip(ctx, db, deps))] -pub async fn update_dependents<'a, Db: DbHandle, I: IntoIterator>( +pub async fn update_dependency_errors_of_dependents< + 'a, + Db: DbHandle, + I: IntoIterator, +>( ctx: &RpcContext, db: &mut Db, id: &PackageId, @@ -193,7 +197,11 @@ pub async fn cleanup_failed( } #[instrument(skip(db, current_dependencies))] -pub async fn remove_current_dependents<'a, Db: DbHandle, I: IntoIterator>( +pub async fn remove_from_current_dependents_lists< + 'a, + Db: DbHandle, + I: IntoIterator, +>( db: &mut Db, id: &'a PackageId, current_dependencies: I, @@ -245,13 +253,13 @@ pub async fn uninstall( .package_data() .remove(&mut tx, id) .await?; - remove_current_dependents( + remove_from_current_dependents_lists( &mut tx, &entry.manifest.id, entry.current_dependencies.keys(), ) .await?; - update_dependents( + update_dependency_errors_of_dependents( ctx, &mut tx, &entry.manifest.id, diff --git a/appmgr/src/install/mod.rs b/appmgr/src/install/mod.rs index 9fe80b91c..897375bec 100644 --- a/appmgr/src/install/mod.rs +++ b/appmgr/src/install/mod.rs @@ -23,7 +23,7 @@ use tokio::process::Command; use tokio_stream::wrappers::ReadDirStream; 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::core::rpc_continuations::{RequestGuid, RpcContinuation}; use crate::db::model::{ @@ -32,10 +32,10 @@ use crate::db::model::{ }; use crate::db::util::WithRevision; use crate::dependencies::{ - add_current_dependents, break_all_dependents_transitive, BreakageRes, DependencyError, - DependencyErrors, + add_dependent_to_current_dependents_lists, break_all_dependents_transitive, BreakageRes, + 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::notifications::NotificationLevel; use crate::s9pk::manifest::{Manifest, PackageId}; @@ -996,9 +996,10 @@ pub async fn install_s9pk( *main_status = prev.status.main; main_status.save(&mut tx).await?; } - remove_current_dependents(&mut tx, pkg_id, prev.current_dependencies.keys()).await?; // remove previous - add_current_dependents(&mut tx, pkg_id, ¤t_dependencies).await?; // add new - update_dependents( + remove_from_current_dependents_lists(&mut tx, pkg_id, prev.current_dependencies.keys()) + .await?; // remove previous + add_dependent_to_current_dependents_lists(&mut tx, pkg_id, ¤t_dependencies).await?; // add new + update_dependency_errors_of_dependents( ctx, &mut tx, pkg_id, @@ -1024,8 +1025,9 @@ pub async fn install_s9pk( &manifest.volumes, ) .await?; - add_current_dependents(&mut tx, pkg_id, ¤t_dependencies).await?; - update_dependents(ctx, &mut tx, pkg_id, current_dependents.keys()).await?; + add_dependent_to_current_dependents_lists(&mut tx, pkg_id, ¤t_dependencies).await?; + update_dependency_errors_of_dependents(ctx, &mut tx, pkg_id, current_dependents.keys()) + .await?; } else if let Some(recovered) = crate::db::DatabaseModel::new() .recovered_packages() .idx_model(pkg_id) @@ -1034,11 +1036,13 @@ pub async fn install_s9pk( .into_owned() { handle_recovered_package(recovered, manifest, ctx, pkg_id, version, &mut tx).await?; - add_current_dependents(&mut tx, pkg_id, ¤t_dependencies).await?; - update_dependents(ctx, &mut tx, pkg_id, current_dependents.keys()).await?; + add_dependent_to_current_dependents_lists(&mut tx, pkg_id, ¤t_dependencies).await?; + update_dependency_errors_of_dependents(ctx, &mut tx, pkg_id, current_dependents.keys()) + .await?; } else { - add_current_dependents(&mut tx, pkg_id, ¤t_dependencies).await?; - update_dependents(ctx, &mut tx, pkg_id, current_dependents.keys()).await?; + add_dependent_to_current_dependents_lists(&mut tx, pkg_id, ¤t_dependencies).await?; + update_dependency_errors_of_dependents(ctx, &mut tx, pkg_id, current_dependents.keys()) + .await?; } crate::db::DatabaseModel::new()