improve

Author: maxxbw

Diff for: lib/utils/FileUtil.java

@@ -84,6 +84,23 @@ public static Boolean writeStr2File(String wStr, Path fPath) {
 		return true;
 	}
 
+	public static Boolean writeStrList2File(List<String> strList, Path fPath, Boolean ifTrim) {
+		try {
+			String wStr = "";
+			for (String line : strList) {
+				if (ifTrim) {
+					line = line.trim();
+				}
+				wStr += (line + "\n");
+			}
+			Files.write(fPath, wStr.getBytes());
+		} catch (IOException e) {
+			e.printStackTrace();
+			return false;
+		}
+		return true;
+	}
+
 	public static Boolean copyFile2Dir(File f, String DestDir) {
 		try {
 			File DestDirFile = new File(DestDir);
@@ -93,7 +110,7 @@ public static Boolean copyFile2Dir(File f, String DestDir) {
 			String targetFilePath = DestDirFile.getAbsoluteFile() + "/" + f.getName();
 			FileUtils.copyFile(f, new File(targetFilePath));
 		} catch (IOException e) {
-			
+
 			e.printStackTrace();
 			return false;
 		}
@@ -104,7 +121,7 @@ public static Boolean copyFile2File(File srcFile, File dstFile) {
 		try {
 			FileUtils.copyFile(srcFile, dstFile);
 		} catch (IOException e) {
-			
+
 			e.printStackTrace();
 			return false;
 		}
@@ -206,7 +223,7 @@ public static List<String> readFileToLineList(String filePath) {
 			}
 			reader.close();
 		} catch (FileNotFoundException e) {
-			
+
 			System.out.println("filePath : " + filePath);
 			e.printStackTrace();
 		} catch (IOException e) {
@@ -247,7 +264,7 @@ public static List<File> findFilePathofSpecifcTypeRecusive(String tarDir, String
 					fileList.add(new File(filepath));
 			});
 		} catch (IOException e) {
-			
+
 			e.printStackTrace();
 		}
 		return fileList;
@@ -264,7 +281,7 @@ public static List<String> findRelativeFilePathofSpecifcTypeRecusive(String tarD
 					relPathList.add(filepath.replace(tarDir, ""));
 			});
 		} catch (IOException e) {
-			
+
 			e.printStackTrace();
 		}
 		return relPathList;

Diff for: lib/utils/GitUtil.java

@@ -8,22 +8,28 @@
 public class GitUtil {
 
 	public static Boolean clone(String repoName, String usrName, Path targetDir) {
+		
+		if(targetDir.toFile().exists()){
+			FileUtil.deleteDirectory(targetDir.toFile());
+		}
+		targetDir.toFile().mkdirs();
 
-		String cmd = "timeout 600 git clone https://github.com/" + repoName + "/" + usrName + " " + targetDir;
-
+		String cmd = "timeout 300 git clone https://github.com/" + repoName + "/" + usrName + " " + targetDir;
+		
 		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmd, null, targetDir);
 		if (pr.exitCode == 0) {
 			return true;
 		} else {
 			System.out.println("cmd " + cmd + "\n");
 			System.out.println("report \n" + pr.toString());
+			FileUtil.deleteDirectory(targetDir.toFile());
 			return false;
 		}
 	}
 
 	public static List<String> getAllCommitsSha(Path repoDir) {
 
-		String cmd = "timeout 600 git log --pretty=format:\"%H\"";
+		String cmd = "timeout 300 git log --pretty=format:\"%H\"";
 
 		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmd, null, repoDir);
 		if (pr.exitCode == 0) {
@@ -37,7 +43,7 @@ public static List<String> getAllCommitsSha(Path repoDir) {
 
 	public static String getCommitMsg(Path repoDir, String com) {
 
-		String cmd = "git log --format=%B -n 1 " + com;
+		String cmd = "timeout 300 git log --format=%B -n 1 " + com;
 
 		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmd, null, repoDir);
 		if (pr.exitCode == 0) {
@@ -51,7 +57,7 @@ public static String getCommitMsg(Path repoDir, String com) {
 
 	public static String getParentCommit(Path repoDir, String com) {
 
-		String cmd = "git log --pretty=%P -n 1 " + com;
+		String cmd = "timeout 300 git log --pretty=%P -n 1 " + com;
 
 		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmd, null, repoDir);
 		if (pr.exitCode == 0) {
@@ -75,10 +81,10 @@ public static String getDiffBetween2Commits(Path repoDir, String oldCom, String
 
 		String cmd = null;
 		if (diffMode != null) {
-			cmd = "git --git-dir " + repoDir.toString() + " /.git --work-tree " + repoDir.toString() + " diff "
+			cmd = "timeout 300 git --git-dir " + repoDir.toString() + " /.git --work-tree " + repoDir.toString() + " diff "
 					+ diffMode + " --unified=0 " + oldCom + " " + newCom;
 		} else {
-			cmd = "git --git-dir " + repoDir.toString() + " /.git --work-tree " + repoDir.toString()
+			cmd = "timeout 300 git --git-dir " + repoDir.toString() + " /.git --work-tree " + repoDir.toString()
 					+ " diff --unified=0 " + oldCom + " " + newCom;
 		}
 
@@ -94,7 +100,7 @@ public static String getDiffBetween2Commits(Path repoDir, String oldCom, String
 
 	public static List<String> getChangedFileList(Path repoDir, String com) {
 
-		String cmd = "git diff-tree --no-commit-id --name-only -r " + com;
+		String cmd = "timeout 300 git diff-tree --no-commit-id --name-only -r " + com;
 
 		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmd, null, repoDir);
 		if (pr.exitCode == 0) {
@@ -111,25 +117,25 @@ public static Boolean checkout(Path repoDir, String com, Boolean ifForce) {
 		ProcessUtil.ProcessReporter pr = new ProcessUtil.ProcessReporter();
 
 		if (ifForce) {
-			String resetCMD = "git reset --hard";
+			String resetCMD = "timeout 300 git reset --hard";
 			pr = ProcessUtil.executeCMD(resetCMD, null, repoDir);
 		}
 
 		String checkoutCMD = null;
 		if (com == null) { // checkout latest if null
-			checkoutCMD = "git checkout master";
+			checkoutCMD = "timeout 300 git checkout master";
 		} else {
-			checkoutCMD = "git checkout " + com;
+			checkoutCMD = "timeout 300 git checkout " + com;
 		}
 		pr = ProcessUtil.executeCMD(checkoutCMD, null, repoDir);
 
 		if (pr.exitCode == 0) {
 			return true;
 		} else {
-			String cleanCMD = "git --git-dir " + repoDir.toString() + " /.git --work-tree " + repoDir.toString()
+			String cleanCMD = "timeout 300 git --git-dir " + repoDir.toString() + " /.git --work-tree " + repoDir.toString()
 					+ " clean -dfx .";
 			pr = ProcessUtil.executeCMD(cleanCMD, null, repoDir);
-			String resetCMD = "git --git-dir " + repoDir.toString() + " /.git --work-tree " + repoDir.toString()
+			String resetCMD = "timeout 300 git --git-dir " + repoDir.toString() + " /.git --work-tree " + repoDir.toString()
 					+ " reset --hard";
 			pr = ProcessUtil.executeCMD(resetCMD, null, repoDir);
 			pr = ProcessUtil.executeCMD(checkoutCMD, null, repoDir);

Diff for: lib/utils/ProcessUtil.java

@@ -32,6 +32,7 @@ public String toString() {
 
 	/**
 	 * execute cmd
+	 * 
 	 * @param cmd
 	 * @param envp
 	 * @param workDir
@@ -75,7 +76,7 @@ public static ProcessReporter executeCMD(String cmd, String[] envp, Path workDir
 				throw new Exception();
 			}
 		} catch (Exception e) {
-			pr.toString();
+			TimeUtil.printCurTimewithMsg(pr.toString());
 			e.printStackTrace();
 		}
 

Diff for: lib/utils/TimeUtil.java

@@ -14,6 +14,10 @@ public static void printCurTime() {
 	public static void printCurTimewithMsg(String msg) {
 		DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
 		LocalDateTime now = LocalDateTime.now();
-		System.out.println("Processing " + msg + " " + dtf.format(now));
+		System.out.println(msg + "\t" + dtf.format(now));
+	}
+
+	public static void main(String[] args) {
+		printCurTimewithMsg("test");
 	}
 }