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

Merge pull request #9069 from AltruisticCompany/mkpath

Browse Source 
Create non-existing path in setLocationAction()
This commit is contained in:
Mike Tzou 2018-06-21 15:45:33 +08:00 committed by GitHub
commit 383a354700
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/webui/api/torrentscontroller.cpp
View File

@ -737,9 +737,16 @@ void TorrentsController::setLocationAction()
const QStringList hashes {params()["hashes"].split("|")}; const QStringList hashes {params()["hashes"].split("|")};
const QString newLocation {params()["location"].trimmed()}; const QString newLocation {params()["location"].trimmed()};
// check if the location exists if (newLocation.isEmpty())
if (newLocation.isEmpty() || !QDir(newLocation).exists()) throw APIError(APIErrorType::BadParams, tr("Save path is empty"));
return;
// try to create the location if it does not exist
if (!QDir(newLocation).mkpath("."))
throw APIError(APIErrorType::Conflict, tr("Cannot make save path"));
// check permissions
if (!QFileInfo(newLocation).isWritable())
throw APIError(APIErrorType::AccessDenied, tr("Cannot write to directory"));
applyToTorrents(hashes, [newLocation](BitTorrent::TorrentHandle *torrent) applyToTorrents(hashes, [newLocation](BitTorrent::TorrentHandle *torrent)
{ {

2
src/webui/www/private/scripts/mocha-init.js
View File

@ -417,7 +417,7 @@ initializeWindows = function() {
paddingVertical: 0, paddingVertical: 0,
paddingHorizontal: 0, paddingHorizontal: 0,
width: 400, width: 400,
height: 100 height: 130
}); });
} }
}; };

10
src/webui/www/private/setlocation.html
View File

@ -31,8 +31,10 @@
new Event(e).stop(); new Event(e).stop();
// check field // check field
var location = $('setLocation').value.trim(); var location = $('setLocation').value.trim();
if (location === null || location === "") if (location === null || location === "") {
$('error_div').set('text', 'QBT_TR(Save path is empty)QBT_TR[CONTEXT=TorrentsController]');
return false; return false;
}
var hashesList = new URI().getData('hashes'); var hashesList = new URI().getData('hashes');
new Request({ new Request({
@ -42,8 +44,11 @@
hashes: hashesList, hashes: hashesList,
location: location location: location
}, },
onComplete: function() { onSuccess: function() {
window.parent.closeWindows(); window.parent.closeWindows();
},
onFailure: function(xhr) {
$('error_div').set('text', xhr.response);
} }
}).send(); }).send();
}); });
@ -55,6 +60,7 @@
<div style="padding: 10px 10px 0px 10px;"> <div style="padding: 10px 10px 0px 10px;">
<p style="font-weight: bold;">QBT_TR(Location)QBT_TR[CONTEXT=TransferListWidget]:</p> <p style="font-weight: bold;">QBT_TR(Location)QBT_TR[CONTEXT=TransferListWidget]:</p>
<input type="text" id="setLocation" value="" maxlength="100" style="width: 370px;" /> <input type="text" id="setLocation" value="" maxlength="100" style="width: 370px;" />
<div style="float: none; width: 370px;" id="error_div">&nbsp;</div>
<div style="text-align: center; padding-top: 10px;"> <div style="text-align: center; padding-top: 10px;">
<input type="button" value="QBT_TR(Save)QBT_TR[CONTEXT=HttpServer]" id="setLocationButton" /> <input type="button" value="QBT_TR(Save)QBT_TR[CONTEXT=HttpServer]" id="setLocationButton" />
</div> </div>