mirror/zplug
1
0
Fork 0
mirror of https://github.com/zplug/zplug synced 2025-04-30 13:17:57 +02:00
Code Issues

Organize the log files and variables

Browse Source
This commit is contained in:
b4b4r07 2016-12-24 01:32:27 +09:00
parent 1d68397210
commit 69d8d2c21f
3 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
base/core/core.zsh
View File

@ -213,7 +213,7 @@ __zplug::core::core::variable()
"not_on_branch" 18
)
typeset -gx -A _zplug_log _zplug_build_log
typeset -gx -A _zplug_log _zplug_build_log _zplug_load_log
_zplug_log=(
"trace" "$ZPLUG_HOME/log/trace.log"
"install" "$ZPLUG_HOME/log/install.log"
@ -221,17 +221,19 @@ __zplug::core::core::variable()
"status" "$ZPLUG_HOME/log/status.log"
)
_zplug_build_log=(
"success" "$ZPLUG_HOME/log/success.log"
"failure" "$ZPLUG_HOME/log/failure.log"
"timeout" "$ZPLUG_HOME/log/timeout.log"
"rollback" "$ZPLUG_HOME/log/rollback.log"
"success" "$ZPLUG_HOME/log/build_success.log"
"failure" "$ZPLUG_HOME/log/build_failure.log"
"timeout" "$ZPLUG_HOME/log/build_timeout.log"
"rollback" "$ZPLUG_HOME/log/build_rollback.log"
)
_zplug_load_log=(
"success" "$ZPLUG_HOME/log/load_success.log"
"failure" "$ZPLUG_HOME/log/load_failure.log"
)
typeset -gx -A _zplug_cache
_zplug_cache=(
"interface" "$ZPLUG_CACHE_DIR/interface"
"loaded_repos" "$ZPLUG_CACHE_DIR/loaded_repos"
"failed_repos" "$ZPLUG_CACHE_DIR/failed_repos"
"plugin" "$ZPLUG_CACHE_DIR/plugin.zsh"
"lazy_plugin" "$ZPLUG_CACHE_DIR/lazy_plugin.zsh"
"theme" "$ZPLUG_CACHE_DIR/theme.zsh"

16
base/core/load.zsh
View File

@ -3,8 +3,8 @@ __zplug::core::load::prepare()
unsetopt monitor
zstyle ':zplug:core:load' 'verbose' no
__zplug::core::cache::set_file "loaded_repos"
__zplug::core::cache::set_file "failed_repos"
__zplug::io::file::rm_touch "$_zplug_load_log[success]"
__zplug::io::file::rm_touch "$_zplug_load_log[failure]"
}
__zplug::core::load::from_cache()
@ -40,13 +40,13 @@ __zplug::core::load::from_cache()
source "$_zplug_cache[defer_3_plugin]"
}
if [[ -s $_zplug_cache[failed_repos] ]]; then
if [[ -s $_zplug_load_log[failure] ]]; then
# If there are repos that failed to load,
# show those repos and return false
__zplug::io::print::f \
--zplug \
"These repos have failed to load:\n$fg_bold[red]"
sed -e 's/^/- /g' "$_zplug_cache[failed_repos]"
sed -e 's/^/- /g' "$_zplug_load_log[failure]"
__zplug::io::print::f "$reset_color"
return 1
fi
@ -117,9 +117,9 @@ __zplug::core::load::as_plugin()
if [[ -n $hook ]]; then
eval ${=hook}
fi
__zplug::job::handle::flock "$_zplug_cache[loaded_repos]" "$repo"
__zplug::job::handle::flock "$_zplug_load_log[success]" "$repo"
else
__zplug::job::handle::flock "$_zplug_cache[failed_repos]" "$repo"
__zplug::job::handle::flock "$_zplug_load_log[failure]" "$repo"
fi
return $status_code
@ -172,9 +172,9 @@ __zplug::core::load::as_command()
if [[ -n $hook ]]; then
eval ${=hook}
fi
__zplug::job::handle::flock "$_zplug_cache[loaded_repos]" "$repo"
__zplug::job::handle::flock "$_zplug_load_log[success]" "$repo"
else
__zplug::job::handle::flock "$_zplug_cache[failed_repos]" "$repo"
__zplug::job::handle::flock "$_zplug_load_log[failure]" "$repo"
fi
return $status_code

13
base/io/file.zsh
View File

@ -38,3 +38,16 @@ __zplug::io::file::generate()
#
TEMPLATE
}
__zplug::io::file::rm_touch()
{
local filepath="${argv:?}"
# For shorten the calculation time
if [[ ! -d ${filepath:h} ]]; then
mkdir -p "${filepath:h}"
fi
rm -f "$filepath"
touch "$filepath"
}