Commit cb0591c3 authored by Cristiano Urban's avatar Cristiano Urban
Browse files

Added suffix to timestamp wrapper dirs. 



Signed-off-by: default avatarCristiano Urban <cristiano.urban@inaf.it>
parent 34d1dd68

transfer_service/store_preprocessor.py

+3 −3
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ class StorePreprocessor(TaskExecutor): 


        # Case 1: /home/user/store contains both files and dirs

        if files and dirs:

            destPath = self.path + '/' + timestamp

            destPath = self.path + '/' + timestamp + "-vos_wrapper"

            try:

                os.mkdir(destPath)

            except OSError as error:
@@ -113,7 +113,7 @@ class StorePreprocessor(TaskExecutor): 
            self.md5calc.recursive(destPath)

        # Case 2: /home/user/store contains only files

        elif files and not dirs:

            destPath = self.path + '/' + timestamp

            destPath = self.path + '/' + timestamp + "-vos_wrapper"

            try:

                os.mkdir(destPath)

            except OSError as error:
@@ -141,7 +141,7 @@ class StorePreprocessor(TaskExecutor): 
        out.write(f"USER: {self.username}\n")

        out.write(f"USER_ID: {self.userId}\n")

        pathPrefix = self.storageStorePath.replace("{username}", self.username)

        tstampWrapperDirPattern = re.compile("/[0-9]{4}_[0-9]{2}_[0-9]{2}-[0-9]{2}_[0-9]{2}_[0-9]{2}")

        tstampWrapperDirPattern = re.compile("/[0-9]{4}_[0-9]{2}_[0-9]{2}-[0-9]{2}_[0-9]{2}_[0-9]{2}-vos_wrapper")

        for dir in dirs:

            out.write(f"DIR: {dir}\n")

            out.write(f"pathPrefix: {pathPrefix}\n")