fix url skiphead

Author: kitmanzheng

dep/cos_migrate_tool-1.0-jar-with-dependencies.jar

@@ -31,6 +31,10 @@ public String buildKey() {
 
     @Override
     public String buildValue() {
+        if (headAttr == null) {
+            return "no headArrt";
+        }
+        
         String value = String.format("[fileSize: %d], [lastModify: %s]", headAttr.fileSize,
                 headAttr.lastModify);
         return value;

src/main/java/com/qcloud/cos_migrate_tool/record/MigrateUrllistRecordElement.java

@@ -71,7 +71,7 @@ public void doTask() {
                 MigrateType.MIGRATE_FROM_URLLIST, config.getBucketName(), cosPath, url, headAttr);
 
 
-        if (isExist(urllistRecordElement, ((CopyFromUrllistConfig) config).IsSkipHead())) {
+        if (isExist(urllistRecordElement, !((CopyFromUrllistConfig) config).IsSkipHead())) {
             TaskStatics.instance.addSkipCnt();
             return;
         }
@@ -113,7 +113,8 @@ public void doTask() {
             TaskStatics.instance.addFailCnt();
             return;
         }
-
+        
+        
         try {
             com.qcloud.cos.model.ObjectMetadata cosMetadata =
                     new com.qcloud.cos.model.ObjectMetadata();

src/main/java/com/qcloud/cos_migrate_tool/task/MigrateUrllistTask.java

@@ -62,14 +62,14 @@ public boolean isExist(RecordElement recordElement, boolean isCompareValue) {
             return true;
         }
 
-        if (!isCompareValue && query_result == RecordDb.QUERY_RESULT.VALUE_NOT_EQ) {
+        if (!isCompareValue && (query_result == RecordDb.QUERY_RESULT.VALUE_NOT_EQ)) {
             String printMsg = String.format("[skip] task_info: %s", recordElement.buildKey());
             System.out.println(printMsg);
             log.info("skip! not compare value, task_info: [key: {}], [value: {}]",
                     recordElement.buildKey(), recordElement.buildValue());
             return true;
         }
-
+        
         return false;
     }
 

src/main/java/com/qcloud/cos_migrate_tool/task/Task.java

@@ -11,7 +11,6 @@
 
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.config.RequestConfig;
@@ -96,7 +95,7 @@ public HeadAttr headFile(String url, boolean qiniuDownLoadFlag) throws Exception
             httpHead.setConfig(requestConfig);
             httpHead.setHeader("Accept", "*/*");
             httpHead.setHeader("Connection", "Keep-Alive");
-            httpHead.setHeader("User-Agent", "cos-migrate-tool");
+            httpHead.setHeader("User-Agent", "cos-migrate-tool-v1.3.6");
 
             HttpResponse httpResponse = null;
             try {
@@ -219,7 +218,7 @@ public HeadAttr downFile(String url, File localFile, boolean qiniuDownLoadFlag)
             httpGet.setConfig(requestConfig);
             httpGet.setHeader("Accept", "*/*");
             httpGet.setHeader("Connection", "Keep-Alive");
-            httpGet.setHeader("User-Agent", "cos-migrate-tool-v1.0");
+            httpGet.setHeader("User-Agent", "cos-migrate-tool-v1.3.6");
             try {
                 HttpResponse httpResponse = httpClient.execute(httpGet);
                 int http_statuscode = httpResponse.getStatusLine().getStatusCode();