Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve error reporting when connecting to device #2556

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Improve error reporting when connecting to device #2556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
51b1cc3
ManagerDeviceMenu.py_handle_error_message(): extract error code to var
stokito Dec 15, 2024
00655d5
ManagerDeviceMenu.py._handle_error_message(): early return on canceled
stokito Dec 15, 2024
3c53d88
ManagerDeviceMenu.py_handle_error_message(): add dot . to errors to a…
stokito Dec 15, 2024
22af679
ManagerDeviceMenu.py._handle_error_message(): log with bluetoothd: pr…
stokito Dec 15, 2024
c80b21e
ManagerDeviceMenu.py._handle_error_message(): add to message "PulseAu…
stokito Dec 15, 2024
88975d1
ManagerDeviceMenu.py._handle_error_message(): Add "Check bluetoothd l…
stokito Dec 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions blueman/gui/manager/ManagerDeviceMenu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,26 +189,29 @@ def on_device_property_changed(self, lst: "ManagerDeviceList", _device: Device,
self.generate()

def _handle_error_message(self, error: GLib.Error) -> None:
err = self._BLUEZ_ERROR_MAP.get(error.message.split(":", 3)[-1].strip())

bt_error_code = error.message.split(":", 3)[-1].strip()
err = self._BLUEZ_ERROR_MAP.get(bt_error_code)
if err == self._BluezError.CANCELED:
logging.info("bluetoothd: " + "Canceled.")
return
if err == self._BluezError.PROFILE_UNAVAILABLE:
logging.warning("No audio endpoints registered to bluetoothd. "
"Pulseaudio Bluetooth module, bluez-alsa, PipeWire or other audio support missing.")
msg = _("No audio endpoints registered")
logging.warning("bluetoothd: " + "No audio endpoints registered." + " " +
"PulseAudio Bluetooth module, bluez-alsa, PipeWire or other audio support missing.")
msg = (_("No audio endpoints registered.") + " " +
_("PulseAudio Bluetooth module, bluez-alsa, PipeWire or other audio support missing."))
elif err == self._BluezError.CREATE_SOCKET:
logging.warning("bluetoothd reported input/output error. Check its logs for context.")
msg = _("Input/output error")
logging.warning("bluetoothd: " + "Input/output error." + " " + "Check bluetoothd logs.")
msg = _("Input/output error.") + " " + _("Check bluetoothd logs.")
elif err == self._BluezError.PAGE_TIMEOUT:
logging.info("bluetoothd: " + "Device did not respond")
msg = _("Device did not respond")
elif err == self._BluezError.UNKNOWN:
logging.warning("bluetoothd reported an unknown error. "
"Retry or check its logs for context.")
msg = _("Unknown error")
logging.warning("bluetoothd: " + "Unknown error." + " " + "Check bluetoothd logs.")
msg = _("Unknown error.") + " " + _("Check bluetoothd logs.")
else:
msg = error.message.split(":", 3)[-1].strip()

if err != self._BluezError.CANCELED:
self.Blueman.infobar_update(_("Connection Failed: ") + msg)
logging.warning("bluetoothd: " + bt_error_code + " " + "Check bluetoothd logs.")
msg = bt_error_code + " " + _("Check bluetoothd logs.")
self.Blueman.infobar_update(_("Connection Failed: ") + msg)

class _BluezError(Enum):
PAGE_TIMEOUT = auto()
Expand Down
6 changes: 3 additions & 3 deletions po/af.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,11 +701,11 @@ msgid "Disconnection Failed: "
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:195
msgid "No audio endpoints registered"
msgid "No audio endpoints registered."
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:198
msgid "Input/output error"
msgid "Input/output error."
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:200
Expand All @@ -715,7 +715,7 @@ msgstr ""
#: blueman/gui/manager/ManagerDeviceMenu.py:204
#, fuzzy
#| msgid "Unknown"
msgid "Unknown error"
msgid "Unknown error."
msgstr "Onbekend"

#: blueman/gui/manager/ManagerDeviceMenu.py:209
Expand Down
6 changes: 3 additions & 3 deletions po/am.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,11 +727,11 @@ msgid "Disconnection Failed: "
msgstr "መለያየት አልተቻለም"

#: blueman/gui/manager/ManagerDeviceMenu.py:195
msgid "No audio endpoints registered"
msgid "No audio endpoints registered."
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:198
msgid "Input/output error"
msgid "Input/output error."
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:200
Expand All @@ -742,7 +742,7 @@ msgstr "የ አካል መረጃ ማሳያ"
#: blueman/gui/manager/ManagerDeviceMenu.py:204
#, fuzzy
#| msgid "Unknown"
msgid "Unknown error"
msgid "Unknown error."
msgstr "ያልታወቀ"

#: blueman/gui/manager/ManagerDeviceMenu.py:209
Expand Down
6 changes: 3 additions & 3 deletions po/ar.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,11 +737,11 @@ msgid "Disconnection Failed: "
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:195
msgid "No audio endpoints registered"
msgid "No audio endpoints registered."
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:198
msgid "Input/output error"
msgid "Input/output error."
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:200
Expand All @@ -751,7 +751,7 @@ msgstr ""
#: blueman/gui/manager/ManagerDeviceMenu.py:204
#, fuzzy
#| msgid "Unknown"
msgid "Unknown error"
msgid "Unknown error."
msgstr "مجهول"

#: blueman/gui/manager/ManagerDeviceMenu.py:209
Expand Down
6 changes: 3 additions & 3 deletions po/ast.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,11 +722,11 @@ msgid "Disconnection Failed: "
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:195
msgid "No audio endpoints registered"
msgid "No audio endpoints registered."
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:198
msgid "Input/output error"
msgid "Input/output error."
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:200
Expand All @@ -736,7 +736,7 @@ msgstr ""
#: blueman/gui/manager/ManagerDeviceMenu.py:204
#, fuzzy
#| msgid "Unknown"
msgid "Unknown error"
msgid "Unknown error."
msgstr "Desconocíu"

#: blueman/gui/manager/ManagerDeviceMenu.py:209
Expand Down
6 changes: 3 additions & 3 deletions po/be.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,11 +739,11 @@ msgid "Disconnection Failed: "
msgstr "Не атрымалася адлучыцца: "

#: blueman/gui/manager/ManagerDeviceMenu.py:195
msgid "No audio endpoints registered"
msgid "No audio endpoints registered."
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:198
msgid "Input/output error"
msgid "Input/output error."
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:200
Expand All @@ -754,7 +754,7 @@ msgstr "Інфармацыя пра прыладу"
#: blueman/gui/manager/ManagerDeviceMenu.py:204
#, fuzzy
#| msgid "Unknown"
msgid "Unknown error"
msgid "Unknown error."
msgstr "Невядома"

#: blueman/gui/manager/ManagerDeviceMenu.py:209
Expand Down
6 changes: 3 additions & 3 deletions po/bg.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,11 +738,11 @@ msgid "Disconnection Failed: "
msgstr "Неуспешно прекъсване на връзката: "

#: blueman/gui/manager/ManagerDeviceMenu.py:195
msgid "No audio endpoints registered"
msgid "No audio endpoints registered."
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:198
msgid "Input/output error"
msgid "Input/output error."
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:200
Expand All @@ -753,7 +753,7 @@ msgstr "Показване на информация за устройствот
#: blueman/gui/manager/ManagerDeviceMenu.py:204
#, fuzzy
#| msgid "Unknown"
msgid "Unknown error"
msgid "Unknown error."
msgstr "Неизвестно"

#: blueman/gui/manager/ManagerDeviceMenu.py:209
Expand Down
68 changes: 40 additions & 28 deletions po/blueman.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: blueman 2.4.3\n"
"Report-Msgid-Bugs-To: https://github.com/blueman-project/blueman/issues\n"
"POT-Creation-Date: 2024-12-03 18:48+0000\n"
"POT-Creation-Date: 2024-12-15 11:31+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -136,7 +136,7 @@ msgstr ""
msgid "Search"
msgstr ""

#: data/ui/manager-main.ui:319 blueman/gui/manager/ManagerDeviceMenu.py:370
#: data/ui/manager-main.ui:319 blueman/gui/manager/ManagerDeviceMenu.py:373
msgid "Create pairing with the device"
msgstr ""

Expand All @@ -145,7 +145,7 @@ msgstr ""
msgid "Pair"
msgstr ""

#: data/ui/manager-main.ui:333 blueman/gui/manager/ManagerDeviceMenu.py:388
#: data/ui/manager-main.ui:333 blueman/gui/manager/ManagerDeviceMenu.py:391
msgid "Mark/Unmark this device as trusted"
msgstr ""

Expand All @@ -155,7 +155,7 @@ msgstr ""
msgid "Trust"
msgstr ""

#: data/ui/manager-main.ui:347 blueman/gui/manager/ManagerDeviceMenu.py:433
#: data/ui/manager-main.ui:347 blueman/gui/manager/ManagerDeviceMenu.py:436
msgid "Remove this device from the known devices list"
msgstr ""

Expand Down Expand Up @@ -710,87 +710,99 @@ msgstr ""
msgid "Disconnection Failed: "
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:197
msgid "No audio endpoints registered"
#: blueman/gui/manager/ManagerDeviceMenu.py:200
msgid "No audio endpoints registered."
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:200
msgid "Input/output error"
#: blueman/gui/manager/ManagerDeviceMenu.py:201
msgid ""
"PulseAudio Bluetooth module, bluez-alsa, PipeWire or other audio support "
"missing."
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:204
msgid "Input/output error."
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:204
#: blueman/gui/manager/ManagerDeviceMenu.py:210
#: blueman/gui/manager/ManagerDeviceMenu.py:213
msgid "Check bluetoothd logs."
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:202
#: blueman/gui/manager/ManagerDeviceMenu.py:207
msgid "Device did not respond"
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:206
msgid "Unknown error"
#: blueman/gui/manager/ManagerDeviceMenu.py:210
msgid "Unknown error."
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:211
#: blueman/gui/manager/ManagerDeviceMenu.py:214
msgid "Connection Failed: "
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:297
#: blueman/gui/manager/ManagerDeviceMenu.py:300
msgid "<b>_Connect</b>"
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:299
#: blueman/gui/manager/ManagerDeviceMenu.py:302
msgid "Connects auto connect profiles A2DP source, A2DP sink, and HID"
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:303
#: blueman/gui/manager/ManagerDeviceMenu.py:306
msgid "<b>_Disconnect</b>"
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:304
#: blueman/gui/manager/ManagerDeviceMenu.py:307
msgid "Forcefully disconnect the device"
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:320
#: blueman/gui/manager/ManagerDeviceMenu.py:323
msgid "<b>Connect To:</b>"
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:325
#: blueman/gui/manager/ManagerDeviceMenu.py:328
msgid "<b>Disconnect:</b>"
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:336
#: blueman/gui/manager/ManagerDeviceMenu.py:339
msgid "<b>Auto-connect:</b>"
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:356
#: blueman/gui/manager/ManagerDeviceMenu.py:359
msgid "Send a _File…"
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:369
#: blueman/gui/manager/ManagerDeviceMenu.py:372
msgid "_Pair"
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:379
#: blueman/gui/manager/ManagerDeviceMenu.py:382
msgid "_Trust"
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:384
#: blueman/gui/manager/ManagerDeviceMenu.py:387
msgid "_Untrust"
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:391
#: blueman/gui/manager/ManagerDeviceMenu.py:394
msgid "_Block"
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:396
#: blueman/gui/manager/ManagerDeviceMenu.py:399
msgid "_Unblock"
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:400
#: blueman/gui/manager/ManagerDeviceMenu.py:403
msgid "Block/Unblock this device"
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:420
#: blueman/gui/manager/ManagerDeviceMenu.py:423
msgid "R_ename device…"
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:429
#: blueman/gui/manager/ManagerDeviceMenu.py:432
msgid "_Remove…"
msgstr ""

Expand Down
6 changes: 3 additions & 3 deletions po/bs.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,11 +719,11 @@ msgid "Disconnection Failed: "
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:195
msgid "No audio endpoints registered"
msgid "No audio endpoints registered."
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:198
msgid "Input/output error"
msgid "Input/output error."
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:200
Expand All @@ -733,7 +733,7 @@ msgstr ""
#: blueman/gui/manager/ManagerDeviceMenu.py:204
#, fuzzy
#| msgid "Unknown"
msgid "Unknown error"
msgid "Unknown error."
msgstr "Nepoznat"

#: blueman/gui/manager/ManagerDeviceMenu.py:209
Expand Down
6 changes: 3 additions & 3 deletions po/ca.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,11 +729,11 @@ msgid "Disconnection Failed: "
msgstr "No s'ha pogut desconnectar:"

#: blueman/gui/manager/ManagerDeviceMenu.py:195
msgid "No audio endpoints registered"
msgid "No audio endpoints registered."
msgstr ""

#: blueman/gui/manager/ManagerDeviceMenu.py:198
msgid "Input/output error"
msgid "Input/output error."
msgstr "Error d’entrada i sortida"

#: blueman/gui/manager/ManagerDeviceMenu.py:200
Expand All @@ -744,7 +744,7 @@ msgstr "Mostra la informació del dispositiu"
#: blueman/gui/manager/ManagerDeviceMenu.py:204
#, fuzzy
#| msgid "Unknown"
msgid "Unknown error"
msgid "Unknown error."
msgstr "Desconegut"

#: blueman/gui/manager/ManagerDeviceMenu.py:209
Expand Down
Loading
Loading