From d40f2de2a1ed6a3729ad261e42a1646064f5782e Mon Sep 17 00:00:00 2001 From: Damien De Paoli Date: Sun, 10 Oct 2021 21:58:58 +1100 Subject: [PATCH] remove duplicates from search results - fixes BUG-70 --- files.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/files.py b/files.py index 3421049..eb702e9 100644 --- a/files.py +++ b/files.py @@ -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() 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 - all_entries = file_data + all_entries = [] + for f in file_data: + all_entries.append(f) for d in dir_data: add_it=1 for f in file_data: @@ -255,7 +257,7 @@ def GetEntries( OPT ): add_it=0 break if add_it: - all_entries = all_entries + d + all_entries.append(d) for a in ai_data: add_it=1 for f in file_data: @@ -263,7 +265,7 @@ def GetEntries( OPT ): add_it=0 break if add_it: - all_entries = all_entries + a + all_entries.append(a) return all_entries for path in OPT.paths: