From 07e436ef906e648891818cf4f4cfd78bd1eec9d3 Mon Sep 17 00:00:00 2001 From: MinyoungJung Date: Sat, 19 Oct 2019 09:10:17 +0900 Subject: [PATCH 1/2] corrected typo in test_google_images_download.py and adjusted overindent in test_sample.py --- tests/test_google_images_download.py | 12 ++++++------ tests/test_sample.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/test_google_images_download.py b/tests/test_google_images_download.py index ec62afd0..a6119ed9 100644 --- a/tests/test_google_images_download.py +++ b/tests/test_google_images_download.py @@ -15,26 +15,26 @@ def silent_remove_of_file(file): def test_download_images_to_default_location(): start_time = time.time() - argumnets = { + arguments = { "keywords": "Polar bears", "limit": 5, "print_urls": False } try: - temp = argumnets['output_folder'] + temp = arguments['output_folder'] except KeyError: pass else: assert False, "This test checks download to default location yet an output folder was provided" - output_folder_path = os.path.join(os.path.realpath('.'), 'downloads', '{}'.format(argumnets['keywords'])) + output_folder_path = os.path.join(os.path.realpath('.'), 'downloads', '{}'.format(arguments['keywords'])) if os.path.exists(output_folder_path): start_amount_of_files_in_output_folder = len([name for name in os.listdir(output_folder_path) if os.path.isfile(os.path.join(output_folder_path, name)) and os.path.getctime(os.path.join(output_folder_path, name)) < start_time]) else: start_amount_of_files_in_output_folder = 0 response = google_images_download.googleimagesdownload() - response.download(argumnets) + response.download(arguments) files_modified_after_test_started = [name for name in os.listdir(output_folder_path) if os.path.isfile(os.path.join(output_folder_path, name)) and os.path.getmtime(os.path.join(output_folder_path, name)) > start_time] end_amount_of_files_in_output_folder = len(files_modified_after_test_started) print(f"Files downloaded by test {__name__}:") @@ -42,8 +42,8 @@ def test_download_images_to_default_location(): print(os.path.join(output_folder_path, file)) - # assert end_amount_of_files_in_output_folder - start_amount_of_files_in_output_folder == argumnets['limit'] - assert end_amount_of_files_in_output_folder == argumnets['limit'] + # assert end_amount_of_files_in_output_folder - start_amount_of_files_in_output_folder == arguments['limit'] + assert end_amount_of_files_in_output_folder == arguments['limit'] print(f"Cleaning up all files downloaded by test {__name__}...") for file in files_modified_after_test_started: diff --git a/tests/test_sample.py b/tests/test_sample.py index 060cbc88..2b3a4884 100644 --- a/tests/test_sample.py +++ b/tests/test_sample.py @@ -1,4 +1,4 @@ # Sample Test passing with nose and pytest def test_pass(): - assert True, "dummy sample test" + assert True, "dummy sample test" From 84a746af06366815b4e0960617cef0667ef787f4 Mon Sep 17 00:00:00 2001 From: MinyoungJung Date: Sat, 19 Oct 2019 13:22:14 +0900 Subject: [PATCH 2/2] Fix #275 --- google_images_download/google_images_download.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/google_images_download/google_images_download.py b/google_images_download/google_images_download.py index fd89a3a9..351b9b82 100755 --- a/google_images_download/google_images_download.py +++ b/google_images_download/google_images_download.py @@ -33,6 +33,7 @@ import re import codecs import socket +import imghdr args_list = ["keywords", "keywords_from_file", "prefix_keywords", "suffix_keywords", "limit", "format", "color", "color_type", "usage_rights", "size", @@ -637,6 +638,17 @@ def download_image(self,image_url,image_format,main_directory,dir_name,count,pri output_file = open(path, 'wb') output_file.write(data) output_file.close() + + # extension check + with open(path, "rb") as f: + f = open(path, 'rb') + ext = imghdr.what(f) + # change extension when there's mismatch + if ext and image_format != ext: + os.rename(path, path[:path.rfind(".")+1]+ext) + image_name = image_name.replace(image_format, ext) + image_format = ext + if save_source: list_path = main_directory + "/" + save_source + ".txt" list_file = open(list_path,'a')