🔧refactor: replace old logic with new methods

1 files changed, 9 insertions, 13 deletions

diff --git a/src/main.rs b/src/main.rs
index 175b583..f1f6bbd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,9 +1,9 @@
+use std::path::PathBuf;
+
 use clap::Parser;
 use tokio::fs;
 
-use zap_rs::{
-    AppImage, Cli, Command, PackageManager, Source, SourceMetadata, appimages_dir, index_dir,
-};
+use zap_rs::{AppImage, Cli, Command, PackageManager, Source, SourceMetadata, index_dir};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
@@ -11,14 +11,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     match args.command {
         Command::Install(args) => {
-            let options = AppImage {
-                file_path: appimages_dir().join(
-                    args.from
-                        .split('/')
-                        .next_back()
-                        .filter(|s| !s.is_empty())
-                        .unwrap_or("app.AppImage"),
-                ),
+            let mut options = AppImage {
+                file_path: PathBuf::new(),
                 executable: args.executable.unwrap_or(args.appname.clone()),
                 source: Source {
                     identifier: "raw_url".to_string(),
@@ -26,10 +20,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                 },
             };
 
-            PackageManager::install(&options, &args.appname).await?;
+            let pm = PackageManager::new();
+            pm.install(&mut options, &args.appname).await?;
         }
         Command::Remove(args) => {
-            PackageManager::remove(&args.appname).await?;
+            let pm = PackageManager::new();
+            pm.remove(&args.appname).await?;
         }
         Command::List => {
             let mut appimages = fs::read_dir(index_dir()).await?;