修复百度云压缩包文件名乱码问题

Sas256 · Jan 18, 2018 · 97ac51f · 97ac51f
1 parent 84dc9e9
commit 97ac51f
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 42 deletions.
diff --git a/common/src/main/java/lee/study/down/io/BdyZip.java b/common/src/main/java/lee/study/down/io/BdyZip.java
@@ -72,7 +72,7 @@ public static BdyZipEntry getNextBdyZipEntry(FileChannel fileChannel) throws IOE
     ByteBuffer fileNameBuffer = ByteBuffer.allocate((int) zipEntry.getFileNameLength());
     fileChannel.read(fileNameBuffer);
     fileNameBuffer.flip();
-    zipEntry.setFileName(Charset.forName("GBK").decode(fileNameBuffer).toString());
+    zipEntry.setFileName(Charset.forName("GB18030").decode(fileNameBuffer).toString());
     if (zipEntry.getExtraFieldLength() > 0) {
       ByteBuffer extraFieldBuffer = ByteBuffer.allocate((int) zipEntry.getExtraFieldLength());
       fileChannel.read(extraFieldBuffer);

diff --git a/common/src/main/java/lee/study/down/model/TaskInfo.java b/common/src/main/java/lee/study/down/model/TaskInfo.java
@@ -74,13 +74,6 @@ public void reset() {
     });
   }
 
-  public void refresh() {
-    lastTime = System.currentTimeMillis();
-    chunkInfoList.forEach((chunkInfo) -> {
-      chunkInfo.setLastTime(lastTime);
-    });
-  }
-
   public void refresh(ChunkInfo chunkInfo) {
     lastTime = System.currentTimeMillis();
     chunkInfo.setLastTime(lastTime);

diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>proxyee-down</artifactId>
     <groupId>lee.study</groupId>
-    <version>2.0</version>
+    <version>2.01</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/src/main/java/lee/study/down/handle/HttpDownInitializer.java b/core/src/main/java/lee/study/down/handle/HttpDownInitializer.java
@@ -100,16 +100,13 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
                 if (taskInfo.getStatus() == HttpDownStatus.RUNNING
                     && taskInfo.getChunkInfoList().stream()
                     .allMatch((chunk) -> chunk.getStatus() == HttpDownStatus.DONE)) {
-                  //记录完成时间
-                  taskInfo.setLastTime(System.currentTimeMillis());
                   if (taskInfo.getTotalSize() <= 0) {  //chunked编码最后更新文件大小
                     taskInfo.setTotalSize(taskInfo.getDownSize());
                     taskInfo.getChunkInfoList().get(0).setTotalSize(taskInfo.getDownSize());
                   }
                   //文件下载完成回调
                   taskInfo.setStatus(HttpDownStatus.DONE);
                   LOGGER.debug("下载完成：" + chunkInfo.getIndex() + "\t" + chunkInfo.getDownSize());
-                  taskInfo.refresh();
                   if (callback != null) {
                     callback.onDone(bootstrap.getHttpDownInfo());
                   }

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>lee.study</groupId>
   <artifactId>proxyee-down</artifactId>
-  <version>2.0</version>
+  <version>2.01</version>
   <packaging>pom</packaging>
 
   <modules>

diff --git a/sniff/pom.xml b/sniff/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>proxyee-down</artifactId>
     <groupId>lee.study</groupId>
-    <version>2.0</version>
+    <version>2.01</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/ui/pom.xml b/ui/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>proxyee-down</artifactId>
     <groupId>lee.study</groupId>
-    <version>2.0</version>
+    <version>2.01</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/ui/src/main/java/lee/study/down/update/GithubUpdateService.java b/ui/src/main/java/lee/study/down/update/GithubUpdateService.java
@@ -17,6 +17,7 @@
 
 public class GithubUpdateService implements UpdateService {
 
+  private static final String UPDATE_CORE_FILE_NAME = "proxyee-down-core.jar";
   private static final String HOST = "github.com";
 
   @Override
@@ -29,7 +30,7 @@ public UpdateInfo check(float currVersion) throws Exception {
     if (maxVersion > currVersion) {
       updateInfo.setVersion(maxVersion);
       for (Element element : releaseDiv.select(".d-block.py-2")) {
-        if (UPDATE_FILE_NAME.equalsIgnoreCase(element.select("strong").text())) {
+        if (UPDATE_CORE_FILE_NAME.equalsIgnoreCase(element.select("strong").text())) {
           updateInfo.setUrl("https://" + HOST + element.select("a").attr("href"));
           break;
         }
@@ -53,7 +54,7 @@ public HttpDownBootstrap update(UpdateInfo updateInfo)
         .getTaskInfo(requestInfo, null, HttpDownConstant.clientSslContext,
             HttpDownConstant.clientLoopGroup)
         .setConnections(32)
-        .setFileName(UPDATE_FILE_NAME + ".bak")
+        .setFileName(UPDATE_CORE_FILE_NAME + ".bak")
         .setFilePath(HttpDownConstant.MAIN_PATH);
     HttpDownInfo httpDownInfo = new HttpDownInfo(taskInfo, requestInfo, null);
     HttpDownBootstrap bootstrap = new HttpDownBootstrap(httpDownInfo,

diff --git a/ui/src/main/java/lee/study/down/update/UpdateService.java b/ui/src/main/java/lee/study/down/update/UpdateService.java
@@ -5,8 +5,6 @@
 
 public interface UpdateService {
 
-  String UPDATE_FILE_NAME = "proxyee-down-core.jar";
-
   UpdateInfo check(float currVersion) throws Exception;
 
   HttpDownBootstrap update(UpdateInfo updateInfo) throws Exception;

diff --git a/ui/src/main/resources/application.properties b/ui/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-app.version=2.0
+app.version=2.01
 spring.profiles.active=prd
 #server.port= 8443
 #server.ssl.key-store=classpath:server.p12

diff --git a/ui/view/src/components/TaskList.vue b/ui/view/src/components/TaskList.vue
@@ -28,7 +28,7 @@
                 </p>
                 <p>
                   <span>速度：</span>
-                  <b>{{sizeFmt(speed(task), '0B')}}/s</b>
+                  <b>{{sizeFmt(speedTask(task), '0B')}}/s</b>
                 </p>
                 <p>
                   <span>状态：</span>
@@ -40,7 +40,7 @@
                   <task-progress :text-inside="true" :stroke-width="18"
                                  :percentage="task.totalProgress||progress(chunk)"
                                  :status="status(chunk)"></task-progress>
-                  <span>{{sizeFmt(speed(chunk), '0B')}}/s</span>
+                  <span>{{sizeFmt(speedChunk(chunk), '0B')}}/s</span>
                 </li>
               </ul>
               <task-progress type="circle"
@@ -103,15 +103,23 @@
         }
         return 0;
       },
-      speed(task) {
-        if (task.status == 7 || task.status == 5) {
-          return this.speedAvg(task);
+      speedTask(task) {
+        let sumSpeed = task.chunkInfoList.map((chunk)=>{
+          return this.speedChunk(chunk);
+        }).reduce((speed1, speed2) => {
+          return speed1 + speed2;
+        });
+        return sumSpeed;
+      },
+      speedChunk(chunk) {
+        if (chunk.status == 7 || chunk.status == 5) {
+          return this.speedAvg(chunk);
         } else {
-          let speed = this.speedInterval(task);
-          if (task.speedCount > 5 || speed > 0) {
+          let speed = this.speedInterval(chunk);
+          if (chunk.speedCount > 5 || speed > 0) {
             return speed;
           } else {
-            return this.speedAvg(task);
+            return this.speedAvg(chunk);
           }
         }
       },
@@ -138,7 +146,7 @@
         if (task.status == 5) {
           return '暂停中';
         }
-        let speed = this.speed(task);
+        let speed = this.speedTask(task);
         if (speed) {
           return Util.timeFmt((task.totalSize - task.downSize) / speed);
         } else {
@@ -227,18 +235,6 @@
           this.tasks = msg.map((task1) => {
             this.tasks.forEach((task2) => {
               if (task2.id == task1.id) {
-                task1.intervalTime = task1.lastTime - task2.lastTime;
-                task1.intervalDownSize = task1.downSize - task2.downSize;
-                task1.speedCount = task2.speedCount;
-                if (task1.intervalDownSize == 0) {
-                  if (!task1.speedCount) {
-                    task1.speedCount = 1;
-                  } else {
-                    task1.speedCount++;
-                  }
-                } else {
-                  task1.speedCount = 1;
-                }
                 task1.chunkInfoList.forEach((chunk, index) => {
                   chunk.intervalTime = chunk.lastTime - task2.chunkInfoList[index].lastTime;
                   chunk.intervalDownSize = chunk.downSize - task2.chunkInfoList[index].downSize;

diff --git a/update/update.iml b/update/update.iml
@@ -11,6 +11,6 @@
     </content>
     <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Maven: lee.study:proxyee-down-common:2.0" level="project" />
   </component>
 </module>