mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-04-27 07:48:01 -07:00
a8a3fca8c9
* Have CardDatabase::getPreferredPrintingInfo respect card provider ID overrides (pinned printings)
Took 13 minutes
Took 37 seconds
Took 10 seconds
Took 10 seconds
# Commit time for manual adjustment:
# Took 30 seconds
Took 15 seconds
Took 8 minutes
Took 21 seconds
* Move settings cache and settings card preference provider out of libcockatrice_settings and into cockatrice
Took 52 minutes
Took 9 minutes
Took 1 minute
* Temp cache.
Took 16 minutes
* Dependency Injection for SettingsCache
* Turn SettingsCache into a QSharedPointer.
* Implement interfaces for settings that need it
Took 2 hours 38 minutes
* Adjust oracle.
Took 5 minutes
* Move abstract/noop interfaces to libcockatrice_interfaces so they can be linked against independently.
Took 52 minutes
* Clean up some links.
Took 3 minutes
* Cleanup two includes.
Took 3 minutes
* More fixes.
Took 7 minutes
* More includes that slipped past.
Took 3 minutes
* Stop mocking and start injecting for tests.
Took 15 minutes
* I don't know why remote_client was including main.
Took 4 minutes
* Include.
Took 3 minutes
* Lint.
Took 2 minutes
* Don't use Qt pointers.
Took 1 hour 7 minutes
* Make parser use CardSettingsInterface
Took 13 minutes
* Also adjust constructor lol.
Took 8 minutes
* Lint.
Took 32 minutes
* Revert "Lint."
This reverts commit ecb596c39e.
Took 3 minutes
* Test.
Took 3 minutes
---------
Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
80 lines
3.7 KiB
C++
80 lines
3.7 KiB
C++
#include "user_info_connection.h"
|
|
|
|
#include "../../../../client/settings/cache_settings.h"
|
|
|
|
#include <QDebug>
|
|
#include <utility>
|
|
|
|
UserConnection_Information::UserConnection_Information() = default;
|
|
|
|
UserConnection_Information::UserConnection_Information(QString _saveName,
|
|
QString _serverName,
|
|
QString _portNum,
|
|
QString _userName,
|
|
QString _pass,
|
|
bool _savePass,
|
|
QString _site)
|
|
: saveName(std::move(_saveName)), server(std::move(_serverName)), port(std::move(_portNum)),
|
|
username(std::move(_userName)), password(std::move(_pass)), savePassword(_savePass), site(std::move(_site))
|
|
{
|
|
}
|
|
|
|
QMap<QString, std::pair<QString, UserConnection_Information>> UserConnection_Information::getServerInfo()
|
|
{
|
|
QMap<QString, std::pair<QString, UserConnection_Information>> serverList;
|
|
|
|
ServersSettings &servers = SettingsCache::instance().servers();
|
|
|
|
int size = servers.getValue("totalServers", "server", "server_details").toInt() + 1;
|
|
|
|
for (int i = 0; i < size; i++) {
|
|
QString _saveName = servers.getValue(QString("saveName%1").arg(i), "server", "server_details").toString();
|
|
QString serverName = servers.getValue(QString("server%1").arg(i), "server", "server_details").toString();
|
|
QString portNum = servers.getValue(QString("port%1").arg(i), "server", "server_details").toString();
|
|
QString userName = servers.getValue(QString("username%1").arg(i), "server", "server_details").toString();
|
|
QString pass = servers.getValue(QString("password%1").arg(i), "server", "server_details").toString();
|
|
bool savePass = servers.getValue(QString("savePassword%1").arg(i), "server", "server_details").toBool();
|
|
QString _site = servers.getValue(QString("site%1").arg(i), "server", "server_details").toString();
|
|
|
|
UserConnection_Information userInfo(_saveName, serverName, portNum, userName, pass, savePass, _site);
|
|
serverList.insert(_saveName, std::make_pair(serverName, userInfo));
|
|
}
|
|
|
|
return serverList;
|
|
}
|
|
|
|
QStringList UserConnection_Information::getServerInfo(const QString &find)
|
|
{
|
|
QStringList _server;
|
|
|
|
ServersSettings &servers = SettingsCache::instance().servers();
|
|
|
|
int size = servers.getValue("totalServers", "server", "server_details").toInt() + 1;
|
|
for (int i = 0; i < size; i++) {
|
|
QString _saveName = servers.getValue(QString("saveName%1").arg(i), "server", "server_details").toString();
|
|
|
|
if (find != _saveName)
|
|
continue;
|
|
|
|
QString serverName = servers.getValue(QString("server%1").arg(i), "server", "server_details").toString();
|
|
QString portNum = servers.getValue(QString("port%1").arg(i), "server", "server_details").toString();
|
|
QString userName = servers.getValue(QString("username%1").arg(i), "server", "server_details").toString();
|
|
QString pass = servers.getValue(QString("password%1").arg(i), "server", "server_details").toString();
|
|
bool savePass = servers.getValue(QString("savePassword%1").arg(i), "server", "server_details").toBool();
|
|
QString _site = servers.getValue(QString("site%1").arg(i), "server", "server_details").toString();
|
|
|
|
_server.append(_saveName);
|
|
_server.append(serverName);
|
|
_server.append(portNum);
|
|
_server.append(userName);
|
|
_server.append(pass);
|
|
_server.append(savePass ? "1" : "0");
|
|
_server.append(_site);
|
|
break;
|
|
}
|
|
|
|
if (_server.empty())
|
|
qCWarning(UserInfoConnectionLog) << "There was a problem!";
|
|
|
|
return _server;
|
|
}
|