Kaleyard

.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
       FLAVOR2: ${{ steps.output1.outputs.FLAVOR2 }}
     steps:
     - name: Checkout project
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         fetch-depth: 0
 
@@ -68,7 +68,7 @@ jobs:
 
     steps:
     - name: Checkout project
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         fetch-depth: 0
 
@@ -106,7 +106,7 @@ jobs:
         distribution: 'adopt'
 
     - name: Checkout project
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         fetch-depth: 0
         path: oolitestarter
@@ -208,7 +208,7 @@ jobs:
         distribution: 'adopt'
 
     - name: Checkout project
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         fetch-depth: 0
         path: oolitestarter
@@ -303,7 +303,7 @@ jobs:
         distribution: 'adopt'
 
     - name: Checkout project
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         fetch-depth: 0
         path: oolitestarter
@@ -411,7 +411,7 @@ jobs:
 #    
 #    steps:
 #    - name: Checkout project
-#      uses: actions/checkout@v4
+#      uses: actions/checkout@v6
 #      with:
 #        fetch-depth: 0
 #        path: oolitestarter

checkstyle.xml

@@ -44,7 +44,7 @@
   <!-- Checks for Size Violations.                    -->
   <!-- See https://checkstyle.org/config_sizes.html -->
   <module name="FileLength">
-    <property name="max" value="2700"/>
+    <property name="max" value="2800"/>
   </module>
   <!-- TODO: This is a lot of work, despite easy to resolve.
   <module name="LineLength">

pom.xml

@@ -260,12 +260,12 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.25.1</version>
+            <version>2.25.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.25.1</version>
+            <version>2.25.3</version>
             <scope>runtime</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j2-impl ->
@@ -274,7 +274,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j2-impl</artifactId>
-            <version>2.25.1</version>
+            <version>2.25.3</version>
             <scope>runtime</scope>
         </dependency>
 

readme.md

@@ -196,7 +196,8 @@ left, and those already installed on the right.
 
 One of the expansions is selected, and in the bottom you see additional
 information about the selection. The buttons in the middle allow to Install,
-Download, Remove and Delete.
+Download, Remove and Delete. Installation of a newer expansion over an older one
+will result in an update.
 
 You can sort and filter the list of expansions by clicking the button on the
 top right of the lists.
@@ -215,10 +216,12 @@ lifecycle through install and remove. Other expansions can be installed by
 giving a Download URL, will be stored in the Addons folder and will get deleted
 afterwards.
 
-#### Install
+#### Install/Update
 
 Installs an OXZ from the Expansion Manager's manifest into the ManagedAddons
-folder.
+folder. If a previous version of this expansion is already installed, it will be 
+overwritten. In this case the action performs an update. You can but do not have
+to remove the old version first.
 
 #### Download
 

src/main/java/oolite/starter/Configuration.java

@@ -9,6 +9,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.time.Duration;
 import java.time.Instant;
@@ -71,9 +73,9 @@ public class Configuration {
      * Creates a new Configuration instance.
      * Finds the platform specific configuration file to initialize.
      */
-    public Configuration() throws MalformedURLException {
+    public Configuration() throws MalformedURLException, URISyntaxException {
         expansionManagerURLs = new ArrayList<>();
-        expansionManagerURLs.add(new URL(DEFAULT_URL));
+        expansionManagerURLs.add(new URI(DEFAULT_URL).toURL());
 
         installations = new ArrayList<>();
         updateCheckInterval = Duration.ofDays(7);
@@ -85,7 +87,7 @@ public Configuration() throws MalformedURLException {
      * 
      * @param the configuration file to load
      */
-    public Configuration(File f) throws IOException, ParserConfigurationException, SAXException, XPathExpressionException {
+    public Configuration(File f) throws IOException, ParserConfigurationException, SAXException, XPathExpressionException, URISyntaxException {
         this();
 
         this.loadConfiguration(f);
@@ -112,7 +114,7 @@ public Duration getUpdateCheckInterval() {
      * 
      * @param f the file to load
      */
-    public final void loadConfiguration(File f) throws ParserConfigurationException, SAXException, IOException, XPathExpressionException {
+    public final void loadConfiguration(File f) throws ParserConfigurationException, SAXException, IOException, XPathExpressionException, URISyntaxException {
         DocumentBuilder db = DocumentBuilderFactory.newDefaultInstance().newDocumentBuilder();
         Document doc = db.parse(f);
         XPath xpath = XPathFactory.newDefaultInstance().newXPath();
@@ -124,7 +126,7 @@ public final void loadConfiguration(File f) throws ParserConfigurationException,
         ArrayList<URL> urls = new ArrayList<>();
         for (int i = 0; i< nl.getLength(); i++) {
             Element eExpansionManagerUrl = (Element)nl.item(i);
-            urls.add(new URL(eExpansionManagerUrl.getTextContent()));
+            urls.add(new URI(eExpansionManagerUrl.getTextContent()).toURL());
         }
         expansionManagerURLs = urls;
 
@@ -147,7 +149,7 @@ public final void loadConfiguration(File f) throws ParserConfigurationException,
             Installation inst = new Installation();
             inst.setHomeDir(xpath.evaluate("HomeDir", eInstallation));
             inst.setVersion(xpath.evaluate("Version", eInstallation));
-            inst.setExcecutable(xpath.evaluate("Executable", eInstallation));
+            inst.setExecutable(xpath.evaluate("Executable", eInstallation));
             inst.setSavegameDir(xpath.evaluate("SaveGameDir", eInstallation));
             inst.setAddonDir(xpath.evaluate("AddonDir", eInstallation));
             inst.setDeactivatedAddonDir(xpath.evaluate("DeactivatedAddonDir", eInstallation));
@@ -235,7 +237,7 @@ public final void saveConfiguration(File f) throws ParserConfigurationException,
             eInstallation.appendChild(e);
 
             e = doc.createElement("Executable");
-            e.setTextContent(installation.getExcecutable());
+            e.setTextContent(installation.getExecutable());
             eInstallation.appendChild(e);
 
             e = doc.createElement("SaveGameDir");
@@ -388,16 +390,42 @@ public File getSaveGameDir() {
         return new File(activeInstallation.getSavegameDir());
     }
 
+//    /**
+//     * Returns the command to execute for running Oolite.
+//     * 
+//     * @return the command
+//     */
+//    public String getOoliteCommand() {
+//        if (activeInstallation == null) {
+//            throw new IllegalStateException(CONF_NO_ACTIVE_INSTALLATION);
+//        }
+//        return activeInstallation.getExecutable();
+//    }
+
     /**
      * Returns the command to execute for running Oolite.
      * 
      * @return the command
      */
-    public String getOoliteCommand() {
+    public List<String> getOoliteCommand() {
+        log.debug("getOoliteCommand()");
+
         if (activeInstallation == null) {
             throw new IllegalStateException(CONF_NO_ACTIVE_INSTALLATION);
         }
-        return activeInstallation.getExcecutable();
+
+        String exe = activeInstallation.getExecutable();
+        List<String> result = new ArrayList<>();
+        if (exe.startsWith("flatpak ")) {
+            String[] parts = exe.split("\\s+");
+            for (String part: parts) {
+                result.add(part);
+            }
+        } else {
+            result.add(exe);
+        }
+
+        return result;
     }
 
     /**

src/main/java/oolite/starter/MainFrame.java

@@ -11,6 +11,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.lang.module.ModuleDescriptor;
+import java.net.URISyntaxException;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
@@ -58,6 +59,12 @@ public class MainFrame extends javax.swing.JFrame {
 
     private static transient JFrame newSplash;
 
+    /**
+     * This SwingWorker will initialize OoliteStarter by reading configuration,
+     * scanning the disk for savegames and installed expansions and downloading
+     * the expansion catalog.
+     * Finally it displays the main screen.
+     */
     private static class InitFrameSwingWorker extends SwingWorker<MainFrame, Object> {
 
         private GithubVersionChecker gvc;
@@ -227,7 +234,7 @@ protected void done() {
     /**
      * Creates new form MainFrame.
      */
-    public MainFrame() throws IOException, SAXException, ParserConfigurationException, XPathExpressionException {
+    public MainFrame() throws IOException, SAXException, ParserConfigurationException, XPathExpressionException, URISyntaxException {
         initComponents();
         setInstallationTitle(null);
         setIconImage(new ImageIcon(getClass().getResource("/images/Mr_Gimlet_transparent.png")).getImage());
@@ -396,7 +403,14 @@ protected boolean isInstallationsValid() {
         log.debug("isInstallationsValid()");
 
         for (Installation i: configuration.getInstallations()) {
-            File f = new File(i.getExcecutable());
+            // todo: move all this checking into the Installation class
+            // then it is easier to distinguish bare, flatpak and appimage installations
+
+            String executable = i.getExecutable();
+            if (executable == null) {
+                return false;
+            }
+            File f = new File(executable);
             if (!f.isFile()) {
                 log.warn("File {} not found.", f);
                 return false;
@@ -579,6 +593,10 @@ private static void setLookAndFeel() {
         //</editor-fold>
     }
 
+    /**
+     * Starts the UI by showing a splash screen and triggering the background
+     * swing worker to do the needful.
+     */
     private static void startupUI() {
         log.info("{} {}  starting up...", MainFrame.class.getPackage().getImplementationTitle(), MainFrame.class.getPackage().getImplementationVersion());