Made IPFS constructor able to take a compatible Multiaddress

Author: ianopolous

src/org/ipfs/IPFS.java

@@ -31,6 +31,10 @@ public IPFS(String host, int port) {
         this(host, port, "/api/v0/");
     }
 
+    public IPFS(MultiAddress addr) {
+        this(addr.getHost(), addr.getTCPPort(), "/api/v0/");
+    }
+
     public IPFS(String host, int port, String version) {
         this.host = host;
         this.port = port;

src/org/ipfs/MultiAddress.java

@@ -20,6 +20,31 @@ public byte[] getBytes() {
         return Arrays.copyOfRange(raw, 0, raw.length);
     }
 
+    public boolean isTCPIP() {
+        String[] parts = toString().substring(1).split("/");
+        if (parts.length != 4)
+            return false;
+        if (!parts[0].startsWith("ip"))
+            return false;
+        if (!parts[2].equals("tcp"))
+            return false;
+        return true;
+    }
+
+    public String getHost() {
+        String[] parts = toString().substring(1).split("/");
+        if (parts[0].startsWith("ip"))
+            return parts[1];
+        throw new IllegalStateException("This multiaddress doesn't have a host: "+toString());
+    }
+
+    public int getTCPPort() {
+        String[] parts = toString().substring(1).split("/");
+        if (parts[2].startsWith("tcp"))
+            return Integer.parseInt(parts[3]);
+        throw new IllegalStateException("This multiaddress doesn't have a tcp port: "+toString());
+    }
+
     private static byte[] decodeFromString(String addr) {
         while (addr.endsWith("/"))
             addr = addr.substring(0, addr.length()-1);

test/org/ipfs/Test.java

@@ -5,7 +5,7 @@
 
 public class Test {
 
-    IPFS ipfs = new IPFS("127.0.0.1", 5001);
+    IPFS ipfs = new IPFS(new MultiAddress("/ip4/127.0.0.1/tcp/5001"));
     @org.junit.Test
     public void base58Test() {
         String input = "QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB";