X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=ax.zsh;h=0071767967b2a04e6a8f363b2c1d437cb48e7468;hb=0812611b4afc9be26a8485c49ca4e3d884c168ca;hp=de39ad8499b52bcd9527d489b20b436d0c9e33e2;hpb=b91e3d7466fbf874b9a6ce19b74720c1cae93c9f;p=ax-zsh.git

diff --git a/ax.zsh b/ax.zsh
index de39ad8..0071767 100644
--- a/ax.zsh
+++ b/ax.zsh
@@ -1,5 +1,5 @@
 # AX-ZSH: Alex' Modular ZSH Configuration
-# Copyright (c) 2015-2016 Alexander Barton <alex@barton.de>
+# Copyright (c) 2015-2017 Alexander Barton <alex@barton.de>
 
 script_name="${${(%):-%N}:t}"
 script_type="$script_name[2,-1]"
@@ -7,11 +7,13 @@ script_type="$script_name[2,-1]"
 # Load plugin code of a given type.
 # - $1: plugin name
 # - $2: plugin type (optional; defaults to "zshrc")
+# - $3: cache file (optional)
 function axzsh_load_plugin {
-	dname="$1:A"
-	plugin="$dname:t"
-	[[ -z "$2" ]] && type="zshrc" || type="$2"
-	fname="$dname/$plugin.$type"
+	local dname="$1:A"
+	local plugin="$dname:t"
+	[[ -z "$2" ]] && local type="zshrc" || local type="$2"
+	local fname="$dname/$plugin.$type"
+	local cache_file="$3"
 
 	# Strip repository prefix (like "alexbarton#test-plugin"):
 	[[ "$plugin" =~ "#" ]] && plugin=$(echo $plugin | cut -d'#' -f2-)
@@ -39,6 +41,10 @@ function axzsh_load_plugin {
 			# Oh My ZSH plugin
 			type="plugin.zsh"
 			fname="$dname/${plugin_short}.plugin.zsh"
+		elif [[ -r "$dname/${plugin_short##zsh-}.plugin.zsh" ]]; then
+			# Oh My ZSH plugin with "zsh-" prefix stripped
+			type="plugin.zsh"
+			fname="$dname/${plugin_short##zsh-}.plugin.zsh"
 		elif [[ -r "$dname/init.zsh" ]]; then
 			# Prezto module
 			type="init.zsh"
@@ -54,13 +60,47 @@ function axzsh_load_plugin {
 		[[ -n "$AXZSH_DEBUG" ]] \
 			&& echo "   - $plugin ($type): functions ..."
 		axzsh_fpath+=("$dname/functions")
+
+		# Add function path to cache file.
+		[[ -n "$cache_file" ]] \
+			&& echo "axzsh_fpath+=('$dname/functions')" >>$cache_file
 	fi
 
 	if [[ -r "$fname" ]]; then
 		# Read plugin ...
 		[[ -n "$AXZSH_DEBUG" ]] \
 			&& echo "   - $plugin ($type) ..."
-		source "$fname"
+
+		# Note for "external" ("repo/*") plugins and "dumb" terminals:
+		# These (modern?) plugins most probably don't expect such an
+		# unusual old terminal configuration and don't behave well
+		# (echo color sequences, for example). Therefore we DON'T load
+		# any external plugins at all when running on such a terminal:
+		# this results in reduced/disabled functionality, but hopefully
+		# in readable output ...
+
+		case "$fname" in
+			*"/repos/"*)
+				axzsh_is_dumb_terminal || source "$fname"
+				;;
+			*)
+				source "$fname"
+		esac
+
+		if [[ -n "$cache_file" ]]; then
+			# Add plugin data to cache
+			printf "# BEGIN: %s\nax_plugin_init()\n{\n" "$fname" >>"$cache_file"
+			case "$fname" in
+				*"/repos/"*)
+					echo "[[ -n \"\$AXZSH_DEBUG\" ]] && echo '     - $plugin ($type): \"$fname\" ...'" >>$cache_file
+					echo "axzsh_is_dumb_terminal || source '$fname'" >>$cache_file
+					;;
+				*)
+					echo "[[ -n \"\$AXZSH_DEBUG\" ]] && echo '     - $plugin ($type, cached) ...'" >>$cache_file
+					"$cat_cmd" "$fname" >>"$cache_file"
+			esac
+			printf "}\nax_plugin_init\n# END: %s\n\n" "$fname" >>"$cache_file"
+		fi
 	fi
 
 	# It is a success, even if only the plugin directory (and no script!)
@@ -91,20 +131,51 @@ fi
 
 [[ -n "$AXZSH_DEBUG" ]] && echo "» $script_name:"
 
-# Setup list of plugins to load:
-typeset -U plugin_list
-plugin_list=(
-	"$AXZSH/core/"[0-5]*
-	"$AXZSH/active_plugins/"*(N)
-	"$AXZSH/core/"[6-9]*
-)
+# Initialize cache
+mkdir -p "$AXZSH/cache"
+cache_file="$AXZSH/cache/$script_type.cache"
+
+cat_cmd=${commands[cat]:-cat}
+
+if [[ -r "$cache_file" ]]; then
+	# Cache file exists, use it!
+	# But when in the "zshrc" stage, make sure that the "zprofile" stage
+	# has already been handled (this uses the "01_zprofile" plugin which
+	# is used in the "zshrc.cache" as well, but can't be used successfully
+	# there because it becomes sourced inside of a ZSH function; so we have
+	# to source it here in the global context manually ...):
+	[[ -z "$AXZSH_ZPROFILE_READ" && "$script_type" = "zshrc" ]] \
+		&& source "$AXZSH/core/01_zprofile/01_zprofile.zshrc"
+	[[ -n "$AXZSH_DEBUG" ]] \
+		&& echo "   - Reading cache file \"$cache_file\" ..."
+	source "$cache_file"
+	unfunction ax_plugin_init
+else
+	# No cache file available.
+	# Setup list of plugins to load:
+	typeset -U plugin_list
+	plugin_list=(
+		"$AXZSH/core/"[0-5]*
+		"$AXZSH/active_plugins/"*(N)
+		"$AXZSH/core/"[6-9]*
+	)
+
+	# Create new cache file:
+	if [[ -n "$cache_file" ]]; then
+		[[ -n "$AXZSH_DEBUG" ]] \
+			&& echo "   (Writing new cache file to \"$cache_file\" ...)"
+		printf "# %s\n\n" "$(LC_ALL=C date)" >"$cache_file"
+	fi
 
-# Read in all the plugins for the current "type":
-for plugin ($plugin_list); do
-	axzsh_load_plugin "$plugin" "$script_type"
-done
+	# Read in all the plugins for the current "type":
+	for plugin ($plugin_list); do
+		axzsh_load_plugin "$plugin" "$script_type" "$cache_file"
+	done
+fi
 
 # Clean up ...
 unfunction axzsh_load_plugin
 unset script_name script_type plugin
 unset plugin_list
+unset cache_file
+unset cat_cmd