flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 05:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Another attempt to fix copyed hotkeys by updating the identifier

Browse Source 
* check on name OR id
* remote keys not updated, but lenient check on local machine
* Remark: Sometimes copied hotkeys d not work
This commit is contained in:
Klaus Basan
2019-02-13 03:11:13 +01:00
committed by Mat Sutcliffe
parent eb1427e55f
commit d8a730302a
7 changed files with 95 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackgui/components/copysettingsandcachescomponent.cpp
View File

@@ -361,7 +361,8 @@ namespace BlackGui
const QString joStr = CCacheSettingsUtils::otherVersionSettingsFileContent(otherVersionInfo, m_settingsActionHotkeys.getFilename());
if (!joStr.isEmpty())
{
const CActionHotkeyList hotkeys = CActionHotkeyList::fromJsonNoThrow(joStr, true, success, errMsg);
CActionHotkeyList hotkeys = CActionHotkeyList::fromJsonNoThrow(joStr, true, success, errMsg);
hotkeys.updateToCurrentMachine();
if (this->parsingMessage(success, errMsg, m_settingsActionHotkeys.getKey()))
{
this->displayStatusMessage(m_settingsActionHotkeys.setAndSave(hotkeys), hotkeys.toQString(true));

63
src/blackmisc/identifier.cpp
View File

@@ -29,7 +29,8 @@ const QString &cachedLocalHostName()
return hostName;
}
enum {
enum
{
UuidStringLen = sizeof("00000000-0000-0000-0000-000000000000")
};
@@ -40,27 +41,27 @@ QByteArray getMachineUniqueIdImpl()
// https://codereview.qt-project.org/#/c/249399
QByteArray machineUniqueId;
#ifdef Q_OS_MAC
char uuid[UuidStringLen];
size_t uuidlen = sizeof(uuid);
int ret = sysctlbyname("kern.uuid", uuid, &uuidlen, nullptr, 0);
if (ret == 0 && uuidlen == sizeof(uuid))
{
machineUniqueId = QByteArray(uuid, uuidlen - 1);
}
#elif defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
HKEY key = nullptr;
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Cryptography", 0, KEY_READ | KEY_WOW64_64KEY, &key) == ERROR_SUCCESS)
{
wchar_t buffer[UuidStringLen];
DWORD size = sizeof(buffer);
bool ok = (RegQueryValueEx(key, L"MachineGuid", nullptr, nullptr, reinterpret_cast<LPBYTE>(buffer), &size) == ERROR_SUCCESS);
RegCloseKey(key);
if (ok) { machineUniqueId = QStringView(buffer, (size - 1) / 2).toLatin1(); }
}
#else
machineUniqueId = QSysInfo::machineUniqueId();
#endif
#ifdef Q_OS_MAC
char uuid[UuidStringLen];
size_t uuidlen = sizeof(uuid);
int ret = sysctlbyname("kern.uuid", uuid, &uuidlen, nullptr, 0);
if (ret == 0 && uuidlen == sizeof(uuid))
{
machineUniqueId = QByteArray(uuid, uuidlen - 1);
}
#elif defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
HKEY key = nullptr;
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Cryptography", 0, KEY_READ | KEY_WOW64_64KEY, &key) == ERROR_SUCCESS)
{
wchar_t buffer[UuidStringLen];
DWORD size = sizeof(buffer);
bool ok = (RegQueryValueEx(key, L"MachineGuid", nullptr, nullptr, reinterpret_cast<LPBYTE>(buffer), &size) == ERROR_SUCCESS);
RegCloseKey(key);
if (ok) { machineUniqueId = QStringView(buffer, (size - 1) / 2).toLatin1(); }
}
#else
machineUniqueId = QSysInfo::machineUniqueId();
#endif
return machineUniqueId;
}
@@ -162,8 +163,14 @@ namespace BlackMisc
return !m_machineIdBase64.isEmpty() && m_machineIdBase64 == other.m_machineIdBase64;
}
bool CIdentifier::hasSameMachineNameOrId(const CIdentifier &other) const
{
return this->hasSameMachineId(other) || this->hasSameMachineName(other);
}
bool CIdentifier::isFromLocalMachine() const
{
//! \fixme KB 2019-02 wonder if we should check on id (strict) or machine name (lenient)
return cachedMachineUniqueId() == getMachineId();
}
@@ -187,6 +194,18 @@ namespace BlackMisc
return &null() == this || null() == *this;
}
void CIdentifier::updateToCurrentMachine()
{
m_machineIdBase64 = cachedMachineUniqueId().toBase64();
m_machineName = cachedLocalHostName();
}
void CIdentifier::updateToCurrentProcess()
{
m_processName = QCoreApplication::applicationName();
m_processId = QCoreApplication::applicationPid();
}
QString CIdentifier::convertToQString(bool i18n) const
{
Q_UNUSED(i18n);

9
src/blackmisc/identifier.h
View File

@@ -108,6 +108,9 @@ namespace BlackMisc
//! Check if other identifier is from the same machine id
bool hasSameMachineId(const CIdentifier &other) const;
//! Same machine or id?
bool hasSameMachineNameOrId(const CIdentifier &other) const;
//! Get process id
qint64 getProcessId() const {return m_processId;}
@@ -129,6 +132,12 @@ namespace BlackMisc
//! Null identifier (no name, ids etc)
bool isNull() const;
//! Update to current machine
void updateToCurrentMachine();
//! Update to current process
void updateToCurrentProcess();
//! \copydoc BlackMisc::Mixin::String::toQString
QString convertToQString(bool i18n = false) const;

17
src/blackmisc/input/actionhotkey.cpp
View File

@@ -38,11 +38,26 @@ namespace BlackMisc
m_combination = combination;
}
bool CActionHotkey::isForSameMachine(const CActionHotkey &key) const
bool CActionHotkey::isForSameMachineId(const CActionHotkey &key) const
{
return this->getApplicableMachine().hasSameMachineId(key.getApplicableMachine());
}
bool CActionHotkey::isForSameMachineName(const CActionHotkey &key) const
{
return this->getApplicableMachine().hasSameMachineName(key.getApplicableMachine());
}
bool CActionHotkey::isForSameMachine(const CActionHotkey &key) const
{
return this->isForSameMachineId(key) || this->isForSameMachineName(key);
}
void CActionHotkey::updateToCurrentMachine()
{
m_identifier.updateToCurrentMachine();
}
void CActionHotkey::setObject(const CActionHotkey &obj)
{
m_action = obj.m_action;

14
src/blackmisc/input/actionhotkey.h
View File

@@ -64,15 +64,27 @@ namespace BlackMisc
//! Set function
void setAction(const QString &action) { m_action = action; }
//! The identifier
const CIdentifier &getIdentifier() const { return m_identifier; }
//! Set applicable machine
void setApplicableMachine(const CIdentifier &identifier) { m_identifier = identifier; }
//! Get applicable machine
const CIdentifier &getApplicableMachine() const { return m_identifier; }
//! Key for the same machine?
//! Key for the same machine id?
bool isForSameMachineId(const CActionHotkey &key) const;
//! Key for the same machine name
bool isForSameMachineName(const CActionHotkey &key) const;
//! Key for the same machine (same name or id)?
bool isForSameMachine(const CActionHotkey &key) const;
//! Local machine
void updateToCurrentMachine();
//! Set object
void setObject(const CActionHotkey &obj);

12
src/blackmisc/input/actionhotkeylist.cpp
View File

@@ -51,7 +51,7 @@ namespace BlackMisc
CActionHotkeyList sameMachineKeys;
for (const CActionHotkey &actionHotkey : *this)
{
if (!actionHotkey.isForSameMachine(key)) { continue; }
if (!actionHotkey.isForSameMachineId(key)) { continue; }
sameMachineKeys.push_back(actionHotkey);
}
return sameMachineKeys;
@@ -61,5 +61,15 @@ namespace BlackMisc
{
return this->contains(&CActionHotkey::getAction, action);
}
void CActionHotkeyList::updateToCurrentMachine()
{
const CIdentifier comparison("comparison for local machine");
for (CActionHotkey &actionHotkey : *this)
{
const bool sameMachine = actionHotkey.getIdentifier().hasSameMachineNameOrId(comparison);
if (sameMachine) { actionHotkey.updateToCurrentMachine(); }
}
}
} // ns
} // ns

3
src/blackmisc/input/actionhotkeylist.h
View File

@@ -57,6 +57,9 @@ namespace BlackMisc
//! Contains action?
bool containsAction(const QString &action) const;
//! Update for my machine
void updateToCurrentMachine();
};
} // ns
} // ns