github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-25 23:55:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[Web UI] Fix API Content Types. Closes #3393

Browse source 
Conflicts:
	src/core/http/types.h
	src/webui/webapplication.cpp
This commit is contained in:
ngosang 2015-07-11 12:26:00 +02:00 • committed by sledgehammer999
commit 9d5d1dfea8
2 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/core/http/types.h
View file

@ -47,7 +47,8 @@ const QString HEADER_CACHE_CONTROL = "Cache-Control";
const QString CONTENT_TYPE_CSS = "text/css; charset=UTF-8"; const QString CONTENT_TYPE_CSS = "text/css; charset=UTF-8";
const QString CONTENT_TYPE_GIF = "image/gif"; const QString CONTENT_TYPE_GIF = "image/gif";
const QString CONTENT_TYPE_HTML = "text/html; charset=UTF-8"; const QString CONTENT_TYPE_HTML = "text/html; charset=UTF-8";
const QString CONTENT_TYPE_JS = "text/javascript; charset=UTF-8"; const QString CONTENT_TYPE_JS = "application/javascript; charset=UTF-8";
const QString CONTENT_TYPE_JSON = "application/json";
const QString CONTENT_TYPE_PNG = "image/png"; const QString CONTENT_TYPE_PNG = "image/png";
const QString CONTENT_TYPE_TXT = "text/plain; charset=UTF-8"; const QString CONTENT_TYPE_TXT = "text/plain; charset=UTF-8";

28
src/webui/webapplication.cpp
View file

@ -229,43 +229,43 @@ void WebApplication::action_query_torrents()
print(btjson::getTorrents( print(btjson::getTorrents(
gets["filter"], gets["label"], gets["sort"], gets["reverse"] == "true", gets["filter"], gets["label"], gets["sort"], gets["reverse"] == "true",
gets["limit"].toInt(), gets["offset"].toInt() gets["limit"].toInt(), gets["offset"].toInt()
), Http::CONTENT_TYPE_JS); ), Http::CONTENT_TYPE_JSON);
} }
void WebApplication::action_query_preferences() void WebApplication::action_query_preferences()
{ {
CHECK_URI(0); CHECK_URI(0);
print(prefjson::getPreferences(), Http::CONTENT_TYPE_JS); print(prefjson::getPreferences(), Http::CONTENT_TYPE_JSON);
} }
void WebApplication::action_query_transferInfo() void WebApplication::action_query_transferInfo()
{ {
CHECK_URI(0); CHECK_URI(0);
print(btjson::getTransferInfo(), Http::CONTENT_TYPE_JS); print(btjson::getTransferInfo(), Http::CONTENT_TYPE_JSON);
} }
void WebApplication::action_query_propertiesGeneral() void WebApplication::action_query_propertiesGeneral()
{ {
CHECK_URI(1); CHECK_URI(1);
print(btjson::getPropertiesForTorrent(args_.front()), Http::CONTENT_TYPE_JS); print(btjson::getPropertiesForTorrent(args_.front()), Http::CONTENT_TYPE_JSON);
} }
void WebApplication::action_query_propertiesTrackers() void WebApplication::action_query_propertiesTrackers()
{ {
CHECK_URI(1); CHECK_URI(1);
print(btjson::getTrackersForTorrent(args_.front()), Http::CONTENT_TYPE_JS); print(btjson::getTrackersForTorrent(args_.front()), Http::CONTENT_TYPE_JSON);
} }
void WebApplication::action_query_propertiesWebSeeds() void WebApplication::action_query_propertiesWebSeeds()
{ {
CHECK_URI(1); CHECK_URI(1);
print(btjson::getWebSeedsForTorrent(args_.front()), Http::CONTENT_TYPE_JS); print(btjson::getWebSeedsForTorrent(args_.front()), Http::CONTENT_TYPE_JSON);
} }
void WebApplication::action_query_propertiesFiles() void WebApplication::action_query_propertiesFiles()
{ {
CHECK_URI(1); CHECK_URI(1);
print(btjson::getFilesForTorrent(args_.front()), Http::CONTENT_TYPE_JS); print(btjson::getFilesForTorrent(args_.front()), Http::CONTENT_TYPE_JSON);
} }
// GET param: // GET param:
@ -273,7 +273,9 @@ void WebApplication::action_query_propertiesFiles()
void WebApplication::action_sync_maindata() void WebApplication::action_sync_maindata()
{ {
CHECK_URI(0); CHECK_URI(0);
print(btjson::getSyncMainData(request().gets["rid"].toInt(), session()->syncMainDataLastResponse, session()->syncMainDataLastAcceptedResponse)); print(btjson::getSyncMainData(request().gets["rid"].toInt(),
session()->syncMainDataLastResponse,
session()->syncMainDataLastAcceptedResponse), Http::CONTENT_TYPE_JSON);
} }
void WebApplication::action_version_api() void WebApplication::action_version_api()
@ -417,13 +419,13 @@ void WebApplication::action_command_setFilePrio()
void WebApplication::action_command_getGlobalUpLimit() void WebApplication::action_command_getGlobalUpLimit()
{ {
CHECK_URI(0); CHECK_URI(0);
print(QByteArray::number(QBtSession::instance()->getSession()->settings().upload_rate_limit)); print(QByteArray::number(QBtSession::instance()->getSession()->settings().upload_rate_limit), Http::CONTENT_TYPE_TXT);
} }
void WebApplication::action_command_getGlobalDlLimit() void WebApplication::action_command_getGlobalDlLimit()
{ {
CHECK_URI(0); CHECK_URI(0);
print(QByteArray::number(QBtSession::instance()->getSession()->settings().download_rate_limit)); print(QByteArray::number(QBtSession::instance()->getSession()->settings().download_rate_limit), Http::CONTENT_TYPE_TXT);
} }
void WebApplication::action_command_setGlobalUpLimit() void WebApplication::action_command_setGlobalUpLimit()
@ -459,7 +461,7 @@ void WebApplication::action_command_getTorrentsUpLimit()
CHECK_URI(0); CHECK_URI(0);
CHECK_PARAMETERS("hashes"); CHECK_PARAMETERS("hashes");
QStringList hashes = request().posts["hashes"].split("|"); QStringList hashes = request().posts["hashes"].split("|");
print(btjson::getTorrentsRatesLimits(hashes, false), Http::CONTENT_TYPE_JS); print(btjson::getTorrentsRatesLimits(hashes, false), Http::CONTENT_TYPE_JSON);
} }
void WebApplication::action_command_getTorrentsDlLimit() void WebApplication::action_command_getTorrentsDlLimit()
@ -467,7 +469,7 @@ void WebApplication::action_command_getTorrentsDlLimit()
CHECK_URI(0); CHECK_URI(0);
CHECK_PARAMETERS("hashes"); CHECK_PARAMETERS("hashes");
QStringList hashes = request().posts["hashes"].split("|"); QStringList hashes = request().posts["hashes"].split("|");
print(btjson::getTorrentsRatesLimits(hashes, true), Http::CONTENT_TYPE_JS); print(btjson::getTorrentsRatesLimits(hashes, true), Http::CONTENT_TYPE_JSON);
} }
void WebApplication::action_command_setTorrentsUpLimit() void WebApplication::action_command_setTorrentsUpLimit()
@ -513,7 +515,7 @@ void WebApplication::action_command_toggleAlternativeSpeedLimits()
void WebApplication::action_command_alternativeSpeedLimitsEnabled() void WebApplication::action_command_alternativeSpeedLimitsEnabled()
{ {
CHECK_URI(0); CHECK_URI(0);
print(QByteArray::number(Preferences::instance()->isAltBandwidthEnabled())); print(QByteArray::number(Preferences::instance()->isAltBandwidthEnabled()), Http::CONTENT_TYPE_TXT);
} }
void WebApplication::action_command_toggleSequentialDownload() void WebApplication::action_command_toggleSequentialDownload()