修复文件修改时间判断错误和网络IO等待时间过长会报错的问题

Author: asforest

src/main/java/com/github/balloonupdate/mcpatch/client/Work.java

@@ -336,13 +336,20 @@ boolean run2(Servers server) throws IOException, McpatchBusinessException {
                 }
 
                 // 2.判断文件时间
-                if ((mtime.toMillis() / 1000 - f.modified) > 5) {
+                long timeDiff = (mtime.toMillis() / 1000 - f.modified);
+
+//                Log.debug(f.path + " : " + timeDiff);
+
+                if (timeDiff < 5) {
                     continue;
                 }
 
                 // 3.对比hash
                 String hash;
 
+                if (window != null)
+                    window.setLabelSecondaryText(PathUtility.getFilename(f.path));
+
                 try {
                     hash = HashUtility.calculateHash(targetPath);
                 } catch (IOException ex) {
@@ -353,10 +360,17 @@ boolean run2(Servers server) throws IOException, McpatchBusinessException {
                     continue;
                 }
 
+                // 顺便修复文件修改时间
+                Files.setLastModifiedTime(targetPath, FileTime.from(f.modified, TimeUnit.SECONDS));
+
                 // 执行到这里的就是可以跳过的了
                 updateFiles.remove(i);
             }
 
+            // 清空文字
+            if (window != null)
+                window.setLabelSecondaryText("");
+
             // 尽可能跳过要创建的目录
             for (int i = createFolders.size() - 1; i >= 0; i--) {
                 String f = createFolders.get(i);

src/main/java/com/github/balloonupdate/mcpatch/client/ui/McPatchWindow.java

@@ -1,5 +1,7 @@
 package com.github.balloonupdate.mcpatch.client.ui;
 
+import com.github.kasuminova.GUI.SetupSwing;
+
 import javax.swing.*;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -24,13 +26,13 @@ public McPatchWindow(int width, int height) {
 
         window = new JFrame();
 
-        label = new JLabel("空标签空标签空标签空标签空标签空标签空标签空标签空标签");
-        label.setBounds(45, 15, 295, 20);
+        label = new JLabel("空标签空标签空标签空标签空标签空标签空签空标签空标签空签空标签空标签空标签空标签空标签");
+        label.setBounds(0, 15, 380, 20);
         label.setHorizontalAlignment(JLabel.CENTER);
         window.getContentPane().add(label);
 
-        labelSecondary = new JLabel("空标签空标签空标签空标签空标签空标签空标签空标签空标签");
-        labelSecondary.setBounds(45, 40, 295, 20);
+        labelSecondary = new JLabel("空标签空标签空标签空标签空标空标签空标签空标空标签空标签空标签空标签空标签空标签空标签");
+        labelSecondary.setBounds(0, 40, 380, 20);
         labelSecondary.setHorizontalAlignment(JLabel.CENTER);
         window.getContentPane().add(labelSecondary);
 
@@ -88,6 +90,7 @@ public void destroy() {
     // 进度条上的文字
     public void setProgressBarText(String value) {
         progressBar.setString(value);
+        progressBar.setToolTipText(value);
     }
 
     // 进度条的值
@@ -99,10 +102,12 @@ public void setProgressBarValue(int value) {
     // 标签上的文字
     public void setLabelText(String value) {
         label.setText(value);
+        label.setToolTipText(value);
     }
 
     // 副签上的文字
     public void setLabelSecondaryText(String value) {
+        labelSecondary.setToolTipText(value);
         labelSecondary.setText(value);
     }
 
@@ -113,6 +118,7 @@ public interface OnWindowClosing {
 
     // 开发时调试用
     public static void main(String[] args) {
+        SetupSwing.init();
         new McPatchWindow().show();
     }
 }

src/main/java/com/github/balloonupdate/mcpatch/client/utils/BytesUtils.java

@@ -142,10 +142,21 @@ public static long bytesLeToLong(byte[] bytes) {
      * 从流中不断读取数据，直到填满buf或者遇到异常，否则一直读取
      */
     public static void readAll(byte[] buf, InputStream input) throws IOException {
-        int index = 0;
+        int offset = 0;
 
-        while (index < buf.length) {
-            index += input.read(buf, index, buf.length - index);
+        while (offset < buf.length) {
+            int len = buf.length - offset;
+
+            RuntimeAssert.isTrue(offset >= 0);
+            RuntimeAssert.isTrue(len >= 0);
+            RuntimeAssert.isTrue(len <= buf.length - offset);
+
+            int received = input.read(buf, offset, len);
+
+            if (received == -1)
+                throw new IOException("The io reached the end");
+
+            offset += received;
         }
     }