diff --git a/scanner/PhotoAlbum.py b/scanner/PhotoAlbum.py index e88fef4..367c56c 100644 --- a/scanner/PhotoAlbum.py +++ b/scanner/PhotoAlbum.py @@ -140,7 +140,7 @@ class Photo(object): decoded = TAGS.get(tag, tag) if isinstance(value, str): value = value.strip() - if decoded.startswith("DateTime"): + if isinstance(decoded, str) and decoded.startswith("DateTime"): try: value = datetime.strptime(value, '%Y:%m:%d %H:%M:%S') except: @@ -279,7 +279,7 @@ class Photo(object): path = os.path.join(basepath, dictionary["name"]) del dictionary["name"] for key, value in dictionary.items(): - if key.startswith("DateTime"): + if key.startswith("dateTime"): try: dictionary[key] = datetime.strptime(dictionary[key], "%a %b %d %H:%M:%S %Y") except: diff --git a/web/css/000-controls.css b/web/css/000-controls.css index 2a8ea33..694afd4 100644 --- a/web/css/000-controls.css +++ b/web/css/000-controls.css @@ -105,7 +105,7 @@ a:hover { } #metadata { background-color: #000000; - width: 220px; + width: 240px; font-size: 12px; line-height: 12px; padding-top: 3px;