Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,25 @@ lint:
- dotenv-linter@4.0.0
- hadolint@2.14.0
- markdownlint@0.47.0
- eslint@9.39.2
- eslint@9.34.0
- actionlint@1.7.10
- bandit@1.9.2
- black@25.12.0
- checkov@3.2.497
- bandit@1.9.3
- black@26.1.0
- checkov@3.2.500
- git-diff-check
- isort@7.0.0
- mypy@1.19.1
- osv-scanner@2.3.2
- prettier@3.8.0:
- prettier@3.8.1:
packages:
- "@trivago/prettier-plugin-sort-imports@6.0.2"
- "@vue/compiler-sfc@3.5.26"
- ruff@0.14.13
- "@vue/compiler-sfc@3.5.27"
- ruff@0.15.0
- shellcheck@0.11.0
- shfmt@3.6.0
- taplo@0.10.0
- trivy@0.68.2
- trufflehog@3.92.5
- trivy@0.69.1
- trufflehog@3.93.1
- yamllint@1.38.0
ignore:
- linters: [ALL]
Expand Down
31 changes: 22 additions & 9 deletions backend/handler/database/roms_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -424,13 +424,20 @@ def _filter_by_age_ratings(
condition = op(RomMetadata.age_ratings, values, session=session)
return query.filter(~condition) if match_none else query.filter(condition)

def _filter_by_status(self, query: Query, statuses: Sequence[str]):
"""Filter by one or more user statuses using OR logic."""
if not statuses:
def _filter_by_status(
self,
query: Query,
*,
session: Session,
values: Sequence[str],
match_all: bool = False,
match_none: bool = False,
):
if not values:
return query

status_filters = []
for selected_status in statuses:
for selected_status in values:
if selected_status == "now_playing":
status_filters.append(RomUser.now_playing.is_(True))
elif selected_status == "backlogged":
Expand All @@ -440,11 +447,11 @@ def _filter_by_status(self, query: Query, statuses: Sequence[str]):
else:
status_filters.append(RomUser.status == selected_status)

# If hidden is in the list, don't apply the hidden filter at the end
if "hidden" in statuses:
return query.filter(or_(*status_filters))
comb = and_ if match_all else or_
condition = comb(*status_filters)

return query.filter(or_(*status_filters), RomUser.hidden.is_(False))
# Apply negation if match_none, otherwise apply condition
return query.filter(~condition) if match_none else query.filter(condition)

def _filter_by_regions(
self,
Expand Down Expand Up @@ -740,7 +747,13 @@ def filter_roms(

# The RomUser table is already joined if user_id is set
if statuses and user_id:
query = self._filter_by_status(query, statuses)
query = self._filter_by_status(
query,
session=session,
values=statuses,
match_all=(statuses_logic == "all"),
match_none=(statuses_logic == "none"),
)
elif user_id:
query = query.filter(
or_(RomUser.hidden.is_(False), RomUser.hidden.is_(None))
Expand Down
Loading
Loading