Changeset 96 for trunk

Timestamp:

04/17/06 16:45:06 (6 years ago)

Author:

jlee

Message:

Added more logging and log viewer

Location:

trunk/src/org/thestaticvoid/iriverter

Files:

• Converter.java (modified) (2 diffs)
• ConverterUI.java (modified) (4 diffs)
• LogViewer.java (added)
• Logger.java (modified) (3 diffs)
• MPlayerInfo.java (modified) (1 diff)
• MencoderStreamParser.java (modified) (1 diff)

trunk/src/org/thestaticvoid/iriverter/Converter.java

@@ -198 +198 @@
                         commandList.add("xvid");
                         commandList.add("-xvidencopts");
-                        commandList.add("bitrate=" + converterOptions.getVideoBitrate() + ":max_bframes=0:profile=sp0");
-                        commandList.add("-ffourcc");
-                        commandList.add("DX50");
+                        commandList.add("bitrate=" + converterOptions.getVideoBitrate() + ":max_bframes=0");
                 }
                 
@@ -389 +387 @@
                 MencoderStreamParser errorStream = null;
                 
-                System.out.print("DEBUG--- Running: ");
+                String commandStr = "";
                 for (int i = 0; i < command.length; i++)
-                        System.out.print(command[i] + " ");
-                System.out.println();
+                        commandStr += command[i] + " ";
+                Logger.logMessage(commandStr);
                 
                 try {

trunk/src/org/thestaticvoid/iriverter/ConverterUI.java

@@ -19 +19 @@
         private CTabFolder tabFolder;
         private Map profileMenuItems, dimensionsMenuItems;
-        private MenuItem convert, playFile, newSingleVideo, newDirectory, newDVD, advancedJobs, manualSplit, joinVideos, moveUp, moveDown, closeJob, closeAllJobs, quit, bitrate, videoSize, panAndScan, advancedOptions, audioSync, automaticallySplit, volume, contents, about;
+        private MenuItem convert, playFile, newSingleVideo, newDirectory, newDVD, advancedJobs, manualSplit, joinVideos, moveUp, moveDown, closeJob, closeAllJobs, quit, bitrate, videoSize, panAndScan, advancedOptions, audioSync, automaticallySplit, volume, contents, logViewer, about;
         private Menu videoSizeMenu;
         private DropTarget target;
@@ -265 +265 @@
                 contents.addSelectionListener(this);
                 
+                logViewer = new MenuItem(helpMenu, SWT.PUSH);
+                logViewer.setText("&Log Viewer");
+                logViewer.addSelectionListener(this);
+                
+                new MenuItem(helpMenu, SWT.SEPARATOR);
+                
                 about = new MenuItem(helpMenu, SWT.PUSH);
                 about.setText("&About");
@@ -478 +484 @@
                         
                         new HelpBrowser(index);
+                }
+                
+                if (e.getSource() == logViewer) {
+                        if (LogViewer.getSingleton() == null)
+                                new LogViewer();
+                        else
+                                LogViewer.getSingleton().getShell().setActive();
                 }
                 
@@ -653 +666 @@
         
         public static void main(String[] args) {
-                ConverterUI ui = new ConverterUI();
+                try {
+                        ConverterUI ui = new ConverterUI();
+                } catch (Exception e) {
+                        String message = "An unhandled exception occured: " + e.getMessage() + "\n\n";
+                        StackTraceElement[] st = e.getStackTrace();
+                        for (int i = 0; i < st.length; i++)
+                                message += st[i] + "\n";
+                        
+                        MessageBox messageBox = new MessageBox(new Shell(Display.getDefault()), SWT.ICON_ERROR | SWT.OK);
+                        messageBox.setText("Error");
+                        messageBox.setMessage(message);
+                        messageBox.open();
+                }
         }
 }

trunk/src/org/thestaticvoid/iriverter/Logger.java

@@ -9 +9 @@
                 try {
                         output = new PrintWriter(new BufferedWriter(new FileWriter(new File(System.getProperty("user.home") + File.separator + ".iriverter.log"))));
+                        
+                        if (LogViewer.getSingleton() != null)
+                                LogViewer.getSingleton().clear();
                 } catch (IOException e) {
                         e.printStackTrace();
@@ -15 +18 @@
         
         public static void logMessage(String message) {
+                System.out.println(message);
+                
                 if (output == null)
                         openLogFile();
@@ -20 +25 @@
                 output.println(message);
                 output.flush();
+                
+                if (LogViewer.getSingleton() != null)
+                        LogViewer.getSingleton().logMessage(message);
+        }
+        
+        public static String getLogText() {
+                InputStream input = null;
+                try {
+                        input = new FileInputStream(new File(System.getProperty("user.home") + File.separator + ".iriverter.log"));
+                } catch (IOException e) {
+                        // empty
+                }
+                
+                String text = "";
+                if (input != null) {
+                        int read;
+                        byte[] buffer = new byte[4096];
+                        try {
+                                while ((read = input.read(buffer)) > -1)
+                                        text += new String(buffer, 0, read) + "\n";
+                        } catch (IOException e) {
+                                e.printStackTrace();
+                        }
+                }
+                
+                return text;
         }
 }

trunk/src/org/thestaticvoid/iriverter/MPlayerInfo.java

@@ -105 +105 @@
                 String output = matcher.group();
         
-                // originally used String.split() not available in GCJ
-                return Integer.parseInt(output.substring(10, output.indexOf(" titles")));
+                return Integer.parseInt(output.substring(14));
         }
         

trunk/src/org/thestaticvoid/iriverter/MencoderStreamParser.java

@@ -26 +26 @@
                 
                 try {                   
-                        while ((inputLine = input.readLine()) != null)
+                        while ((inputLine = input.readLine()) != null) {
+                                if (inputLine.indexOf("Pos:") == -1)
+                                        Logger.logMessage(inputLine);
+                                
                                 if (inputLine.indexOf("Video stream:") > -1)
                                         lengthLine = inputLine;
+                        }
                         
                         input.close();