takino
/
ordigi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gh-139 Add files via upload 

added hours, minutes and seconds
This commit is contained in:
Daniel Dräs 2016-10-15 22:00:51 +02:00 committed by Jaisen Mathai
parent 54f3fac155
commit 56847511b9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
elodie/filesystem.py
View File

@ -235,17 +235,17 @@ class FileSystem(object):
# Initialize date taken to what's returned from the metadata function. # Initialize date taken to what's returned from the metadata function.
# If the folder and file name follow a time format of # If the folder and file name follow a time format of
# YYYY-MM/DD-IMG_0001.JPG then we override the date_taken # YYYY-MM/DD-IMG_0001.JPG then we override the date_taken
(year, month, day) = [None] * 3 (year, month, day, hour, minute, second) = [None] * 6
year_month_day_match = re.search('(\d{4})-(\d{2})-(\d{2})', file_name) year_month_day_match = re.search('(\d{4})-(\d{2})-(\d{2})_(\d{2})-(\d{2})-(\d{2})', file_name)
if(year_month_day_match is not None): if(year_month_day_match is not None):
(year, month, day) = year_month_day_match.groups() (year, month, day, hour, minute, second) = year_month_day_match.groups()
# check if the file system path indicated a date and if so we # check if the file system path indicated a date and if so we
# override the metadata value # override the metadata value
if(year is not None and month is not None and day is not None): if(year is not None and month is not None and day is not None and hour is not None and minute is not None and second is not None):
date_taken = time.strptime( date_taken = time.strptime(
'{}-{}-{}'.format(year, month, day), '{}-{}-{} {}:{}:{}'.format(year, month, day, hour, minute, second),
'%Y-%m-%d' '%Y-%m-%d %H:%M:%S'
) )
os.utime(file, (time.time(), time.mktime(date_taken))) os.utime(file, (time.time(), time.mktime(date_taken)))