54 is_active with tokio::select!

trydirect · Apr 20, 2024 · 67b8538 · 67b8538
1 parent 326619f
commit 67b8538
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 53 deletions.
diff --git a/src/console/commands/debug/dockerhub.rs b/src/console/commands/debug/dockerhub.rs
@@ -26,43 +26,9 @@ impl crate::console::commands::CallableTrait for DockerhubCommand {
             println!("{}", self.json);
             let dockerImage: DockerImage = serde_json::from_str(&self.json)?;
             let mut dockerhub = DockerHub::try_from(&dockerImage)?;
-            /*
-            if dockerhub.creds.username.is_empty() {
-            */
-            let lookupOfficialRepos = dockerhub.lookup_official_repos();
-            let lookupPublicRepos = dockerhub.lookup_public_repos();
-            let lookupPublicRepos1 = dockerhub.lookup_public_repos();
-            tokio::select! {
-                Ok(true) = lookupOfficialRepos => {println!("lookup oficial repos"); }
-                Ok(true) = lookupPublicRepos => {println!("lookup public repos"); }
-                Ok(true) = lookupPublicRepos1 => {println!("lookup public repos1"); }
-                //todo add timer
-                //complete => { println!("complete"); }
-                //default => { println!("no good result"); }
-                else => { println!("nothing found") }
-            }
-            /*
-                if Ok(true) == dockerhub.lookup_official_repos().await {
-                    println!("official: true");
-                    return Ok(());
-                } else {
-                    println!("official: false");
-                };
+            let isActive = dockerhub.is_active().await?;
 
-                if Ok(true) == dockerhub.lookup_public_repos().await {
-                    println!("public: true");
-                    return Ok(());
-                };
-                */
-                /*
-            } else {
-                println!("username is not empty");
-                if Ok(true) == dockerhub.lookup_private_repo().await {
-                    tracing::debug!("private: true");
-                    return Ok(());
-                };
-            }
-            */
+            println!("image is active: {isActive}");
 
             Ok(())
         })

diff --git a/src/helpers/dockerhub.rs b/src/helpers/dockerhub.rs
@@ -206,10 +206,15 @@ impl<'a> DockerHub<'a> {
     }
 
     pub async fn lookup_private_repo(&'a self) -> Result<bool, String> {
+        if self.creds.username.is_empty() {
+            return Ok(false);
+        }
+
         let url = format!(
             "https://hub.docker.com/v2/namespaces/{}/repositories/{}/tags",
             &self.creds.username, &self.repos
         );
+
         tracing::debug!("Validate image {:?}", url);
         let client = reqwest::Client::new()
             .get(url)
@@ -262,30 +267,23 @@ impl<'a> DockerHub<'a> {
         //     }
         // }
 
-        if self.creds.username.is_empty() {
-
-            if Ok(true) == self.lookup_official_repos().await {
-                tracing::debug!("official: true");
-                return Ok(true);
-            } else {
-                tracing::debug!("official: false");
-            };
+        tokio::select! {
+            Ok(true) = self.lookup_official_repos() => {
+                    tracing::debug!("official: true");
+                    return Ok(true);
+                }
 
-            if Ok(true) == self.lookup_public_repos().await {
+            Ok(true) = self.lookup_public_repos() => {
                 tracing::debug!("public: true");
                 return Ok(true);
-            };
-
-            Ok(false)
-
-        } else {
+            }
 
-            if Ok(true) == self.lookup_private_repo().await {
+            Ok(true) = self.lookup_private_repo() => {
                 tracing::debug!("private: true");
                 return Ok(true);
-            };
+            }
 
-            Ok(false)
+            else => { return Ok(false); }
         }
     }