deploy.py: repackage WAR files using standard zipfile module

This change removes dependency on jar/zip/unzip executables
and simplifies code a bit.

Author: edigaryev

opengrok-tools/src/main/python/opengrok_tools/deploy.py

@@ -27,11 +27,9 @@
 import os
 import sys
 import tempfile
+from zipfile import ZipFile
 from shutil import copyfile
 
-from .utils.command import Command
-from .utils.utils import get_command
-
 """
  deploy war file
 
@@ -44,70 +42,18 @@ def repack_war(logger, sourceWar, targetWar, configFile, defaultConfigFile):
     in the process.
     """
 
-    jar_cmd = get_command(logger, None, 'jar')
-    if jar_cmd:
-        extract_cmd = [jar_cmd, '-xf']
-        compress_cmd = [jar_cmd, '-uf']
-    else:
-        zip_cmd = get_command(logger, None, 'zip')
-        unzip_cmd = get_command(logger, None, 'unzip')
-        if not zip_cmd:
-            raise Exception("zip not found")
-        if not unzip_cmd:
-            raise Exception("unzip not found")
-
-        extract_cmd = [unzip_cmd]
-        compress_cmd = [zip_cmd, '-rf']
-
-    # Resolve the full path. This is needed if sourceWar is specified as
-    # relative path because the process will switch working directory below.
-    sourceWar = os.path.realpath(sourceWar)
-    logger.debug('source war path = {}'.format(sourceWar))
-
-    # Create temporary directory and switch to it.
-    with tempfile.TemporaryDirectory(prefix='OpenGrokWarRepack') as tmpDirName:
-        logger.debug('Changing working directory to {}'.format(tmpDirName))
-        origWorkingDir = os.getcwd()
-        os.chdir(tmpDirName)
-
-        # Extract the web.xml file from the source archive.
-        WEB_INF = 'WEB-INF'
-        WEB_XML = os.path.join(WEB_INF, 'web.xml')
-        logger.debug('Decompressing {} from {} into {}'.
-                     format(WEB_XML, sourceWar, tmpDirName))
-        extract_cmd.append(sourceWar)
-        extract_cmd.append(WEB_XML)
-        cmd = Command(extract_cmd, logger=logger)
-        cmd.execute()
-        ret = cmd.getretcode()
-        if ret is None or ret != 0:
-            raise Exception("Cannot decompress war file {}, command '{}' "
-                            "ended with {}".format(sourceWar, cmd, ret))
-
-        # Substitute the configuration path in the web.xml file.
-        logger.debug("Performing substitution of '{}' with '{}'".
-                     format(defaultConfigFile, configFile))
-        with open(WEB_XML, 'r') as f:
-            data = f.read().replace(defaultConfigFile, configFile)
-        with open(WEB_XML, 'w') as f:
-            f.write(data)
-
-        # Refresh the target archive with the modified file.
-        logger.debug('Copying {} to {}'.format(sourceWar, targetWar))
-        copyfile(sourceWar, targetWar)
-        logger.debug('Refreshing target archive {}'.format(targetWar))
-        compress_cmd.append(targetWar)
-        compress_cmd.append(WEB_XML)
-        cmd = Command(compress_cmd, logger=logger)
-        cmd.execute()
-        ret = cmd.getretcode()
-        if ret is None or ret != 0:
-            raise Exception("Cannot re-compress war file {}, command '{}' "
-                            "ended with {}".format(targetWar, cmd, ret))
-
-        # Need to switch back to original working directory, so that the
-        # temporary directory can be deleted.
-        os.chdir(origWorkingDir)
+    WEB_XML = 'WEB-INF/web.xml'
+
+    with ZipFile(sourceWar, 'r') as infile, ZipFile(targetWar, 'w') as outfile:
+        for item in infile.infolist():
+            data = infile.read(item.filename)
+            if item.filename == WEB_XML:
+                logger.debug("Performing substitution of '{}' with '{}'".
+                             format(defaultConfigFile, configFile))
+                defaultConfigFile = defaultConfigFile.encode()
+                configFile = configFile.encode()
+                data = data.replace(defaultConfigFile, configFile)
+            outfile.writestr(item, data)
 
 
 def deploy_war(logger, sourceWar, targetWar, configFile=None):