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

Fix for deleting the file that is currently selected

Browse source 
Due to a missing switch to a refactored version of an internal data structure, that file stayed being selected but wasn't actually there anymore, leading to an error upon hitting Print.
This commit is contained in:
Gina Häußge 2014-10-06 19:01:30 +02:00
parent cd973adedf
commit 10d76ae7a4
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/octoprint/server/api/files.py
View file

@ -359,17 +359,15 @@ def deleteGcodeFile(filename, target):
if not _verifyFileExists(target, filename):
return make_response("File not found on '%s': %s" % (target, filename), 404)
sd = target == FileDestinations.SDCARD
currentJob = printer.getCurrentJob()
currentFilename = None
currentSd = None
if currentJob is not None and "filename" in currentJob.keys() and "sd" in currentJob.keys():
currentFilename = currentJob["filename"]
currentSd = currentJob["sd"]
currentOrigin = None
if currentJob is not None and "file" in currentJob.keys() and "name" in currentJob["file"] and "origin" in currentJob["file"]:
currentFilename = currentJob["file"]["name"]
currentOrigin = currentJob["file"]["origin"]
# prohibit deleting the file that is currently being printed
if currentFilename == filename and currentSd == sd and (printer.isPrinting() or printer.isPaused()):
if currentFilename == filename and currentOrigin == target and (printer.isPrinting() or printer.isPaused()):
make_response("Trying to delete file that is currently being printed: %s" % filename, 409)
# deselect the file if it's currently selected
@ -377,7 +375,7 @@ def deleteGcodeFile(filename, target):
printer.unselectFile()
# delete it
if sd:
if target == FileDestinations.SDCARD:
printer.deleteSdFile(filename)
else:
fileManager.remove_file(target, filename)