UI: Added dropdowns for logs, history, and config.

Only logs works for now. Gussied up the UI as well.

src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java

@@ -150,7 +150,7 @@ public abstract class AbstractRipper
             return;
         }
         try {
-            String path = saveAs.getCanonicalPath();
+            String path = Utils.removeCWD(saveAs);
             RipStatusMessage msg = new RipStatusMessage(STATUS.DOWNLOAD_COMPLETE, path);
             synchronized(observer) {
                 itemsPending.remove(url);
@@ -182,7 +182,10 @@ public abstract class AbstractRipper
         if (!completed && itemsPending.size() == 0) {
             completed = true;
             logger.info("Rip completed!");
-            observer.update(this, new RipStatusMessage(STATUS.RIP_COMPLETE, new File(Utils.removeCWD(workingDir))));
+            observer.update(this,
+                    new RipStatusMessage(
+                            STATUS.RIP_COMPLETE,
+                            workingDir));
             observer.notifyAll();
         }
     }

src/main/java/com/rarchives/ripme/ripper/DownloadFileThread.java

@@ -57,7 +57,6 @@ public class DownloadFileThread extends Thread {
                 FileOutputStream out = (new FileOutputStream(saveAs));
                 out.write(response.bodyAsBytes());
                 out.close();
-                observer.downloadCompleted(url, saveAs.getCanonicalFile());
                 break; // Download successful: break out of infinite loop
             } catch (IOException e) {
                 logger.error("[!] Exception while downloading file: " + url + " - " + e.getMessage());

src/main/java/com/rarchives/ripme/ui/MainWindow.java

@@ -1,7 +1,9 @@
 package com.rarchives.ripme.ui;
 
+import java.awt.Color;
 import java.awt.Container;
 import java.awt.Desktop;
+import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
@@ -14,12 +16,17 @@ import java.util.Observer;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
+import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JProgressBar;
 import javax.swing.JScrollPane;
 import javax.swing.JTextField;
 import javax.swing.JTextPane;
 import javax.swing.border.EmptyBorder;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.SimpleAttributeSet;
+import javax.swing.text.StyleConstants;
+import javax.swing.text.StyledDocument;
 
 import org.apache.log4j.Logger;
 
@@ -40,13 +47,28 @@ public class MainWindow implements Runnable {
     private static JButton openButton;
     private static JProgressBar statusProgress;
 
-    private static JTextPane textLog;
+    // Log
-    private static JScrollPane textLogScroll;
+    private static JButton optionLog;
+    private static JPanel logPanel;
+    private static JTextPane logText;
+    private static JScrollPane logTextScroll;
 
+    // History
+    private static JButton optionHistory;
+    private static JPanel historyPanel;
+    private static JList historyList;
+    private static JScrollPane historyListScroll;
+
+    // Configuration
+    private static JButton optionConfiguration;
+    private static JPanel configurationPanel;
+    // TODO Configuration components
+    
     public MainWindow() {
         mainFrame = new JFrame(WINDOW_TITLE);
         mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        mainFrame.setResizable(false);
+        //mainFrame.setPreferredSize(new Dimension(400, 180));
+        //mainFrame.setResizable(false);
         mainFrame.setLayout(new GridBagLayout());
 
         createUI(mainFrame.getContentPane());
@@ -67,55 +89,127 @@ public class MainWindow implements Runnable {
     private void createUI(Container pane) {
         EmptyBorder emptyBorder = new EmptyBorder(5, 5, 5, 5);
         GridBagConstraints gbc = new GridBagConstraints();
-        gbc.weightx = 9; gbc.ipadx = 5; gbc.gridx = 0;
+        gbc.fill = GridBagConstraints.BOTH;
-        gbc.weighty = 9; gbc.ipady = 5; gbc.gridy = 0;
+        gbc.weightx = 2; gbc.ipadx = 2; gbc.gridx = 0;
+        gbc.weighty = 2; gbc.ipady = 2; gbc.gridy = 0;
 
         ripTextfield = new JTextField("", 20);
         ripButton    = new JButton("rip");
         JPanel ripPanel = new JPanel(new GridBagLayout());
         ripPanel.setBorder(emptyBorder);
 
-        ripPanel.add(new JLabel("URL:"), gbc);
+        ripPanel.add(new JLabel("URL:", JLabel.RIGHT), gbc);
         gbc.gridx = 1;
         ripPanel.add(ripTextfield, gbc);
         gbc.gridx = 2;
         ripPanel.add(ripButton, gbc);
 
         statusLabel  = new JLabel("Inactive");
+        statusLabel.setHorizontalAlignment(JLabel.CENTER);
         openButton = new JButton();
         openButton.setVisible(false);
         JPanel statusPanel = new JPanel(new GridBagLayout());
         statusPanel.setBorder(emptyBorder);
-        
+
-        gbc.gridx = 0; gbc.gridy = 1;
+        gbc.gridx = 0;
         statusPanel.add(statusLabel, gbc);
-        gbc.gridx = 1;
         statusPanel.add(openButton, gbc);
 
         JPanel progressPanel = new JPanel(new GridBagLayout());
         progressPanel.setBorder(emptyBorder);
         statusProgress = new JProgressBar(0,  100);
         progressPanel.add(statusProgress, gbc);
-        
-        JPanel logPanel = new JPanel(new GridBagLayout());
-        logPanel.setBorder(emptyBorder);
-        textLog = new JTextPane();
-        textLogScroll = new JScrollPane(textLog);
-        logPanel.add(textLogScroll, gbc);
 
-        gbc.gridx = 0; gbc.gridy = 0;
+        JPanel optionsPanel = new JPanel(new GridBagLayout());
-        gbc.fill = GridBagConstraints.BOTH;
+        optionsPanel.setBorder(emptyBorder);
+        optionLog = new JButton("Log");
+        optionHistory = new JButton("History");
+        optionConfiguration = new JButton("Configuration");
+        gbc.gridx = 0;
+        optionsPanel.add(optionLog, gbc);
+        gbc.gridx = 1;
+        optionsPanel.add(optionHistory, gbc);
+        gbc.gridx = 2;
+        optionsPanel.add(optionConfiguration, gbc);
+
+        logPanel = new JPanel(new GridBagLayout());
+        logPanel.setBorder(emptyBorder);
+        logText = new JTextPaneNoWrap();
+        logTextScroll = new JScrollPane(logText);
+        logPanel.setVisible(false);
+        logPanel.setPreferredSize(new Dimension(300, 300));
+        logPanel.add(logTextScroll, gbc);
+        
+        historyPanel = new JPanel(new GridBagLayout());
+        historyPanel.setBorder(emptyBorder);
+        historyList = new JList();
+        historyListScroll = new JScrollPane(historyList);
+        historyPanel.setVisible(false);
+        historyPanel.setPreferredSize(new Dimension(300, 300));
+        historyPanel.add(historyListScroll, gbc);
+        
+        configurationPanel = new JPanel(new GridBagLayout());
+        configurationPanel.setBorder(emptyBorder);
+        configurationPanel.setVisible(false);
+        configurationPanel.setPreferredSize(new Dimension(300, 300));
+        // TODO Configuration components
+
         pane.add(ripPanel, gbc);
         gbc.gridy = 1;
         pane.add(statusPanel, gbc);
         gbc.gridy = 2;
         pane.add(progressPanel, gbc);
         gbc.gridy = 3;
+        pane.add(optionsPanel, gbc);
+        gbc.gridy = 4;
         pane.add(logPanel, gbc);
+        gbc.gridy = 5;
+        pane.add(historyPanel, gbc);
+        gbc.gridy = 5;
+        pane.add(configurationPanel, gbc);
     }
     
     private void setupHandlers() {
         ripButton.addActionListener(new RipButtonHandler());
+        optionLog.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent event) {
+                logPanel.setVisible(!logPanel.isVisible());
+                historyPanel.setVisible(false);
+                configurationPanel.setVisible(false);
+                mainFrame.pack();
+            }
+        });
+        optionHistory.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent event) {
+                logPanel.setVisible(false);
+                historyPanel.setVisible(!historyPanel.isVisible());
+                configurationPanel.setVisible(false);
+                mainFrame.pack();
+            }
+        });
+        optionConfiguration.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent event) {
+                logPanel.setVisible(false);
+                historyPanel.setVisible(false);
+                configurationPanel.setVisible(!configurationPanel.isVisible());
+                mainFrame.pack();
+            }
+        });
+    }
+    
+    private void appendLog(String text, Color color) {
+        SimpleAttributeSet sas = new SimpleAttributeSet();
+        StyleConstants.setForeground(sas, color);
+
+        StyledDocument sd = logText.getStyledDocument();
+        try {
+            sd.insertString(sd.getLength(), text + "\n", sas);
+        } catch (BadLocationException e) {
+            e.printStackTrace();
+        }
     }
 
     class RipButtonHandler implements ActionListener {
@@ -139,16 +233,20 @@ public class MainWindow implements Runnable {
     class RipStatusHandler implements Observer {
         public void update(Observable observable, Object object) {
             RipStatusMessage msg = (RipStatusMessage) object;
-            System.err.println("Observer update, object: " + object.toString());
+
+            int completedPercent = ((AbstractRipper) observable).getCompletionPercentage();
+            statusProgress.setValue(completedPercent);
+            status( ((AbstractRipper)observable).getStatusText() );
+
             switch(msg.getStatus()) {
             case LOADING_RESOURCE:
             case DOWNLOAD_STARTED:
+                appendLog( "File Downloading: " + (String) msg.getObject(), Color.BLACK);
             case DOWNLOAD_COMPLETE:
+                appendLog( "File Completed: " + (String) msg.getObject(), Color.GREEN);
+                break;
             case DOWNLOAD_ERRORED:
-                //status((String) msg.getObject());
+                appendLog( "File Errored: " + (String) msg.getObject(), Color.RED);
-                int completedPercent = ((AbstractRipper) observable).getCompletionPercentage();
-                statusProgress.setValue(completedPercent);
-                status( ((AbstractRipper)observable).getStatusText() );
                 break;
 
             case RIP_COMPLETE:
@@ -156,7 +254,9 @@ public class MainWindow implements Runnable {
                 statusLabel.setVisible(false);
                 openButton.setVisible(true);
                 File f = (File) msg.getObject();
-                openButton.setText("Open " + Utils.removeCWD(f));
+                String prettyFile = Utils.removeCWD(f);
+                openButton.setText("Open " + prettyFile);
+                appendLog( "Rip complete, saved to " + prettyFile, Color.GREEN);
                 openButton.setActionCommand(f.toString());
                 openButton.addActionListener(new ActionListener() {
                     @Override
@@ -172,4 +272,10 @@ public class MainWindow implements Runnable {
             }
         }
     }
+    
+    class JTextPaneNoWrap extends JTextPane {
+        public boolean getScrollableTracksViewportWidth() {
+            return false;
+        }
+    }
 }