Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

dbus -> jeepney for network status

Browse Source
This commit is contained in:
Kovid Goyal 2021-06-27 12:32:24 +05:30
parent 27a68efb7a
commit 5319cacd41
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/calibre/utils/network.py
View File

@ -4,7 +4,8 @@
from contextlib import suppress from contextlib import suppress
from calibre.constants import iswindows, islinux, isbsd
from calibre.constants import isbsd, islinux, iswindows
from calibre.utils.config_base import tweaks from calibre.utils.config_base import tweaks
@ -20,40 +21,57 @@ class LinuxNetworkStatus:
} }
def __init__(self): def __init__(self):
from jeepney import DBusAddress, Properties, new_method_call
# Prefer desktop portal interface here since it can theoretically # Prefer desktop portal interface here since it can theoretically
# work with network management solutions other than NetworkManager # work with network management solutions other than NetworkManager
# and is controlled by the current desktop session # and is controlled by the current desktop session
# #
# There is no difference in terms of “features” provided between # There is no difference in terms of “features” provided between
# the two APIs from our point of view. # the two APIs from our point of view.
self.get_connectivity = self.connect_to_xdp() self.xdp_call = lambda : new_method_call(DBusAddress(
if self.get_connectivity is None: '/org/freedesktop/portal/desktop',
self.get_connectivity = self.connect_to_nm() bus_name='org.freedesktop.portal.Desktop',
interface="org.freedesktop.portal.NetworkMonitor"), 'GetConnectivity')
self.nm_call = lambda : Properties(DBusAddress('/org/freedesktop/NetworkManager',
bus_name='org.freedesktop.NetworkManager',
interface="org.freedesktop.NetworkManager")).get('Connectivity')
def connect_to_xdp(self): if self.xdp() is not None:
with suppress(Exception): self.get_connectivity = self.xdp
import dbus elif self.nm() is not None:
bus = dbus.SessionBus() self.get_connectivity = self.nm
proxy = bus.get_object("org.freedesktop.portal.Desktop", else:
"/org/freedesktop/portal/desktop") self.get_connectivity = lambda : 4
return proxy.get_dbus_method("GetConnectivity",
"org.freedesktop.portal.NetworkMonitor")
def connect_to_nm(self): def connect(self, which='SESSION'):
from jeepney.io.blocking import open_dbus_connection
if not hasattr(self, 'connection'):
self.connection = open_dbus_connection(which)
def xdp(self):
with suppress(Exception): with suppress(Exception):
import dbus self.connect('SESSION')
bus = dbus.SystemBus() return self.send(self.xdp_call())
proxy = bus.get_object("org.freedesktop.NetworkManager", if hasattr(self, 'connection'):
"/org/freedesktop/NetworkManager") self.connection.close()
prop_getter = proxy.get_dbus_method("Get", del self.connection
"org.freedesktop.DBus.Properties")
return (lambda: self.NM_XDP_CONNECTIVITY_MAP.get( def nm(self):
prop_getter("org.freedesktop.NetworkManager", "Connectivity"), 4 with suppress(RuntimeError):
)) self.connect('SYSTEM')
return self.NM_XDP_CONNECTIVITY_MAP.get(self.send(self.nm_call()), 4)
if hasattr(self, 'connection'):
self.connection.close()
del self.connection
def send(self, msg):
from jeepney import DBusErrorResponse, MessageType
reply = self.connection.send_and_get_reply(msg)
if reply.header.message_type is MessageType.error:
raise DBusErrorResponse(reply)
return reply.body[0]
def __call__(self): def __call__(self):
if self.get_connectivity is None:
return True
with suppress(Exception): with suppress(Exception):
# Meanings of returned XDP/GLib connectivity values: # Meanings of returned XDP/GLib connectivity values:
# * 1: Local only. The host is not configured with a route to the internet. # * 1: Local only. The host is not configured with a route to the internet.
@ -82,12 +100,12 @@ class DummyNetworkStatus:
return True return True
_network_status = WindowsNetworkStatus() if iswindows else \
LinuxNetworkStatus() if (islinux or isbsd) else \
DummyNetworkStatus()
def internet_connected(): def internet_connected():
if tweaks['skip_network_check']: if tweaks['skip_network_check']:
return True return True
return _network_status() if not hasattr(internet_connected, 'checker'):
internet_connected.checker = WindowsNetworkStatus() if iswindows else \
LinuxNetworkStatus() if (islinux or isbsd) else \
DummyNetworkStatus()
return internet_connected.checker()