Merge pull request #207 from ipfs-shipyard/fix/remove-double-encoding

kevodwyer · web-flow · commit 49bd34ac327e · 2023-01-25T11:05:15.000Z
remove double encoding. issue: 111
diff --git a/src/main/java/io/ipfs/api/NamedStreamable.java b/src/main/java/io/ipfs/api/NamedStreamable.java
@@ -52,11 +52,7 @@ public List<NamedStreamable> getChildren() {
         }
 
         public Optional<String> getName() {
-            try {
-                return Optional.of(URLEncoder.encode(source.getName(), "UTF-8"));
-            } catch (UnsupportedEncodingException e) {
-                throw new RuntimeException(e);
-            }
+            return Optional.of(source.getName());
         }
     }
 
diff --git a/src/test/java/io/ipfs/api/SimpleAddTest.java b/src/test/java/io/ipfs/api/SimpleAddTest.java
@@ -56,6 +56,15 @@ public void testAddArgs() throws Exception {
         Assert.assertEquals(1, tree.size());
         Assert.assertEquals("index.html", tree.get(0).name.get());
     }
+    @Test
+    public void testFilenameEncoding() throws Exception {
+        Path path = Paths.get("src/test/resources/folder/你好.html");
+        NamedStreamable file = new FileWrapper(path.toFile());
+        List<MerkleNode> tree = ipfs.add(file);
+
+        Assert.assertEquals(1, tree.size());
+        Assert.assertEquals("你好.html", tree.get(0).name.get());
+    }
 
     @Test
     public void testSingleWrapped() throws Exception {
diff --git a/src/test/resources/folder/你好.html b/src/test/resources/folder/你好.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Blank page</title>
+    <meta charset="utf-8" />
+</head>
+<body>
+<h1>blank</h1>
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -52,11 +52,7 @@ public List<NamedStreamable> getChildren() {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public Optional<String> getName() {`
`55`		`- try {`
`56`		`- return Optional.of(URLEncoder.encode(source.getName(), "UTF-8"));`
`57`		`- } catch (UnsupportedEncodingException e) {`
`58`		`- throw new RuntimeException(e);`
`59`		`- }`
	`55`	`+ return Optional.of(source.getName());`
`60`	`56`	`}`
`61`	`57`	`}`
`62`	`58`