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

Converted to python3

Browse Source
This commit is contained in:
Laurie Clark-Michalek 2010-09-01 22:38:38 +01:00
parent de9270bb99
commit 308adad952
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
autojump
View File

@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/python3
#Copyright Joel Schaerer 2008, 2009 #Copyright Joel Schaerer 2008, 2009
#This file is part of autojump #This file is part of autojump
@ -15,8 +15,7 @@
#You should have received a copy of the GNU General Public License #You should have received a copy of the GNU General Public License
#along with autojump. If not, see <http://www.gnu.org/licenses/>. #along with autojump. If not, see <http://www.gnu.org/licenses/>.
from __future__ import division import pickle
import cPickle
import getopt import getopt
from sys import argv,exit,stderr from sys import argv,exit,stderr
import os import os
@ -27,7 +26,7 @@ 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):
@ -39,7 +38,7 @@ def dicadd(dic,key,increment=1):
def save(path_dict,dic_file): def save(path_dict,dic_file):
f=open(dic_file+".tmp",'w') f=open(dic_file+".tmp",'w')
cPickle.dump(path_dict,f,-1) pickle.dump(path_dict,f,protocol=2)
f.flush() f.flush()
os.fsync(f) os.fsync(f)
f.close() f.close()
@ -56,7 +55,7 @@ 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 from the actual jump since it can take time"""
keyweight=sum(path_dict.values()) #Gradually forget about old directories keyweight=sum(path_dict.values()) #Gradually forget about old directories
if keyweight>max_keyweight: if keyweight>max_keyweight:
for k in path_dict.keys(): for k in list(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)
@ -106,12 +105,12 @@ def find_matches(dirs,patterns,result_list,ignore_case,max_matches):
def open_dic(dic_file,error_recovery=False): def open_dic(dic_file,error_recovery=False):
try: try:
aj_file=open(dic_file) aj_file=open(dic_file)
path_dict=cPickle.load(aj_file) path_dict=pickle.load(aj_file)
aj_file.close() aj_file.close()
return path_dict return path_dict
except (IOError,EOFError,cPickle.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 >> stderr, 'Problem with autojump database, trying to recover from backup...' 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)
@ -120,8 +119,8 @@ def open_dic(dic_file,error_recovery=False):
#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, 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("~"):
@ -134,15 +133,15 @@ if ('-a','') in optlist:
dicadd(path_dict,args[-1]) dicadd(path_dict,args[-1])
save(path_dict,dic_file) save(path_dict,dic_file)
elif ('--stat','') in optlist: elif ('--stat','') in optlist:
a=path_dict.items() a=list(path_dict.items())
a.sort(key=lambda e:e[1]) a.sort(key=lambda e:e[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" % (sum(path_dict.values()),len(a)))
elif ('--import','') in optlist: 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])
cPickle.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
@ -160,7 +159,7 @@ else:
last_pattern_path = re.sub("(.*)"+completion_separator,"",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(completion_separator+"([0-9]+)",patterns[-1]) #user has selected a completion endmatch=re.search(completion_separator+"([0-9]+)",patterns[-1]) #user has selected a completion
@ -171,7 +170,7 @@ else:
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=path_dict.items() dirs=list(path_dict.items())
dirs.sort(key=lambda e:e[1],reverse=True) dirs.sort(key=lambda e:e[1],reverse=True)
if completion or userchoice != -1: if completion or userchoice != -1:
max_matches = 9 max_matches = 9
@ -187,8 +186,8 @@ else:
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],completion_separator,n+1,completion_separator,r)\
for n,r in enumerate(results[:8]))) for n,r in enumerate(results[:8]))))
elif results: print quotes+results[0]+quotes elif results: print(quotes+results[0]+quotes)