diff --git a/photos.py b/photos.py index 6df2c51..0943b43 100644 --- a/photos.py +++ b/photos.py @@ -71,7 +71,7 @@ class Photos(db.Model): id = db.Column(db.Integer, db.Sequence('photos_id_seq'), primary_key=True ) name = db.Column(db.String, unique=True, nullable=False ) type = db.Column(db.String, unique=False, nullable=False) - size_MB = db.Column(db.Integer, unique=False, nullable=False) + 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) thumbnail = db.Column(db.LargeBinary, unique=False, nullable=True) @@ -123,7 +123,11 @@ def photos(): fsize = round(os.stat(file).st_size/(1024*1024)) fname=file.replace(p, "") - view_list.append( Photos( name=fname, type=ftype, size_MB=fsize, hash=fhash, thumbnail=fthumbnail )) +# tmp_photo=Photos( name=fname, type=ftype, size_mb=fsize, hash=fhash ) +# db.session.add(tmp_photo) + view_list.append( Photos( name=fname, type=ftype, size_mb=fsize, hash=fhash, thumbnail=fthumbnail )) + +# db.session.commit() return render_template("photos.html", page_title='View Photos', view_path=view_path, file_list=view_list, symlink=symlink, alert=st.GetAlert(), message=st.GetMessage() ) diff --git a/templates/photos.html b/templates/photos.html index 612ba9c..f768580 100644 --- a/templates/photos.html +++ b/templates/photos.html @@ -19,7 +19,7 @@ {% endif %} {{obj.name}} - {{obj.size_MB}}{{obj.hash}} + {{obj.size_mb}}{{obj.hash}} {% endfor %}