pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Directly determine file download URL in js client

Browse source 
We don't need an extra round trip here
This commit is contained in:
Gina Häußge 2016-09-16 18:36:09 +02:00
parent 53c0ad0889
commit d017e507aa
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/octoprint/static/js/app/client/files.js
View file

@ -9,11 +9,20 @@
}
})(function(OctoPrint, $, _) {
var url = "api/files";
var downloadUrl = "downloads/files";
var resourceForLocation = function(location) {
return url + "/" + location;
};
var downloadForLocation = function(location) {
return downloadUrl + "/" + location;
};
var downloadForEntry = function(location, filename) {
return downloadForLocation(location) + "/" + filename;
};
var resourceForEntry = function(location, filename) {
return resourceForLocation(location) + "/" + filename;
};
@ -119,21 +128,7 @@
},
download: function (location, path, opts) {
var deferred = $.Deferred();
getEntry(location, path, opts)
.done(function (response) {
OctoPrint.download(response.refs.download, opts)
.done(function () {
deferred.resolve.apply(null, arguments);
})
.fail(function () {
deferred.reject.apply(null, arguments);
});
})
.fail(function () {
deferred.reject.apply(null, arguments);
});
return deferred.promise();
return OctoPrint.download(downloadForEntry(location, path), opts);
}
}
});