mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

vpm: increment vpm downloads, use new endpoints (#18202)

Browse Source
This commit is contained in:
xy3 2023-05-25 02:47:58 +02:00 committed by GitHub
parent c45c36ccce
commit 010a5c26a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cmd/tools/vpm.v
View File

@ -220,6 +220,10 @@ fn vpm_install_from_vpm(module_names []string) {
continue continue
} }
println('Installing module "${name}" from "${mod.url}" to "${minfo.final_module_path}" ...') println('Installing module "${name}" from "${mod.url}" to "${minfo.final_module_path}" ...')
increment_module_download_count(name) or {
errors++
eprintln('Errors while incrementing the download count for ${name}:')
}
vcs_install_cmd := supported_vcs_install_cmds[vcs] vcs_install_cmd := supported_vcs_install_cmds[vcs]
cmd := '${vcs_install_cmd} "${mod.url}" "${minfo.final_module_path}"' cmd := '${vcs_install_cmd} "${mod.url}" "${minfo.final_module_path}"'
verbose_println(' command: ${cmd}') verbose_println(' command: ${cmd}')
@ -406,6 +410,10 @@ fn vpm_update(m []string) {
continue continue
} else { } else {
verbose_println(' ${vcs_res.output.trim_space()}') verbose_println(' ${vcs_res.output.trim_space()}')
increment_module_download_count(zname) or {
errors++
eprintln('Errors while incrementing the download count for ${zname}:')
}
} }
resolve_dependencies(modulename, final_module_path, module_names) resolve_dependencies(modulename, final_module_path, module_names)
} }
@ -740,7 +748,7 @@ fn get_module_meta_info(name string) !Mod {
mut errors := []string{} mut errors := []string{}
for server_url in vpm_server_urls { for server_url in vpm_server_urls {
modurl := server_url + '/jsmod/${name}' modurl := server_url + '/api/packages/${name}'
verbose_println('Retrieving module metadata from: "${modurl}" ...') verbose_println('Retrieving module metadata from: "${modurl}" ...')
r := http.get(modurl) or { r := http.get(modurl) or {
errors << 'Http server did not respond to our request for "${modurl}" .' errors << 'Http server did not respond to our request for "${modurl}" .'
@ -774,6 +782,25 @@ fn get_module_meta_info(name string) !Mod {
return error(errors.join_lines()) return error(errors.join_lines())
} }
fn increment_module_download_count(name string) ! {
mut errors := []string{}
for server_url in vpm_server_urls {
modurl := server_url + '/api/packages/${name}/incr_downloads'
r := http.post(modurl, '') or {
errors << 'Http server did not respond to our request for "${modurl}" .'
errors << 'Error details: ${err}'
continue
}
if r.status_code != 200 {
errors << 'Failed to increment the download count for module "${name}", since "${server_url}" responded with ${r.status_code} http status code. Please try again later.'
continue
}
return
}
return error(errors.join_lines())
}
fn vpm_show(module_names []string) { fn vpm_show(module_names []string) {
installed_modules := get_installed_modules() installed_modules := get_installed_modules()
for module_name in module_names { for module_name in module_names {