summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/net/geedge/api/controller/APIController.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/main/java/net/geedge/api/controller/APIController.java b/src/main/java/net/geedge/api/controller/APIController.java
index a5efda8..0b7342d 100644
--- a/src/main/java/net/geedge/api/controller/APIController.java
+++ b/src/main/java/net/geedge/api/controller/APIController.java
@@ -13,7 +13,9 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
+import java.io.FileFilter;
import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -261,8 +263,14 @@ public class APIController {
if (T.FileUtil.extName(file.getOriginalFilename()).equals("zip")) {
File playbookFile = T.FileUtil.file(Constant.TEMP_PATH, tid, file.getOriginalFilename());
T.FileUtil.writeBytes(file.getInputStream().readAllBytes(), playbookFile);
- playbookAirDir = T.FileUtil.file(Constant.TEMP_PATH, tid, "main.air");
- T.ZipUtil.unzip(playbookFile, playbookAirDir);
+ File playbookDir = T.FileUtil.file(Constant.TEMP_PATH, tid);
+ T.ZipUtil.unzip(playbookFile, playbookDir);
+ playbookAirDir = Arrays.stream(playbookDir.listFiles(new FileFilter() {
+ @Override
+ public boolean accept(File pathname) {
+ return pathname.getName().endsWith(".air");
+ }
+ })).findFirst().get();
} else {
appFile = T.FileUtil.file(Constant.TEMP_PATH, tid, file.getOriginalFilename());
T.FileUtil.writeBytes(file.getInputStream().readAllBytes(), appFile);