ipfs.add() with FileWrapper should not URL-encode filenames.

[bwkimmel]

If I try to add a file whose name contains a character affected by URLEncoder.encode, the file name in IPFS ends up as the encoded version of the original. To reproduce:

$ mkdir /tmp/foo
$ touch '/tmp/foo/bar$baz.txt'

Run the following program:

import java.io.File;
import java.io.IOException;
import java.util.List;

import io.ipfs.api.IPFS;
import io.ipfs.api.MerkleNode;
import io.ipfs.api.NamedStreamable;
import io.ipfs.multiaddr.MultiAddress;

public class Test {
  public static void main(String... args) throws IOException {
    IPFS ipfs = new IPFS(new MultiAddress("/ip4/127.0.0.1/tcp/5001"));
    NamedStreamable dir = new NamedStreamable.FileWrapper(new File("/tmp/foo"));
    List<MerkleNode> nodes = ipfs.add(dir);
    System.out.println("/ipfs/" + nodes.get(nodes.size() - 1).hash.toBase58());
  }
}

This prints out: /ipfs/QmSuq7496UJ3b5fZJWWnZknWxtfazGDQ3Gw5gfG1YNfvdd

$ ipfs ls /ipfs/QmSuq7496UJ3b5fZJWWnZknWxtfazGDQ3Gw5gfG1YNfvdd
QmbFMke1KXqnYyBBWxB74N4c5SBnJMVAiMNRcGu6x1AwQH 6 bar%24baz.txt

Compare this with the behavior using ipfs add -r:

$ ipfs add -r /tmp/foo
added QmbFMke1KXqnYyBBWxB74N4c5SBnJMVAiMNRcGu6x1AwQH foo/bar$baz.txt
added QmYYohh3cVpiMCwsr4hLpRdN6qmsKrrPDdNJMYVqekk2cq foo
$ ipfs ls /ipfs/QmYYohh3cVpiMCwsr4hLpRdN6qmsKrrPDdNJMYVqekk2cq
QmbFMke1KXqnYyBBWxB74N4c5SBnJMVAiMNRcGu6x1AwQH 6 bar$baz.txt

[maksimyugai]

What about this issue?
I have a problem with filename encoding too. But a bit different.

I have a method:

    private String executePostMethod( File file, String originalFileName )
    {
        String result = null;
        CloseableHttpResponse response;
        String url = "http://127.0.0.1:5001/api/v0/add?wrap-with-directory=true&recurcive=true";

        try ( CloseableHttpClient httpClient = getHttpClient() )
        {
            if ( !file.exists() )
            {
                throw new FileNotFoundException( "File not found" );
            }

            HttpPost httpPost = new HttpPost( url );

            MultipartEntityBuilder builder = MultipartEntityBuilder.create();
            builder.addBinaryBody( "file", file, ContentType.APPLICATION_OCTET_STREAM, originalFileName.trim() )
                   .setCharset( Charset.forName( "UTF8" ) );

            HttpEntity multipart = builder.build();
            httpPost.setEntity( multipart );
            response = httpClient.execute( httpPost );
            HttpEntity entityResponse = response.getEntity();

            result = getIpfsHash( EntityUtils.toString( entityResponse ) );
        } catch(...) {...}

        return result;
}

And in response I get following json:

{"Name":"????????_????11","Hash":"Qmb4BeHHc3CwMuckqcTCMswRZ7vC2a2Yo1xo7n7wCn4GWW","Size":"25"}
{"Name":"","Hash":"QmSpz26SU23Jr7YzvHUSkpUGw9sKa2PiVD6XU6HzzSGytB","Size":"86"}

Filename is "тестовый_тест11". And consequently when I use UI:
http://localhost:8088/ipfs/QmNk3gWSXcy8XunJXke2DE6GR1rfFRt12Ax9MWKizPPHbn/%3F%3F%3F%3F%3F%3F%3F%3F_%3F%3F%3F%3F9 - available, but filename is mess and

http://localhost:8088/ipfs/QmNk3gWSXcy8XunJXke2DE6GR1rfFRt12Ax9MWKizPPHbn/тестовый_тест11 - unavailable.
Message states: ipfs resolve -r /ipfs/QmNk3gWSXcy8XunJXke2DE6GR1rfFRt12Ax9MWKizPPHbn/%D1%82%D0%B5%D1%81%D1%82%D0%BE%D0%B2%D1%8B%D0%B9_%D1%82%D0%B5%D1%81%D1%8211: no link by that name

What wrong with this method? What wrong with encoding? Is it a bug of IPFS or maybe I need to add some header?

[kevodwyer]

resolved in: #207