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

remove duplicates from search results - fixes BUG-70

Browse Source
This commit is contained in:
Damien De Paoli
2021-10-10 21:58:58 +11:00
parent 91f0f10767
commit d40f2de2a1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
files.py
View File

@@ -247,7 +247,9 @@ def GetEntries( OPT ):
dir_data=Entry.query.join(File).join(EntryDirLink).join(Dir).filter(Dir.rel_path.ilike(f"%{search_term}%")).order_by(File.year.desc(),File.month.desc(),File.day.desc(),Entry.name).offset(OPT.offset).limit(OPT.how_many).all() dir_data=Entry.query.join(File).join(EntryDirLink).join(Dir).filter(Dir.rel_path.ilike(f"%{search_term}%")).order_by(File.year.desc(),File.month.desc(),File.day.desc(),Entry.name).offset(OPT.offset).limit(OPT.how_many).all()
ai_data=Entry.query.join(File).join(FaceFileLink).join(Face).join(FaceRefimgLink).join(Refimg).join(PersonRefimgLink).join(Person).filter(Person.tag.ilike(f"%{search_term}%")).order_by(File.year.desc(),File.month.desc(),File.day.desc(),Entry.name).offset(OPT.offset).limit(OPT.how_many).all() ai_data=Entry.query.join(File).join(FaceFileLink).join(Face).join(FaceRefimgLink).join(Refimg).join(PersonRefimgLink).join(Person).filter(Person.tag.ilike(f"%{search_term}%")).order_by(File.year.desc(),File.month.desc(),File.day.desc(),Entry.name).offset(OPT.offset).limit(OPT.how_many).all()
# remove any duplicates from combined data # remove any duplicates from combined data
all_entries = file_data all_entries = []
for f in file_data:
all_entries.append(f)
for d in dir_data: for d in dir_data:
add_it=1 add_it=1
for f in file_data: for f in file_data:
@@ -255,7 +257,7 @@ def GetEntries( OPT ):
add_it=0 add_it=0
break break
if add_it: if add_it:
all_entries = all_entries + d all_entries.append(d)
for a in ai_data: for a in ai_data:
add_it=1 add_it=1
for f in file_data: for f in file_data:
@@ -263,7 +265,7 @@ def GetEntries( OPT ):
add_it=0 add_it=0
break break
if add_it: if add_it:
all_entries = all_entries + a all_entries.append(a)
return all_entries return all_entries
for path in OPT.paths: for path in OPT.paths: