Improve error messages and extend regex pattern to also accept

oolite-source-1.92.1.zip

Author: cube

src/main/java/com/chaudhuri/ooliteaddonscanner2/AddonsUtil.java

@@ -310,9 +310,19 @@ public static void readOolite(ExpansionCache cache, Registry registry) throws IO
         }
 
         String tag = "latest";
+        String url = null;
+        Map<String, Object> manifest = null;
 
-        Map<String, Object> manifest = cache.getOoliteManifest(tag);
-        String url = cache.getOoliteDownloadUrl(manifest);
+        try {
+            manifest = cache.getOoliteManifest(tag);
+        } catch (Exception e) {
+            throw new IllegalStateException("Could not get manifest for Oolite '" + tag+ "'", e);
+        }
+        try {
+            url = cache.getOoliteDownloadUrl(manifest);
+        } catch (Exception e) {
+            throw new IllegalStateException("Could not get download url for Oolite from manifest", e);
+        }
         try (InputStream olitezip = cache.getPluginInputStream(url); ZipInputStream zin = new ZipInputStream(olitezip)) {
             Expansion oxp = new Expansion();
             oxp.setDownloadUrl(url);

src/main/java/com/chaudhuri/ooliteaddonscanner2/ExpansionCache.java

@@ -205,7 +205,7 @@ public Map<String, Object> getOoliteManifest(String tag) throws IOException, URI
     public String getOoliteDownloadUrl(Map<String, Object> manifest) {
         log.debug("getOoliteDownloadUrl({})", manifest);
 
-        Pattern pattern = Pattern.compile("oolite-source-\\d+\\.\\d+\\.zip");
+        Pattern pattern = Pattern.compile("oolite-source-\\d+(\\.\\d+)*\\.zip");
 
         List<Object> assets = (List<Object>)manifest.get("assets");
         for (Object oasset: assets) {
@@ -219,7 +219,8 @@ public String getOoliteDownloadUrl(Map<String, Object> manifest) {
                 return assetUrlStr;
             }
         }
-        throw new IllegalStateException("Could not find file matching "+pattern.pattern());
+        log.error("Manifest: {}", manifest);
+        throw new IllegalStateException("Could not find file matching "+pattern.pattern() +" in manifest's assets");
     }
 
     /**