Merge branch 'master' of https://github.com/skywind3000/z.lua

Introduce _ZL_NO_ALIASES to skip creating aliases

README.md

@@ -131,6 +131,7 @@ z -b foo    # cd to the parent directory starting with foo
 - set `$_ZL_ECHO` to 1 to display new directory name after cd.
 - set `$_ZL_MATCH_MODE` to 1 to enable enhanced matching.
 - set `$_ZL_NO_CHECK` to 1 to disable path validation, use `z --purge` to clean
+- set `$_ZL_HYPHEN` to 1 to treat hyphon (-) as a normal character not a lua regexp keyword.
 
 ## Aging
 
@@ -458,6 +459,11 @@ As you see, z.lua is the fastest one and requires less resource.
 
 ## History
 
+- 1.7.4 (2019-12-29): new: `$_ZL_HYPHEN` to treat hyphen as a normal character, see [here](https://github.com/skywind3000/z.lua/wiki/FAQ#how-to-input-a-hyphen---in-the-keyword-).
+- 1.7.3 (2019-09-07): use [lua-filesystem](http://keplerproject.github.io/luafilesystem/) package if possible when `$_ZL_USE_LFS` is `1`.
+- 1.7.2 (2019-08-01): Improve bash/zsh shell compatibility by [@barlik](https://github.com/barlik).
+- 1.7.1 (2019-06-07): Fixed: `$_ZL_DATA` failure on Linux sometimes.
+- 1.7.0 (2019-03-09): Support [ranger](https://github.com/skywind3000/z.lua/wiki/FAQ#how-to-integrate-zlua-to-ranger-), fix ReplaceFile issue in luajit (windows).
 - 1.6.0 (2019-03-04): optimize with ffi module (luajit builtin module).
 - 1.5.11 (2019-03-02): fixed: os.path.isdir doesn't work for symbol link folders.
 - 1.5.10 (2019-03-01): Prevent writing file racing.
@@ -509,6 +515,7 @@ This project needs help for the tasks below:
 - Thanks to [@TeddyDD](https://github.com/TeddyDD) for Fish Shell porting.
 - Thanks to [@manhong2112](https://github.com/manhong2112) for Power Shell porting.
 - Thanks to [@BarbUk](https://github.com/BarbUk) for fzf completion in Bash.
+- Thanks to [@barlik](https://github.com/barlik) for many improvements.
 
 And many others.
 

ranger_zlua.py

@@ -0,0 +1,91 @@
+import time, sys, os
+import ranger.api
+import subprocess
+
+old_hook_init = ranger.api.hook_init
+
+PATH_LUA = os.environ.get('RANGER_LUA')
+PATH_ZLUA = os.environ.get('RANGER_ZLUA')
+
+if not PATH_LUA:
+    for path in os.environ.get('PATH', '').split(os.path.pathsep):
+        for name in ('lua', 'luajit', 'lua5.3', 'lua5.2', 'lua5.1'):
+            test = os.path.join(path, name)
+            test = test + (sys.platform[:3] == 'win' and ".exe" or "")
+            if os.path.exists(test):
+                PATH_LUA = test
+                break
+
+if not PATH_LUA:
+    sys.stderr.write('Please install lua or set $RANGER_LUA.\n')
+    sys.exit()
+
+if (not PATH_ZLUA) or (not os.path.exists(PATH_ZLUA)):
+    sys.stderr.write('Not find z.lua, please set $RANGER_ZLUA to absolute path of z.lua.\n')
+    sys.exit()
+
+            
+def hook_init(fm):
+    def update_zlua(signal):
+        import os, random
+        os.environ['_ZL_RANDOM'] = str(random.randint(0, 0x7fffffff))
+        p = subprocess.Popen([PATH_LUA, PATH_ZLUA, "--add", signal.new.path])
+        p.wait()
+    if PATH_ZLUA and PATH_LUA and os.path.exists(PATH_ZLUA):
+        fm.signal_bind('cd', update_zlua)
+    return old_hook_init(fm)
+
+ranger.api.hook_init = hook_init
+
+class z(ranger.api.commands.Command):
+    def execute (self):
+        import sys, os, time
+        args = self.args[1:]
+        if args:
+            mode = ''
+            for arg in args:
+                if arg in ('-l', '-e', '-x', '-h', '--help', '--'):
+                    mode = arg
+                    break
+                elif arg in ('-I', '-i'):
+                    mode = arg
+                elif arg[:1] != '-':
+                    break
+            if mode:
+                cmd = '"%s" "%s" '%(PATH_LUA, PATH_ZLUA)
+                if mode in ('-I', '-i', '--'):
+                    cmd += ' --cd'
+                for arg in args:
+                    cmd += ' "%s"'%arg
+                if mode in ('-e', '-x'):
+                    path = subprocess.check_output([PATH_LUA, PATH_ZLUA, '--cd'] + args)
+                    path = path.decode("utf-8", "ignore")
+                    path = path.rstrip('\n')
+                    self.fm.notify(path)
+                elif mode in ('-h', '-l', '--help'):
+                    p = self.fm.execute_command(cmd + '| less +G', universal_newlines=True)
+                    stdout, stderr = p.communicate()
+                elif mode == '--':
+                    p = self.fm.execute_command(cmd + ' 2>&1 | less +G', universal_newlines=True)
+                    stdout, stderr = p.communicate()
+                else:
+                    if mode == '-I':
+                        os.environ['_ZL_FZF_HEIGHT'] = '0'
+                        path = subprocess.check_output([PATH_LUA, PATH_ZLUA, '--cd'] + args)
+                        self.fm.execute_console('redraw_window')
+                    else:
+                        p = self.fm.execute_command(cmd, universal_newlines=True, stdout=subprocess.PIPE)
+                        stdout, stderr = p.communicate()
+                        path = stdout.rstrip('\n')
+                    if path and os.path.exists(path):
+                        self.fm.cd(path)
+            else:
+                path = subprocess.check_output([PATH_LUA, PATH_ZLUA, '--cd'] + args)
+                path = path.decode("utf-8", "ignore")
+                path = path.rstrip('\n')
+                if path and os.path.exists(path):
+                    self.fm.cd(path)
+                else:
+                    self.fm.notify('No matching found', bad = True)
+        return True
+

z.lua

@@ -4,7 +4,7 @@
 -- z.lua - a cd command that learns, by skywind 2018, 2019
 -- Licensed under MIT license.
 --
--- Version 1.6.0, Last Modified: 2019/03/04 14:47
+-- Version 1.7.4, Last Modified: 2019/12/29 04:52
 --
 -- * 10x faster than fasd and autojump, 3x faster than z.sh
 -- * available for posix shells: bash, zsh, sh, ash, dash, busybox
@@ -74,6 +74,8 @@
 --   set $_ZL_MAXAGE to define a aging threshold (default is 5000).
 --   set $_ZL_MATCH_MODE to 1 to enable enhanced matching mode.
 --   set $_ZL_NO_CHECK to 1 to disable path validation. z --purge to clear.
+--   set $_ZL_USE_LFS to 1 to use lua-filesystem package
+--   set $_ZL_HYPHEN to 1 to stop treating hyphen as a regexp keyword
 --
 --=====================================================================
 
@@ -120,6 +122,7 @@ Z_CMD = 'z'
 Z_MATCHMODE = 0
 Z_MATCHNAME = false
 Z_SKIPPWD = false
+Z_HYPHEN = false
 
 os.LOG_NAME = os.getenv('_ZL_LOG_NAME')
 
@@ -548,6 +551,9 @@ end
 -- file or path exists
 -----------------------------------------------------------------------
 function os.path.exists(name)
+	if name == '/' then
+		return true
+	end
 	local ok, err, code = os.rename(name, name)
 	if not ok then
 		if code == 13 then
@@ -1106,7 +1112,10 @@ function data_save(filename, M)
 	fp:close()
 	if tmpname ~= nil then
 		if windows then
-			os.native.ReplaceFile(filename, tmpname)
+			local ok, err, code = os.rename(tmpname, filename)
+			if not ok then
+				os.native.ReplaceFile(filename, tmpname)
+			end
 		else
 			os.rename(tmpname, filename)
 		end
@@ -1260,6 +1269,9 @@ function data_select(M, patterns, matchlast)
 	local pats = {}
 	for i = 1, #patterns do
 		local p = patterns[i]
+		if Z_HYPHEN then
+			p = p:gsub('-', '%%-')
+		end
 		table.insert(pats, case_insensitive_pattern(p))
 	end
 	for i = 1, #M do
@@ -1861,16 +1873,14 @@ function z_init()
 	local _zl_matchname = os.getenv('_ZL_MATCH_NAME')
 	local _zl_skippwd = os.getenv('_ZL_SKIP_PWD')
 	local _zl_matchmode = os.getenv('_ZL_MATCH_MODE')
+	local _zl_hyphen = os.getenv('_ZL_HYPHEN')
 	if _zl_data ~= nil and _zl_data ~= "" then
 		if windows then
 			DATA_FILE = _zl_data
 		else
 			-- avoid windows environments affect cygwin & msys
-			if _zl_data:sub(2, 2) ~= ':' then
-				local t = _zl_data:sub(3, 3)
-				if t ~= '/' and t ~= "\\" then
-					DATA_FILE = _zl_data
-				end
+			if not string.match(_zl_data, '^%a:[/\\]') then
+				DATA_FILE = _zl_data
 			end
 		end
 	end
@@ -1916,6 +1926,12 @@ function z_init()
 			Z_SKIPPWD = true
 		end
 	end
+	if _zl_hyphen ~= nil then
+		local m = string.lower(_zl_hyphen)
+		if (m == '1' or m == 'yes' or m == 'true' or m == 't') then
+			Z_HYPHEN = true
+		end
+	end
 end
 
 
@@ -2010,14 +2026,14 @@ alias ${_ZL_CMD:-z}='_zlua'
 local script_init_bash = [[
 case "$PROMPT_COMMAND" in
 	*_zlua?--add*) ;;
-	*) PROMPT_COMMAND="(_zlua --add \"\$(command pwd 2>/dev/null)\" &);$PROMPT_COMMAND" ;;
+	*) PROMPT_COMMAND="(_zlua --add \"\$(command pwd 2>/dev/null)\" &)${PROMPT_COMMAND:+;$PROMPT_COMMAND}" ;;
 esac
 ]]
 
 local script_init_bash_fast = [[
 case "$PROMPT_COMMAND" in
 	*_zlua?--add*) ;;
-	*) PROMPT_COMMAND="(_zlua --add \"\$PWD\" &);$PROMPT_COMMAND" ;;
+	*) PROMPT_COMMAND="(_zlua --add \"\$PWD\" &)${PROMPT_COMMAND:+;$PROMPT_COMMAND}" ;;
 esac
 ]]
 
@@ -2029,7 +2045,7 @@ _zlua_precmd() {
 }
 case "$PROMPT_COMMAND" in
 	*_zlua_precmd*) ;;
-	*) PROMPT_COMMAND="_zlua_precmd;$PROMPT_COMMAND" ;;
+	*) PROMPT_COMMAND="_zlua_precmd${PROMPT_COMMAND:+;$PROMPT_COMMAND}" ;;
 esac
 ]]
 
@@ -2056,7 +2072,7 @@ local script_init_zsh = [[
 _zlua_precmd() {
 	(_zlua --add "${PWD:a}" &)
 }
-typeset -gaU precmd_functions
+typeset -ga precmd_functions
 [ -n "${precmd_functions[(r)_zlua_precmd]}" ] || {
 	precmd_functions[$(($#precmd_functions+1))]=_zlua_precmd
 }
@@ -2066,7 +2082,7 @@ local script_init_zsh_once = [[
 _zlua_precmd() {
 	(_zlua --add "${PWD:a}" &)
 }
-typeset -gaU chpwd_functions
+typeset -ga chpwd_functions
 [ -n "${chpwd_functions[(r)_zlua_precmd]}" ] || {
 	chpwd_functions[$(($#chpwd_functions+1))]=_zlua_precmd
 }
@@ -2539,7 +2555,33 @@ end
 
 
 -----------------------------------------------------------------------
--- testing case
+-- LFS optimize
+-----------------------------------------------------------------------
+os.lfs = {}
+os.lfs.enable = os.getenv('_ZL_USE_LFS')
+if os.lfs.enable ~= nil then
+	local m = string.lower(os.lfs.enable)
+	if (m == '1' or m == 'yes' or m == 'true' or m == 't') then
+		os.lfs.status, os.lfs.pkg = pcall(require, 'lfs')
+		if os.lfs.status then
+			local lfs = os.lfs.pkg
+			os.path.exists = function (name)
+				return lfs.attributes(name) and true or false
+			end
+			os.path.isdir = function (name)
+				local mode = lfs.attributes(name)
+				if not mode then 
+					return false
+				end
+				return (mode.mode == 'directory') and true or false
+			end
+		end
+	end
+end
+
+
+-----------------------------------------------------------------------
+-- program entry
 -----------------------------------------------------------------------
 if not pcall(debug.getlocal, 4, 1) then
 	-- main script

z.lua.plugin.zsh

@@ -20,15 +20,15 @@ if [[ -z "$ZLUA_EXEC" ]]; then
 	fi
 fi
 
-export _ZL_FZF_FLAG="-e"
+export _ZL_FZF_FLAG=${_ZL_FZF_FLAG:-"-e"}
 
 eval "$($ZLUA_EXEC $ZLUA_SCRIPT --init zsh once enhanced)"
 
-
-alias zz='z -i'
-alias zc='z -c'
-alias zf='z -I'
-alias zb='z -b'
-alias zh='z -I -t .'
-alias zzc='zz -c'
-
+if [[ -z "$_ZL_NO_ALIASES" ]]; then
+  alias zz='z -i'
+  alias zc='z -c'
+  alias zf='z -I'
+  alias zb='z -b'
+  alias zh='z -I -t .'
+  alias zzc='zz -c'
+fi