mirror of
https://github.com/wting/autojump
synced 2024-10-27 20:34:07 +00:00
attempt to make autojump more pep8-compliant
(pour les grincheux)
This commit is contained in:
parent
0217d6e066
commit
43d2d94a48
202
autojump
202
autojump
@ -23,63 +23,70 @@ except ImportError:
|
|||||||
import pickle
|
import pickle
|
||||||
|
|
||||||
import getopt
|
import getopt
|
||||||
from sys import argv,exit,stderr,version_info
|
from sys import argv, stderr, version_info
|
||||||
from tempfile import NamedTemporaryFile
|
from tempfile import NamedTemporaryFile
|
||||||
from operator import itemgetter
|
from operator import itemgetter
|
||||||
import os
|
import os
|
||||||
import signal
|
import signal
|
||||||
max_keyweight=1000
|
max_keyweight = 1000
|
||||||
max_stored_paths=600
|
max_stored_paths = 600
|
||||||
completion_separator='__'
|
completion_separator = '__'
|
||||||
config_dir=os.environ.get("AUTOJUMP_DATA_DIR",os.path.expanduser("~"))
|
config_dir = os.environ.get("AUTOJUMP_DATA_DIR", os.path.expanduser("~"))
|
||||||
|
|
||||||
def signal_handler(arg1,arg2):
|
def signal_handler(arg1, arg2):
|
||||||
print("Received SIGINT, trying to continue")
|
print("Received SIGINT, trying to continue")
|
||||||
signal.signal(signal.SIGINT,signal_handler) #Don't break on sigint
|
signal.signal(signal.SIGINT, signal_handler) #Don't break on sigint
|
||||||
|
|
||||||
def uniqadd(list,key):
|
def uniqadd(list, key):
|
||||||
if key not in list:
|
if key not in list:
|
||||||
list.append(key)
|
list.append(key)
|
||||||
|
|
||||||
def dicadd(dic,key,increment=1):
|
def dicadd(dic, key, increment=1):
|
||||||
dic[key]=dic.get(key,0.)+increment
|
dic[key] = dic.get(key, 0.)+increment
|
||||||
|
|
||||||
def save(path_dict,dic_file):
|
def save(path_dict, dic_file):
|
||||||
f=NamedTemporaryFile(dir=config_dir,delete=False)
|
f = NamedTemporaryFile(dir=config_dir, delete=False)
|
||||||
pickle.dump(path_dict,f,-1)
|
pickle.dump(path_dict, f, -1)
|
||||||
f.flush()
|
f.flush()
|
||||||
os.fsync(f)
|
os.fsync(f)
|
||||||
f.close()
|
f.close()
|
||||||
os.rename(f.name,dic_file) #cf. http://thunk.org/tytso/blog/2009/03/15/dont-fear-the-fsync/
|
#cf. http://thunk.org/tytso/blog/2009/03/15/dont-fear-the-fsync/
|
||||||
|
os.rename(f.name, dic_file)
|
||||||
try: #backup file
|
try: #backup file
|
||||||
import time
|
import time
|
||||||
if not os.path.exists(dic_file+".bak") or time.time()-os.path.getmtime(dic_file+".bak")>86400:
|
if (not os.path.exists(dic_file+".bak") or
|
||||||
|
time.time()-os.path.getmtime(dic_file+".bak")>86400):
|
||||||
import shutil
|
import shutil
|
||||||
shutil.copy(dic_file,dic_file+".bak")
|
shutil.copy(dic_file, dic_file+".bak")
|
||||||
except OSError as e:
|
except OSError as e:
|
||||||
print("Error while creating backup autojump file. (%s)" % e, file=stderr)
|
print("Error while creating backup autojump file. (%s)" % e,
|
||||||
|
file=stderr)
|
||||||
|
|
||||||
def forget(path_dict,dic_file):
|
def forget(path_dict, dic_file):
|
||||||
"""Gradually forget about directories. Only call from the actual jump since it can take time"""
|
"""Gradually forget about directories. Only call
|
||||||
keyweight=sum(path_dict.values()) #Gradually forget about old directories
|
from the actual jump since it can take time"""
|
||||||
|
keyweight = sum(path_dict.values())
|
||||||
if keyweight>max_keyweight:
|
if keyweight>max_keyweight:
|
||||||
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
|
||||||
save(path_dict,dic_file)
|
save(path_dict, dic_file)
|
||||||
|
|
||||||
def clean_dict(sorted_dirs,path_dict):
|
def clean_dict(sorted_dirs, path_dict):
|
||||||
"""Limits the sized of the path_dict to max_stored_paths. Returns True if keys were deleted"""
|
"""Limits the sized of the path_dict to max_stored_paths.
|
||||||
|
Returns True if keys were deleted"""
|
||||||
if len(sorted_dirs) > max_stored_paths:
|
if len(sorted_dirs) > max_stored_paths:
|
||||||
#remove 25 more than needed, to avoid doing it every time
|
#remove 25 more than needed, to avoid doing it every time
|
||||||
for dir,dummy in sorted_dirs[max_stored_paths-25:]:
|
for dir, dummy in sorted_dirs[max_stored_paths-25:]:
|
||||||
del path_dict[dir]
|
del path_dict[dir]
|
||||||
return True
|
return True
|
||||||
else: return False
|
else: return False
|
||||||
|
|
||||||
def match(path,pattern,ignore_case=False,only_end=False):
|
def match(path, pattern, ignore_case=False, only_end=False):
|
||||||
try:
|
try:
|
||||||
if os.path.realpath(os.curdir)==path : return False
|
if os.path.realpath(os.curdir) == path : return False
|
||||||
except OSError: #sometimes the current path doesn't exist anymore. In that case, jump if possible.
|
#Sometimes the current path doesn't exist anymore.
|
||||||
|
#In that case, jump if possible.
|
||||||
|
except OSError:
|
||||||
pass
|
pass
|
||||||
if only_end:
|
if only_end:
|
||||||
match_string = "/".join(path.split('/')[-1-pattern.count('/'):])
|
match_string = "/".join(path.split('/')[-1-pattern.count('/'):])
|
||||||
@ -88,108 +95,125 @@ def match(path,pattern,ignore_case=False,only_end=False):
|
|||||||
if ignore_case:
|
if ignore_case:
|
||||||
match=(match_string.lower().find(pattern.lower()) != -1)
|
match=(match_string.lower().find(pattern.lower()) != -1)
|
||||||
else:
|
else:
|
||||||
match=(match_string.find(pattern) != -1)
|
match = (match_string.find(pattern) != -1)
|
||||||
#return true if there is a match and the path exists (useful in the case of external drives, for example)
|
#return True if there is a match and the path exists
|
||||||
|
#(useful in the case of external drives, for example)
|
||||||
return match and os.path.exists(path)
|
return match and os.path.exists(path)
|
||||||
|
|
||||||
def find_matches(dirs,patterns,result_list,ignore_case,max_matches):
|
def find_matches(dirs, patterns, result_list, ignore_case, max_matches):
|
||||||
"""Find max_matches paths that match the pattern, and add them to the result_list"""
|
"""Find max_matches paths that match the pattern,
|
||||||
for path,count in dirs:
|
and add them to the result_list"""
|
||||||
|
for path, count in dirs:
|
||||||
if len(result_list) >= max_matches : break
|
if len(result_list) >= max_matches : break
|
||||||
#For the last pattern, only match the end of the pattern
|
#For the last pattern, only match the end of the pattern
|
||||||
if all(match(path,p,ignore_case, only_end = (n==len(patterns)-1)) for n,p in enumerate(patterns)):
|
if all(match(path, p, ignore_case,
|
||||||
uniqadd(result_list,path)
|
only_end=(n == len(patterns)-1)) for n, p in enumerate(patterns)):
|
||||||
|
uniqadd(result_list, path)
|
||||||
|
|
||||||
def open_dic(dic_file,error_recovery=False):
|
def open_dic(dic_file, error_recovery=False):
|
||||||
try:
|
try:
|
||||||
aj_file=open(dic_file, 'rb')
|
aj_file = open(dic_file, 'rb')
|
||||||
if version_info[0]>2:
|
if version_info[0]>2:
|
||||||
#encoding is only specified for python2.x compatibility
|
#encoding is only specified for python2.x compatibility
|
||||||
path_dict=pickle.load(aj_file,encoding="utf-8")
|
path_dict = pickle.load(aj_file, encoding="utf-8")
|
||||||
else:
|
else:
|
||||||
path_dict=pickle.load(aj_file)
|
path_dict = pickle.load(aj_file)
|
||||||
aj_file.close()
|
aj_file.close()
|
||||||
return path_dict
|
return path_dict
|
||||||
except (IOError,EOFError,pickle.UnpicklingError):
|
except (IOError, EOFError, pickle.UnpicklingError):
|
||||||
if not error_recovery and os.path.exists(dic_file+".bak"):
|
if not error_recovery and os.path.exists(dic_file+".bak"):
|
||||||
print('Problem with autojump database, trying to recover from backup...', file=stderr)
|
print('Problem with autojump database,\
|
||||||
|
trying to recover from backup...', file=stderr)
|
||||||
import shutil
|
import shutil
|
||||||
shutil.copy(dic_file+".bak",dic_file)
|
shutil.copy(dic_file+".bak", dic_file)
|
||||||
return open_dic(dic_file,True)
|
return open_dic(dic_file, True)
|
||||||
else: return {} #if everything fails, return an empty file
|
else: return {} #if everything fails, return an empty file
|
||||||
|
|
||||||
#Main code
|
#Main code
|
||||||
try:
|
try:
|
||||||
optlist, args = getopt.getopt(argv[1:], 'a',['stat','import','completion', 'bash'])
|
optlist, args = getopt.getopt(argv[1:], 'a',
|
||||||
|
['stat', 'import', 'completion', 'bash'])
|
||||||
except getopt.GetoptError as e:
|
except getopt.GetoptError as e:
|
||||||
print("Unknown command line argument: %s" % e)
|
print("Unknown command line argument: %s" % e)
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
if config_dir == os.path.expanduser("~"):
|
if config_dir == os.path.expanduser("~"):
|
||||||
dic_file=config_dir+"/.autojump_py"
|
dic_file = config_dir+"/.autojump_py"
|
||||||
else:
|
else:
|
||||||
dic_file=config_dir+"/autojump_py"
|
dic_file = config_dir+"/autojump_py"
|
||||||
path_dict=open_dic(dic_file)
|
path_dict = open_dic(dic_file)
|
||||||
if ('-a','') in optlist:
|
if ('-a', '') in optlist:
|
||||||
if(args[-1] != os.path.expanduser("~")): # home dir can be reached quickly by "cd" and may interfere with other directories
|
# The home dir can be reached quickly by "cd"
|
||||||
dicadd(path_dict,args[-1])
|
# and may interfere with other directories
|
||||||
save(path_dict,dic_file)
|
if(args[-1] != os.path.expanduser("~")):
|
||||||
elif ('--stat','') in optlist:
|
dicadd(path_dict, args[-1])
|
||||||
a=list(path_dict.items())
|
save(path_dict, dic_file)
|
||||||
|
elif ('--stat', '') in optlist:
|
||||||
|
a = list(path_dict.items())
|
||||||
a.sort(key=itemgetter(1))
|
a.sort(key=itemgetter(1))
|
||||||
for path,count in a[-100:]:
|
for path, count in a[-100:]:
|
||||||
print("%.1f:\t%s" % (count,path))
|
print("%.1f:\t%s" % (count, path))
|
||||||
print("Total key weight: %d. Number of stored paths: %d" % (sum(path_dict.values()),len(a)))
|
print("Total key weight: %d. Number of stored paths: %d" %
|
||||||
elif ('--import','') in optlist:
|
(sum(path_dict.values()), len(a)))
|
||||||
|
elif ('--import', '') in optlist:
|
||||||
for i in open(args[-1]).readlines():
|
for i in open(args[-1]).readlines():
|
||||||
dicadd(path_dict,i[:-1])
|
dicadd(path_dict, i[:-1])
|
||||||
pickle.dump(path_dict,open(dic_file,'w'),-1)
|
pickle.dump(path_dict, open(dic_file, 'w'), -1)
|
||||||
else:
|
else:
|
||||||
import re
|
import re
|
||||||
completion=False
|
completion = False
|
||||||
userchoice=-1 #i if the pattern is of the form __pattern__i, otherwise -1
|
userchoice = -1 #i if the pattern is of the form __pattern__i, otherwise -1
|
||||||
results=[]
|
results = []
|
||||||
if ('--completion','') in optlist:
|
if ('--completion', '') in optlist:
|
||||||
completion=True
|
completion = True
|
||||||
else:
|
else:
|
||||||
forget(path_dict,dic_file) #gradually forget about old directories
|
forget(path_dict, dic_file) #gradually forget about old directories
|
||||||
if not args: patterns=[""]
|
if not args: patterns = [""]
|
||||||
else: patterns=args
|
else: patterns = args
|
||||||
|
|
||||||
#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
|
||||||
last_pattern_path = re.sub("(.*)"+completion_separator,"",patterns[-1])
|
# "j wo jo__3__/home/joel/workspace/joel" for zsh
|
||||||
#print >> stderr, last_pattern_path
|
last_pattern_path = re.sub("(.*)"+completion_separator, "", patterns[-1])
|
||||||
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(completion_separator+"([0-9]+)",patterns[-1]) #user has selected a completion
|
endmatch = re.search(completion_separator+"([0-9]+)", patterns[-1])
|
||||||
if endmatch:
|
if endmatch: #user has selected a completion
|
||||||
userchoice=int(endmatch.group(1))
|
userchoice = int(endmatch.group(1))
|
||||||
patterns[-1]=re.sub(completion_separator+"[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("(.*)"+completion_separator,patterns[-1])
|
endmatch = re.match("(.*)"+completion_separator, patterns[-1])
|
||||||
if endmatch: patterns[-1]=endmatch.group(1)
|
if endmatch: patterns[-1] = endmatch.group(1)
|
||||||
|
|
||||||
dirs=list(path_dict.items())
|
dirs = list(path_dict.items())
|
||||||
dirs.sort(key=itemgetter(1), reverse=True)
|
dirs.sort(key=itemgetter(1), reverse=True)
|
||||||
if completion or userchoice != -1:
|
if completion or userchoice != -1:
|
||||||
max_matches = 9
|
max_matches = 9
|
||||||
else:
|
else:
|
||||||
max_matches = 1
|
max_matches = 1
|
||||||
find_matches(dirs,patterns,results,False,max_matches)
|
find_matches(dirs, patterns, results, False, max_matches)
|
||||||
if completion or not results: #if not found, try ignoring case. On completion always show all results
|
# If not found, try ignoring case.
|
||||||
find_matches(dirs,patterns,results,ignore_case=True,max_matches=max_matches)
|
# On completion always show all results
|
||||||
if not completion and clean_dict(dirs,path_dict): #keep the database to a reasonable size
|
if completion or not results:
|
||||||
save(path_dict,dic_file)
|
find_matches(dirs, patterns, results,
|
||||||
|
ignore_case=True, max_matches=max_matches)
|
||||||
|
# Keep the database to a reasonable size
|
||||||
|
if not completion and clean_dict(dirs, path_dict):
|
||||||
|
save(path_dict, dic_file)
|
||||||
|
|
||||||
if completion and ('--bash', '') in optlist: quotes='"'
|
if completion and ('--bash', '') in optlist: quotes = '"'
|
||||||
else: quotes=""
|
else: quotes = ""
|
||||||
|
|
||||||
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%s%d%s%s" % (patterns[-1],completion_separator,n+1,completion_separator,r)\
|
print("\n".join(("%s%s%d%s%s" % (patterns[-1],
|
||||||
for n,r in enumerate(results[:8]))))
|
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)
|
||||||
|
Loading…
Reference in New Issue
Block a user