mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2024-09-19 03:51:22 +02:00
Merge branch 'gcloud'
This commit is contained in:
romkatv
commit
a7594e103e
5 changed files with 214 additions and 47 deletions
|
|
@ -1241,14 +1241,36 @@
|
|||
# Google cloud color.
|
||||
typeset -g POWERLEVEL9K_GCLOUD_FOREGROUND=32
|
||||
|
||||
# Google cloud format. Change the value of POWERLEVEL9K_GCLOUD_CONTENT_EXPANSION if the default
|
||||
# is too verbose or not informative enough.
|
||||
# Google cloud format. Change the value of POWERLEVEL9K_GCLOUD_PARTIAL_CONTENT_EXPANSION and/or
|
||||
# POWERLEVEL9K_GCLOUD_COMPLETE_CONTENT_EXPANSION if the default is too verbose or not informative
|
||||
# enough. You can use the following parameters in the expansions. Each of them corresponds to the
|
||||
# output of `gcloud` tool.
|
||||
#
|
||||
# P9K_GCLOUD_ACCOUNT: the output of `gcloud config get-value account`
|
||||
# P9K_GCLOUD_PROJECT: the output of `gcloud config get-value project`
|
||||
# ${VARIABLE//\%/%%}: ${VARIABLE} with all occurences of '%' replaced with '%%'.
|
||||
# Parameter | Source
|
||||
# -------------------------|--------------------------------------------------------------------
|
||||
# P9K_GCLOUD_CONFIGURATION | gcloud config configurations list --format='value(name)'
|
||||
# P9K_GCLOUD_ACCOUNT | gcloud config get-value account
|
||||
# P9K_GCLOUD_PROJECT_ID | gcloud config get-value project
|
||||
# P9K_GCLOUD_PROJECT_NAME | gcloud projects describe $P9K_GCLOUD_PROJECT_ID --format='value(name)'
|
||||
#
|
||||
typeset -g POWERLEVEL9K_GCLOUD_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT//\%/%%}'
|
||||
# Note: ${VARIABLE//\%/%%} expands to ${VARIABLE} with all occurences of '%' replaced with '%%'.
|
||||
#
|
||||
# Obtaining project name requires sending a request to Google servers. This can take a long time
|
||||
# and even fail. When project name is unknown, P9K_GCLOUD_PROJECT_NAME is not set and gcloud
|
||||
# prompt segment is in state PARTIAL. When project name gets known, P9K_GCLOUD_PROJECT_NAME gets
|
||||
# set and gcloud prompt segment transitions to state COMPLETE.
|
||||
#
|
||||
# You can customize the format, icon and colors of gcloud segment separately for states PARTIAL
|
||||
# and COMPLETE. You can also hide gcloud in state PARTIAL by setting
|
||||
# POWERLEVEL9K_GCLOUD_PARTIAL_VISUAL_IDENTIFIER_EXPANSION and
|
||||
# POWERLEVEL9K_GCLOUD_PARTIAL_CONTENT_EXPANSION to empty.
|
||||
typeset -g POWERLEVEL9K_GCLOUD_PARTIAL_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT_ID//\%/%%}'
|
||||
typeset -g POWERLEVEL9K_GCLOUD_COMPLETE_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT_NAME//\%/%%}'
|
||||
|
||||
# Send a request to Google (by means of `gcloud projects describe ...`) to obtain project name
|
||||
# this often. Negative value disables periodic polling. In this mode project name is retrieved
|
||||
# only when the current configuration, account or project id changes.
|
||||
typeset -g POWERLEVEL9K_GCLOUD_REFRESH_PROJECT_NAME_SECONDS=60
|
||||
|
||||
# Custom icon.
|
||||
# typeset -g POWERLEVEL9K_GCLOUD_VISUAL_IDENTIFIER_EXPANSION='⭐'
|
||||
|
|
|
|||
|
|
@ -1219,14 +1219,36 @@
|
|||
# Google cloud color.
|
||||
typeset -g POWERLEVEL9K_GCLOUD_FOREGROUND=4
|
||||
|
||||
# Google cloud format. Change the value of POWERLEVEL9K_GCLOUD_CONTENT_EXPANSION if the default
|
||||
# is too verbose or not informative enough.
|
||||
# Google cloud format. Change the value of POWERLEVEL9K_GCLOUD_PARTIAL_CONTENT_EXPANSION and/or
|
||||
# POWERLEVEL9K_GCLOUD_COMPLETE_CONTENT_EXPANSION if the default is too verbose or not informative
|
||||
# enough. You can use the following parameters in the expansions. Each of them corresponds to the
|
||||
# output of `gcloud` tool.
|
||||
#
|
||||
# P9K_GCLOUD_ACCOUNT: the output of `gcloud config get-value account`
|
||||
# P9K_GCLOUD_PROJECT: the output of `gcloud config get-value project`
|
||||
# ${VARIABLE//\%/%%}: ${VARIABLE} with all occurences of '%' replaced with '%%'.
|
||||
# Parameter | Source
|
||||
# -------------------------|--------------------------------------------------------------------
|
||||
# P9K_GCLOUD_CONFIGURATION | gcloud config configurations list --format='value(name)'
|
||||
# P9K_GCLOUD_ACCOUNT | gcloud config get-value account
|
||||
# P9K_GCLOUD_PROJECT_ID | gcloud config get-value project
|
||||
# P9K_GCLOUD_PROJECT_NAME | gcloud projects describe $P9K_GCLOUD_PROJECT_ID --format='value(name)'
|
||||
#
|
||||
typeset -g POWERLEVEL9K_GCLOUD_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT//\%/%%}'
|
||||
# Note: ${VARIABLE//\%/%%} expands to ${VARIABLE} with all occurences of '%' replaced with '%%'.
|
||||
#
|
||||
# Obtaining project name requires sending a request to Google servers. This can take a long time
|
||||
# and even fail. When project name is unknown, P9K_GCLOUD_PROJECT_NAME is not set and gcloud
|
||||
# prompt segment is in state PARTIAL. When project name gets known, P9K_GCLOUD_PROJECT_NAME gets
|
||||
# set and gcloud prompt segment transitions to state COMPLETE.
|
||||
#
|
||||
# You can customize the format, icon and colors of gcloud segment separately for states PARTIAL
|
||||
# and COMPLETE. You can also hide gcloud in state PARTIAL by setting
|
||||
# POWERLEVEL9K_GCLOUD_PARTIAL_VISUAL_IDENTIFIER_EXPANSION and
|
||||
# POWERLEVEL9K_GCLOUD_PARTIAL_CONTENT_EXPANSION to empty.
|
||||
typeset -g POWERLEVEL9K_GCLOUD_PARTIAL_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT_ID//\%/%%}'
|
||||
typeset -g POWERLEVEL9K_GCLOUD_COMPLETE_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT_NAME//\%/%%}'
|
||||
|
||||
# Send a request to Google (by means of `gcloud projects describe ...`) to obtain project name
|
||||
# this often. Negative value disables periodic polling. In this mode project name is retrieved
|
||||
# only when the current configuration, account or project id changes.
|
||||
typeset -g POWERLEVEL9K_GCLOUD_REFRESH_PROJECT_NAME_SECONDS=60
|
||||
|
||||
# Custom icon.
|
||||
# typeset -g POWERLEVEL9K_GCLOUD_VISUAL_IDENTIFIER_EXPANSION='⭐'
|
||||
|
|
|
|||
|
|
@ -1219,14 +1219,36 @@
|
|||
# Google cloud color.
|
||||
typeset -g POWERLEVEL9K_GCLOUD_FOREGROUND=32
|
||||
|
||||
# Google cloud format. Change the value of POWERLEVEL9K_GCLOUD_CONTENT_EXPANSION if the default
|
||||
# is too verbose or not informative enough.
|
||||
# Google cloud format. Change the value of POWERLEVEL9K_GCLOUD_PARTIAL_CONTENT_EXPANSION and/or
|
||||
# POWERLEVEL9K_GCLOUD_COMPLETE_CONTENT_EXPANSION if the default is too verbose or not informative
|
||||
# enough. You can use the following parameters in the expansions. Each of them corresponds to the
|
||||
# output of `gcloud` tool.
|
||||
#
|
||||
# P9K_GCLOUD_ACCOUNT: the output of `gcloud config get-value account`
|
||||
# P9K_GCLOUD_PROJECT: the output of `gcloud config get-value project`
|
||||
# ${VARIABLE//\%/%%}: ${VARIABLE} with all occurences of '%' replaced with '%%'.
|
||||
# Parameter | Source
|
||||
# -------------------------|--------------------------------------------------------------------
|
||||
# P9K_GCLOUD_CONFIGURATION | gcloud config configurations list --format='value(name)'
|
||||
# P9K_GCLOUD_ACCOUNT | gcloud config get-value account
|
||||
# P9K_GCLOUD_PROJECT_ID | gcloud config get-value project
|
||||
# P9K_GCLOUD_PROJECT_NAME | gcloud projects describe $P9K_GCLOUD_PROJECT_ID --format='value(name)'
|
||||
#
|
||||
typeset -g POWERLEVEL9K_GCLOUD_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT//\%/%%}'
|
||||
# Note: ${VARIABLE//\%/%%} expands to ${VARIABLE} with all occurences of '%' replaced with '%%'.
|
||||
#
|
||||
# Obtaining project name requires sending a request to Google servers. This can take a long time
|
||||
# and even fail. When project name is unknown, P9K_GCLOUD_PROJECT_NAME is not set and gcloud
|
||||
# prompt segment is in state PARTIAL. When project name gets known, P9K_GCLOUD_PROJECT_NAME gets
|
||||
# set and gcloud prompt segment transitions to state COMPLETE.
|
||||
#
|
||||
# You can customize the format, icon and colors of gcloud segment separately for states PARTIAL
|
||||
# and COMPLETE. You can also hide gcloud in state PARTIAL by setting
|
||||
# POWERLEVEL9K_GCLOUD_PARTIAL_VISUAL_IDENTIFIER_EXPANSION and
|
||||
# POWERLEVEL9K_GCLOUD_PARTIAL_CONTENT_EXPANSION to empty.
|
||||
typeset -g POWERLEVEL9K_GCLOUD_PARTIAL_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT_ID//\%/%%}'
|
||||
typeset -g POWERLEVEL9K_GCLOUD_COMPLETE_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT_NAME//\%/%%}'
|
||||
|
||||
# Send a request to Google (by means of `gcloud projects describe ...`) to obtain project name
|
||||
# this often. Negative value disables periodic polling. In this mode project name is retrieved
|
||||
# only when the current configuration, account or project id changes.
|
||||
typeset -g POWERLEVEL9K_GCLOUD_REFRESH_PROJECT_NAME_SECONDS=60
|
||||
|
||||
# Custom icon.
|
||||
# typeset -g POWERLEVEL9K_GCLOUD_VISUAL_IDENTIFIER_EXPANSION='⭐'
|
||||
|
|
|
|||
|
|
@ -1307,14 +1307,36 @@
|
|||
# typeset -g POWERLEVEL9K_GCLOUD_FOREGROUND=7
|
||||
# typeset -g POWERLEVEL9K_GCLOUD_BACKGROUND=4
|
||||
|
||||
# Google cloud format. Change the value of POWERLEVEL9K_GCLOUD_CONTENT_EXPANSION if the default
|
||||
# is too verbose or not informative enough.
|
||||
# Google cloud format. Change the value of POWERLEVEL9K_GCLOUD_PARTIAL_CONTENT_EXPANSION and/or
|
||||
# POWERLEVEL9K_GCLOUD_COMPLETE_CONTENT_EXPANSION if the default is too verbose or not informative
|
||||
# enough. You can use the following parameters in the expansions. Each of them corresponds to the
|
||||
# output of `gcloud` tool.
|
||||
#
|
||||
# P9K_GCLOUD_ACCOUNT: the output of `gcloud config get-value account`
|
||||
# P9K_GCLOUD_PROJECT: the output of `gcloud config get-value project`
|
||||
# ${VARIABLE//\%/%%}: ${VARIABLE} with all occurences of '%' replaced with '%%'.
|
||||
# Parameter | Source
|
||||
# -------------------------|--------------------------------------------------------------------
|
||||
# P9K_GCLOUD_CONFIGURATION | gcloud config configurations list --format='value(name)'
|
||||
# P9K_GCLOUD_ACCOUNT | gcloud config get-value account
|
||||
# P9K_GCLOUD_PROJECT_ID | gcloud config get-value project
|
||||
# P9K_GCLOUD_PROJECT_NAME | gcloud projects describe $P9K_GCLOUD_PROJECT_ID --format='value(name)'
|
||||
#
|
||||
typeset -g POWERLEVEL9K_GCLOUD_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT//\%/%%}'
|
||||
# Note: ${VARIABLE//\%/%%} expands to ${VARIABLE} with all occurences of '%' replaced with '%%'.
|
||||
#
|
||||
# Obtaining project name requires sending a request to Google servers. This can take a long time
|
||||
# and even fail. When project name is unknown, P9K_GCLOUD_PROJECT_NAME is not set and gcloud
|
||||
# prompt segment is in state PARTIAL. When project name gets known, P9K_GCLOUD_PROJECT_NAME gets
|
||||
# set and gcloud prompt segment transitions to state COMPLETE.
|
||||
#
|
||||
# You can customize the format, icon and colors of gcloud segment separately for states PARTIAL
|
||||
# and COMPLETE. You can also hide gcloud in state PARTIAL by setting
|
||||
# POWERLEVEL9K_GCLOUD_PARTIAL_VISUAL_IDENTIFIER_EXPANSION and
|
||||
# POWERLEVEL9K_GCLOUD_PARTIAL_CONTENT_EXPANSION to empty.
|
||||
typeset -g POWERLEVEL9K_GCLOUD_PARTIAL_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT_ID//\%/%%}'
|
||||
typeset -g POWERLEVEL9K_GCLOUD_COMPLETE_CONTENT_EXPANSION='${P9K_GCLOUD_PROJECT_NAME//\%/%%}'
|
||||
|
||||
# Send a request to Google (by means of `gcloud projects describe ...`) to obtain project name
|
||||
# this often. Negative value disables periodic polling. In this mode project name is retrieved
|
||||
# only when the current configuration, account or project id changes.
|
||||
typeset -g POWERLEVEL9K_GCLOUD_REFRESH_PROJECT_NAME_SECONDS=60
|
||||
|
||||
# Custom icon.
|
||||
# typeset -g POWERLEVEL9K_GCLOUD_VISUAL_IDENTIFIER_EXPANSION='⭐'
|
||||
|
|
|
|||
|
|
@ -1177,7 +1177,7 @@ _p9k_prompt_disk_usage_init() {
|
|||
typeset -g _p9k__disk_usage_normal=
|
||||
typeset -g _p9k__disk_usage_warning=
|
||||
typeset -g _p9k__disk_usage_critical=
|
||||
_p9k__async_segments_compute+='_p9k_prompt_disk_usage_compute ${(q)_p9k__cwd_a}'
|
||||
_p9k__async_segments_compute+='_p9k_worker_invoke disk_usage "_p9k_prompt_disk_usage_compute ${(q)_p9k__cwd_a}"'
|
||||
}
|
||||
|
||||
_p9k_prompt_disk_usage_compute() {
|
||||
|
|
@ -1242,7 +1242,7 @@ prompt_battery() {
|
|||
_p9k_prompt_battery_init() {
|
||||
typeset -ga _p9k__battery_args=()
|
||||
if [[ $_p9k_os == OSX && $+commands[pmset] == 1 ]]; then
|
||||
_p9k__async_segments_compute+=_p9k_prompt_battery_compute
|
||||
_p9k__async_segments_compute+='_p9k_worker_invoke battery _p9k_prompt_battery_compute'
|
||||
return
|
||||
fi
|
||||
if [[ $_p9k_os != (Linux|Android) ||
|
||||
|
|
@ -1409,7 +1409,7 @@ prompt_public_ip() {
|
|||
_p9k_prompt_public_ip_init() {
|
||||
typeset -g _p9k__public_ip=
|
||||
typeset -gF _p9k__public_ip_next_time=0
|
||||
_p9k__async_segments_compute+=_p9k_prompt_public_ip_compute
|
||||
_p9k__async_segments_compute+='_p9k_worker_invoke public_ip _p9k_prompt_public_ip_compute'
|
||||
}
|
||||
|
||||
_p9k_prompt_public_ip_compute() {
|
||||
|
|
@ -2200,7 +2200,7 @@ _p9k_prompt_load_init() {
|
|||
typeset -g _p9k__load_normal=
|
||||
typeset -g _p9k__load_warning=
|
||||
typeset -g _p9k__load_critical=
|
||||
_p9k__async_segments_compute+=_p9k_prompt_load_compute
|
||||
_p9k__async_segments_compute+='_p9k_worker_invoke load _p9k_prompt_load_compute'
|
||||
elif [[ ! -r /proc/loadavg ]]; then
|
||||
typeset -g "_p9k__segment_cond_${_p9k__prompt_side}[_p9k__segment_index]"='${:-}'
|
||||
fi
|
||||
|
|
@ -2524,7 +2524,7 @@ function _p9k_prompt_ram_init() {
|
|||
return
|
||||
fi
|
||||
typeset -g _p9k__ram_free=
|
||||
_p9k__async_segments_compute+=_p9k_prompt_ram_compute
|
||||
_p9k__async_segments_compute+='_p9k_worker_invoke ram _p9k_prompt_ram_compute'
|
||||
}
|
||||
|
||||
_p9k_prompt_ram_compute() {
|
||||
|
|
@ -3124,7 +3124,7 @@ function _p9k_prompt_swap_init() {
|
|||
return
|
||||
fi
|
||||
typeset -g _p9k__swap_used=
|
||||
_p9k__async_segments_compute+=_p9k_prompt_swap_compute
|
||||
_p9k__async_segments_compute+='_p9k_worker_invoke swap _p9k_prompt_swap_compute'
|
||||
}
|
||||
|
||||
_p9k_prompt_swap_compute() {
|
||||
|
|
@ -3235,7 +3235,7 @@ instant_prompt_time() {
|
|||
|
||||
_p9k_prompt_time_init() {
|
||||
(( _POWERLEVEL9K_EXPERIMENTAL_TIME_REALTIME )) || return
|
||||
_p9k__async_segments_compute+=_p9k_prompt_time_compute
|
||||
_p9k__async_segments_compute+='_p9k_worker_invoke time _p9k_prompt_time_compute'
|
||||
}
|
||||
|
||||
_p9k_prompt_time_compute() {
|
||||
|
|
@ -4320,22 +4320,92 @@ _p9k_prompt_azure_init() {
|
|||
}
|
||||
|
||||
prompt_gcloud() {
|
||||
unset P9K_GCLOUD_PROJECT P9K_GCLOUD_ACCOUNT
|
||||
local -i len=$#_p9k__prompt _p9k__has_upglob
|
||||
_p9k_prompt_segment \
|
||||
$0_PARTIAL blue white GCLOUD_ICON 1 \
|
||||
'${${(M)${#P9K_GCLOUD_PROJECT_NAME}:#0}:+$P9K_GCLOUD_ACCOUNT$P9K_GCLOUD_PROJECT_ID}' \
|
||||
'${P9K_GCLOUD_ACCOUNT//\%/%%}:${P9K_GCLOUD_PROJECT_ID//\%/%%}'
|
||||
_p9k_prompt_segment \
|
||||
$0_COMPLETE blue white GCLOUD_ICON 1 \
|
||||
'$P9K_GCLOUD_PROJECT_NAME' \
|
||||
'${P9K_GCLOUD_ACCOUNT//\%/%%}:${P9K_GCLOUD_PROJECT_ID//\%/%%}'
|
||||
(( _p9k__has_upglob )) || typeset -g "_p9k__segment_val_${_p9k__prompt_side}[_p9k__segment_index]"=$_p9k__prompt[len+1,-1]
|
||||
}
|
||||
|
||||
_p9k_gcloud_prefetch() {
|
||||
# P9K_GCLOUD_PROJECT is deprecated; it's always equal to P9K_GCLOUD_PROJECT_ID
|
||||
unset P9K_GCLOUD_CONFIGURATION P9K_GCLOUD_ACCOUNT P9K_GCLOUD_PROJECT P9K_GCLOUD_PROJECT_ID P9K_GCLOUD_PROJECT_NAME
|
||||
(( $+commands[gcloud] )) || return
|
||||
_p9k_read_word ~/.config/gcloud/active_config || return
|
||||
if ! _p9k_cache_stat_get $0 ~/.config/gcloud/configurations/config_$_p9k__ret; then
|
||||
# TODO: Use `gcloud config configurations list` instead.
|
||||
_p9k_cache_stat_set "$(gcloud config get-value account 2>/dev/null)" "$(gcloud config get-value project 2>/dev/null)"
|
||||
P9K_GCLOUD_CONFIGURATION=$_p9k__ret
|
||||
if ! _p9k_cache_stat_get $0 ~/.config/gcloud/configurations/config_$P9K_GCLOUD_CONFIGURATION; then
|
||||
local pair account project_id
|
||||
pair="$(gcloud config configurations list --configuration=$P9K_GCLOUD_CONFIGURATION \
|
||||
--format=$'value[separator="\1"](properties.core.account,properties.core.project)')"
|
||||
(( ! $? )) && IFS=$'\1' read account project_id <<<$pair
|
||||
_p9k_cache_stat_set "$account" "$project_id"
|
||||
fi
|
||||
[[ -n $_p9k__cache_val[1] || -n $_p9k__cache_val[2] ]] || return
|
||||
P9K_GCLOUD_ACCOUNT=$_p9k__cache_val[1]
|
||||
P9K_GCLOUD_PROJECT=$_p9k__cache_val[2]
|
||||
_p9k_prompt_segment "$0" "blue" "white" "GCLOUD_ICON" 0 '' "${P9K_GCLOUD_ACCOUNT//\%/%%}:${P9K_GCLOUD_PROJECT//\%/%%}"
|
||||
if [[ -n $_p9k__cache_val[1] ]]; then
|
||||
P9K_GCLOUD_ACCOUNT=$_p9k__cache_val[1]
|
||||
fi
|
||||
if [[ -n $_p9k__cache_val[2] ]]; then
|
||||
P9K_GCLOUD_PROJECT_ID=$_p9k__cache_val[2]
|
||||
P9K_GCLOUD_PROJECT=$P9K_GCLOUD_PROJECT_ID # deprecated parameter; set for backward compatibility
|
||||
fi
|
||||
if [[ $P9K_GCLOUD_CONFIGURATION == $_p9k_gcloud_configuration &&
|
||||
$P9K_GCLOUD_ACCOUNT == $_p9k_gcloud_account &&
|
||||
$P9K_GCLOUD_PROJECT_ID == $_p9k_gcloud_project_id ]]; then
|
||||
[[ -n $_p9k_gcloud_project_name ]] && P9K_GCLOUD_PROJECT_NAME=$_p9k_gcloud_project_name
|
||||
if (( _POWERLEVEL9K_GCLOUD_REFRESH_PROJECT_NAME_SECONDS < 0 ||
|
||||
_p9k__gcloud_last_fetch_ts + _POWERLEVEL9K_GCLOUD_REFRESH_PROJECT_NAME_SECONDS > EPOCHREALTIME )); then
|
||||
return
|
||||
fi
|
||||
else
|
||||
_p9k_gcloud_configuration=$P9K_GCLOUD_CONFIGURATION
|
||||
_p9k_gcloud_account=$P9K_GCLOUD_ACCOUNT
|
||||
_p9k_gcloud_project_id=$P9K_GCLOUD_PROJECT_ID
|
||||
_p9k_gcloud_project_name=
|
||||
_p9k__state_dump_scheduled=1
|
||||
fi
|
||||
[[ -n $P9K_GCLOUD_CONFIGURATION && -n $P9K_GCLOUD_ACCOUNT && -n $P9K_GCLOUD_PROJECT_ID ]] || return
|
||||
_p9k__gcloud_last_fetch_ts=EPOCHREALTIME
|
||||
_p9k_worker_invoke gcloud "_p9k_prompt_gcloud_compute ${(q)commands[gcloud]} ${(q)P9K_GCLOUD_CONFIGURATION} ${(q)P9K_GCLOUD_ACCOUNT} ${(q)P9K_GCLOUD_PROJECT_ID}"
|
||||
}
|
||||
|
||||
_p9k_prompt_gcloud_init() {
|
||||
_p9k__async_segments_compute+=_p9k_gcloud_prefetch
|
||||
typeset -g "_p9k__segment_cond_${_p9k__prompt_side}[_p9k__segment_index]"='$commands[gcloud]'
|
||||
}
|
||||
|
||||
_p9k_prompt_gcloud_compute() {
|
||||
local gcloud=$1
|
||||
P9K_GCLOUD_CONFIGURATION=$2
|
||||
P9K_GCLOUD_ACCOUNT=$3
|
||||
P9K_GCLOUD_PROJECT_ID=$4
|
||||
_p9k_worker_async "_p9k_prompt_gcloud_async ${(q)gcloud}" _p9k_prompt_gcloud_sync
|
||||
}
|
||||
|
||||
_p9k_prompt_gcloud_async() {
|
||||
local gcloud=$1
|
||||
$gcloud projects describe $P9K_GCLOUD_PROJECT_ID --configuration=$P9K_GCLOUD_CONFIGURATION \
|
||||
--account=$P9K_GCLOUD_ACCOUNT --format='value(name)'
|
||||
}
|
||||
|
||||
_p9k_prompt_gcloud_sync() {
|
||||
_p9k_worker_reply "_p9k_prompt_gcloud_update ${(q)P9K_GCLOUD_CONFIGURATION} ${(q)P9K_GCLOUD_ACCOUNT} ${(q)P9K_GCLOUD_PROJECT_ID} ${(q)REPLY%$'\n'}"
|
||||
}
|
||||
|
||||
_p9k_prompt_gcloud_update() {
|
||||
[[ $1 == $P9K_GCLOUD_CONFIGURATION &&
|
||||
$2 == $P9K_GCLOUD_ACCOUNT &&
|
||||
$3 == $P9K_GCLOUD_PROJECT_ID &&
|
||||
$4 != $P9K_GCLOUD_PROJECT_NAME ]] || return
|
||||
[[ -n $4 ]] && P9K_GCLOUD_PROJECT_NAME=$4 || unset P9K_GCLOUD_PROJECT_NAME
|
||||
_p9k_gcloud_project_name=$P9K_GCLOUD_PROJECT_NAME
|
||||
_p9k__state_dump_scheduled=1
|
||||
reset=1
|
||||
}
|
||||
|
||||
prompt_google_app_cred() {
|
||||
unset P9K_GOOGLE_APP_CRED_{TYPE,PROJECT_ID,CLIENT_EMAIL}
|
||||
|
||||
|
|
@ -4780,7 +4850,7 @@ _p9k_prompt_wifi_init() {
|
|||
typeset -g P9K_WIFI_RSSI=
|
||||
typeset -g P9K_WIFI_NOISE=
|
||||
typeset -g P9K_WIFI_BARS=
|
||||
_p9k__async_segments_compute+=_p9k_prompt_wifi_compute
|
||||
_p9k__async_segments_compute+='_p9k_worker_invoke wifi _p9k_prompt_wifi_compute'
|
||||
else
|
||||
typeset -g "_p9k__segment_cond_${_p9k__prompt_side}[_p9k__segment_index]"='${:-}'
|
||||
fi
|
||||
|
|
@ -5169,7 +5239,7 @@ function _p9k_prompt_net_iface_init() {
|
|||
typeset -g _p9__ip_timestamp=
|
||||
typeset -g _p9k__vpn_ip_ips=()
|
||||
[[ -z $_POWERLEVEL9K_PUBLIC_IP_VPN_INTERFACE ]] && _p9k__public_ip_not_vpn=1
|
||||
_p9k__async_segments_compute+=_p9k_prompt_net_iface_compute
|
||||
_p9k__async_segments_compute+='_p9k_worker_invoke net_iface _p9k_prompt_net_iface_compute'
|
||||
}
|
||||
|
||||
# reads `iface2ip` and sets `ifaces` and `ips`
|
||||
|
|
@ -6292,10 +6362,7 @@ _p9k_precmd_impl() {
|
|||
fi
|
||||
fi
|
||||
|
||||
local f_compute
|
||||
for f_compute in "${_p9k__async_segments_compute[@]}"; do
|
||||
_p9k_worker_invoke ${f_compute%% *} ${(e)f_compute}
|
||||
done
|
||||
(( $+functions[_p9k_async_segments_compute] )) && _p9k_async_segments_compute
|
||||
|
||||
_p9k__expanded=0
|
||||
|
||||
|
|
@ -6393,6 +6460,12 @@ typeset -g _p9k__param_pat
|
|||
typeset -g _p9k__param_sig
|
||||
|
||||
_p9k_init_vars() {
|
||||
typeset -gF _p9k__gcloud_last_fetch_ts
|
||||
typeset -g _p9k_gcloud_configuration
|
||||
typeset -g _p9k_gcloud_account
|
||||
typeset -g _p9k_gcloud_project_id
|
||||
typeset -g _p9k_gcloud_project_name
|
||||
|
||||
typeset -gi _p9k_term_has_href
|
||||
|
||||
typeset -gi _p9k_vcs_index
|
||||
|
|
@ -6576,7 +6649,6 @@ _p9k_init_vars() {
|
|||
typeset -g _p9k__last_prompt_pwd
|
||||
typeset -gA _p9k_display_k
|
||||
typeset -ga _p9k__display_v
|
||||
typeset -gaU _p9k__async_segments_compute
|
||||
|
||||
typeset -gA _p9k__dotnet_stat_cache
|
||||
typeset -gA _p9k__dir_stat_cache
|
||||
|
|
@ -6590,6 +6662,8 @@ _p9k_init_vars() {
|
|||
}
|
||||
|
||||
_p9k_init_params() {
|
||||
_p9k_declare -F POWERLEVEL9K_GCLOUD_REFRESH_PROJECT_NAME_SECONDS 60
|
||||
|
||||
# invarint: _POWERLEVEL9K_INSTANT_PROMPT == (verbose|quiet|off)
|
||||
# invariant: [[ ($_POWERLEVEL9K_INSTANT_PROMPT == off) == $_POWERLEVEL9K_DISABLE_INSTANT_PROMPT ]]
|
||||
_p9k_declare -s POWERLEVEL9K_INSTANT_PROMPT # verbose, quiet, off
|
||||
|
|
@ -7821,6 +7895,8 @@ _p9k_init() {
|
|||
|
||||
typeset -g P9K_OS_ICON=$_p9k_os_icon
|
||||
|
||||
local -a _p9k__async_segments_compute
|
||||
|
||||
local -i i
|
||||
local elem
|
||||
|
||||
|
|
@ -7850,7 +7926,10 @@ _p9k_init() {
|
|||
_p9k_prompt_net_iface_init
|
||||
fi
|
||||
|
||||
(( $#_p9k__async_segments_compute )) && _p9k_worker_start
|
||||
if [[ -n $_p9k__async_segments_compute ]]; then
|
||||
functions[_p9k_async_segments_compute]=${(pj:\n:)_p9k__async_segments_compute}
|
||||
_p9k_worker_start
|
||||
fi
|
||||
|
||||
local k v
|
||||
for k v in ${(kv)_p9k_display_k}; do
|
||||
|
|
|
|||
Loading…
Reference in a new issue