3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 07:27:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Moving self.executableName into __init__ as executable_name

Browse source
This commit is contained in:
Thomas Karl Pietrowski 2016-08-02 08:47:48 +02:00
parent 92983636b0
commit fb1b199c6a
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/CuraEngineBackend/CuraEngineBackend.py
View file

@ -40,25 +40,24 @@ class CuraEngineBackend(Backend):
# This registers all the signal listeners and prepares for communication # This registers all the signal listeners and prepares for communication
# with the back-end in general. # with the back-end in general.
executableName = "CuraEngine"
def __init__(self): def __init__(self):
super().__init__() super().__init__()
# Find out where the engine is located, and how it is called. # Find out where the engine is located, and how it is called.
# This depends on how Cura is packaged and which OS we are running on. # This depends on how Cura is packaged and which OS we are running on.
executable_name = "CuraEngine"
default_engine_location = None default_engine_location = None
if os.path.exists(os.path.join(Application.getInstallPrefix(), "bin", self.executableName)): if os.path.exists(os.path.join(Application.getInstallPrefix(), "bin", executable_name)):
default_engine_location = os.path.join(Application.getInstallPrefix(), "bin", self.executableName) default_engine_location = os.path.join(Application.getInstallPrefix(), "bin", executable_name)
if hasattr(sys, "frozen"): if hasattr(sys, "frozen"):
default_engine_location = os.path.join(os.path.dirname(os.path.abspath(sys.executable)), self.executableName) default_engine_location = os.path.join(os.path.dirname(os.path.abspath(sys.executable)), executable_name)
if Platform.isWindows(): if Platform.isWindows():
default_engine_location += ".exe" default_engine_location += ".exe"
if Platform.isLinux() and not default_engine_location: if Platform.isLinux() and not default_engine_location:
if not os.getenv('PATH'): if not os.getenv('PATH'):
raise OSError("There is something wrong with your Linux installation.") raise OSError("There is something wrong with your Linux installation.")
for pathdir in os.getenv('PATH').split(os.pathsep): for pathdir in os.getenv('PATH').split(os.pathsep):
execpath = os.path.join(pathdir, self.executableName) execpath = os.path.join(pathdir, executable_name)
if os.path.exists(execpath): if os.path.exists(execpath):
default_engine_location = execpath default_engine_location = execpath
break break