Skip to content

Fix addon filtering when no category present #360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix addon filtering when no category present #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
106a735
Fix addon filtering
steven-sheehy Nov 23, 2025
00af9b0
Add tests
steven-sheehy Nov 23, 2025
aa6bd09
Fix title
steven-sheehy Nov 25, 2025
9ca6d3c
Address review feedback
steven-sheehy Nov 30, 2025
2717b7f
Tweaks
steven-sheehy Nov 30, 2025
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
3 changes: 3 additions & 0 deletions modules/dat/process_dat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,9 @@ def __init__(
else:
self.categories.append(category)

self.categories = category_assign(
self.full_name, self.categories, (config.regex.addons,), 'Add-Ons'
)
self.categories = category_assign(
self.full_name, self.categories, (config.regex.programs,), 'Applications'
)
Expand Down
3 changes: 3 additions & 0 deletions modules/titletools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ def __init__(self, LANGUAGES: str) -> None:
self.secam_2: Pattern[str] = re.compile('\\[(.*)?SECAM(.*)?\\]')

# Other tags
self.addons: Pattern[str] = re.compile(
'\\((?:Addon(?: for XBLA)?|DLC)\\)', flags=re.I
)
self.aftermarket: Pattern[str] = re.compile('\\(Aftermarket\\)', flags=re.I)
self.alt: Pattern[str] = re.compile('\\(Alt.*?\\)', flags=re.I)
self.bad: Pattern[str] = re.compile('\\[b\\]', flags=re.I)
Expand Down
17 changes: 16 additions & 1 deletion tests/source/features/Retool - Exclusions.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,27 @@
<rom name="Test Title 0 (USA).cue" size="1000" crc="00000000" md5="00000000000000000000000000000000" sha1="0000000000000000000000000000000000000000"/>
<rom name="Test Title 0 (USA).bin" size="1000" crc="00000000" md5="00000000000000000000000000000000" sha1="0000000000000000000000000000000000000000"/>
</game>
<!-- This title should be removed when add-ons are excluded -->
<!-- These titles should be removed when add-ons are excluded -->
<game name="Test Title 1 (USA)">
<category>Add-Ons</category>
<description>Test Title 1 (USA)</description>
<rom name="Test Title 1 (USA).cue" size="1000" crc="00000000" md5="00000000000000000000000000000000" sha1="0000000000000000000000000000000000000000"/>
<rom name="Test Title 1 (USA).bin" size="1000" crc="00000000" md5="00000000000000000000000000000000" sha1="0000000000000000000000000000000000000000"/>
</game>
<game name="Test Title 51 (USA) (Addon)">
<description>Test Title 51 (USA) (Addon)</description>
<rom name="Test Title 51 (USA) (Addon).cue" size="1000" crc="00000000" md5="00000000000000000000000000000000" sha1="0000000000000000000000000000000000000000"/>
<rom name="Test Title 51 (USA) (Addon).bin" size="1000" crc="00000000" md5="00000000000000000000000000000000" sha1="0000000000000000000000000000000000000000"/>
</game>
<game name="Test Title 52 (USA) (DLC)">
<description>Test Title 52 (USA) (DLC)</description>
<rom name="Test Title 52 (USA) (DLC).cue" size="1000" crc="00000000" md5="00000000000000000000000000000000" sha1="0000000000000000000000000000000000000000"/>
<rom name="Test Title 52 (USA) (DLC).bin" size="1000" crc="00000000" md5="00000000000000000000000000000000" sha1="0000000000000000000000000000000000000000"/>
</game>
<game name="Test Title 55 (USA) (Addon for XBLA)">
<description>Test Title 55 (USA) (Addon for XBLA)</description>
<rom name="Test Title 55 (USA) (Addon for XBLA).cue" size="1000" crc="00000000" md5="00000000000000000000000000000000" sha1="0000000000000000000000000000000000000000"/>
<rom name="Test Title 55 (USA) (Addon for XBLA).bin" size="1000" crc="00000000" md5="00000000000000000000000000000000" sha1="0000000000000000000000000000000000000000"/>
</game>
<!-- These titles should be removed when aftermarket titles are excluded -->
<game name="Test Title 49 (USA) (Aftermarket)">
Expand Down