aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe
diff options
context:
space:
mode:
Diffstat (limited to 'crates/shirabe')
-rw-r--r--crates/shirabe/src/command/fund_command.rs10
-rw-r--r--crates/shirabe/src/command/update_command.rs14
-rw-r--r--crates/shirabe/src/installer/binary_installer.rs11
-rw-r--r--crates/shirabe/src/json/json_manipulator.rs43
-rw-r--r--crates/shirabe/src/package/version/version_guesser.rs16
-rw-r--r--crates/shirabe/src/repository/vcs/svn_driver.rs34
-rw-r--r--crates/shirabe/src/util/hg.rs54
7 files changed, 101 insertions, 81 deletions
diff --git a/crates/shirabe/src/command/fund_command.rs b/crates/shirabe/src/command/fund_command.rs
index 109943d6..22c94539 100644
--- a/crates/shirabe/src/command/fund_command.rs
+++ b/crates/shirabe/src/command/fund_command.rs
@@ -10,7 +10,7 @@ use crate::package::base_package::{self};
use crate::repository::CompositeRepository;
use crate::repository::RepositoryInterface;
use indexmap::IndexMap;
-use shirabe_pcre::Preg;
+use shirabe_pcre::{CaptureKey, Preg};
use shirabe_php_shim::{PhpMixed, impl_php_class, php_regex};
use shirabe_semver::constraint::AnyConstraint;
use shirabe_semver::constraint::MatchAllConstraint;
@@ -63,11 +63,9 @@ impl FundCommand {
.and_then(|v| v.as_string())
.unwrap_or("");
if r#type == "github"
- && let Some(matches) = Preg::is_match_with_indexed_captures(
- php_regex!(r"{^https://github.com/([^/]+)$}"),
- &url,
- )
- && let Some(sponsor) = matches.into_iter().nth(1).flatten()
+ && let Some(matches) =
+ Preg::is_match3(php_regex!(r"{^https://github.com/([^/]+)$}"), &url)
+ && let Some(sponsor) = matches.get(&CaptureKey::ByIndex(1)).map(str::to_string)
{
url = format!("https://github.com/sponsors/{}", sponsor);
}
diff --git a/crates/shirabe/src/command/update_command.rs b/crates/shirabe/src/command/update_command.rs
index 2eca6db7..5c119489 100644
--- a/crates/shirabe/src/command/update_command.rs
+++ b/crates/shirabe/src/command/update_command.rs
@@ -27,7 +27,7 @@ use crate::repository::PlatformRepository;
use crate::repository::RepositorySet;
use crate::util::HttpDownloader;
use indexmap::IndexMap;
-use shirabe_pcre::Preg;
+use shirabe_pcre::{CaptureKey, Preg};
use shirabe_php_shim::{
InvalidArgumentException, PhpMixed, RuntimeException, array_filter, array_intersect,
array_keys, array_merge_map, array_search_in_vec, impl_php_class, php_regex, strtolower,
@@ -459,15 +459,15 @@ impl Command for UpdateCommand {
if package.is_dev() {
continue;
}
- let matches = Preg::is_match_with_indexed_captures(
- php_regex!(r"{^(\d+\.\d+\.\d+)}"),
- &package.get_version(),
- );
+ let version = package.get_version();
+ let matches = Preg::is_match3(php_regex!(r"{^(\d+\.\d+\.\d+)}"), &version);
let Some(matches) = matches else {
continue;
};
- let constraint = parser
- .parse_constraints(&format!("~{}", matches[1].clone().unwrap_or_default()))?;
+ let constraint = parser.parse_constraints(&format!(
+ "~{}",
+ matches.get(&CaptureKey::ByIndex(1)).unwrap_or_default()
+ ))?;
if let Some(existing) = temporary_constraints.get(&package.get_name()) {
temporary_constraints.insert(
package.get_name(),
diff --git a/crates/shirabe/src/installer/binary_installer.rs b/crates/shirabe/src/installer/binary_installer.rs
index b382f7c1..1e750439 100644
--- a/crates/shirabe/src/installer/binary_installer.rs
+++ b/crates/shirabe/src/installer/binary_installer.rs
@@ -316,15 +316,14 @@ impl BinaryInstaller {
file_get_contents5(bin, false, PhpMixed::Null, 0, Some(500)).unwrap_or_default();
// For php files, we generate a PHP proxy instead of a shell one,
// which allows calling the proxy with a custom php process
- if let Some(m) = Preg::is_match_with_indexed_captures(
+ if let Some(m) = Preg::is_match3(
php_regex!(r"{^(#!.*\r?\n)?[\r\n\t ]*<\?php}"),
&bin_contents,
) {
// carry over the existing shebang if present, otherwise add our own
- let proxy_code = if m[1].is_none() {
- "#!/usr/bin/env php".to_string()
- } else {
- trim(m[1].as_deref().unwrap_or(""), None)
+ let proxy_code = match m.get(&CaptureKey::ByIndex(1)) {
+ None => "#!/usr/bin/env php".to_string(),
+ Some(shebang) => trim(shebang, None),
};
let bin_path_exported = self
.filesystem
@@ -370,7 +369,7 @@ impl BinaryInstaller {
$data = str_replace('__FILE__', var_export($this->realpath, true), $data);"
.to_string();
}
- if trim(m[0].as_deref().unwrap_or(""), None) != "<?php" {
+ if trim(m.get(&CaptureKey::ByIndex(0)).unwrap_or(""), None) != "<?php" {
stream_hint =
" using a stream wrapper to prevent the shebang from being output on PHP<8\n *"
.to_string();
diff --git a/crates/shirabe/src/json/json_manipulator.rs b/crates/shirabe/src/json/json_manipulator.rs
index 92661d41..0f0d50de 100644
--- a/crates/shirabe/src/json/json_manipulator.rs
+++ b/crates/shirabe/src/json/json_manipulator.rs
@@ -737,21 +737,23 @@ impl JsonManipulator {
&children[cm.value_end..]
);
} else {
- if let Some(leading_match) = Preg::is_match_named(
+ if let Some(leading_match) = Preg::is_match3(
php_regex!(
"#^\\{(?P<leadingspace>\\s*?)(?P<content>\\S+.*?)?(?P<trailingspace>\\s*)\\}$#s"
),
&children,
) {
let mut whitespace = leading_match
- .get("trailingspace")
- .cloned()
- .unwrap_or_default();
+ .get(&CaptureKey::ByName("trailingspace".to_string()))
+ .unwrap_or_default()
+ .to_string();
let leading_space = leading_match
- .get("leadingspace")
- .cloned()
- .unwrap_or_default();
- let content_present = leading_match.get("content").is_some();
+ .get(&CaptureKey::ByName("leadingspace".to_string()))
+ .unwrap_or_default()
+ .to_string();
+ let content_present = leading_match
+ .get(&CaptureKey::ByName("content".to_string()))
+ .is_some();
if content_present {
let mut value_local = value;
if let Some(ref sub) = sub_name {
@@ -937,10 +939,12 @@ impl JsonManipulator {
let children_clean = children_clean.ok_or_else(|| InvalidArgumentException::new("JsonManipulator: $childrenClean is not defined. Please report at https://github.com/nsfisis/php-shirabe/issues/new.".to_string()))?;
// no child data left, $name was the only key in
- if let Some(empty_match) = Preg::is_match_named(
+ if let Some(empty_match) = Preg::is_match3(
php_regex!("#^\\{\\s*?(?P<content>\\S+.*?)?(?P<trailingspace>\\s*)\\}$#s"),
&children_clean,
- ) && empty_match.get("content").is_none()
+ ) && empty_match
+ .get(&CaptureKey::ByName("content".to_string()))
+ .is_none()
{
self.contents = format!(
"{}{{{}{}}}{}",
@@ -1032,20 +1036,20 @@ impl JsonManipulator {
return Ok(false);
}
- if let Some(leading_match) = Preg::is_match_named(
+ if let Some(leading_match) = Preg::is_match3(
php_regex!(
"#^\\[(?P<leadingspace>\\s*?)(?P<content>\\S+.*?)?(?P<trailingspace>\\s*)\\]$#s"
),
&children,
) {
let leading_whitespace = leading_match
- .get("leadingspace")
- .cloned()
- .unwrap_or_default();
+ .get(&CaptureKey::ByName("leadingspace".to_string()))
+ .unwrap_or_default()
+ .to_string();
let mut whitespace = leading_match
- .get("trailingspace")
- .cloned()
- .unwrap_or_default();
+ .get(&CaptureKey::ByName("trailingspace".to_string()))
+ .unwrap_or_default()
+ .to_string();
let mut leading_item_whitespace =
format!("{}{}{}", self.newline, self.indent, self.indent);
let mut trailing_item_whitespace = whitespace.clone();
@@ -1058,7 +1062,10 @@ impl JsonManipulator {
item_depth = 0;
}
- if leading_match.get("content").is_some() {
+ if leading_match
+ .get(&CaptureKey::ByName("content".to_string()))
+ .is_some()
+ {
// child missing but non empty children
if append {
children = Preg::replace(
diff --git a/crates/shirabe/src/package/version/version_guesser.rs b/crates/shirabe/src/package/version/version_guesser.rs
index daa25361..a01bf469 100644
--- a/crates/shirabe/src/package/version/version_guesser.rs
+++ b/crates/shirabe/src/package/version/version_guesser.rs
@@ -707,12 +707,12 @@ impl VersionGuesser {
trunk_path, branches_path, tags_path,
);
- if let Some(matches) = Preg::is_match_with_indexed_captures(&url_pattern, &output) {
- let m1 = matches[1].clone().unwrap_or_default();
- let m2 = matches[2].clone();
- let m3 = matches[3].clone();
- if let Some(m2) = m2.as_ref()
- && let Some(m3) = m3.as_ref()
+ if let Some(matches) = Preg::is_match3(&url_pattern, &output) {
+ let m1 = matches.get(&CaptureKey::ByIndex(1)).unwrap_or_default();
+ let m2 = matches.get(&CaptureKey::ByIndex(2));
+ let m3 = matches.get(&CaptureKey::ByIndex(3));
+ if let Some(m2) = m2
+ && let Some(m3) = m3
&& (branches_path == *m2 || tags_path == *m2)
{
// we are in a branches path
@@ -728,8 +728,8 @@ impl VersionGuesser {
}));
}
- assert!(is_string(&PhpMixed::String(m1.clone())));
- let pretty_version = trim(&m1, None);
+ assert!(is_string(&PhpMixed::String(m1.to_string())));
+ let pretty_version = trim(m1, None);
let version = if pretty_version == "trunk" {
"dev-trunk".to_string()
} else {
diff --git a/crates/shirabe/src/repository/vcs/svn_driver.rs b/crates/shirabe/src/repository/vcs/svn_driver.rs
index 9426e1f3..bdd7f021 100644
--- a/crates/shirabe/src/repository/vcs/svn_driver.rs
+++ b/crates/shirabe/src/repository/vcs/svn_driver.rs
@@ -258,16 +258,15 @@ impl SvnDriver {
let identifier = format!("/{}/", trim(identifier, Some("/")));
let (path, rev) = if let Some(m) =
- Preg::is_match_with_indexed_captures(php_regex!(r"{^(.+?)(@\d+)?/$}"), &identifier)
+ Preg::is_match3(php_regex!(r"{^(.+?)(@\d+)?/$}"), &identifier)
+ && let Some(rev) = m.get(&CaptureKey::ByIndex(2))
{
- if m[2].is_some() {
- (
- m[1].clone().unwrap_or_default(),
- m[2].clone().unwrap_or_default(),
- )
- } else {
- (identifier.clone(), String::new())
- }
+ (
+ m.get(&CaptureKey::ByIndex(1))
+ .unwrap_or_default()
+ .to_string(),
+ rev.to_string(),
+ )
} else {
(identifier, String::new())
};
@@ -298,16 +297,15 @@ impl SvnDriver {
let identifier = format!("/{}/", trim(identifier, Some("/")));
let (path, rev) = if let Some(m) =
- Preg::is_match_with_indexed_captures(php_regex!(r"{^(.+?)(@\d+)?/$}"), &identifier)
+ Preg::is_match3(php_regex!(r"{^(.+?)(@\d+)?/$}"), &identifier)
+ && let Some(rev) = m.get(&CaptureKey::ByIndex(2))
{
- if m[2].is_some() {
- (
- m[1].clone().unwrap_or_default(),
- m[2].clone().unwrap_or_default(),
- )
- } else {
- (identifier.clone(), String::new())
- }
+ (
+ m.get(&CaptureKey::ByIndex(1))
+ .unwrap_or_default()
+ .to_string(),
+ rev.to_string(),
+ )
} else {
(identifier, String::new())
};
diff --git a/crates/shirabe/src/util/hg.rs b/crates/shirabe/src/util/hg.rs
index 29d305f0..395ea6d5 100644
--- a/crates/shirabe/src/util/hg.rs
+++ b/crates/shirabe/src/util/hg.rs
@@ -5,7 +5,7 @@ use crate::io::IOInterface;
use crate::io::IOInterfaceImmutable;
use crate::util::ProcessExecutor;
use crate::util::Url;
-use shirabe_pcre::Preg;
+use shirabe_pcre::{CaptureKey, Preg};
use shirabe_php_shim::{php_regex, rawurlencode};
use std::sync::OnceLock;
@@ -56,7 +56,7 @@ impl Hg {
}
// Try with the authentication information available
- let matched = Preg::is_match_named(
+ let matched = Preg::is_match3(
php_regex!(
r"{^(?P<proto>ssh|https?)://(?:(?P<user>[^:@]+)(?::(?P<pass>[^:@]+))?@)?(?P<host>[^/]+)(?P<path>/.*)?}mi"
),
@@ -64,30 +64,44 @@ impl Hg {
);
if let Some(matches) = matched
- && self
- .io
- .has_authentication(matches.get("host").map(|s| s.as_str()).unwrap_or(""))
+ && self.io.has_authentication(
+ matches
+ .get(&CaptureKey::ByName("host".to_string()))
+ .unwrap_or(""),
+ )
{
- let authenticated_url = if matches.get("proto").map(|s| s.as_str()) == Some("ssh") {
- let user = if let Some(u) = matches.get("user") {
+ let authenticated_url = if matches.get(&CaptureKey::ByName("proto".to_string()))
+ == Some("ssh")
+ {
+ let user = if let Some(u) = matches.get(&CaptureKey::ByName("user".to_string())) {
format!("{}@", rawurlencode(u))
} else {
String::new()
};
format!(
"{}://{}{}{}",
- matches.get("proto").unwrap_or(&String::new()),
+ matches
+ .get(&CaptureKey::ByName("proto".to_string()))
+ .unwrap_or(""),
user,
- matches.get("host").unwrap_or(&String::new()),
- matches.get("path").unwrap_or(&String::new()),
+ matches
+ .get(&CaptureKey::ByName("host".to_string()))
+ .unwrap_or(""),
+ matches
+ .get(&CaptureKey::ByName("path".to_string()))
+ .unwrap_or(""),
)
} else {
- let auth = self
- .io
- .get_authentication(matches.get("host").map(|s| s.as_str()).unwrap_or(""));
+ let auth = self.io.get_authentication(
+ matches
+ .get(&CaptureKey::ByName("host".to_string()))
+ .unwrap_or(""),
+ );
format!(
"{}://{}:{}@{}{}",
- matches.get("proto").unwrap_or(&String::new()),
+ matches
+ .get(&CaptureKey::ByName("proto".to_string()))
+ .unwrap_or(""),
rawurlencode(
auth.get("username")
.and_then(|s| s.as_deref())
@@ -98,8 +112,12 @@ impl Hg {
.and_then(|s| s.as_deref())
.unwrap_or("")
),
- matches.get("host").unwrap_or(&String::new()),
- matches.get("path").unwrap_or(&String::new()),
+ matches
+ .get(&CaptureKey::ByName("host".to_string()))
+ .unwrap_or(""),
+ matches
+ .get(&CaptureKey::ByName("path".to_string()))
+ .unwrap_or(""),
)
};
@@ -151,12 +169,12 @@ impl Hg {
&mut output,
None,
) == 0
- && let Some(matches) = Preg::is_match_with_indexed_captures(
+ && let Some(matches) = Preg::is_match3(
php_regex!(r"/^.+? (\d+(?:\.\d+)+)(?:\+.*?)?\)?\r?\n/"),
&output,
)
{
- return matches.into_iter().nth(1).flatten();
+ return matches.get(&CaptureKey::ByIndex(1)).map(str::to_string);
}
None
})
generated by cgit v1.3.1-4-g156e (git 2.54.0) at 2026-09-21 05:18:16 +0000