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

Let jumpapplet follow the XDG Base Directory Spec.

Browse Source
This commit is contained in:
Tanguy Ortolo 2011-07-24 20:56:46 +02:00
parent 3c67f84437
commit 88575c72f8
1 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
jumpapplet
View File

@ -28,6 +28,15 @@ import gtk
defaults={} defaults={}
actions={} actions={}
#directory finding helpers, conforming to the XDG Base Directory Specification
def data_dir():
xdg_data_dir = os.environ.get('XDG_DATA_HOME') or os.path.join(os.environ['HOME'], '.local', 'share')
return os.path.join(xdg_data_dir, 'autojump')
def config_dir():
xdg_config_dir = os.environ.get('XDG_CONFIG_HOME') or os.path.join(os.environ['HOME'], '.config')
return os.path.join(xdg_config_dir, 'autojump')
#decorator truff #decorator truff
def action(validator,name=None): def action(validator,name=None):
if name is None: if name is None:
@ -57,8 +66,11 @@ def has_child_file(filename):
return wrapper return wrapper
#do the work #do the work
def load_paths(filename="~/.autojump_py",maxpath=10): def load_paths(filename=None,maxpath=10):
dic_file=os.path.expanduser(filename) if not filename:
filename = os.path.join(data_dir(), 'autojump_py')
dic_file = filename
try: try:
aj_file=open(dic_file) aj_file=open(dic_file)
@ -71,10 +83,18 @@ def load_paths(filename="~/.autojump_py",maxpath=10):
except IOError: except IOError:
return [] return []
def load_settings_file(filename="~/.jumpapplet_py"): def load_settings_file(filename=None):
if not filename:
filename = os.path.join(config_dir(), 'jumpapplet_py')
#migration from old location
old_filename = os.path.join(os.environ['HOME'], '.jumpapplet_py')
if not os.path.exists(filename) and os.path.exists(old_filename):
os.rename(old_filename, filename)
print "loading settings" print "loading settings"
global defaults global defaults
dic_file=os.path.expanduser(filename) dic_file = filename
try: try:
aj_file=open(dic_file,'r') aj_file=open(dic_file,'r')
@ -92,9 +112,16 @@ def load_settings_file(filename="~/.jumpapplet_py"):
create_actions() create_actions()
def save_settings_file(filename="~/.jumpapplet_py"): def save_settings_file(filename=None):
directory = config_dir()
if not filename:
filename = os.path.join(directory, 'jumpapplet_py')
if not os.path.exists(directory):
os.makedirs(directory)
print "saving settings" print "saving settings"
dic_file=os.path.expanduser(filename) dic_file= filename
aj_file=open(dic_file,'w') aj_file=open(dic_file,'w')
cPickle.dump(defaults,aj_file) cPickle.dump(defaults,aj_file)