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

still buggy, but I think we are improving

Browse Source
This commit is contained in:
Joel Schaerer 2009-02-14 01:57:49 +01:00
parent 1f2292708a
commit 81c8e3ea3f
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
autojump
View File

@ -64,6 +64,7 @@ elif ('--import','') in optlist:
else: else:
import re import re
completion=False completion=False
userchoice=-1 #3 if the pattern is of the form __pattern__3, otherwise -1
if ('--completion','') in optlist: if ('--completion','') in optlist:
completion=True completion=True
results=[] results=[]
@ -72,7 +73,18 @@ else:
for k in path_dict.keys(): for k in path_dict.keys():
path_dict[k]*=0.9*max_keyweight/keyweight path_dict[k]*=0.9*max_keyweight/keyweight
if not args: args=[''] if not args: args=['']
argument=re.sub("[0-9]*\__","",args[-1]) if completion:
argument=args[-1]
endmatch=re.search("__([0-9]+)$",argument)
if endmatch:
userchoice=int(endmatch.group(1))
argument=argument[2:]
argument=re.sub("__[0-9]+$","",argument)
else:
endmatch=re.match("__(.*)__",argument)
if endmatch: argument=endmatch.group(1)
else:
argument=re.sub("^__.*__[0-9]+__","",args[-1])
dirs=path_dict.items() dirs=path_dict.items()
dirs.sort(key=lambda e:e[1],reverse=True) dirs.sort(key=lambda e:e[1],reverse=True)
found=False found=False
@ -95,7 +107,10 @@ else:
else: else:
uniqadd(results,path) uniqadd(results,path)
if completion: if completion:
print " ".join(("%d__%s" % (n,r) for n,r in enumerate(results))) if userchoice!=-1:
print results[userchoice]
else:
print " ".join(("__%s__%d__%s" % (argument,n,r) for n,r in enumerate(results)))
cPickle.dump(path_dict,open(dic_file+".tmp",'w'),-1) cPickle.dump(path_dict,open(dic_file+".tmp",'w'),-1)
import shutil import shutil
shutil.copy(dic_file+".tmp",dic_file) #cPickle.dump doesn't seem to be atomic, so this is more secure shutil.copy(dic_file+".tmp",dic_file) #cPickle.dump doesn't seem to be atomic, so this is more secure