From 0bc868a8190fa1caf7e753c94062321749fbf8d3 Mon Sep 17 00:00:00 2001
From: luccioman <luccioman@users.noreply.github.com>
Date: Wed, 12 Apr 2017 09:23:10 +0200
Subject: [PATCH] Improved support for non ASCII chars in local file system
 URLs

Creating a MultiProtocolURL instance from a File object and then
retrieving a File with getFSFile() was inconsistent with file paths
containing space or non ASCII chars.
---
 .../cora/document/id/MultiProtocolURL.java    |  2 +-
 .../document/id/MultiProtocolURLTest.java     | 29 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/source/net/yacy/cora/document/id/MultiProtocolURL.java b/source/net/yacy/cora/document/id/MultiProtocolURL.java
index b0cf9c7dd..098308a59 100644
--- a/source/net/yacy/cora/document/id/MultiProtocolURL.java
+++ b/source/net/yacy/cora/document/id/MultiProtocolURL.java
@@ -2147,7 +2147,7 @@ public class MultiProtocolURL implements Serializable, Comparable<MultiProtocolU
      */
     public java.io.File getFSFile() throws MalformedURLException {
         if (!isFile()) throw new MalformedURLException();
-        return new java.io.File(this.toNormalform(true).substring(5));
+        return new java.io.File(unescape(this.toNormalform(true)).substring("file://".length()));
     }
 
     /**
diff --git a/test/java/net/yacy/cora/document/id/MultiProtocolURLTest.java b/test/java/net/yacy/cora/document/id/MultiProtocolURLTest.java
index 596afed8a..8052ef8f5 100644
--- a/test/java/net/yacy/cora/document/id/MultiProtocolURLTest.java
+++ b/test/java/net/yacy/cora/document/id/MultiProtocolURLTest.java
@@ -1,8 +1,12 @@
 package net.yacy.cora.document.id;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
+import java.io.File;
 import java.net.MalformedURLException;
+import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -373,6 +377,29 @@ public class MultiProtocolURLTest {
 			assertEquals(testString[1], unescaped);
 		}
 	}
+	
+	/**
+	 * Unit tests for {@link MultiProtocolURL#MultiProtocolURL(java.io.File)}
+	 * @throws MalformedURLException when an error occurred
+	 * @throws URISyntaxException 
+	 */
+	@Test
+	public void testFileConstructor() throws MalformedURLException, URISyntaxException {
+		File[] files = new File[] {
+			/* Simple file name */
+			new File(File.separator + "textFile.txt"),
+			/* File name with space */
+			new File(File.separator + "text file.txt"),
+			/* File name with non ASCII latin chars */
+			new File(File.separator + "fileéàè.txt"),
+		};
+		for(int i = 0; i < files.length; i++) {
+			MultiProtocolURL url = new MultiProtocolURL(files[i]);
+			assertTrue(url.isFile());
+			/* Check consistency when retrieving a File object with getFSFile() */
+			assertEquals(files[i], url.getFSFile());
+		}
+	}
     
 }