From 3a0ba2571af433d9fa7b2c735bcc2739aeef6b79 Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Sun, 9 Aug 2026 13:52:37 +0800 Subject: refactor: move packages dir to mingling/packages --- mingling_cli/src/pkg_mgr.rs | 4 ++-- mingling_cli/src/pkg_mgr/cmd_install.rs | 2 +- mingling_cli/src/pkg_mgr/cmd_uninstall.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mingling_cli/src/pkg_mgr.rs b/mingling_cli/src/pkg_mgr.rs index 080c50f..e140991 100644 --- a/mingling_cli/src/pkg_mgr.rs +++ b/mingling_cli/src/pkg_mgr.rs @@ -19,7 +19,7 @@ pack_err!(ErrorNoDataDirectory); pack_err!(ErrorPackageSpecInvalid = String); pack_err!(ErrorPackageNameRequired); -/// The `.mingling` packages directory under the user's data directory. +/// The `mingling/packages` packages directory under the user's data directory. #[derive(Debug, Default, Clone)] pub struct ResPackagesDir { pub path: PathBuf, @@ -28,7 +28,7 @@ pub struct ResPackagesDir { #[program_setup] pub fn package_manager_setup(program: &mut Program) { let path = dirs::data_dir() - .map(|data_dir| data_dir.join(".mingling")) + .map(|data_dir| data_dir.join("mingling").join("packages")) .unwrap_or_default(); program.with_resource(ResPackagesDir { path }); } diff --git a/mingling_cli/src/pkg_mgr/cmd_install.rs b/mingling_cli/src/pkg_mgr/cmd_install.rs index 2b4082a..ddcef7d 100644 --- a/mingling_cli/src/pkg_mgr/cmd_install.rs +++ b/mingling_cli/src/pkg_mgr/cmd_install.rs @@ -42,7 +42,7 @@ pub struct ResultInstall { } /// Parse arguments and resolve the install directory: -/// {data_dir}/.mingling/{PACKAGE_NAME}@{PACKAGE_VERSION} +/// {data_dir}/mingling/packages/{PACKAGE_NAME}@{PACKAGE_VERSION} #[metadata(EntryInstall)] pub fn desc_install() -> Description { "Install the project to the Mingling package list".into() diff --git a/mingling_cli/src/pkg_mgr/cmd_uninstall.rs b/mingling_cli/src/pkg_mgr/cmd_uninstall.rs index 988437c..2b288d6 100644 --- a/mingling_cli/src/pkg_mgr/cmd_uninstall.rs +++ b/mingling_cli/src/pkg_mgr/cmd_uninstall.rs @@ -31,7 +31,7 @@ pack_err!(ErrorPackageNotInstall = Vec); // No installed package matched the given spec. pack_err!(ErrorNoMatchingPackages); -/// `{data_dir}/.mingling` +/// `{data_dir}/mingling/packages` #[metadata(EntryUninstall)] pub fn desc_uninstall() -> Description { "Uninstall the project from the Mingling package list".into() -- cgit