WARNING: CURRENTLY BROKEN... updated photos.py to use exif data for thumbnails, and templates/photos.html to reflect changes

This commit is contained in:
2021-01-10 18:07:56 +11:00
parent c01c586bcd
commit 2d88a65ead
2 changed files with 28 additions and 3 deletions

View File

@@ -10,6 +10,8 @@ import glob
from PIL import Image
from pymediainfo import MediaInfo
import hashlib
import exifread
import base64
################################################################################
# Local Class imports
@@ -39,7 +41,7 @@ class Photos(db.Model):
size_MB = db.Column(db.Integer, unique=False, nullable=False)
# hash might not be unique, this could be the source of dupe problems
hash = db.Column(db.Integer, unique=True, nullable=True)
thumnbnail = db.Column(db.BYTE, unique=False, nullable=False)
thumbnail = db.Column(db.LargeBinary, unique=False, nullable=True)
def __repr__(self):
return "<id: {}, name: {}>".format(self.id, self.name )
@@ -61,10 +63,14 @@ def photos():
view_path = p
file_list.append(glob.glob(view_path + '**', recursive=True))
for file in file_list[0]:
fthumbnail = None
if file == p:
continue
if os.path.isdir(file):
ftype = 'Directory'
elif isImage(file):
ftype = 'Image'
fthumbnail = getExif(file)
elif isVideo(file):
ftype = 'Video'
else:
@@ -75,8 +81,13 @@ def photos():
fhash=md5(file)
else:
fhash=None
fsize = round(os.stat(file).st_size/(1024*1024))
view_list.append( Photos( name=file, type=ftype, size_MB=fsize, hash=fhash ))
view_list.append( Photos( name=file, type=ftype, size_MB=fsize, hash=fhash, thumbnail=fthumbnail ))
return render_template("photos.html", page_title='View Photos', view_path=view_path, file_list=view_list, alert=st.GetAlert(), message=st.GetMessage() )
@@ -97,3 +108,17 @@ def isVideo(file):
return False
except Exception as e:
return False
def getExif(file):
f = open(file, 'rb')
try:
tags = exifread.process_file(f)
except:
print('NO EXIF TAGS?!?!?!?')
f.close()
raise
f.close()
fthumbnail = base64.b64encode(tags['JPEGThumbnail'])
return fthumbnail

View File

@@ -17,7 +17,7 @@
{% endif %}
&nbsp;{{obj.name}}
{% if obj.type=="Image" %}
<img width="64" height="64" src="data:image/gif;base64,{{obj.thumb}}"></img>
<img width="64" height="64" src="data:image/jpg;base64,{{obj.thumbnail}}"></img>
{% endif %}
</td></td><td>{{obj.size_MB}}</td><td>{{obj.hash}}</tr>
{% endfor %}