fix: custom release url not working and compilation failure

Author: YageGeng

postgresql_archive/Cargo.toml

@@ -30,7 +30,7 @@ serde_json = { workspace = true, optional = true }
 sha1 = { workspace = true, optional = true }
 sha2 = { workspace = true, optional = true }
 tar = { workspace = true }
-target-triple = { workspace = true, optional = true }
+target-triple = { workspace = true }
 tempfile = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["full"], optional = true }
@@ -70,7 +70,6 @@ rustls = ["reqwest/rustls-tls-native-roots"]
 sha1 = ["dep:sha1"]
 sha2 = ["dep:sha2"]
 theseus = [
-    "dep:target-triple",
     "github",
     "sha2",
 ]

postgresql_archive/src/configuration/mod.rs

@@ -1,4 +1,53 @@
+use semver::Version;
+
 #[cfg(feature = "theseus")]
 pub mod theseus;
 #[cfg(feature = "zonky")]
 pub mod zonky;
+
+/// Matcher for PostgreSQL binaries from custom GitHub release repositories
+/// following the same pattern as <https://github.com/theseus-rs/postgresql-binaries>
+///
+/// # Errors
+/// * If the asset matcher fails.
+pub fn matcher(_url: &str, name: &str, version: &Version) -> crate::Result<bool> {
+    let target = target_triple::TARGET;
+    let expected_name = format!("postgresql-{version}-{target}.tar.gz");
+    Ok(name == expected_name)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::Result;
+
+    #[test]
+    fn test_asset_match_success() -> Result<()> {
+        let url = "";
+        let version = Version::parse("16.4.0")?;
+        let target = target_triple::TARGET;
+        let name = format!("postgresql-{version}-{target}.tar.gz");
+
+        assert!(matcher(url, name.as_str(), &version)?, "{}", name);
+        Ok(())
+    }
+
+    #[test]
+    fn test_asset_match_errors() -> Result<()> {
+        let url = "";
+        let version = Version::parse("16.4.0")?;
+        let target = target_triple::TARGET;
+        let names = vec![
+            format!("foo-{version}-{target}.tar.gz"),
+            format!("postgresql-{target}.tar.gz"),
+            format!("postgresql-{version}.tar.gz"),
+            format!("postgresql-{version}-{target}.tar"),
+            format!("postgresql-{version}-{target}"),
+        ];
+
+        for name in names {
+            assert!(!matcher(url, name.as_str(), &version)?, "{}", name);
+        }
+        Ok(())
+    }
+}

postgresql_archive/src/configuration/theseus/matcher.rs

@@ -1,7 +1,5 @@
 mod extractor;
-mod matcher;
 
 pub const URL: &str = "https://github.com/theseus-rs/postgresql-binaries";
 
 pub use extractor::extract;
-pub use matcher::matcher;

postgresql_archive/src/configuration/theseus/mod.rs

@@ -1,5 +1,6 @@
 use crate::Error::{PoisonedLock, UnsupportedMatcher};
 use crate::Result;
+use crate::configuration::matcher;
 #[cfg(feature = "theseus")]
 use crate::configuration::theseus;
 #[cfg(feature = "zonky")]
@@ -66,7 +67,7 @@ impl Default for MatchersRegistry {
     fn default() -> Self {
         let mut registry = Self::new();
         #[cfg(feature = "theseus")]
-        registry.register(|url| Ok(url == theseus::URL), theseus::matcher);
+        registry.register(|url| Ok(url == theseus::URL), matcher);
         #[cfg(feature = "zonky")]
         registry.register(|url| Ok(url == zonky::URL), zonky::matcher);
         registry

postgresql_archive/src/matcher/registry.rs

@@ -1,16 +1,21 @@
 #![allow(dead_code)]
 
 use anyhow::Result;
-use postgresql_archive::VersionReq;
 use postgresql_archive::repository::github::repository::GitHub;
+use postgresql_archive::{VersionReq, matcher};
 use postgresql_archive::{get_archive, repository};
 use std::fs::File;
 use std::io::Write;
+use std::ops::Deref;
 use std::path::PathBuf;
 use std::str::FromStr;
+use std::sync::{Arc, LazyLock, Mutex};
 use std::{env, fs};
 use url::Url;
 
+static CUSTOM_REPO_URL: LazyLock<Arc<Mutex<String>>> =
+    LazyLock::new(|| Arc::new(Mutex::new(String::new())));
+
 /// Stage the PostgreSQL archive when the `bundled` feature is enabled so that
 /// it can be included in the final binary. This is useful for creating a
 /// self-contained binary that does not require the PostgreSQL archive to be
@@ -26,6 +31,10 @@ pub(crate) async fn stage_postgresql_archive() -> Result<()> {
     let version_req = VersionReq::from_str(postgres_version_req.as_str())?;
     println!("PostgreSQL version: {postgres_version_req}");
     println!("Target: {}", target_triple::TARGET);
+    {
+        let mut custom_repo_url = CUSTOM_REPO_URL.lock().unwrap();
+        custom_repo_url.push_str(&releases_url);
+    }
 
     let out_dir = PathBuf::from(env::var("OUT_DIR")?);
     println!("OUT_DIR: {:?}", out_dir);
@@ -40,6 +49,8 @@ pub(crate) async fn stage_postgresql_archive() -> Result<()> {
         return Ok(());
     }
 
+    // let str = releases_url.clone();
+    // let s = str.leak();
     register_github_repository()?;
     let (asset_version, archive) = get_archive(&releases_url, &version_req).await?;
 
@@ -61,5 +72,16 @@ fn register_github_repository() -> Result<()> {
         },
         Box::new(GitHub::new),
     )?;
+
+    matcher::registry::register(
+        |url| {
+            CUSTOM_REPO_URL
+                .lock()
+                .map_err(|err| postgresql_archive::Error::PoisonedLock(err.to_string()))
+                .map(|custom_repo_url| url == custom_repo_url.deref())
+        },
+        postgresql_archive::configuration::matcher,
+    )?;
+
     Ok(())
 }