qbittorrent/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-30 21:20:28 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #19333 from Chocobo1/clean

Browse Source 
Change default power management to Gnome Session Manager
This commit is contained in:
Chocobo1 2023-07-20 13:04:13 +08:00 committed by GitHub
commit 2c08dc9dad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 83 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/powermanagement/powermanagement.h
View File

@ -61,6 +61,6 @@ private:
PowerManagementInhibitor *m_inhibitor = nullptr;
#endif
#ifdef Q_OS_MACOS
IOPMAssertionID m_assertionID;
IOPMAssertionID m_assertionID {};
#endif
};

139
src/gui/powermanagement/powermanagement_x11.cpp
View File

@ -29,26 +29,43 @@
#include "powermanagement_x11.h"
#include <QDBusConnection>
#include <QDBusMessage>
#include <QDBusInterface>
#include <QDBusPendingCall>
#include <QDBusPendingReply>
#include "base/global.h"
#include "base/logger.h"
PowerManagementInhibitor::PowerManagementInhibitor(QObject *parent)
: QObject(parent)
, m_busInterface {new QDBusInterface(u"org.gnome.SessionManager"_s, u"/org/gnome/SessionManager"_s
, u"org.gnome.SessionManager"_s, QDBusConnection::sessionBus(), this)}
{
if (!QDBusConnection::sessionBus().isConnected()) {
qDebug("D-Bus: Could not connect to session bus");
m_state = Error;
}
else {
m_state = Idle;
if (!m_busInterface->isValid())
{
delete m_busInterface;
m_busInterface = new QDBusInterface(u"org.freedesktop.PowerManagement"_s, u"/org/freedesktop/PowerManagement/Inhibit"_s
, u"org.freedesktop.PowerManagement.Inhibit"_s, QDBusConnection::sessionBus(), this);
m_manager = ManagerType::Freedesktop;
if (!m_busInterface->isValid())
{
delete m_busInterface;
m_busInterface = nullptr;
m_state = Error;
}
}
m_intendedState = Idle;
m_cookie = 0;
m_useGSM = false;
if (m_busInterface)
{
m_busInterface->setTimeout(1000);
LogMsg(tr("Power management found suitable D-Bus interface. Interface: %1").arg(m_busInterface->interface()));
}
else
{
LogMsg(tr("Power management error. Did not found suitable D-Bus interface."), Log::WARNING);
}
}
void PowerManagementInhibitor::requestIdle()
@ -60,25 +77,14 @@ void PowerManagementInhibitor::requestIdle()
m_state = RequestIdle;
qDebug("D-Bus: PowerManagementInhibitor: Requesting idle");
QDBusMessage call = m_useGSM
? QDBusMessage::createMethodCall(
u"org.gnome.SessionManager"_s,
u"/org/gnome/SessionManager"_s,
u"org.gnome.SessionManager"_s,
u"Uninhibit"_s)
: QDBusMessage::createMethodCall(
u"org.freedesktop.PowerManagement"_s,
u"/org/freedesktop/PowerManagement/Inhibit"_s,
u"org.freedesktop.PowerManagement.Inhibit"_s,
u"UnInhibit"_s);
call.setArguments({m_cookie});
QDBusPendingCall pcall = QDBusConnection::sessionBus().asyncCall(call, 1000);
auto *watcher = new QDBusPendingCallWatcher(pcall, this);
const QString method = (m_manager == ManagerType::Gnome)
? u"Uninhibit"_s
: u"UnInhibit"_s;
const QDBusPendingCall pcall = m_busInterface->asyncCall(method, m_cookie);
const auto *watcher = new QDBusPendingCallWatcher(pcall, this);
connect(watcher, &QDBusPendingCallWatcher::finished, this, &PowerManagementInhibitor::onAsyncReply);
}
void PowerManagementInhibitor::requestBusy()
{
m_intendedState = Busy;
@ -88,65 +94,51 @@ void PowerManagementInhibitor::requestBusy()
m_state = RequestBusy;
qDebug("D-Bus: PowerManagementInhibitor: Requesting busy");
QDBusMessage call = m_useGSM
? QDBusMessage::createMethodCall(
u"org.gnome.SessionManager"_s,
u"/org/gnome/SessionManager"_s,
u"org.gnome.SessionManager"_s,
u"Inhibit"_s)
: QDBusMessage::createMethodCall(
u"org.freedesktop.PowerManagement"_s,
u"/org/freedesktop/PowerManagement/Inhibit"_s,
u"org.freedesktop.PowerManagement.Inhibit"_s,
u"Inhibit"_s);
QList<QVariant> args = {u"qBittorrent"_s};
if (m_useGSM)
args << 0u;
args << u"Active torrents are presented"_s;
if (m_useGSM)
args << 4u;
call.setArguments(args);
QDBusPendingCall pcall = QDBusConnection::sessionBus().asyncCall(call, 1000);
auto *watcher = new QDBusPendingCallWatcher(pcall, this);
const QString message = u"Active torrents are currently present"_s;
const auto args = (m_manager == ManagerType::Gnome)
? QList<QVariant> {u"qBittorrent"_s, 0u, message, 4u}
: QList<QVariant> {u"qBittorrent"_s, message};
const QDBusPendingCall pcall = m_busInterface->asyncCallWithArgumentList(u"Inhibit"_s, args);
const auto *watcher = new QDBusPendingCallWatcher(pcall, this);
connect(watcher, &QDBusPendingCallWatcher::finished, this, &PowerManagementInhibitor::onAsyncReply);
}
void PowerManagementInhibitor::onAsyncReply(QDBusPendingCallWatcher *call)
{
if (m_state == RequestIdle) {
QDBusPendingReply<> reply = *call;
call->deleteLater();
if (reply.isError()) {
if (m_state == RequestIdle)
{
const QDBusPendingReply reply = *call;
if (reply.isError())
{
qDebug("D-Bus: Reply: Error: %s", qUtf8Printable(reply.error().message()));
LogMsg(tr("Power management error. Action: %1. Error: %2").arg(u"RequestIdle"_s
, reply.error().message()), Log::WARNING);
m_state = Error;
}
else {
else
{
m_state = Idle;
qDebug("D-Bus: PowerManagementInhibitor: Request successful");
if (m_intendedState == Busy)
requestBusy();
}
}
else if (m_state == RequestBusy) {
QDBusPendingReply<uint> reply = *call;
else if (m_state == RequestBusy)
{
const QDBusPendingReply<quint32> reply = *call;
if (reply.isError()) {
if (reply.isError())
{
qDebug("D-Bus: Reply: Error: %s", qUtf8Printable(reply.error().message()));
if (!m_useGSM) {
qDebug("D-Bus: Falling back to org.gnome.SessionManager");
m_useGSM = true;
m_state = Idle;
if (m_intendedState == Busy)
requestBusy();
}
else {
m_state = Error;
}
LogMsg(tr("Power management error. Action: %1. Error: %2").arg(u"RequestBusy"_s
, reply.error().message()), Log::WARNING);
m_state = Error;
}
else {
else
{
m_state = Busy;
m_cookie = reply.value();
qDebug("D-Bus: PowerManagementInhibitor: Request successful, cookie is %d", m_cookie);
@ -154,10 +146,17 @@ void PowerManagementInhibitor::onAsyncReply(QDBusPendingCallWatcher *call)
requestIdle();
}
}
else {
else
{
const QDBusPendingReply reply = *call;
const QDBusError error = reply.error();
qDebug("D-Bus: Unexpected reply in state %d", m_state);
if (error.isValid())
{
LogMsg(tr("Power management unexpected error. State: %1. Error: %2").arg(QString::number(m_state)
, error.message()), Log::WARNING);
}
m_state = Error;
}
call->deleteLater();
}

18
src/gui/powermanagement/powermanagement_x11.h
View File

@ -30,9 +30,10 @@
#include <QObject>
class QDBusInterface;
class QDBusPendingCallWatcher;
class PowerManagementInhibitor : public QObject
class PowerManagementInhibitor final : public QObject
{
Q_OBJECT
Q_DISABLE_COPY_MOVE(PowerManagementInhibitor)
@ -57,9 +58,16 @@ private:
RequestIdle
};
enum State m_state;
enum State m_intendedState;
unsigned int m_cookie;
enum class ManagerType
{
Freedesktop, // https://www.freedesktop.org/wiki/Specifications/power-management-spec/
Gnome // https://github.com/GNOME/gnome-settings-daemon/blob/master/gnome-settings-daemon/org.gnome.SessionManager.xml
};
bool m_useGSM;
QDBusInterface *m_busInterface = nullptr;
ManagerType m_manager = ManagerType::Gnome;
enum State m_state = Error;
enum State m_intendedState = Idle;
quint32 m_cookie = 0;
};