From 34e0ea7a7b81ca6823ea47a2a0261ccf7ba0fd71 Mon Sep 17 00:00:00 2001 From: Seonah Moon Date: Mon, 16 Jul 2018 13:41:56 +0900 Subject: [PATCH] [DF180706-00348] Extract file extension from URL #3 Change-Id: I832d4b45277f1788cb1b27f586726a28101a0a1e --- agent/download-agent-file.c | 13 +++++++------ packaging/download-provider.spec | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/agent/download-agent-file.c b/agent/download-agent-file.c index b44c3a6..1000347 100755 --- a/agent/download-agent-file.c +++ b/agent/download-agent-file.c @@ -425,12 +425,13 @@ da_ret_t __decide_file_path(da_info_t *da_info) DA_SECURE_LOGI("candidate file name [%s]", file_name); - if (!extension - && file_info->mime_type - && strncmp(file_info->mime_type, "application/x-xz", strlen("application/x-xz")) - && strncmp(file_info->mime_type, "application/rss+xml", strlen("application/rss+xml"))) { - extension = __get_extension_name(file_info->mime_type, - file_name_from_header, url); + if (!extension) { + if (file_info->mime_type + && strncmp(file_info->mime_type, "application/x-xz", strlen("application/x-xz")) + && strncmp(file_info->mime_type, "application/rss+xml", strlen("application/rss+xml"))) + extension = __get_extension_name(file_info->mime_type, file_name_from_header, url); + else + extension = __get_extension_name(NULL, file_name_from_header, url); } if (file_name && !file_info->pure_file_name) { file_info->pure_file_name = file_name; diff --git a/packaging/download-provider.spec b/packaging/download-provider.spec index c090f7d..4274a16 100755 --- a/packaging/download-provider.spec +++ b/packaging/download-provider.spec @@ -1,6 +1,6 @@ Name: download-provider Summary: Download the contents in background -Version: 2.1.97 +Version: 2.1.99 Release: 0 Group: Development/Libraries License: Apache-2.0 -- 2.7.4