mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-16 07:52:32 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 24

tools.vpm: improve detection of already parsed modules (#20223)

Browse source
This commit is contained in:
Turiiya 2023-12-19 22:47:37 +01:00 • committed by GitHub
parent 4bab3e700e
commit 9ea039e6fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cmd/tools/vpm/dependency_test.v
View file

@ -84,6 +84,14 @@ fn test_install_with_recursive_dependencies() {
eprintln('Timeout while testing installation with recursive dependencies.') eprintln('Timeout while testing installation with recursive dependencies.')
exit(1) exit(1)
}() }()
res := os.execute('${v} install https://gitlab.com/tobealive/a') mut res := os.execute('${v} install https://gitlab.com/tobealive/a')
assert res.exit_code == 0, res.str()
// Test the installation of a module when passing its URL with the `.git` extension.
// One of the modules dependencies `https://gitlab.com/tobealive/c` has the
// `https://gitlab.com/tobealive/a` dependency without `.git`.
res = os.execute('${v} remove a b c')
assert res.exit_code == 0, res.str()
res = os.execute('${v} install https://gitlab.com/tobealive/a.git')
assert res.exit_code == 0, res.str() assert res.exit_code == 0, res.str()
} }

32
cmd/tools/vpm/parse.v
View file

@ -45,27 +45,32 @@ fn parse_query(query []string) []Module {
} }
fn (mut p Parser) parse_module(m string) { fn (mut p Parser) parse_module(m string) {
if m in p.modules {
return
}
kind := match true { kind := match true {
m.starts_with('https://') { ModuleKind.https } m.starts_with('https://') { ModuleKind.https }
m.starts_with('git@') { ModuleKind.ssh } m.starts_with('git@') { ModuleKind.ssh }
m.starts_with('http://') { ModuleKind.http } m.starts_with('http://') { ModuleKind.http }
else { ModuleKind.registered } else { ModuleKind.registered }
} }
ident, version := if kind == .ssh {
if m.count('@') > 1 {
m.all_before_last('@'), m.all_after_last('@')
} else {
m, ''
}
} else {
m.rsplit_once('@') or { m, '' }
}
key := match kind {
.registered { m }
.ssh { ident.replace(':', '/') + at_version(version) }
else { ident.all_after('//').trim_string_right('.git') + at_version(version) }
}
if key in p.modules {
return
}
println('Scanning `${m}`...') println('Scanning `${m}`...')
mut mod := if kind != ModuleKind.registered { mut mod := if kind != ModuleKind.registered {
// External module. The identifier is an URL. // External module. The identifier is an URL.
ident, version := if kind == .ssh {
if m.count('@') > 1 {
m.all_before_last('@'), m.all_after_last('@')
} else {
m, ''
}
} else {
m.rsplit_once('@') or { m, '' }
}
if kind == .http { if kind == .http {
vpm_warn('installing `${ident}` via http.', vpm_warn('installing `${ident}` via http.',
details: 'Support for `http` is deprecated, use `https` to ensure future compatibility.' details: 'Support for `http` is deprecated, use `https` to ensure future compatibility.'
@ -119,7 +124,6 @@ fn (mut p Parser) parse_module(m string) {
} }
} else { } else {
// VPM registered module. // VPM registered module.
ident, version := m.rsplit_once('@') or { m, '' }
info := get_mod_vpm_info(ident) or { info := get_mod_vpm_info(ident) or {
vpm_error('failed to retrieve metadata for `${ident}`.', details: err.msg()) vpm_error('failed to retrieve metadata for `${ident}`.', details: err.msg())
p.errors++ p.errors++
@ -177,7 +181,7 @@ fn (mut p Parser) parse_module(m string) {
} }
mod.install_path_fmted = fmt_mod_path(mod.install_path) mod.install_path_fmted = fmt_mod_path(mod.install_path)
mod.get_installed() mod.get_installed()
p.modules[m] = mod p.modules[key] = mod
if mod.manifest.dependencies.len > 0 { if mod.manifest.dependencies.len > 0 {
verbose_println('Found ${mod.manifest.dependencies.len} dependencies for `${mod.name}`: ${mod.manifest.dependencies}.') verbose_println('Found ${mod.manifest.dependencies.len} dependencies for `${mod.name}`: ${mod.manifest.dependencies}.')
for d in mod.manifest.dependencies { for d in mod.manifest.dependencies {