feat: Update ghastoolkit + pack installing

Author: GeekMasher

Cargo.lock

@@ -25,7 +25,8 @@ glob = "0.3"
 ghactions = { version = "^0.16", features = ["dotenvy", "log", "generate", "octocrab", "toolcache-all"] }
 ghactions-core = { version = "^0.16" }
 
-ghastoolkit = { version = "^0.10", features = ["toolcache"] }
+ghastoolkit = { version = "^0.11", features = ["toolcache"] }
+# ghastoolkit = { path = "../ghastoolkit-rs/core/", features = ["toolcache"] }
 
 # GitHub API
 octocrab = "^0.44"

Cargo.toml

@@ -175,19 +175,28 @@ impl Action {
             log::debug!("Installing pack `{pack}`");
 
             let qlpack = CodeQLPack::try_from(pack.clone())?;
-            log::info!("QLPack :: {qlpack:?}");
 
-            if pack.starts_with("./") {
-                qlpack
-                    .install(codeql)
-                    .await
-                    .context(format!("Failed to install pack `{pack}`"))?;
+            if !qlpack.is_installed().await {
+                log::info!(
+                    "QLPack `{}` is not installed, installing it now",
+                    qlpack.full_name()
+                );
+                if pack.starts_with("./") {
+                    qlpack
+                        .install(codeql)
+                        .await
+                        .context(format!("Failed to install pack `{pack}`"))?;
+                } else {
+                    codeql
+                        .pack(&qlpack)
+                        .download()
+                        .await
+                        .context(format!("Failed to download pack `{pack}`"))?;
+                }
             } else {
-                qlpack
-                    .download(codeql)
-                    .await
-                    .context(format!("Failed to download pack `{pack}`"))?;
+                log::info!("QLPack `{}` is already installed", qlpack.full_name());
             }
+            log::info!("QLPack :: {qlpack:#?}");
         }
         Ok(())
     }

src/action.rs

@@ -4,15 +4,13 @@ use anyhow::{Context, Result};
 use ghactions::{ActionTrait, group, groupend};
 use ghactions_core::RepositoryReference;
 use ghastoolkit::codeql::database::queries::CodeQLQueries;
-use ghastoolkit::{CodeQL, CodeQLDatabase, CodeQLExtractor};
+use ghastoolkit::prelude::*;
 use log::{debug, info};
 
 mod action;
 mod extractors;
 
-use action::Action;
-
-use self::action::{AUTHORS, BANNER, VERSION};
+use action::{AUTHORS, Action, BANNER, VERSION};
 
 #[tokio::main]
 async fn main() -> Result<()> {
@@ -100,7 +98,7 @@ async fn main() -> Result<()> {
         log::info!("No languages provided, using all available languages");
     }
 
-    log::info!("CodeQL :: {codeql:?}");
+    log::info!("CodeQL :: {codeql:#?}");
 
     groupend!();