miracle091/SafeEyes
miracle091
/
SafeEyes
mirror of https://github.com/slgobinath/SafeEyes.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add lock command for KDE and Mate (See #111)

This commit is contained in:
Gobinath 2017-04-10 11:16:02 -04:00
parent 1a16bf3d4e
commit 697d60fed0
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
safeeyes/Utility.py
View File

@ -24,7 +24,7 @@ import pyaudio, wave
bin_directory = os.path.dirname(os.path.realpath(__file__)) bin_directory = os.path.dirname(os.path.realpath(__file__))
home_directory = os.path.expanduser('~') home_directory = os.path.expanduser('~')
system_language_directory = os.path.join(bin_directory, "config/lang") system_language_directory = os.path.join(bin_directory, 'config/lang')
config_directory = os.path.join(home_directory, '.config/safeeyes') config_directory = os.path.join(home_directory, '.config/safeeyes')
@ -32,7 +32,7 @@ def play_notification():
""" """
Play the alert.wav Play the alert.wav
""" """
logging.info("Playing audible alert") logging.info('Playing audible alert')
CHUNK = 1024 CHUNK = 1024
try: try:
@ -117,7 +117,7 @@ def is_active_window_skipped(skip_break_window_classes, take_break_window_classe
Check for full-screen applications. Check for full-screen applications.
This method must be executed by the main thread. If not, it will cause to random failure. This method must be executed by the main thread. If not, it will cause to random failure.
""" """
logging.info("Searching for full-screen application") logging.info('Searching for full-screen application')
screen = Gdk.Screen.get_default() screen = Gdk.Screen.get_default()
active_window = screen.get_active_window() active_window = screen.get_active_window()
@ -128,7 +128,7 @@ def is_active_window_skipped(skip_break_window_classes, take_break_window_classe
try: try:
stdout = subprocess.check_output(cmdlist).decode('utf-8') stdout = subprocess.check_output(cmdlist).decode('utf-8')
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
logging.warning("Error in finding full-screen application") logging.warning('Error in finding full-screen application')
pass pass
else: else:
if stdout: if stdout:
@ -247,38 +247,38 @@ def lock_screen_command():
""" """
Function tries to detect the screensaver command based on the current envinroment Function tries to detect the screensaver command based on the current envinroment
Possible results: Possible results:
Gnome, Unity: ["gnome-screensaver-command", "--lock"] Gnome, Unity: ['gnome-screensaver-command', '--lock']
Cinnamon: ["cinnamon-screensaver-command", "--lock"] Cinnamon: ['cinnamon-screensaver-command', '--lock']
Mate: ['mate-screensaver-command', '--lock']
KDE: ['qdbus', 'org.freedesktop.ScreenSaver', '/ScreenSaver', 'Lock']
None if nothing detected None if nothing detected
""" """
# TODO: Add the command-line tools for other desktop environments (Atleast for KDE, XFCE, LXDE and MATE) # TODO: Add the command-line tools for other desktop environments (Atleast for KDE, XFCE, LXDE and MATE)
desktop_session = os.environ.get("DESKTOP_SESSION") desktop_session = os.environ.get('DESKTOP_SESSION')
if desktop_session is not None: if desktop_session is not None:
desktop_session = desktop_session.lower() desktop_session = desktop_session.lower()
# if desktop_session in ["gnome","unity", "cinnamon", "mate", "xfce4", "lxde", "fluxbox", "blackbox", "openbox", "icewm", "jwm", "afterstep", "trinity", "kde"]: # if desktop_session in ['gnome','unity', 'cinnamon', 'mate', 'xfce4', 'lxde', 'fluxbox', 'blackbox', 'openbox', 'icewm', 'jwm', 'afterstep', 'trinity', 'kde']:
if desktop_session in ["gnome","unity"] or desktop_session.startswith("ubuntu"): if desktop_session in ['gnome','unity'] or desktop_session.startswith('ubuntu'):
return ["gnome-screensaver-command", "--lock"] return ['gnome-screensaver-command', '--lock']
elif desktop_session == "cinnamon": elif desktop_session == 'cinnamon':
return ["cinnamon-screensaver-command", "--lock"] return ['cinnamon-screensaver-command', '--lock']
# elif desktop_session.startswith("lubuntu"): elif desktop_session == 'mate':
# return "lxde" return ['mate-screensaver-command', '--lock']
# elif desktop_session.startswith("kubuntu"): elif desktop_session == 'kde' or 'plasma' in desktop_session or desktop_session.startswith('kubuntu') or os.environ.get('KDE_FULL_SESSION') == 'true':
# return "kde" return ['qdbus', 'org.freedesktop.ScreenSaver', '/ScreenSaver', 'Lock']
# elif "xfce" in desktop_session or desktop_session.startswith("xubuntu"): # elif desktop_session.startswith('lubuntu'):
# return "xfce4" # return 'lxde'
# elif desktop_session.startswith("razor"): # elif 'xfce' in desktop_session or desktop_session.startswith('xubuntu'):
# return "razor-qt" # return 'xfce4'
# elif desktop_session.startswith("wmaker"): # elif desktop_session.startswith('razor'):
# return "windowmaker" # return 'razor-qt'
# if os.environ.get('KDE_FULL_SESSION') == 'true': # elif desktop_session.startswith('wmaker'):
# return "kde" # return 'windowmaker'
elif os.environ.get('GNOME_DESKTOP_SESSION_ID'): elif os.environ.get('GNOME_DESKTOP_SESSION_ID'):
if not "deprecated" in os.environ.get('GNOME_DESKTOP_SESSION_ID'): if not 'deprecated' in os.environ.get('GNOME_DESKTOP_SESSION_ID'):
return ["gnome-screensaver-command", "--lock"] return ['gnome-screensaver-command', '--lock']
# elif self.is_running("xfce-mcs-manage"): # elif self.is_running('xfce-mcs-manage'):
# return "xfce4" # return 'xfce4'
# elif self.is_running("ksmserver"):
# return "kde"
return None return None
def is_desktop_lock_supported(): def is_desktop_lock_supported():
@ -293,4 +293,4 @@ def lock_desktop():
try: try:
subprocess.Popen(command) subprocess.Popen(command)
except Exception as e: except Exception as e:
logging.error("Error in executing the commad" + str(command) + " to lock screen", e) logging.error('Error in executing the commad' + str(command) + ' to lock screen', e)