Skip to content
Snippets Groups Projects
Commit c5ed06b7 authored by sveseli's avatar sveseli
Browse files

hashtag file name fix

parent 1149511a
No related branches found
No related tags found
No related merge requests found
...@@ -28,6 +28,16 @@ class GridftpFileTransferPlugin(FileTransferPlugin): ...@@ -28,6 +28,16 @@ class GridftpFileTransferPlugin(FileTransferPlugin):
self.directoryTransferCommand = directoryTransferCommand self.directoryTransferCommand = directoryTransferCommand
self.pluginMustProcessFiles = pluginMustProcessFiles self.pluginMustProcessFiles = pluginMustProcessFiles
def replaceSpecialCharacters(self, url):
replacementMap = {
'#' : '%23',
' ' : '%20',
'~' : '%7E',
}
for (original, replacement) in replacementMap.items():
url = url.replace(original,replacement)
return url
def getSrcUrl(self, filePath, dataDirectory): def getSrcUrl(self, filePath, dataDirectory):
(scheme, host, port, dirPath) = FtpUtility.parseFtpUrl(dataDirectory, defaultPort=self.DEFAULT_PORT) (scheme, host, port, dirPath) = FtpUtility.parseFtpUrl(dataDirectory, defaultPort=self.DEFAULT_PORT)
if scheme: if scheme:
...@@ -36,7 +46,7 @@ class GridftpFileTransferPlugin(FileTransferPlugin): ...@@ -36,7 +46,7 @@ class GridftpFileTransferPlugin(FileTransferPlugin):
srcUrl = 'file://%s' % filePath srcUrl = 'file://%s' % filePath
else: else:
srcUrl = '%s/%s' % (self.src,filePath) srcUrl = '%s/%s' % (self.src,filePath)
return srcUrl return self.replaceSpecialCharacters(srcUrl)
def getDestUrl(self, filePath, dataDirectory, storageHost, storageDirectory): def getDestUrl(self, filePath, dataDirectory, storageHost, storageDirectory):
(scheme, host, port, dirPath) = FtpUtility.parseFtpUrl(dataDirectory, defaultPort=self.DEFAULT_PORT) (scheme, host, port, dirPath) = FtpUtility.parseFtpUrl(dataDirectory, defaultPort=self.DEFAULT_PORT)
...@@ -46,7 +56,7 @@ class GridftpFileTransferPlugin(FileTransferPlugin): ...@@ -46,7 +56,7 @@ class GridftpFileTransferPlugin(FileTransferPlugin):
destUrl = '%s/%s/%s' % (self.dest, dirName, fileName) destUrl = '%s/%s/%s' % (self.dest, dirName, fileName)
else: else:
destUrl = 'sshftp://%s/%s/%s/%s' % (storageHost, storageDirectory, dirName, fileName) destUrl = 'sshftp://%s/%s/%s/%s' % (storageHost, storageDirectory, dirName, fileName)
return destUrl return self.replaceSpecialCharacters(destUrl)
def checkUploadFilesForProcessing(self, filePathsDict, uploadInfo): def checkUploadFilesForProcessing(self, filePathsDict, uploadInfo):
if not self.pluginMustProcessFiles: if not self.pluginMustProcessFiles:
......
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