d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-10 23:07:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7584 from Chocobo1/refactor

Browse Source 
[WebAPI] Refactor
This commit is contained in:
Mike Tzou 2017-10-23 19:36:28 +08:00 committed by GitHub
commit b6be5afb89
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/webui/abstractwebapplication.h
View File

@ -79,8 +79,8 @@ protected:
static QString saveTmpFile(const QByteArray &data); static QString saveTmpFile(const QByteArray &data);
WebSessionData *session(); WebSessionData *session();
Http::Request request() const { return request_; } const Http::Request &request() const { return request_; }
Http::Environment env() const { return env_; } const Http::Environment &env() const { return env_; }
private slots: private slots:
void UnbanTimerEvent(); void UnbanTimerEvent();

41
src/webui/webapplication.cpp
View File

@ -262,12 +262,12 @@ void WebApplication::action_public_images()
void WebApplication::action_query_torrents() void WebApplication::action_query_torrents()
{ {
CHECK_URI(0); CHECK_URI(0);
const QStringMap& gets = request().gets;
const QStringMap &gets = request().gets;
print(btjson::getTorrents( print(btjson::getTorrents(
gets["filter"], gets["category"], gets["sort"], gets["reverse"] == "true", gets["filter"], gets["category"], gets["sort"], parseBool(gets["reverse"], false),
gets["limit"].toInt(), gets["offset"].toInt() gets["limit"].toInt(), gets["offset"].toInt())
), Http::CONTENT_TYPE_JSON); , Http::CONTENT_TYPE_JSON);
} }
void WebApplication::action_query_preferences() void WebApplication::action_query_preferences()
@ -315,18 +315,18 @@ void WebApplication::action_query_propertiesFiles()
void WebApplication::action_query_getLog() void WebApplication::action_query_getLog()
{ {
CHECK_URI(0); CHECK_URI(0);
bool normal = request().gets["normal"] != "false";
bool info = request().gets["info"] != "false";
bool warning = request().gets["warning"] != "false";
bool critical = request().gets["critical"] != "false";
int lastKnownId;
bool ok;
lastKnownId = request().gets["last_known_id"].toInt(&ok); const bool isNormal = parseBool(request().gets["normal"], true);
const bool isInfo = parseBool(request().gets["info"], true);
const bool isWarning = parseBool(request().gets["warning"], true);
const bool isCritical = parseBool(request().gets["critical"], true);
bool ok = false;
int lastKnownId = request().gets["last_known_id"].toInt(&ok);
if (!ok) if (!ok)
lastKnownId = -1; lastKnownId = -1;
print(btjson::getLog(normal, info, warning, critical, lastKnownId), Http::CONTENT_TYPE_JSON); print(btjson::getLog(isNormal, isInfo, isWarning, isCritical, lastKnownId), Http::CONTENT_TYPE_JSON);
} }
// GET params: // GET params:
@ -718,8 +718,9 @@ void WebApplication::action_command_setSuperSeeding()
{ {
CHECK_URI(0); CHECK_URI(0);
CHECK_PARAMETERS("hashes" << "value"); CHECK_PARAMETERS("hashes" << "value");
bool value = request().posts["value"] == "true";
QStringList hashes = request().posts["hashes"].split('|'); const bool value = parseBool(request().posts["value"], false);
const QStringList hashes = request().posts["hashes"].split('|');
foreach (const QString &hash, hashes) { foreach (const QString &hash, hashes) {
BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(hash); BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(hash);
if (torrent) if (torrent)
@ -731,8 +732,9 @@ void WebApplication::action_command_setForceStart()
{ {
CHECK_URI(0); CHECK_URI(0);
CHECK_PARAMETERS("hashes" << "value"); CHECK_PARAMETERS("hashes" << "value");
bool value = request().posts["value"] == "true";
QStringList hashes = request().posts["hashes"].split('|'); const bool value = parseBool(request().posts["value"], false);
const QStringList hashes = request().posts["hashes"].split('|');
foreach (const QString &hash, hashes) { foreach (const QString &hash, hashes) {
BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(hash); BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(hash);
if (torrent) if (torrent)
@ -860,13 +862,12 @@ void WebApplication::action_command_setAutoTMM()
CHECK_URI(0); CHECK_URI(0);
CHECK_PARAMETERS("hashes" << "enable"); CHECK_PARAMETERS("hashes" << "enable");
QStringList hashes = request().posts["hashes"].split('|'); const QStringList hashes = request().posts["hashes"].split('|');
QString enableStr = request().posts["enable"]; const bool isEnabled = parseBool(request().posts["enable"], false);
foreach (const QString &hash, hashes) { foreach (const QString &hash, hashes) {
BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(hash); BitTorrent::TorrentHandle *const torrent = BitTorrent::Session::instance()->findTorrent(hash);
if (torrent) if (torrent)
torrent->setAutoTMMEnabled(QString::compare(enableStr, "true", Qt::CaseInsensitive) == 0); torrent->setAutoTMMEnabled(isEnabled);
} }
} }