Changeset 703

Timestamp:

Mar 19, 2013, 11:13:17 AM (12 years ago)

Author:

alloc

Message:

AEI2 0.99u:

• Added duration output for executed commands
• Added total time output for both applying patches and combine binaries tasks of installation

Location:

AE/installer2/src/net/oni2/aeinstaller/backend

Files:

• appexecution/AppExecution.java (modified) (3 diffs)
• appexecution/AppExecutionResult.java (modified) (2 diffs)
• oni/Installer.java (modified) (6 diffs)

AE/installer2/src/net/oni2/aeinstaller/backend/appexecution/AppExecution.java

@@ -6 +6 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.util.Date;
 import java.util.List;
 import java.util.Vector;
@@ -24 +25 @@
         public static AppExecutionResult executeAndWait(Vector<String> cmdLine)
                         throws IOException {
+                long start = new Date().getTime();
                 ProcessBuilder pb = new ProcessBuilder(cmdLine);
                 pb.redirectErrorStream(true);
@@ -44 +46 @@
                         e.printStackTrace();
                 }
-                return new AppExecutionResult(proc.exitValue(), cmdLine, lines);
+                return new AppExecutionResult(proc.exitValue(), cmdLine, lines,
+                                (int) (new Date().getTime() - start));
         }
 

AE/installer2/src/net/oni2/aeinstaller/backend/appexecution/AppExecutionResult.java

@@ -19 +19 @@
          */
         public Vector<String> output;
+        /**
+         * Time the app was run for
+         */
+        public int time;
 
         /**
@@ -27 +31 @@
          * @param output
          *            Output of executed program
+         * @param time
+         *            Time of execution in ms
          */
         public AppExecutionResult(int errorCode, Vector<String> cmdLine,
-                        Vector<String> output) {
+                        Vector<String> output, int time) {
                 this.errorCode = errorCode;
                 this.cmdLine = cmdLine;
                 this.output = output;
+                this.time = time;
         }
 }

AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java

@@ -468 +468 @@
                 listener.installProgressUpdate(0, 1, "Applying XML patches");
 
-                // TODO: REMOVE
                 long startMS = new Date().getTime();
 
@@ -493 +492 @@
                         File levelFolder = new File(tmpFolder, level);
                         levelFolder.mkdir();
-                        
+
                         log.println("\t\tPatches for " + level);
 
@@ -581 +580 @@
 
                         // Remove XML folder as import will only require .oni's
-//                      try {
-//                              FileUtils.deleteDirectory(levelFolderXML);
-//                      } catch (IOException e) {
-//                              e.printStackTrace();
-//                      }
+                        // try {
+                        // FileUtils.deleteDirectory(levelFolderXML);
+                        // } catch (IOException e) {
+                        // e.printStackTrace();
+                        // }
 
                         oniLevelFolders.get(level).add(levelFolder);
-                        
-                        log.println();
-                }
-
-                System.out.println("Took: " + (new Date().getTime() - startMS)
-                                + " msec");
+                }
+
+                log.println("Applying XML patches took "
+                                + (new Date().getTime() - startMS) + " ms");
         }
 
@@ -599 +596 @@
                         TreeMap<String, Vector<File>> oniLevelFolders,
                         InstallProgressListener listener, PrintWriter log) {
+                long startMS = new Date().getTime();
+
                 int totalSteps = 0;
                 int stepsDone = 0;
@@ -619 +618 @@
                         logAppOutput(res, log);
 
-                        log.println();
                         stepsDone++;
                 }
+
+                log.println("Importing levels took " + (new Date().getTime() - startMS)
+                                + " ms");
+                log.println();
         }
 
@@ -928 +930 @@
                         for (String s : result.output)
                                 log.println("\t\t\t\t" + s);
+                        log.println("\t\t\tDuration: " + result.time + " ms");
                         log.println();
                 }