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

cache os information so it's requested to system only once

Browse source
This commit is contained in:
Yann Leboulanger 2008-12-24 15:00:38 +00:00
parent a1f346e48a
commit 507bd7b8c6
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/gajim.py
View file

@ -105,6 +105,8 @@ if LANG is None:
else: else:
LANG = LANG[:2] # en, fr, el etc.. LANG = LANG[:2] # en, fr, el etc..
os_info = None # used to cache os information
gmail_domains = ['gmail.com', 'googlemail.com'] gmail_domains = ['gmail.com', 'googlemail.com']
transport_type = {} # list the type of transport transport_type = {} # list the type of transport

21
src/common/helpers.py
View file

@ -767,6 +767,8 @@ def get_random_string_16():
return ''.join(sample(char_sequence, 16)) return ''.join(sample(char_sequence, 16))
def get_os_info(): def get_os_info():
if gajim.os_info:
return gajim.os_info
if os.name == 'nt': if os.name == 'nt':
ver = os.sys.getwindowsversion() ver = os.sys.getwindowsversion()
ver_format = ver[3], ver[0], ver[1] ver_format = ver[3], ver[0], ver[1]
@ -781,9 +783,11 @@ def get_os_info():
(2, 6, 0): 'Vista', (2, 6, 0): 'Vista',
} }
if ver_format in win_version: if ver_format in win_version:
return 'Windows' + ' ' + win_version[ver_format] os_info = 'Windows' + ' ' + win_version[ver_format]
else: else:
return 'Windows' os_info = 'Windows'
gajim.os_info = os_info
return os_info
elif os.name == 'posix': elif os.name == 'posix':
executable = 'lsb_release' executable = 'lsb_release'
params = ' --description --codename --release --short' params = ' --description --codename --release --short'
@ -796,6 +800,7 @@ def get_os_info():
output = temp_failure_retry(p.stdout.readline).strip() output = temp_failure_retry(p.stdout.readline).strip()
# some distros put n/a in places, so remove those # some distros put n/a in places, so remove those
output = output.replace('n/a', '').replace('N/A', '') output = output.replace('n/a', '').replace('N/A', '')
gajim.os_info = output
return output return output
# lsb_release executable not available, so parse files # lsb_release executable not available, so parse files
@ -823,13 +828,19 @@ def get_os_info():
text = distro_name text = distro_name
elif path_to_file.endswith('lfs-release'): # file just has version elif path_to_file.endswith('lfs-release'): # file just has version
text = distro_name + ' ' + text text = distro_name + ' ' + text
return text.replace('\n', '') os_info = text.replace('\n', '')
gajim.os_info = os_info
return os_info
# our last chance, ask uname and strip it # our last chance, ask uname and strip it
uname_output = get_output_of_command('uname -sr') uname_output = get_output_of_command('uname -sr')
if uname_output is not None: if uname_output is not None:
return uname_output[0] # only first line os_info = uname_output[0] # only first line
return 'N/A' gajim.os_info = os_info
return os_info
os_info = 'N/A'
gajim.os_info = os_info
return os_info
def sanitize_filename(filename): def sanitize_filename(filename):
'''makes sure the filename we will write does contain only acceptable and '''makes sure the filename we will write does contain only acceptable and