fix compression tools for files that are already compressed

src/python/dm/aps_beamline_tools/cli/compressFilesCli.py

@@ -138,9 +138,10 @@ Description:
                 fileMetadata = fileMetadataList.pop()
                 fileId = fileMetadata.get('id')
                 experimentFilePath = fileMetadata.get('experimentFilePath')
-                print('Requesting compression for file %s' % (experimentFilePath))
-                experimentFile = dsFileApi.compressFile(experimentFilePath, experimentName, compression)
-                modifiedFileMetadata = {'id' : fileId, 'compression' : experimentFile['compression'], 'experimentName' : experimentName, 'experimentFilePath' : experimentFilePath }
+                if not experimentFilePath.endswith(compression):
+                    print('Requesting compression for file %s' % (experimentFilePath))
+                    experimentFile = dsFileApi.compressFile(experimentFilePath, experimentName, compression)
+                modifiedFileMetadata = {'id' : fileId, 'compression' : compression, 'experimentName' : experimentName, 'experimentFilePath' : experimentFilePath }
                 requestedMetadataList.append(modifiedFileMetadata)
  
             # Update catalog after file gets compressed
@@ -148,7 +149,9 @@ Description:
             while len(requestedMetadataList):
                 requestedFileMetadata = requestedMetadataList.pop()
                 experimentFilePath = requestedFileMetadata['experimentFilePath']
-                compressedExperimentFilePath = '%s.%s' % (experimentFilePath, compression)
+                compressedExperimentFilePath = experimentFilePath
+                if not experimentFilePath.endswith(compression):
+                    compressedExperimentFilePath = '%s.%s' % (experimentFilePath, compression)
                 print('Waiting on compression for file %s (%s/%s)' % (experimentFilePath,(nCompressed+1),nFiles))
                 while True:
                     try:

src/python/dm/aps_beamline_tools/cli/decompressFilesCli.py

@@ -128,8 +128,9 @@ Description:
                 fileId = fileMetadata.get('id')
                 experimentFilePath = fileMetadata.get('experimentFilePath')
                 compression = fileMetadata.get('compression')
-                print('Requesting decompression for file %s' % (experimentFilePath))
-                experimentFile = dsFileApi.decompressFile(experimentFilePath, experimentName, compression)
+                if not experimentFilePath.endswith(compression):
+                    print('Requesting decompression for file %s' % (experimentFilePath))
+                    experimentFile = dsFileApi.decompressFile(experimentFilePath, experimentName, compression)
                 modifiedFileMetadata = {'id' : fileId, 'compression' : '', 'experimentName' : experimentName, 'experimentFilePath' : experimentFilePath }
                 requestedMetadataList.append(modifiedFileMetadata)