修改删除的方法

Author: githbwjb

src/main/java/io/udfs/api/MerkleNode.java

@@ -19,8 +19,8 @@ public class MerkleNode {
     public final List<MerkleNode> links;
     public final Optional<byte[]> data;
     public final List<String> backup;
-    public static String backdirhash="";
-    public static String backfilehash="";
+    //public static String backdirhash="";
+    //public static String backfilehash="";
 
     public MerkleNode(String hash,
                       Optional<String> name,
@@ -72,16 +72,16 @@ public static MerkleNode fromJSON(Object rawjson) {
             hash = (String)json.get("Key");
         if (hash == null && json.containsKey("Cid"))
             hash = (String) (((Map) json.get("Cid")).get("/"));
-        if(null!=hash){
+       /* if(null!=hash){
             backdirhash=hash;
-        }
+        }*/
         Optional<String> name = json.containsKey("Name") ?
                 Optional.of((String) json.get("Name")):
                 Optional.empty();
         String fileName=(String) json.get("Name");
-        if(StringUtils.isNotEmpty(fileName)){
+       /* if(StringUtils.isNotEmpty(fileName)){
             backfilehash=hash;
-        }
+        }*/
         Object rawSize = json.get("Size");
         Optional<Integer> size = rawSize instanceof Integer ?
                 Optional.of((Integer) rawSize) :
@@ -102,8 +102,8 @@ public static MerkleNode fromJSON(Object rawjson) {
         if(null!=job&&job.size()!=0){
             JSONArray list = job.getJSONArray("Success");
             if(null!=list){
-                hash=backdirhash;//备份信息将存放的节点的hash做为hash值
-                name=Optional.of(backfilehash);//备份信息将文件的hash值作为name值
+                //hash=backdirhash;//备份信息将存放的节点的hash做为hash值
+                //name=Optional.of(backfilehash);//备份信息将文件的hash值作为name值
                 Iterator<Object> it = list.iterator();
                 while (it.hasNext()) {
                     JSONObject ob = (JSONObject) it.next();

src/main/java/io/udfs/api/UDFS.java

@@ -225,12 +225,20 @@ public Map<Multihash, Object> ls(PinType type) throws IOException {
         public List<Multihash> rm(Multihash hash) throws IOException {
             return rm(hash, true);
         }
+        public List<Multihash> rmlocal(Multihash hash) throws IOException {
+            return rmlocal(hash, true);
+        }
 
         public List<Multihash> rm(Multihash hash, boolean recursive) throws IOException {
             Map json = retrieveMap("pin/rm?stream-channels=true&r=" + recursive + "&arg=" + hash);
             return ((List<Object>) json.get("Pins")).stream().map(x -> Cid.decode((String) x)).collect(Collectors.toList());
         }
 
+        public List<Multihash> rmlocal(Multihash hash, boolean recursive) throws IOException {
+            Map json = retrieveMap("localrm?stream-channels=true&r=" + recursive + "&arg=" + hash);
+            return ((List<Object>) json.get("Pins")).stream().map(x -> Cid.decode((String) x)).collect(Collectors.toList());
+        }
+
         public List<MultiAddress> update(Multihash existing, Multihash modified, boolean unpin) throws IOException {
             return ((List<Object>)((Map)retrieveAndParse("pin/update?stream-channels=true&arg=" + existing + "&arg=" + modified + "&unpin=" + unpin)).get("Pins"))
                     .stream()

src/test/java/io/udfs/api/APITest.java

@@ -17,9 +17,9 @@
 
 public class APITest {
     //http访问方式
-    //private final UDFS udfs = new UDFS("132.232.99.150",5001,false);
+    private final UDFS udfs = new UDFS("132.232.99.150",5001,false);
     //https访问方式
-    private final UDFS udfs = new UDFS("114.67.37.76",443,false);
+    //private final UDFS udfs = new UDFS("114.67.37.76",443,false);
     private final Random r = new Random(33550336); // perfect
 
     @Test
@@ -123,13 +123,27 @@ public void pushSingleFileTest() throws IOException {
     @Test
     public void pushFileTest() throws IOException {
         //要添加文件使用
-        NamedStreamable.FileWrapper file = new NamedStreamable.FileWrapper(new File("F:/test/20181116.txt"));
+       /* NamedStreamable.FileWrapper file = new NamedStreamable.FileWrapper(new File("F:/test/20181116.txt"));
         //添加文件到IPFS返回HASH值
         List<MerkleNode> addParts = udfs.add(file);
+        System.out.println("内容为:"+addParts.get(0).toJSONString());*/
+       /* String hash="QmPQJ6CTMxxGintCKKeQ38gxE8P9nnUdq5nM8nifLT1aQh";
+        //Multihash hash=new Multihash("QmPQJ6CTMxxGintCKKeQ38gxE8P9nnUdq5nM8nifLT1aQh");
+        List<Multihash> pinRm=udfs.pin.rm(Multihash.fromBase58("QmPQJ6CTMxxGintCKKeQ38gxE8P9nnUdq5nM8nifLT1aQh"));
+        System.out.println("删除结果:"+pinRm.get(0).toString());*/
+
+        Multihash filePointer = Multihash.fromBase58("Qme7KYZZTkARzkwE4x3vLKC4zB1jtNdw5HwuCxqABE7Kgc");
+        byte[] fileContents = udfs.cat(filePointer);
+        String str=new String(fileContents);
+        System.out.println("查询的内容为："+str);
+        List<Multihash> pinRm=udfs.pin.rmlocal(filePointer);
+        System.out.println("删除结果:"+pinRm.get(0).toString());
         //输出HASH值
-
         //List<MerkleNode> addParts = udfs.push(file);
-        System.out.println(addParts.get(0).hash);
+        /* System.out.println("哈希值:"+addParts.get(0).hash);
+        System.out.println("名称:"+addParts.get(0).name);
+        System.out.println("文件大小"+addParts.get(0).largeSize);
+        System.out.println("备份节点信息"+addParts.get(0).backup);*/
     }
 
     @Test