[TNEXT-2301] Use the extension in the file name first

The download-provider checks the extension from URL first.
So, it appends the extension to the file name although it includes the extension.
This issue makes the file name have the duplicated extension.

Change-Id: I81cc1aa344a7252693397706edfe58b23800dbc2
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>

diff --git a/agent/download-agent-file.c b/agent/download-agent-file.c
index 60f5bad..5dd5ff7 100755 (executable)
--- a/agent/download-agent-file.c
+++ b/agent/download-agent-file.c
@@ -85,32 +85,30 @@ da_ret_t __divide_file_name_into_pure_name_N_extesion(const char *in_file_name,
 
     file_name = (char *)in_file_name;
 
-    if(url) {
-        char *extension = DA_NULL;
-        da_bool_t b_ret = da_get_extension_name_from_url(url, &extension);
-        if (b_ret && !extension) {
+       tmp_ptr = strrchr(file_name, '.');
+       if (tmp_ptr)
+               tmp_ptr++;
+       if (tmp_ptr && out_extension) {
+               strncpy((char*) tmp_ext, tmp_ptr, sizeof(tmp_ext) - 1);
+               *out_extension = strdup((const char*) tmp_ext);
+               DA_SECURE_LOGD("extension [%s]", *out_extension);
+       } else if (!tmp_ptr && url) {
+               char *extension = DA_NULL;
+               da_bool_t b_ret = da_get_extension_name_from_url(url, &extension);
+               if (b_ret && !extension) {
 #if 0
-            tmp_ptr = strrchr(file_name, '.');
-            if (tmp_ptr)
-                tmp_ptr++;
-            if (tmp_ptr && out_extension) {
-                strncpy((char*) tmp_ext, tmp_ptr, sizeof(tmp_ext) - 1);
-                *out_extension = strdup((const char*) tmp_ext);
-                DA_SECURE_LOGD("extension [%s]", *out_extension);
-            }
+                       tmp_ptr = strrchr(file_name, '.');
+                       if (tmp_ptr)
+                               tmp_ptr++;
+                       if (tmp_ptr && out_extension) {
+                               strncpy((char*) tmp_ext, tmp_ptr, sizeof(tmp_ext) - 1);
+                               *out_extension = strdup((const char*) tmp_ext);
+                               DA_SECURE_LOGD("extension [%s]", *out_extension);
+                       }
 #endif
-           *out_extension = NULL;
-        }
-    } else {
-        tmp_ptr = strrchr(file_name, '.');
-        if (tmp_ptr)
-            tmp_ptr++;
-        if (tmp_ptr && out_extension) {
-            strncpy((char*) tmp_ext, tmp_ptr, sizeof(tmp_ext) - 1);
-            *out_extension = strdup((const char*) tmp_ext);
-            DA_SECURE_LOGD("extension [%s]", *out_extension);
-        }
-    }
+                       *out_extension = NULL;
+               }
+       }
 
     if (!out_pure_file_name)
         return ret;

diff --git a/packaging/download-provider.spec b/packaging/download-provider.spec
index 9c4c025..a757037 100755 (executable)
--- a/packaging/download-provider.spec
+++ b/packaging/download-provider.spec
@@ -1,7 +1,7 @@
 %define _ux_define tizen2.3
 Name:       download-provider
 Summary:    Download the contents in background
-Version:    2.1.85
+Version:    2.1.86
 Release:    0
 Group:      Development/Libraries
 License:    Apache-2.0