🐛 Fix handling of URL-ish paths on Windows; Resolves #335

Author: ebullient

src/main/java/dev/ebullient/convert/qute/ImageRef.java

@@ -151,7 +151,7 @@ public String url() {
     }
 
     public static class Builder {
-        private Path sourcePath;
+        private String sourcePath;
         private Path relativeTarget;
         private String title = "";
         private Integer width;
@@ -162,12 +162,17 @@ public static class Builder {
         private String url;
 
         public Builder setSourcePath(Path sourcePath) {
+            this.sourcePath = sourcePath.toString();
+            return this;
+        }
+
+        public Builder setInternalPath(String sourcePath) {
             this.sourcePath = sourcePath;
             return this;
         }
 
         public Builder setStreamSource(String glyph) {
-            this.sourcePath = Path.of("stream", glyph);
+            this.sourcePath = "stream/" + glyph;
             return this;
         }
 
@@ -207,11 +212,12 @@ public ImageRef build() {
             if (url != null && !imageRoot.copyExternalToVault()) {
                 // leave external images alone (referenced as url)
                 return new ImageRef(url, null, null, title, null, width);
-            } else if (url == null && sourcePath == null) {
+            }
+
+            if (url == null && sourcePath == null) {
                 Tui.instance().errorf("ImageRef build for internal image called without url or sourcePath set");
                 return null;
             }
-
             if (relativeTarget == null || vaultRoot == null || rootFilePath == null) {
                 Tui.instance().errorf("ImageRef build called without target paths set");
                 return null;

src/main/java/dev/ebullient/convert/tools/dnd5e/Json2QuteCommon.java

@@ -746,7 +746,7 @@ ImageRef getToken() {
             return null;
         }
 
-        return getSources().buildTokenImageRef(index, Path.of(sourcePath), targetFile, true);
+        return getSources().buildTokenImageRef(index, sourcePath, targetFile, true);
     }
 
     String collectImmunities(JsonNode fromNode, VulnerabilityFields field) {

src/main/java/dev/ebullient/convert/tools/dnd5e/Tools5eSources.java

@@ -218,11 +218,11 @@ public Optional<String> uaSource() {
         return source.map(TtrpgConfig::sourceToAbbreviation);
     }
 
-    public ImageRef buildTokenImageRef(Tools5eIndex index, Path sourcePath, Path target, boolean useCompendium) {
+    public ImageRef buildTokenImageRef(Tools5eIndex index, String sourcePath, Path target, boolean useCompendium) {
         String key = sourcePath.toString();
         ImageRef imageRef = new ImageRef.Builder()
                 .setRelativePath(target)
-                .setSourcePath(sourcePath)
+                .setInternalPath(sourcePath)
                 .setRootFilepath(useCompendium ? index.compendiumFilePath() : index.rulesFilePath())
                 .setVaultRoot(useCompendium ? index.compendiumVaultRoot() : index.rulesVaultRoot())
                 .build(imageSourceToRef.get(key));
@@ -246,17 +246,19 @@ public ImageRef buildImageRef(Tools5eIndex index, JsonMediaHref mediaHref, Strin
             return imageRef;
         }
 
-        String fileName = external
-                ? Path.of(mediaHref.href.url).getFileName().toString()
-                : Path.of(mediaHref.href.path).getFileName().toString();
+        String fullPath = external
+                ? mediaHref.href.url
+                : mediaHref.href.path.replace("\\", "/");
+        int pos = fullPath.lastIndexOf('/');
+        String fileName = fullPath.substring(pos + 1);
 
         if (type == Tools5eIndexType.deity || type == Tools5eIndexType.note || type == Tools5eIndexType.variantrule) {
             fileName = primarySource() + "-" + fileName;
         }
 
         int x = fileName.lastIndexOf('.');
         fileName = x < 0
-                ? fileName
+                ? index.slugify(fileName)
                 : index.slugify(fileName.substring(0, x)) + fileName.substring(x);
         Path target = Path.of(imageBasePath, "img", fileName);
 
@@ -270,7 +272,7 @@ public ImageRef buildImageRef(Tools5eIndex index, JsonMediaHref mediaHref, Strin
         if (external) {
             builder.setUrl(mediaHref.href.url);
         } else {
-            builder.setSourcePath(Path.of(mediaHref.href.path));
+            builder.setInternalPath(mediaHref.href.path);
         }
 
         ImageRef imageRef = builder.build(imageSourceToRef.get(key));