Archives/wting_autojump
1
0
Fork 0
mirror of https://github.com/wting/autojump synced 2024-10-27 20:34:07 +00:00
Code Issues Releases Wiki Activity

make the completion separator configurable

Browse Source
This commit is contained in:
Joel Schaerer 2010-07-07 23:55:32 +02:00
parent 8e1ab9ca54
commit ea3cd60653
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
autojump
View File

@ -22,6 +22,7 @@ from sys import argv,exit,stderr
import os import os
import signal import signal
max_keyweight=1000 max_keyweight=1000
completion_separator='__'
dead_dirs=False #global variable (evil ;-) to know if we should save the dict at the end dead_dirs=False #global variable (evil ;-) to know if we should save the dict at the end
def signal_handler(arg1,arg2): def signal_handler(arg1,arg2):
@ -141,18 +142,18 @@ else:
#if the last pattern contains a full path, jump there #if the last pattern contains a full path, jump there
#the regexp is because we need to support stuff like "j wo jo__3__/home/joel/workspace/joel" for zsh #the regexp is because we need to support stuff like "j wo jo__3__/home/joel/workspace/joel" for zsh
last_pattern_path = re.sub("(.*)__","",patterns[-1]) last_pattern_path = re.sub("(.*)"+completion_separator,"",patterns[-1])
#print >> stderr, last_pattern_path #print >> stderr, last_pattern_path
if len(last_pattern_path)>0 and last_pattern_path[0]=="/" and os.path.exists(last_pattern_path): if len(last_pattern_path)>0 and last_pattern_path[0]=="/" and os.path.exists(last_pattern_path):
if not completion : print last_pattern_path if not completion : print last_pattern_path
else: else:
#check for ongoing completion, and act accordingly #check for ongoing completion, and act accordingly
endmatch=re.search("__([0-9]+)",patterns[-1]) #user has selected a completion endmatch=re.search(completion_separator+"([0-9]+)",patterns[-1]) #user has selected a completion
if endmatch: if endmatch:
userchoice=int(endmatch.group(1)) userchoice=int(endmatch.group(1))
patterns[-1]=re.sub("__[0-9]+.*","",patterns[-1]) patterns[-1]=re.sub(completion_separator+"[0-9]+.*","",patterns[-1])
else: #user hasn't selected a completion, display the same choices again else: #user hasn't selected a completion, display the same choices again
endmatch=re.match("(.*)__",patterns[-1]) endmatch=re.match("(.*)"+completion_separator,patterns[-1])
if endmatch: patterns[-1]=endmatch.group(1) if endmatch: patterns[-1]=endmatch.group(1)
dirs=path_dict.items() dirs=path_dict.items()
@ -172,5 +173,6 @@ else:
if userchoice!=-1: if userchoice!=-1:
if len(results) > userchoice-1 : print quotes+results[userchoice-1]+quotes if len(results) > userchoice-1 : print quotes+results[userchoice-1]+quotes
elif len(results) > 1 and completion: elif len(results) > 1 and completion:
print "\n".join(("%s__%d__%s" % (patterns[-1],n+1,r) for n,r in enumerate(results[:8]))) print "\n".join(("%s%s%d%s%s" % (patterns[-1],completion_separator,n+1,completion_separator,r)\
for n,r in enumerate(results[:8])))
elif results: print quotes+results[0]+quotes elif results: print quotes+results[0]+quotes