WIP add directory walk to find qt artifacts

Author: BenFordTytherington

Cargo.lock

@@ -27,7 +27,7 @@ members = [
 
     "tests/basic_cxx_only/rust",
     "tests/basic_cxx_qt/rust",
-    "tests/qt_types_standalone/rust",
+    "tests/qt_types_standalone/rust", "examples/qt_minimal",
 ]
 resolver = "2"
 

Cargo.toml

@@ -4,7 +4,8 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 use std::path::{Path, PathBuf};
-
+use std::time::Duration;
+use semver::Version;
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -29,7 +30,7 @@ impl ParsedQtArtifact {
     /// Download the artifact and extract to the given target path
     pub fn download_and_extract(&self, target_path: &Path) -> PathBuf {
         // Download to a temporary location
-        let http_client = reqwest::blocking::Client::new();
+        let http_client = reqwest::blocking::Client::builder().timeout(None).build().expect("Http client failed to build");
         let temp_dir = tempfile::TempDir::new().expect("Could not create temporary directory");
         let archive_path =
             super::download::download_from_url(&self.url, &self.sha256, &temp_dir, &http_client)
@@ -46,6 +47,18 @@ impl ParsedQtArtifact {
         target_path.to_path_buf()
     }
 
+    pub fn new(version: Version, arch: String, os: String, url: String, content_type: String) -> Self {
+        Self {
+            version,
+            arch,
+            os,
+            url,
+            sha256: "".to_string(),
+            content: vec![content_type],
+        }
+    }
+
+
     /// Assert that the hashes are the same, from bytes
     pub fn verify(&self, hash: &[u8]) -> anyhow::Result<()> {
         let mut hash_string = String::new();

crates/qt-build-utils/src/installation/qt_minimal/artifact.rs

@@ -11,6 +11,7 @@ mod extract;
 use std::path::PathBuf;
 
 use crate::{QtBuildError, QtInstallation};
+use crate::installation::qt_minimal::artifact::ParsedQtArtifact;
 
 /// A implementation of [QtInstallation] using qtminimal
 pub struct QtInstallationQtMinimal {
@@ -148,4 +149,48 @@ impl QtInstallationQtMinimal {
 
         path
     }
+
+    /// Get a collection of the locally installed Qt artifacts
+    pub fn local_artifacts() {
+    // pub fn local_artifacts() -> Vec<artifact::ParsedQtArtifact> {
+        let base_dir = Self::qt_minimal_root();
+
+        let mut artifacts = vec![];
+
+        // Iterate versions
+        for version in base_dir.read_dir().unwrap() {
+            let path = version.unwrap();
+            let semver = semver::Version::parse(path.file_name().to_str().unwrap()).expect("Could not parse semver from directory name");
+
+            for os in path.path().read_dir().unwrap() {
+                let path = os.unwrap();
+                let os = path.file_name().to_str().unwrap().to_string();
+
+                for arch in path.path().read_dir().unwrap() {
+                    // Ugly code, this can surely be better
+                    // Expects to find valid directories
+                    let path = arch.unwrap();
+                    let dir_entries = path.path().read_dir().unwrap()
+                        .filter(|d| d.is_ok())
+                        .map(|dir| dir.unwrap())
+                        .collect::<Vec<_>>();
+
+                    // Expects one qt dir
+                    let qt_dir_path = dir_entries.iter().filter(|dir| dir.file_name() == "qt").last().expect("Expected to find a Qt dir in this folder");
+
+                    let qt_folders = qt_dir_path.path().read_dir().unwrap();
+                    for dir in qt_folders {
+                        let filename = dir.unwrap().file_name();
+                        if filename == "bin" {
+                            artifacts.append(ParsedQtArtifact::new(semver.clone(), path.file_name().to_str().unwrap().to_string().clone(), os.clone(), "dummy/url/not/finished".to_string(), "bin".to_string()))
+                        } else if filename == "include" {
+                            artifacts.append(ParsedQtArtifact::new(semver.clone(), path.file_name().to_str().unwrap().to_string().clone(), os.clone(), "dummy/url/not/finished".to_string(), "bin".to_string()))
+                        }
+                    }
+                }
+            }
+        }
+
+        artifacts
+    }
 }

crates/qt-build-utils/src/installation/qt_minimal/mod.rs

@@ -0,0 +1,16 @@
+[package]
+name = "qt_minimal"
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+version.workspace = true
+rust-version.workspace = true
+
+[dependencies]
+
+[build-dependencies]
+semver.workspace = true
+qt-build-utils = { workspace = true, features = ["qt_minimal"] }
+
+[lints]
+workspace = true

examples/qt_minimal/Cargo.toml

@@ -0,0 +1,14 @@
+use qt_build_utils::{QtInstallation, QtInstallationQtMinimal};
+
+fn main() {
+    //  println!("qt_minimal auto download, asking for 6.10.0");
+    //  let install = QtInstallationQtMinimal::try_from(semver::Version::new(6, 10, 0)).unwrap();
+    //  println!("Found Qt install: {}", install.version());
+    //  println!(
+    //      "Discovered include path: {:?}",
+    //      install.include_paths(&vec![])
+    //  );
+    // let moc = install.try_find_tool(qt_build_utils::QtTool::Moc).unwrap();
+    // println!("Found moc: {}", moc.display());
+    QtInstallationQtMinimal::local_artifacts();
+}

examples/qt_minimal/build.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}