fix (DMS.directory-sync): more use of returnSingleResult and log/error copy paste fixes

Author: andresailer

src/DIRAC/DataManagementSystem/scripts/dirac_dms_directory_sync.py

@@ -218,26 +218,6 @@ def removeRemoteFiles(dm, lfns):
             else:
                 return S_OK()
 
-    def uploadLocalFile(dm, lfn, localfile, storage):
-        """
-        Upload a local file to a storage element
-        """
-        res = returnSingleResult(dm.putAndRegister(lfn, localfile, storage, None))
-        if not res["OK"]:
-            return S_ERROR("Error: failed to upload %s to %s: %s" % (lfn, storage, res["Message"]))
-        else:
-            return S_OK("Successfully uploaded file to %s" % storage)
-
-    def downloadRemoteFile(dm, lfn, destination):
-        """
-        Download a file from the system
-        """
-        res = dm.getFile(lfn, destination)
-        if not res["OK"]:
-            return S_ERROR("Error: failed to download %s " % lfn)
-        else:
-            return S_OK("Successfully uploaded file %s" % lfn)
-
     def removeStorageDirectoryFromSE(directory, storageElement):
         """
         Delete directory on selected storage element
@@ -275,19 +255,6 @@ def removeRemoteDirectory(fc, lfn):
 
         return S_OK("Successfully removed directory")
 
-    def createRemoteDirectory(fc, newdir):
-        """
-        Create directory in file catalog
-        """
-        result = fc.createDirectory(newdir)
-        if result["OK"]:
-            if result["Value"]["Successful"] and newdir in result["Value"]["Successful"]:
-                return S_OK("Successfully created directory:" + newdir)
-            elif result["Value"]["Failed"] and newdir in result["Value"]["Failed"]:
-                return S_ERROR("Failed to create directory: " + result["Value"]["Failed"][newdir])
-        else:
-            return S_ERROR("Failed to create directory:" + result["Message"])
-
     def createLocalDirectory(directory):
         """
         Create local directory
@@ -304,7 +271,7 @@ def removeLocalFile(path):
         try:
             os.remove(path)
         except OSError as e:
-            return S_ERROR("Directory creation failed:" + e.strerror)
+            return S_ERROR("File deletion failed:" + e.strerror)
 
         if os.path.isfile(path):
             return S_ERROR("File deleting failed")
@@ -346,7 +313,7 @@ def doUpload(fc, dm, result, source_dir, dest_dir, storage, delete, nthreads):
                     gLogger.notice("Deleting " + directoryname + " -> [DONE]")
 
         for directoryname in result["Value"]["Create"]["Directories"]:
-            res = createRemoteDirectory(fc, dest_dir + "/" + directoryname)
+            res = returnSingleResult(fc.createDirectory(dest_dir + "/" + directoryname))
             if not res["OK"]:
                 gLogger.fatal("Creation of directory: " + directoryname + " -X- [FAILED] " + res["Message"])
                 DIRAC.exit(1)
@@ -377,10 +344,11 @@ def uploadListOfFiles(dm, source_dir, dest_dir, storage, listOfFiles, tID):
         log = gLogger.getLocalSubLogger("[Thread %s] " % tID)
         threadLine = "[Thread %s]" % tID
         for filename in listOfFiles:
-            res = uploadLocalFile(dm, dest_dir + "/" + filename, source_dir + "/" + filename, storage)
+            destLFN = os.path.join(dest_dir, filename)
+            res = returnSingleResult(dm.putAndRegister(destLFN, source_dir + "/" + filename, storage, None))
             if not res["OK"]:
                 log.fatal(threadLine + " Uploading " + filename + " -X- [FAILED] " + res["Message"])
-                listOfFailedFiles.append("%s: %s" % (filename, res["Message"]))
+                listOfFailedFiles.append("%s: %s" % (destLFN, res["Message"]))
             else:
                 log.notice(threadLine + " Uploading " + filename + " -> [DONE]")
 
@@ -454,10 +422,11 @@ def downloadListOfFiles(dm, source_dir, dest_dir, listOfFiles, tID):
         log = gLogger.getLocalSubLogger("[Thread %s] " % tID)
         threadLine = "[Thread %s]" % tID
         for filename in listOfFiles:
-            res = downloadRemoteFile(dm, source_dir + "/" + filename, dest_dir + ("/" + filename).rsplit("/", 1)[0])
+            sourceLFN = os.path.join(source_dir, filename)
+            res = returnSingleResult(dm.getFile(sourceLFN, dest_dir + ("/" + filename).rsplit("/", 1)[0]))
             if not res["OK"]:
                 log.fatal(threadLine + " Downloading " + filename + " -X- [FAILED] " + res["Message"])
-                listOfFailedFiles.append("%s: %s" % (filename, res["Message"]))
+                listOfFailedFiles.append("%s: %s" % (sourceLFN, res["Message"]))
             else:
                 log.notice(threadLine + " Downloading " + filename + " -> [DONE]")