ddp/photoassistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add some padding, and set root_eid - Its 0 when nothing at all in Path (first run/empty). Also, started override for marshmallow, but overrides wont work yet

Browse Source
This commit is contained in:
Damien De Paoli
2025-10-07 00:00:50 +11:00
parent 7f13d78700
commit eb7bb84e09
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
files.py
View File

@@ -209,6 +209,16 @@ class FaceRefimgLinkSchema(ma.SQLAlchemyAutoSchema):
class Meta: model = FaceRefimgLink
load_instance = True
class FaceNoMatchOverrideSchema(ma.SQLAlchemyAutoSchema):
class Meta: model = FaceOverrideType
load_instance = True
type = ma.Nested(FaceOverrideType)
class FaceForceMatchOverrideSchema(ma.SQLAlchemyAutoSchema):
class Meta: model = FaceOverrideType
load_instance = True
person = ma.Nested(Person)
class FaceSchema(ma.SQLAlchemyAutoSchema):
class Meta:
model=Face
@@ -218,6 +228,8 @@ class FaceSchema(ma.SQLAlchemyAutoSchema):
# faces have to come with a file connection
facefile_lnk = ma.Nested(FaceFileLinkSchema)
refimg_lnk = ma.Nested(FaceRefimgLinkSchema,allow_none=True)
fnmo = ma.Nested( FaceNoMatchOverride, allow_none=True )
ffmo = ma.Nested( FaceForceMatchOverride, allow_none=True )
class FileSchema(ma.SQLAlchemyAutoSchema):
class Meta: model = File
@@ -466,9 +478,8 @@ def file_list_ip():
@login_required
def files_ip():
OPT=States( request )
people = Person.query.all()
query_data = GetQueryData( OPT )
return render_template("files.html", page_title=f"View Files ({OPT.path_type} Path)", OPT=OPT, people=people, query_data=query_data )
return render_template("files.html", page_title=f"View Files ({OPT.path_type} Path)", OPT=OPT, query_data=query_data )
################################################################################
# /files -> show thumbnail view of files from storage_path
@@ -477,9 +488,8 @@ def files_ip():
@login_required
def files_sp():
OPT=States( request )
people = Person.query.all()
query_data = GetQueryData( OPT )
return render_template("files.html", page_title=f"View Files ({OPT.path_type} Path)", OPT=OPT, people=people, query_data=query_data )
return render_template("files.html", page_title=f"View Files ({OPT.path_type} Path)", OPT=OPT, query_data=query_data )
################################################################################
@@ -489,9 +499,8 @@ def files_sp():
@login_required
def files_rbp():
OPT=States( request )
people = Person.query.all()
query_data = GetQueryData( OPT )
return render_template("files.html", page_title=f"View Files ({OPT.path_type} Path)", OPT=OPT, people=people, query_data=query_data )
return render_template("files.html", page_title=f"View Files ({OPT.path_type} Path)", OPT=OPT, query_data=query_data )
################################################################################
# search -> GET version -> has search_term in the URL and is therefore able to