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

WebAPI: fix root_folder default behavior

Browse Source 
Bug was introduced in
6b33db3ae3fe9d37c5f73737b537a64c77d2830e
This commit is contained in:
Chocobo1 2017-09-19 13:03:54 +08:00
parent b9e233601d
commit b107c0671d
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/webui/webapplication.cpp
View File

@ -394,7 +394,7 @@ void WebApplication::action_command_download()
QStringList list = urls.split('\n'); QStringList list = urls.split('\n');
bool skipChecking = request().posts["skip_checking"] == "true"; bool skipChecking = request().posts["skip_checking"] == "true";
bool addPaused = request().posts["paused"] == "true"; bool addPaused = request().posts["paused"] == "true";
bool hasRootFolder = request().posts["root_folder"] == "true"; const QString rootFolder = request().posts["root_folder"];
QString savepath = request().posts["savepath"]; QString savepath = request().posts["savepath"];
QString category = request().posts["category"]; QString category = request().posts["category"];
QString cookie = request().posts["cookie"]; QString cookie = request().posts["cookie"];
@ -423,9 +423,12 @@ void WebApplication::action_command_download()
params.skipChecking = skipChecking; params.skipChecking = skipChecking;
params.addPaused = TriStateBool(addPaused); params.addPaused = TriStateBool(addPaused);
params.createSubfolder = TriStateBool(hasRootFolder);
params.savePath = savepath; params.savePath = savepath;
params.category = category; params.category = category;
if (rootFolder == "true")
params.createSubfolder = TriStateBool::True;
else if (rootFolder == "false")
params.createSubfolder = TriStateBool::False;
bool partialSuccess = false; bool partialSuccess = false;
foreach (QString url, list) { foreach (QString url, list) {
@ -448,7 +451,7 @@ void WebApplication::action_command_upload()
CHECK_URI(0); CHECK_URI(0);
bool skipChecking = request().posts["skip_checking"] == "true"; bool skipChecking = request().posts["skip_checking"] == "true";
bool addPaused = request().posts["paused"] == "true"; bool addPaused = request().posts["paused"] == "true";
bool hasRootFolder = request().posts["root_folder"] == "true"; const QString rootFolder = request().posts["root_folder"];
QString savepath = request().posts["savepath"]; QString savepath = request().posts["savepath"];
QString category = request().posts["category"]; QString category = request().posts["category"];
@ -471,9 +474,13 @@ void WebApplication::action_command_upload()
params.skipChecking = skipChecking; params.skipChecking = skipChecking;
params.addPaused = TriStateBool(addPaused); params.addPaused = TriStateBool(addPaused);
params.createSubfolder = TriStateBool(hasRootFolder);
params.savePath = savepath; params.savePath = savepath;
params.category = category; params.category = category;
if (rootFolder == "true")
params.createSubfolder = TriStateBool::True;
else if (rootFolder == "false")
params.createSubfolder = TriStateBool::False;
if (!BitTorrent::Session::instance()->addTorrent(torrentInfo, params)) { if (!BitTorrent::Session::instance()->addTorrent(torrentInfo, params)) {
status(500, "Internal Server Error"); status(500, "Internal Server Error");
print(QObject::tr("Error: Could not add torrent to session."), Http::CONTENT_TYPE_TXT); print(QObject::tr("Error: Could not add torrent to session."), Http::CONTENT_TYPE_TXT);