增加加速器

Author: lamborc

conf/nbs.db

@@ -45,4 +45,8 @@ private void initComponents(){
     public void setVolumeText(String text){
         this.textArea.setText(text);
     }
+
+    public void setHorizontalAlignment(int horizontalAlignment){
+        this.label.setHorizontalAlignment(horizontalAlignment);
+    }
 }

src/main/java/io/nbs/client/ui/components/forms/LCFormLabel.java

@@ -7,6 +7,7 @@
 import io.nbs.client.exceptions.FileTooLargeException;
 import io.nbs.client.listener.IPFSFileUploader;
 import io.nbs.client.ui.frames.MainFrame;
+import io.nbs.commons.helper.DateHelper;
 import io.nbs.commons.utils.DataSizeFormatUtil;
 import io.nbs.sdk.beans.PeerInfo;
 import io.nbs.sdk.prot.IPMParser;
@@ -46,7 +47,7 @@ public void actionPerformed(ActionEvent e) {
         this.jFileChooser.showDialog(Launcher.getContext().getCurrentFrame(),"选择");
         File selection = jFileChooser.getSelectedFile();
         if(selection==null)return;
-        logger.info(selection.getAbsolutePath());
+        logger.info("{}在{}分享了{}",MainFrame.getContext().getCurrentPeer().getNick(),DateHelper.currentTime(),selection.getAbsolutePath());
         if(selection.length()>200*1024*1024){
             JOptionPane.showMessageDialog(MainFrame.getContext(),"成功加入分享任务，由于文件较大需要稍等一会儿返回唯一串码.");
         }

src/main/java/io/nbs/client/ui/panels/im/IMFileActionListener.java

@@ -23,6 +23,7 @@
 import io.nbs.client.ui.panels.ParentAvailablePanel;
 import io.nbs.client.ui.panels.manage.body.TipResultHashPanel;
 import io.nbs.client.vo.AttachmentDataDTO;
+import io.nbs.commons.helper.DateHelper;
 import io.nbs.commons.utils.ButtonIconUtil;
 import io.nbs.commons.utils.IconUtil;
 import io.nbs.sdk.page.PageModel;
@@ -184,10 +185,12 @@ private void searchHash(final String text){
                Multihash multihash1= Multihash.fromBase58(text);
                long start = System.currentTimeMillis();
                try {
+                   tipResultHashPanel.searchingFromIntelnet();
                    Object o =ipfs.object.stat(multihash1);
                    String json = JSONParser.toString(o);
                    BlockStat stat = JSON.parseObject(json,BlockStat.class);
                    long usedsecd = System.currentTimeMillis()-start;
+                   logger.info("TESTLOG>>>查找文件:{},用时{}",text,DateHelper.calcUsedTime(usedsecd));
                    tipResultHashPanel.setBlkStat(stat,null,usedsecd);
                } catch (IOException e) {
                    e.printStackTrace();

src/main/java/io/nbs/client/ui/panels/manage/MMSearcherPanel.java

@@ -1,10 +1,7 @@
 package io.nbs.client.ui.panels.manage.body;
 
 import com.alibaba.fastjson.JSON;
-import io.ipfs.api.IPFS;
-import io.ipfs.api.JSONParser;
-import io.ipfs.api.MerkleNode;
-import io.ipfs.api.ResData;
+import io.ipfs.api.*;
 import io.ipfs.api.beans.blk.BlockStat;
 import io.ipfs.api.beans.bw.BitSwap;
 import io.ipfs.api.bitswap.BitSwapService;
@@ -160,11 +157,13 @@ public void startMonitor(String rhash,BlockStat stat){
         statusLabel.setText("浏览器打开，正在加载数据...");
 
         new Thread(()->{
+            int sec = 0;
             while (completeSize.get()<fsize){
-                seconds += seconds;
+                sec++;
                 try {
                     TimeUnit.SECONDS.sleep(1);
-                    timelabel.setText(seconds+"s");
+                    timelabel.setText(sec+"s");
+                    timelabel.updateUI();
                 } catch (InterruptedException e) {
                     e.printStackTrace();
                 }
@@ -178,8 +177,8 @@ public void startMonitor(String rhash,BlockStat stat){
             generateHash(multihash);
         }).start();
 
-        boosterPined();
         monitorList();
+        boosterPined();
         this.setVisible(true);
     }
 
@@ -219,6 +218,9 @@ private void boosterPined(){
                     long nl = completeSize.longValue()+stat.getCumulativeSize();
                     completeSize.addAndGet(nl);
                     ipfs.pin.add(multihash);
+                    byte[] data =ipfs.object.data(multihash);
+                    NamedStreamable.ByteArrayWrapper byteArrayWrapper = new NamedStreamable.ByteArrayWrapper(data);
+                    ipfs.add(byteArrayWrapper);
                     Map blkMap = ipfs.block.stat(multihash);
                     logger.info("{}>>block :{}",multihash.toBase58(),JSON.toJSON(blkMap));
                 } catch (InterruptedException e) {

src/main/java/io/nbs/client/ui/panels/manage/body/MMMonitPanel.java

@@ -122,7 +122,8 @@ private void initComponents() {
         /**
          *
          */
-        searchUsed = new LCFormLabel("搜索到文件用时");
+        searchUsed = new LCFormLabel("搜索到文件用时:");
+        searchUsed.setHorizontalAlignment(JLabel.LEFT);
         operPanel = new JPanel();
         operPanel.setLayout(new FlowLayout(FlowLayout.RIGHT,20,5));
         operPanel.setVisible(false);
@@ -180,6 +181,9 @@ private void setListeners() {
         openBtn.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
+
+
+
                 BrowserOperationHelper.getInstance().openURL(hash58);
             }
         });
@@ -198,6 +202,8 @@ public void setHash(String hash){
         this.updateUI();
     }
 
+
+
     public void setBlkStat(BlockStat stat,String errorMSG,long usedSecd){
         String timeUsed = DateHelper.calcUsedTime(usedSecd);
         searchUsed.setVolumeText(timeUsed);