Skip to content
Snippets Groups Projects
Commit 7b7ad85d authored by Manuela Kuhn's avatar Manuela Kuhn
Browse files

Reorganized receiver

parent e8062951
No related branches found
No related tags found
No related merge requests found
......@@ -171,12 +171,12 @@ class FileReceiver:
"""
targetFilename = configDict["filename"]
targetRelativePath = configDict["relativeParent"]
targetRelativePath = configDict["relativePath"]
if targetRelativePath is '' or targetRelativePath is None:
targetPath = self.getOutputDir()
else:
targetPath = os.path.join(self.getOutputDir(), targetRelativePath)
targetPath = os.path.normpath(self.getOutputDir() + os.sep + targetRelativePath)
targetFilepath = os.path.join(targetPath, targetFilename)
......@@ -192,7 +192,7 @@ class FileReceiver:
generates path where target file will saved to.
"""
targetRelativePath = configDict["relativeParent"]
targetRelativePath = configDict["relativePath"]
outputDir = self.getOutputDir()
targetPath = os.path.join(outputDir, targetRelativePath)
......
......@@ -5,7 +5,8 @@ import time
from threading import Thread
### Get configured paths and files
LIVEVIEWER_PATH = os.path.dirname ( os.path.dirname ( os.path.dirname ( os.path.realpath ( __file__ ) ) ) ) + os.sep + "src"
LIVEVIEWER_PATH = os.path.dirname ( os.path.dirname ( os.path.realpath ( __file__ ) ) ) + os.sep + "src"
print LIVEVIEWER_PATH
sys.path.append ( LIVEVIEWER_PATH )
from LiveViewer import LiveView
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment