RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

exif: support more cases in date parsing (fix #485) 

Signed-off-by: Varun Patil <varunpatil@ucla.edu>
pull/504/head
Varun Patil 2023-03-15 10:51:33 -07:00
parent fb45a0fd36
commit 695b5c54ec
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Exif.php
View File

@ -155,6 +155,13 @@ class Exif
if (isset($dt) && \is_string($dt) && !empty($dt)) { if (isset($dt) && \is_string($dt) && !empty($dt)) {
$dt = explode('-', explode('+', $dt, 2)[0], 2)[0]; // get rid of timezone if present $dt = explode('-', explode('+', $dt, 2)[0], 2)[0]; // get rid of timezone if present
$dt = explode('.', $dt, 2)[0]; // timezone may be after a dot (https://github.com/pulsejet/memories/pull/397) $dt = explode('.', $dt, 2)[0]; // timezone may be after a dot (https://github.com/pulsejet/memories/pull/397)
$dt = explode('Z', $dt, 2)[0]; // get rid of Z if present (https://github.com/pulsejet/memories/issues/485)
// Some cameras don't add seconds to the date if it's 00
// https://github.com/pulsejet/memories/issues/485
if (3 === substr_count($dt, ':')) {
$dt .= ':00';
}
$dt = \DateTime::createFromFormat('Y:m:d H:i:s', $dt); $dt = \DateTime::createFromFormat('Y:m:d H:i:s', $dt);
if (!$dt) { if (!$dt) {