From 2dc410f9bcabda1f2cc461bcffdb075a2133072e Mon Sep 17 00:00:00 2001 From: Andros Fenollosa Date: Mon, 18 Nov 2019 00:44:13 +0100 Subject: [PATCH] Fix extension date --- organize_my_photos.py | 15 +++++++++++---- setup.py | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/organize_my_photos.py b/organize_my_photos.py index 3d1b741..f89a3b8 100644 --- a/organize_my_photos.py +++ b/organize_my_photos.py @@ -10,20 +10,27 @@ import calendar import shutil from PIL import Image +# Variables META_CREATED = 36867 +EXTENSIONS = ('jpg', 'jpeg', 'gif') def get_date_created(filename): + '''Get date created from create METADATA or file information''' + # Not image + if not os.path.basename(filename).lower().endswith(EXTENSIONS): + return time.strftime('%d/%m/%Y', time.gmtime(os.path.getctime(filename))) + # Image image = Image.open(filename) image.verify() # Format date d/m/Y - if image._getexif() is not None and META_CREATED in image._getexif(): - # Metadata + if image._getexif() is not None \ + and META_CREATED in image._getexif(): + # Get metadata return time.strftime('%d/%m/%Y', datetime.datetime.strptime(image._getexif()[META_CREATED], "%Y:%m:%d %H:%M:%S").timetuple()) else: - # Create data file + # Get create data file return time.strftime('%d/%m/%Y', time.gmtime(os.path.getctime(filename))) -EXTENSIONS = ('jpg', 'jpeg', 'gif') @click.command() @click.argument('path') diff --git a/setup.py b/setup.py index 4b2e214..8ebd148 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup setup( name = 'Organize-my-photos', py_modules=['organize_my_photos'], - version = '1.0.6', + version = '1.0.7', python_requires='>3.6', description = 'Terminal program that organizes and organizes the photographs in folders by year, month and day.', author = 'Andros Fenollosa',