From f419a08d2861d76dce3d2a8206d6f1eb24bf1f2e Mon Sep 17 00:00:00 2001 From: Naz Date: Tue, 29 Jul 2025 13:24:35 +0100 Subject: =?UTF-8?q?=F0=9F=94=A7refactor:=20use=20separate=20structs=20for?= =?UTF-8?q?=20download=20logic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.rs | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index 4c3d5d7..175b583 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,9 @@ use clap::Parser; use tokio::fs; -use zap_rs::{AppImage, Cli, Command, Source, SourceMetadata, appimages_dir, index_dir}; +use zap_rs::{ + AppImage, Cli, Command, PackageManager, Source, SourceMetadata, appimages_dir, index_dir, +}; #[tokio::main] async fn main() -> Result<(), Box> { @@ -24,23 +26,10 @@ async fn main() -> Result<(), Box> { }, }; - if index_dir() - .join(format!("{}.json", &options.executable)) - .exists() - { - eprintln!("{} is already installed.", &options.executable); - } else { - options.download_from_url().await?; - options.save_to_index(&args.appname).await?; - options.create_symlink().await?; - } + PackageManager::install(&options, &args.appname).await?; } Command::Remove(args) => { - let index_file_path = index_dir().join(format!("{}.json", args.appname)); - let index_file_content = fs::read_to_string(&index_file_path).await?; - let appimage: AppImage = serde_json::from_str(&index_file_content)?; - - appimage.remove().await?; + PackageManager::remove(&args.appname).await?; } Command::List => { let mut appimages = fs::read_dir(index_dir()).await?; -- cgit v1.2.3