copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

change variable name

Browse source
This commit is contained in:
Yann Leboulanger 2014-01-07 19:51:56 +01:00
parent 7e1fc336cb
commit 42619dc5cb
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/common/helpers.py
View file

@ -717,49 +717,49 @@ def play_sound(event):
path_to_soundfile = gajim.config.get_per('soundevents', event, 'path') path_to_soundfile = gajim.config.get_per('soundevents', event, 'path')
play_sound_file(path_to_soundfile) play_sound_file(path_to_soundfile)
def check_soundfile_path(file, dirs=(gajim.gajimpaths.data_root, def check_soundfile_path(file_, dirs=(gajim.gajimpaths.data_root,
gajim.DATA_DIR)): gajim.DATA_DIR)):
""" """
Check if the sound file exists Check if the sound file exists
:param file: the file to check, absolute or relative to 'dirs' path :param file_: the file to check, absolute or relative to 'dirs' path
:param dirs: list of knows paths to fallback if the file doesn't exists :param dirs: list of knows paths to fallback if the file doesn't exists
(eg: ~/.gajim/sounds/, DATADIR/sounds...). (eg: ~/.gajim/sounds/, DATADIR/sounds...).
:return the path to file or None if it doesn't exists. :return the path to file or None if it doesn't exists.
""" """
if not file: if not file_:
return None return None
elif os.path.exists(file): elif os.path.exists(file_):
return file return file_
for d in dirs: for d in dirs:
d = os.path.join(d, 'sounds', file) d = os.path.join(d, 'sounds', file_)
if os.path.exists(d): if os.path.exists(d):
return d return d
return None return None
def strip_soundfile_path(file, dirs=(gajim.gajimpaths.data_root, def strip_soundfile_path(file_, dirs=(gajim.gajimpaths.data_root,
gajim.DATA_DIR), abs=True): gajim.DATA_DIR), abs=True):
""" """
Remove knowns paths from a sound file Remove knowns paths from a sound file
Filechooser returns absolute path. If path is a known fallback path, we remove it. Filechooser returns absolute path. If path is a known fallback path, we remove it.
So config have no hardcoded path to DATA_DIR and text in textfield is shorther. So config have no hardcoded path to DATA_DIR and text in textfield is shorther.
param: file: the filename to strip. param: file_: the filename to strip.
param: dirs: list of knowns paths from which the filename should be stripped. param: dirs: list of knowns paths from which the filename should be stripped.
param: abs: force absolute path on dirs param: abs: force absolute path on dirs
""" """
if not file: if not file_:
return None return None
name = os.path.basename(file) name = os.path.basename(file_)
for d in dirs: for d in dirs:
d = os.path.join(d, 'sounds', name) d = os.path.join(d, 'sounds', name)
if abs: if abs:
d = os.path.abspath(d) d = os.path.abspath(d)
if file == d: if file_ == d:
return name return name
return file return file_
def play_sound_file(path_to_soundfile): def play_sound_file(path_to_soundfile):
if path_to_soundfile == 'beep': if path_to_soundfile == 'beep':