fault tolerance

README.md

@@ -4,13 +4,13 @@ Firestar is a mod manager for WipEout 2048 which automatically handles sorting m
   
 # about 85% complete
 **What works:**
-- Importing mods
+- Importing & deleting mods
 - Repacking (installing) mods
 - config loading
 - Cross-platform support
 
 **What doesn't work yet:**
-- managing mods within the program (delete, change priority, toggle)
+- change load order, toggle
 - settings screen
 - misc. tools (pack creator, soundtrack mod generator...)
 

src/Kermit.java

@@ -95,7 +95,7 @@ public class Kermit implements ActionListener {
                     button.setVisible(false);frame.remove(button);
                     button2.setVisible(false);frame.remove(button2);
                     dialogText.setVisible(false);frame.remove(dialogText);
-                    changePage(Pages.EXPORT_MODE);
+                    changePage(Pages.SDK_INSTALL); // EXPORT_MODE
                     break;
                 case EXPORT_MODE:
                     button.setVisible(false);frame.remove(button);

src/Main.java

@@ -25,7 +25,7 @@ import javax.swing.JOptionPane;
 
 public class Main {
     // Build Information
-    public static final String vstr = "PREALPHA";
+    public static final String vstr = "Beta 1";
     public static final String vcode = "Natasha";
     public static final int vint = 0;
 

src/MissPiggy.java

@@ -31,7 +31,10 @@ import java.io.IOException;
 import java.math.RoundingMode;
 import java.nio.file.*;
 import java.text.DecimalFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import java.util.Random;
 import java.util.regex.Pattern;
 import net.lingala.zip4j.*;
@@ -66,10 +69,12 @@ public class MissPiggy implements ActionListener {
     private JButton deployButton;
     private JTextPane descriptionField;
 
-    private int selectedItem;
+    //private int selectedItem;
 
     public String priorityList;
 
+    public boolean listenersAlreadySet = false; // was written to troubleshoot a bug but this wasn't actually the cause
+
     // Initialize the main window
     public void Action(/*Main entryPoint*/) {
         System.out.println("Main window created");
@@ -125,38 +130,6 @@ public class MissPiggy implements ActionListener {
         toggleButton.addActionListener(this);
 
         descriptionField.getDocument().putProperty("filterNewlines", Boolean.FALSE);
-        modList.addListSelectionListener(e -> {
-            String authorDisplay;
-            File pathReference = new File(System.getProperty("user.home") + "/.firestar/mods/" + Main.Mods.get(modList.getSelectedIndex()).path);
-            DecimalFormat df = new DecimalFormat("##.##");
-            df.setRoundingMode(RoundingMode.UP);
-            float modFileSize = pathReference.length(); //precise units
-            String modFileSizeStr = String.valueOf(modFileSize);
-            String modFileSizeUnits = "bytes"; //todo: don't show decimals for bytes
-            if (pathReference.length() >= 1024) {
-                modFileSizeStr = String.valueOf(df.format(modFileSize / 1024));
-                modFileSizeUnits = "Kilobytes";
-            }
-            if (pathReference.length() >= 1024 * 1024) {
-                modFileSizeStr = String.valueOf(df.format(modFileSize / (1024 * 1024)));
-                modFileSizeUnits = "Megabytes";
-            }
-            if (pathReference.length() >= 1024 * 1024 * 1024) {
-                modFileSizeStr = String.valueOf(df.format(modFileSize / (1024 * 1024 * 1024)));
-                modFileSizeUnits = "Gigabytes";
-            }
-            if (Main.Mods.get(modList.getSelectedIndex()).author == null) {
-                authorDisplay = "an Unknown Author";
-            } else {
-                authorDisplay = Main.Mods.get(modList.getSelectedIndex()).author;
-            }
-            descriptionField.setText(
-                "\"" + Main.Mods.get(modList.getSelectedIndex()).friendlyName + "\"\n" +
-                "by " + authorDisplay + "\n\n" +
-                "Version " + Main.Mods.get(modList.getSelectedIndex()).version + "\n" +
-                        modFileSizeStr + " " + modFileSizeUnits + " in size" +
-                "\n\n" + Main.Mods.get(modList.getSelectedIndex()).description
-        );});
 
         // display window
         try {
@@ -237,8 +210,9 @@ public class MissPiggy implements ActionListener {
         }
     }
 
-    public void InitializeModListInGUI() { // i really wanted this to be "lights, camera, action" but the code organizing kept getting stupider and stupider so i gave up
+    public void InitializeModListInGUI() {
         // cleanup
+        if (listenersAlreadySet) {modList.removeListSelectionListener(modList.getListSelectionListeners()[0]);} // was written to troubleshoot a bug but this wasn't actually the cause
         descriptionField.setText("Select a mod from the list on the right to view more details, or to make changes to your installation.");
         modList.clearSelection();
         modList.removeAll();
@@ -260,6 +234,7 @@ public class MissPiggy implements ActionListener {
             i++;
         }
         modList.setListData(contents);
+        createSelectionEventListener();
     }
 
     private ListSelectionListener whenItemSelected() {
@@ -277,10 +252,11 @@ public class MissPiggy implements ActionListener {
         if (actionEvent.getSource() == optionsButton) {optionsGUI();} else
         if (actionEvent.getSource() == fileMenu.getItem(4)) {optionsGUI();} else
 
-        if (actionEvent.getSource() == moveUpButton) {throwUnimplemented();} else // todo
+        if (actionEvent.getSource() == moveUpButton) {moveUp(modList.getSelectedIndex());} else
-        if (actionEvent.getSource() == moveDownButton) {throwUnimplemented();} else // todo
+        if (actionEvent.getSource() == moveDownButton) {moveDown(modList.getSelectedIndex());} else
+
         if (actionEvent.getSource() == toggleButton) {throwUnimplemented();} else // todo
-        if (actionEvent.getSource() == deleteButton1) {throwUnimplemented();} else // todo
+        if (actionEvent.getSource() == deleteButton1) {deleteSelected();} else
 
         if (actionEvent.getSource() == helpMenu.getItem(0)) {new Rowlf().displayAboutScreen();}
     }
@@ -343,7 +319,18 @@ public class MissPiggy implements ActionListener {
 
     public void removeAllGUI() {
         // todo warning dialog that nukes list when Yes is clicked
-        throwUnimplemented();
+        int result = JOptionPane.showConfirmDialog(frame, "Do you really want to delete all mods?", "Remove All", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
+
+        if (result == JOptionPane.YES_OPTION) {
+            for (Main.Mod entry : Main.Mods) {
+                new File(System.getProperty("user.home") + "/.firestar/mods/" + entry.path).delete();
+            }
+        }
+        new File(System.getProperty("user.home") + "/.firestar/mods/index").delete();
+        Main.Mods.clear();
+
+        InitializeModListStructure();
+        InitializeModListInGUI();
     }
 
     public void optionsGUI() {
@@ -351,6 +338,14 @@ public class MissPiggy implements ActionListener {
         throwUnimplemented();
     }
 
+    public void deleteSelected() {
+        File file = new File(System.getProperty("user.home") + "/.firestar/mods/" + Main.Mods.get(modList.getSelectedIndex()).path);
+        file.delete();
+        System.out.println("Deleted " + Main.Mods.get(modList.getSelectedIndex()).friendlyName); //debug
+        Main.Mods.remove(modList.getSelectedIndex());
+        regenerateModIndex(true);
+    }
+
     public void generatorGUI() {
         // todo mod packer
         throwUnimplemented();
@@ -361,12 +356,109 @@ public class MissPiggy implements ActionListener {
         throwUnimplemented();
     }
 
-    public void aboutGUI() {
+    private void moveUp(int index) {
-        // todo about page
+        if (index > 0) {
-        throwUnimplemented();
+            Collections.swap(Main.Mods, index, index - 1);
+            System.out.println("Items moved, redeploying list");
+            InitializeModListInGUI();
+            regenerateModIndex(false);
+        }
+    }
+
+    private void moveDown(int index) {
+        if (index < (Main.Mods.size() - 1)) {
+            Collections.swap(Main.Mods, index, index + 1);
+            System.out.println("Items moved, redeploying list");
+            InitializeModListInGUI();
+            regenerateModIndex(false);
+        }
     }
 
     public void throwUnimplemented() {
         JOptionPane.showMessageDialog(frame, "Unimplemented.\nSee README at https://git.worlio.com/bonkmaykr/firestar", "Unimplemented", JOptionPane.INFORMATION_MESSAGE);
     }
+
+    public void createSelectionEventListener() { // moved incase needs to be removed and re-added
+        listenersAlreadySet = true; // was written to troubleshoot a bug but this wasn't actually the cause
+        modList.addListSelectionListener(e -> {
+            if (modList.getSelectedIndex() >= 0 && modList.getModel().getSize() >= 1) { // avoid race OOB when reinitializing mod list
+            String authorDisplay;
+
+            try { //debug
+
+            File pathReference = new File(System.getProperty("user.home") + "/.firestar/mods/" + Main.Mods.get(modList.getSelectedIndex()).path);
+            DecimalFormat df = new DecimalFormat("##.##");
+            df.setRoundingMode(RoundingMode.UP);
+            float modFileSize = pathReference.length(); //precise units
+            String modFileSizeStr = String.valueOf(modFileSize);
+            String modFileSizeUnits = "bytes"; //todo: don't show decimals for bytes
+            if (pathReference.length() >= 1024) {
+                modFileSizeStr = String.valueOf(df.format(modFileSize / 1024));
+                modFileSizeUnits = "Kilobytes";
+            }
+            if (pathReference.length() >= 1024 * 1024) {
+                modFileSizeStr = String.valueOf(df.format(modFileSize / (1024 * 1024)));
+                modFileSizeUnits = "Megabytes";
+            }
+            if (pathReference.length() >= 1024 * 1024 * 1024) {
+                modFileSizeStr = String.valueOf(df.format(modFileSize / (1024 * 1024 * 1024)));
+                modFileSizeUnits = "Gigabytes";
+            }
+            if (Main.Mods.get(modList.getSelectedIndex()).author == null) {
+                authorDisplay = "an Unknown Author";
+            } else {
+                authorDisplay = Main.Mods.get(modList.getSelectedIndex()).author;
+            }
+            descriptionField.setText(
+                    "\"" + Main.Mods.get(modList.getSelectedIndex()).friendlyName + "\"\n" +
+                            "by " + authorDisplay + "\n\n" +
+                            "Version " + Main.Mods.get(modList.getSelectedIndex()).version + "\n" +
+                            modFileSizeStr + " " + modFileSizeUnits + " in size" +
+                            "\n\n" + Main.Mods.get(modList.getSelectedIndex()).description
+            );}
+
+            catch (IndexOutOfBoundsException ex) {
+                System.out.println(ex.getMessage());
+                System.out.println("mods " + Main.Mods.size());
+                System.out.println("mod display " + modList.getModel().getSize());
+                System.out.println("selection index " + modList.getSelectedIndex());
+
+                int result = JOptionPane.showConfirmDialog(frame, "Firestar encountered an internal error.\n" + ex.getMessage(), "Fatal Error", JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE);
+                if (result == JOptionPane.OK_OPTION) {System.exit(1);} //user safety
+            }
+
+            }
+        });
+    }
+
+    public void regenerateModIndex(boolean reload) {
+        try {
+            System.out.println("Regenerating index..."); //debug
+
+            new File(System.getProperty("user.home") + "/.firestar/mods/index").delete();
+            File priorityListFileHandle = new File(System.getProperty("user.home") + "/.firestar/mods/index");
+            priorityListFileHandle.createNewFile();
+
+
+            BufferedWriter bw = new BufferedWriter(new FileWriter(System.getProperty("user.home") + "/.firestar/mods/index", true));
+            int i = 0;
+            for (Main.Mod m : Main.Mods) {
+                bw.write(i + "=" + m.path);
+                bw.newLine();
+                i++;
+            }
+            bw.close();
+
+            if(reload) {
+                Main.Mods.clear(); //cleanup
+                priorityList = "";
+                InitializeModListStructure();
+                InitializeModListInGUI();
+            }
+            System.out.println("Mod index file regenerated.");
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            JOptionPane.showMessageDialog(frame, "An error has occured.\n" + e.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
+        }
+    }
 }

src/Rowlf.java

@@ -47,12 +47,13 @@ public class Rowlf {
         picLabel.setIcon(new ImageIcon(logo));picLabel.setText("");
 
         informationText.getDocument().putProperty("filterNewlines", Boolean.FALSE);
-        informationText.setText("Created by bonkmaykr\n" +
+        informationText.setHorizontalAlignment(JTextField.CENTER);
-                "a.k.a. \"Downforce Agent\"\n" +
+        informationText.setText("Created by bonkmaykr, a.k.a. \"Downforce Agent\"\n" +
                 "\n" +
                 "Special thanks to:\n" +
-                "ThatOneBonk, for almost beating me to it\n" +
+                "ThatOneBonk, for Thallium and for modding help\n" +
-                "Wirlaburla, for web hosting and code help\n" +
+                "Wirlaburla, for web hosting and being awesome\n" +
+                "Psygnosis, for making our favorite game ever\n" +
                 "and to all the PSVita hackers who made this possible");
         informationText.setHighlighter(null);
         informationText.getCaret().setVisible(false);