Merge pull request #617 from DaveBoy/master

添加文件名适配器接口，修复group中useServerFileName未同步到子task的问题

PublicComponent/src/main/java/com/arialyy/aria/core/TaskOptionParams.java

@@ -22,6 +22,7 @@ import com.arialyy.aria.core.processor.FtpInterceptHandler;
 import com.arialyy.aria.core.processor.IBandWidthUrlConverter;
 import com.arialyy.aria.core.processor.IFtpUploadInterceptor;
 import com.arialyy.aria.core.processor.IHttpFileLenAdapter;
+import com.arialyy.aria.core.processor.IHttpFileNameAdapter;
 import com.arialyy.aria.core.processor.IKeyUrlConverter;
 import com.arialyy.aria.core.processor.ILiveTsUrlConverter;
 import com.arialyy.aria.core.processor.ITsMergeHandler;
@@ -59,6 +60,7 @@ public class TaskOptionParams {
     PROCESSORES.add(IBandWidthUrlConverter.class);
     PROCESSORES.add(IFtpUploadInterceptor.class);
     PROCESSORES.add(IHttpFileLenAdapter.class);
+    PROCESSORES.add(IHttpFileNameAdapter.class);
     PROCESSORES.add(ILiveTsUrlConverter.class);
     PROCESSORES.add(ITsMergeHandler.class);
     PROCESSORES.add(IVodTsUrlConverter.class);

PublicComponent/src/main/java/com/arialyy/aria/core/processor/IHttpFileNameAdapter.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2016 AriaLyy(https://github.com/AriaLyy/Aria)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.arialyy.aria.core.processor;
+
+import com.arialyy.aria.core.download.DownloadEntity;
+import com.arialyy.aria.core.inf.IEventHandler;
+
+import java.net.URLConnection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Http文件名适配器
+ */
+public interface IHttpFileNameAdapter extends IEventHandler {
+
+  /**
+   * 根据header中的数据获取文件名字
+   * @param headers header参数{@link URLConnection#getHeaderFields()}
+   * @param key 这里如果传entity可能会导致entity属性变更而其他地方没有改变，所以就传了个key 减少可操作范围
+   * @return 文件长度
+   */
+  String handleFileName(Map<String, List<String>> headers, String key);
+}

PublicComponent/src/main/java/com/arialyy/aria/util/DbDataHelper.java

@@ -105,7 +105,11 @@ public class DbDataHelper {
       entity.setUrl(url);
       entity.setFilePath(groupHash + "_" + i);
       int lastIndex = url.lastIndexOf(File.separator);
-      entity.setFileName(url.substring(lastIndex + 1));
+      //去除url末尾携带的的参数
+      int endIndex = url.lastIndexOf("?");
+      if(endIndex<0)endIndex=url.length();
+
+      entity.setFileName(url.substring(lastIndex + 1,endIndex));
       entity.setGroupHash(groupHash);
       entity.setGroupChild(true);
       list.add(entity);