checking for GLib.GError on bus.get, redundant gi.require_version

pull/14/head
sezanzeb 4 years ago
parent 2adb4daf67
commit 141561d74f

@ -29,12 +29,11 @@ from argparse import ArgumentParser
import gi
gi.require_version('Gtk', '3.0')
gi.require_version('GLib', '2.0')
from gi.repository import Gtk, GLib
from gi.repository import Gtk
from keymapper.logger import update_verbosity, log_info
from keymapper.gtk.window import Window
from keymapper.daemon import Daemon
from keymapper.dev.permissions import can_read_devices
try:

@ -28,6 +28,7 @@ https://github.com/LEW21/pydbus/tree/cc407c8b1d25b7e28a6d661a29f9e661b1c9b964/ex
import subprocess
from pydbus import SessionBus
from gi.repository import GLib
from keymapper.logger import logger
from keymapper.dev.injector import KeycodeInjector
@ -49,15 +50,22 @@ def is_service_running():
def get_dbus_interface():
"""Get an interface to start and stop injecting keystrokes."""
msg = (
'The daemon "key-mapper-service" is not running, mapping keys '
'only works as long as the window is open.'
)
if not is_service_running():
logger.warning(
'The daemon "key-mapper-service" is not running, mapping keys '
'only works as long as the window is open.'
)
logger.warning(msg)
return Daemon()
bus = SessionBus()
interface = bus.get(BUS_NAME)
try:
interface = bus.get(BUS_NAME)
except GLib.GError as error:
logger.debug(error)
logger.warning(msg)
return Daemon()
return interface

@ -30,7 +30,7 @@ from keymapper.logger import logger
from keymapper.dev.ev_abs_mapper import JOYSTICK
def should_map_event_as_btn(ev_type, code):
def should_map_event_as_btn(ev_type, code):
"""Does this event describe a button.
Especially important for gamepad events, some of the buttons

@ -25,8 +25,6 @@
import evdev
import gi
gi.require_version('Gtk', '3.0')
gi.require_version('GLib', '2.0')
from gi.repository import Gtk, GLib
from keymapper.state import custom_mapping

@ -23,8 +23,6 @@
import gi
gi.require_version('Gtk', '3.0')
gi.require_version('GLib', '2.0')
from gi.repository import Gtk
from keymapper.data import get_data_path

@ -25,8 +25,6 @@
import evdev
from evdev.ecodes import EV_KEY
import gi
gi.require_version('Gtk', '3.0')
gi.require_version('GLib', '2.0')
from gi.repository import Gtk, Gdk, GLib
from keymapper.data import get_data_path

@ -32,6 +32,9 @@ import multiprocessing
import asyncio
import evdev
import gi
gi.require_version('Gtk', '3.0')
gi.require_version('GLib', '2.0')
from keymapper.logger import update_verbosity

@ -27,7 +27,6 @@ import time
import evdev
from evdev.ecodes import EV_KEY
import gi
gi.require_version('Gtk', '3.0')
from gi.repository import Gtk
from keymapper.state import custom_mapping, system_mapping

Loading…
Cancel
Save