pack root level files in addition to directories

Author: Sheikah45

src/main/java/com/faforever/api/deployment/LegacyFeaturedModDeploymentTask.java

@@ -16,6 +16,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
+import org.apache.commons.io.FilenameUtils;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
@@ -98,7 +99,7 @@ public void run() {
 
     Deployment deployment = apiProperties.getDeployment();
     Path targetFolder = Paths.get(deployment.getFeaturedModsTargetDirectory(), String.format(deployment.getFilesDirectoryFormat(), modName));
-    List<StagedFile> files = packageDirectories(repositoryDirectory, version, fileIds, targetFolder);
+    List<StagedFile> files = packageFiles(repositoryDirectory, version, fileIds, targetFolder);
 
     if ("faf".equals(modName)) {
       createPatchedExe(version, fileIds, targetFolder).ifPresent(files::add);
@@ -198,12 +199,20 @@ private void updateStatus(String message) {
    * @return the list of deployed files
    */
   @SneakyThrows
-  private List<StagedFile> packageDirectories(Path repositoryDirectory, short version, Map<String, Short> fileIds, Path targetFolder) {
+  @SuppressWarnings("unchecked")
+  private List<StagedFile> packageFiles(Path repositoryDirectory, short version, Map<String, Short> fileIds, Path targetFolder) {
     updateStatus("Packaging files");
     try (Stream<Path> stream = Files.list(repositoryDirectory)) {
-      return stream
-        .filter((path) -> Files.isDirectory(path) && !path.getFileName().toString().startsWith("."))
-        .map(path -> packDirectory(path, version, targetFolder, fileIds))
+      return (List<StagedFile>) stream
+        .map(path -> {
+          if (Files.isDirectory(path) && !path.getFileName().toString().startsWith(".")) {
+            return packDirectory(path, version, targetFolder, fileIds);
+          } else if (Files.isRegularFile(path)) {
+            return packFile(path, version, targetFolder, fileIds);
+          } else{
+            return Optional.empty();
+          }
+        })
         .filter(Optional::isPresent)
         .map(Optional::get)
         .collect(Collectors.toList());
@@ -253,6 +262,31 @@ private Optional<StagedFile> packDirectory(Path directory, Short version, Path t
     return Optional.of(new StagedFile(fileId, tmpNxtFile, targetNxtFile, clientFileName));
   }
 
+  /**
+   * Creates a ZIP file with the file ending configured in {@link #featuredMod}. The content of the ZIP file is the
+   * content of the directory. If no file ID is available, an empty optional is returned.
+   */
+  @SneakyThrows
+  private Optional<StagedFile> packFile(Path file, Short version, Path targetFolder, Map<String, Short> fileIds) {
+    String fullFileName = file.getFileName().toString();
+    String baseName = FilenameUtils.getBaseName(fullFileName);
+    String extension = FilenameUtils.getExtension(fullFileName);
+    Path targetFile = targetFolder.resolve(String.format("%s_%d.%s", baseName, version, extension));
+    Path tmpFile = toTmpFile(targetFile);
+
+    Short fileId = fileIds.get(fullFileName);
+    if (fileId == null) {
+      log.debug("Skipping file '{}' because there's no file ID available", fullFileName);
+      return Optional.empty();
+    }
+
+    log.trace("Copying '{}' to '{}'", file, targetFolder);
+
+    createDirectories(targetFolder, FilePermissionUtil.directoryPermissionFileAttributes());
+    Files.copy(file, tmpFile, StandardCopyOption.REPLACE_EXISTING);
+    return Optional.of(new StagedFile(fileId, tmpFile, targetFile, fullFileName));
+  }
+
   private void checkoutCode(Path repositoryDirectory, String repoUrl, String branch) throws IOException {
     if (Files.notExists(repositoryDirectory)) {
       createDirectories(repositoryDirectory.getParent(), FilePermissionUtil.directoryPermissionFileAttributes());