pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

common: Simplify get_os_info() using pathlib.Path().

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2018-07-10 08:47:09 +02:00
parent 8fbbe701f2
commit 3acfd83c24
1 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
poezio/common.py
View file

@ -9,6 +9,7 @@ Various useful functions.
""" """
from datetime import datetime, timedelta from datetime import datetime, timedelta
from pathlib import Path
from slixmpp import JID, InvalidJID from slixmpp import JID, InvalidJID
from poezio.poezio_shlex import shlex from poezio.poezio_shlex import shlex
@ -61,25 +62,25 @@ def _is_in_path(command, return_abs_path=False):
DISTRO_INFO = { DISTRO_INFO = {
'Arch Linux': '/etc/arch-release', 'Arch Linux': Path('/etc/arch-release'),
'Aurox Linux': '/etc/aurox-release', 'Aurox Linux': Path('/etc/aurox-release'),
'Conectiva Linux': '/etc/conectiva-release', 'Conectiva Linux': Path('/etc/conectiva-release'),
'CRUX': '/usr/bin/crux', 'CRUX': Path('/usr/bin/crux'),
'Debian GNU/Linux': '/etc/debian_version', 'Debian GNU/Linux': Path('/etc/debian_version'),
'Fedora Linux': '/etc/fedora-release', 'Fedora Linux': Path('/etc/fedora-release'),
'Gentoo Linux': '/etc/gentoo-release', 'Gentoo Linux': Path('/etc/gentoo-release'),
'Linux from Scratch': '/etc/lfs-release', 'Linux from Scratch': Path('/etc/lfs-release'),
'Mandrake Linux': '/etc/mandrake-release', 'Mandrake Linux': Path('/etc/mandrake-release'),
'Slackware Linux': '/etc/slackware-version', 'Slackware Linux': Path('/etc/slackware-version'),
'Solaris/Sparc': '/etc/release', 'Solaris/Sparc': Path('/etc/release'),
'Source Mage': '/etc/sourcemage_version', 'Source Mage': Path('/etc/sourcemage_version'),
'SUSE Linux': '/etc/SuSE-release', 'SUSE Linux': Path('/etc/SuSE-release'),
'Sun JDS': '/etc/sun-release', 'Sun JDS': Path('/etc/sun-release'),
'PLD Linux': '/etc/pld-release', 'PLD Linux': Path('/etc/pld-release'),
'Yellow Dog Linux': '/etc/yellowdog-release', 'Yellow Dog Linux': Path('/etc/yellowdog-release'),
# many distros use the /etc/redhat-release for compatibility # many distros use the /etc/redhat-release for compatibility
# so Redhat is the last # so Redhat is the last
'Redhat Linux': '/etc/redhat-release' 'Redhat Linux': Path('/etc/redhat-release')
} }
@ -111,27 +112,26 @@ def get_os_info():
# lsb_release executable not available, so parse files # lsb_release executable not available, so parse files
for distro_name in DISTRO_INFO: for distro_name in DISTRO_INFO:
path_to_file = DISTRO_INFO[distro_name] path_to_file = DISTRO_INFO[distro_name]
if os.path.exists(path_to_file): if path_to_file.exists():
if os.access(path_to_file, os.X_OK): if os.access(str(path_to_file), os.X_OK):
# the file is executable (f.e. CRUX) # the file is executable (f.e. CRUX)
# yes, then run it and get the first line of output. # yes, then run it and get the first line of output.
text = _get_output_of_command(path_to_file)[0] text = _get_output_of_command(str(path_to_file))[0]
else: else:
fdes = open(path_to_file, encoding='utf-8') with path_to_file.open(encoding='utf-8') as fdes:
text = fdes.readline().strip() # get only first line text = fdes.readline().strip() # get only first line
fdes.close() basename = path_to_file.name
if path_to_file.endswith('version'): if basename.endswith('version'):
# sourcemage_version and slackware-version files # sourcemage_version and slackware-version files
# have all the info we need (name and version of distro) # have all the info we need (name and version of distro)
if not os.path.basename(path_to_file).startswith( if not basename.startswith('sourcemage') or not\
'sourcemage') or not\ basename.startswith('slackware'):
os.path.basename(path_to_file).startswith('slackware'):
text = distro_name + ' ' + text text = distro_name + ' ' + text
elif path_to_file.endswith('aurox-release') or \ elif basename == 'aurox-release' or \
path_to_file.endswith('arch-release'): basename == 'arch-release':
# file doesn't have version # file doesn't have version
text = distro_name text = distro_name
elif path_to_file.endswith('lfs-release'): elif basename == 'lfs-release':
# file just has version # file just has version
text = distro_name + ' ' + text text = distro_name + ' ' + text
os_info = text.replace('\n', '') os_info = text.replace('\n', '')