development/webtester
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some smaller fixes and improvements for joomla testing

Browse Source
This commit is contained in:
Marc Wäckerlin
2016-05-03 06:52:11 +00:00
parent 1340c1efe5
commit b177a78c89
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/commands.hxx
View File

@@ -1548,6 +1548,8 @@ class Download: public Command {
} }
bool execute(Script* script, QWebFrame* frame) { bool execute(Script* script, QWebFrame* frame) {
Logger log(this, script); Logger log(this, script);
_realfilename = script->replacevars(_filename);
log("REALFILENAME="+_realfilename);
frame->page()->setForwardUnsupportedContent(true); frame->page()->setForwardUnsupportedContent(true);
connect(frame->page(), SIGNAL(unsupportedContent(QNetworkReply*)), connect(frame->page(), SIGNAL(unsupportedContent(QNetworkReply*)),
this, SLOT(unsupportedContent(QNetworkReply*))); this, SLOT(unsupportedContent(QNetworkReply*)));
@@ -1577,11 +1579,9 @@ class Download: public Command {
_filesuccess = filesuccess; _filesuccess = filesuccess;
} }
void unsupportedContent(QNetworkReply* reply) { void unsupportedContent(QNetworkReply* reply) {
if (!_realfilename.size()) {
_realfilename = reply->url().toString().split('/').last(); _realfilename = reply->url().toString().split('/').last();
if (_filename.size()) if (reply->header(QNetworkRequest::ContentDispositionHeader).isValid()) {
_realfilename = _filename;
else if (reply->header(QNetworkRequest::ContentDispositionHeader)
.isValid()) {
QString part(reply->header(QNetworkRequest::ContentDispositionHeader) QString part(reply->header(QNetworkRequest::ContentDispositionHeader)
.toString()); .toString());
if (part.contains(QRegularExpression("attachment; *filename="))) { if (part.contains(QRegularExpression("attachment; *filename="))) {
@@ -1589,6 +1589,7 @@ class Download: public Command {
if (part.size()) _realfilename = part; if (part.size()) _realfilename = part;
} }
} }
}
connect(new RunDownload(reply, _realfilename), connect(new RunDownload(reply, _realfilename),
SIGNAL(completed(bool, bool)), SLOT(completed(bool, bool))); SIGNAL(completed(bool, bool)), SLOT(completed(bool, bool)));
} }