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

Migrate to new utility methods for testing URLs & executable paths

Browse source
This commit is contained in:
Gina Häußge 2015-09-28 17:08:25 +02:00
parent c5f0ccdb94
commit 7b7f21d126
2 changed files with 20 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/octoprint/plugins/cura/static/js/cura.js
View file

@ -168,13 +168,9 @@ $(function() {
$("#settings_plugin_cura_import").modal("show");
};
self.testEnginePath = function(successCallback) {
self.sendTestRequest(self.settings.plugins.cura.cura_engine());
};
self.sendTestRequest = function(enginePath, successCallback) {
if (successCallback == undefined) {
successCallback = function(response) {
self.testEnginePath = function() {
OctoPrint.util.testExecutable(self.settings.plugins.cura.cura_engine())
.done(function(response) {
if (!response.result) {
if (!response.exists) {
self.pathText(gettext("The path doesn't exist"));
@ -188,11 +184,7 @@ $(function() {
}
self.pathOk(response.result);
self.pathBroken(!response.result);
}
}
OctoPrint.util.test("path", {path: enginePath, check_type: "file", check_access: "x"})
.done(successCallback);
});
};
self.requestData = function() {

45
src/octoprint/static/js/app/viewmodels/settings.js
View file

@ -226,12 +226,7 @@ $(function() {
var errorText = gettext("Could not retrieve snapshot URL, please double check the URL");
var errorTitle = gettext("Snapshot test failed");
var data = {
url: self.webcam_snapshotUrl(),
method: "GET",
response: true
};
OctoPrint.util.test("url", data)
OctoPrint.util.testUrl(self.webcam_snapshotUrl(), {method: "GET", response: true})
.done(function(response) {
$("i.icon-spinner", target).remove();
@ -271,30 +266,22 @@ $(function() {
return;
}
var successCallback = function(response) {
if (!response.result) {
if (!response.exists) {
self.webcam_ffmpegPathText(gettext("The path doesn't exist"));
} else if (!response.typeok) {
self.webcam_ffmpegPathText(gettext("The path is not a file"));
} else if (!response.access) {
self.webcam_ffmpegPathText(gettext("The path is not an executable"));
OctoPrint.util.testExecutable(self.webcam_ffmpegPath())
.done(function(response) {
if (!response.result) {
if (!response.exists) {
self.webcam_ffmpegPathText(gettext("The path doesn't exist"));
} else if (!response.typeok) {
self.webcam_ffmpegPathText(gettext("The path is not a file"));
} else if (!response.access) {
self.webcam_ffmpegPathText(gettext("The path is not an executable"));
}
} else {
self.webcam_ffmpegPathText(gettext("The path is valid"));
}
} else {
self.webcam_ffmpegPathText(gettext("The path is valid"));
}
self.webcam_ffmpegPathOk(response.result);
self.webcam_ffmpegPathBroken(!response.result);
};
var path = self.webcam_ffmpegPath();
var data = {
path: path,
check_type: "file",
check_access: "x"
};
OctoPrint.util.test("path", data)
.done(successCallback);
self.webcam_ffmpegPathOk(response.result);
self.webcam_ffmpegPathBroken(!response.result);
});
};
self.onSettingsShown = function() {