From 858873dfa03090d56298fecd649fd407854fe7e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Mon, 20 Jan 2014 15:33:08 +0100 Subject: [PATCH] Also provide the filename (basename without the path) in print events --- src/octoprint/util/comm.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py index 1a970495..4679fc22 100644 --- a/src/octoprint/util/comm.py +++ b/src/octoprint/util/comm.py @@ -341,6 +341,7 @@ class MachineCom(object): if self._currentFile is not None: payload = { "file": self._currentFile.getFilename(), + "filename": os.path.basename(self._currentFile.getFilename()), "origin": self._currentFile.getFileLocation() } eventManager().fire(Events.PRINT_FAILED, payload) @@ -372,6 +373,7 @@ class MachineCom(object): self._changeState(self.STATE_PRINTING) eventManager().fire(Events.PRINT_STARTED, { "file": self._currentFile.getFilename(), + "filename": os.path.basename(self._currentFile.getFilename()), "origin": self._currentFile.getFileLocation() }) @@ -438,6 +440,7 @@ class MachineCom(object): eventManager().fire(Events.PRINT_CANCELLED, { "file": self._currentFile.getFilename(), + "filename": os.path.basename(self._currentFile.getFilename()), "origin": self._currentFile.getFileLocation() }) @@ -454,6 +457,7 @@ class MachineCom(object): eventManager().fire(Events.PRINT_RESUMED, { "file": self._currentFile.getFilename(), + "filename": os.path.basename(self._currentFile.getFilename()), "origin": self._currentFile.getFileLocation() }) elif pause and self.isPrinting(): @@ -463,6 +467,7 @@ class MachineCom(object): eventManager().fire(Events.PRINT_PAUSED, { "file": self._currentFile.getFilename(), + "filename": os.path.basename(self._currentFile.getFilename()), "origin": self._currentFile.getFileLocation() }) @@ -665,6 +670,7 @@ class MachineCom(object): self._changeState(self.STATE_OPERATIONAL) eventManager().fire(Events.PRINT_DONE, { "file": self._currentFile.getFilename(), + "filename": os.path.basename(self._currentFile.getFilename()), "origin": self._currentFile.getFileLocation(), "time": time.time() - self._currentFile.getStartTime() }) @@ -939,6 +945,7 @@ class MachineCom(object): else: payload = { "file": self._currentFile.getFilename(), + "filename": os.path.basename(self._currentFile.getFilename()), "origin": self._currentFile.getFileLocation(), "time": time.time() - self._currentFile.getStartTime() }