v2.01.2

Author: unexpectedpanda

changelog.md

@@ -1,5 +1,31 @@
 # Retool changelog
 
+
+## 2.01.2
+
+- Fixed a bug where an empty system language list fell back to a global language list
+  instead of using all languages.
+- Fixed a bug that crashed Retool when a trace string was entered in the global settings,
+  the **Options** tab was set to override in the system settings, and no system-level
+  trace string was entered.
+- Added a PlayStation Vita disc ID regex to automate one stage of choosing between Vita
+  titles.
+- Added a few more demo regexes to identify different demo types.
+- When Redump or No-Intro forgot to add the `(Demo)` tag to a title's full name but added
+  a category of `Demos`, Retool would append `(Demo)` to the full, short, tag-free, and
+  region-free names to avoid confusion with the full version of the title.
+
+  This lead to strange situations in clone lists where a title like
+  `Example Title (USA) (Trial)` had a short name of `Example Title (Trial) (Demo)`. This
+  behavior also wasn't taken into account for Retool GUI's title tools, making clone list
+  updating harder than it needed to be for contributors.
+
+  Now a `(Demo)` tag is only added if a title doesn't contain any of a collection of
+  demo regexes, making short names more predictable to deal with.
+- The title tool now has a checkbox for when a title has a DAT category of `Demos`, which
+  can affect how a title's names are generated.
+
+
 ## 2.01.1
 
 Looks like post filters needed a little more testing before release. The feature now
@@ -14,6 +40,7 @@ works properly.
   such a title was meant to be filtered out, it could randomly turn up in the output DAT
   due to the way compilations work.
 
+
 ## 2.01.0
 
 - The **Games** title type is now an option for exclusion. Retool assume titles without
@@ -63,6 +90,7 @@ works properly.
   checks the output of multiple different configurations, verifies the output is
   consistent, and makes it easier to pick up errors as a result of code changes.
 
+
 ## 2.00.5
 
 - Fixed handling of No-Intro's quasi-RFC 3339 date format.
@@ -122,12 +150,14 @@ works properly.
 
 - Made some minor GUI tweaks for consistency.
 
+
 ## 2.00.3
 
 - Due to the influx of pirate ROMs in the No-Intro NES DAT, pirate ROMs are now treated
   like bad dumps. That is, they are demoted below licensed variations of games, even if
   the pirate ROM is in a preferred language and the licensed version isn't.
 
+
 ## 2.00.2
 
 - Expanded support for some newer No-Intro DATs.

docs/changelog.md

@@ -5,6 +5,32 @@ hide:
 
 # Changelog
 
+
+## 2.01.2
+
+- Fixed a bug where an empty system language list fell back to a global language list
+  instead of using all languages.
+- Fixed a bug that crashed Retool when a trace string was entered in the global settings,
+  the **Options** tab was set to override in the system settings, and no system-level
+  trace string was entered.
+- Added a PlayStation Vita disc ID regex to automate one stage of choosing between Vita
+  titles.
+- Added a few more demo regexes to identify different demo types.
+- When Redump or No-Intro forgot to add the `(Demo)` tag to a title's full name but added
+  a category of `Demos`, Retool would append `(Demo)` to the full, short, tag-free, and
+  region-free names to avoid confusion with the full version of the title.
+
+  This lead to strange situations in clone lists where a title like
+  `Example Title (USA) (Trial)` had a short name of `Example Title (Trial) (Demo)`. This
+  behavior also wasn't taken into account for Retool GUI's title tools, making clone list
+  updating harder than it needed to be for contributors.
+
+  Now a `(Demo)` tag is only added if a title doesn't contain any of a collection of
+  demo regexes, making short names more predictable to deal with.
+- The title tool now has a checkbox for when a title has a DAT category of `Demos`, which
+  can affect how a title's names are generated.
+
+
 ## 2.01.1
 
 Looks like post filters needed a little more testing before release. The feature now
@@ -19,6 +45,7 @@ works properly.
   such a title was meant to be filtered out, it could randomly turn up in the output DAT
   due to the way compilations work.
 
+
 ## 2.01.0
 
 - The **Games** title type is now an option for exclusion. Retool assume titles without
@@ -68,10 +95,12 @@ works properly.
   checks the output of multiple different configurations, verifies the output is
   consistent, and makes it easier to pick up errors as a result of code changes.
 
+
 ## 2.00.5
 
 -   Fixed handling of No-Intro's quasi-RFC 3339 date format.
 
+
 ## 2.00.4
 
 -   Added another level of language selection fallback if you have a language order

docs/includes/file.md

@@ -1 +1 @@
-[retool-2.01.1-win-x86-64.zip](https://unexpectedpanda.github.io/files/retool-2.01.1-win-x86-64.zip)
+[retool-2.01.2-win-x86-64.zip](https://unexpectedpanda.github.io/files/retool-2.01.2-win-x86-64.zip)

docs/includes/sha256.md

@@ -1 +1 @@
-cb1c0b8383c7db870a384ca34c37bd1f2207d8035cacd5885a3c4c5ea29a5cc4
+8e121cdc13a31125b296e6b06c4577da118d6e1461fa29f5f3645679c5fcc2dd

mkdocs.yml

@@ -11,7 +11,6 @@ theme:
     - content.code.annotate
     - content.tabs.link
     - header.autohide
-    - navigation.expand
     - toc.follow
   palette:
     scheme: slate

modules/chooseparent.py

@@ -670,13 +670,16 @@ def choose_language(title_set: set[DatNode], config: Config, report_on_match: bo
         language_order: list[str] = []
 
         if config.languages_filter:
-            language_order = config.language_order_user
-
             if config.system_language_order_user:
                 if {'override': 'true'} in config.system_language_order_user:
                     language_order = [str(x) for x in config.system_language_order_user if 'override' not in x]
-        else:
-            language_order = config.region_order_languages_user
+                elif {'override': 'true'} in config.system_region_order_user:
+                    for region in [x for x in config.system_region_order_user if x != {'override': 'true'}]:
+                        language_order.extend(config.languages_filter[region])
+                else:
+                    language_order = language_order = config.language_order_user
+            else:
+                language_order = language_order = config.language_order_user
 
         # Select titles based on language
         remove_titles: set[DatNode] = set()
@@ -730,13 +733,22 @@ def choose_language(title_set: set[DatNode], config: Config, report_on_match: bo
                         if not (title_1.is_superset or title_2.is_superset):
                             if config.languages_filter:
                                 # Cycle through implied languages from region order as the first fallback
-                                for language in config.region_order_languages_user:
+                                fallback_language_order: list[str] = []
+
+                                # Use the system region order if there is one
+                                if {'override': 'true'} in config.system_region_order_user:
+                                    for region in [x for x in config.system_region_order_user if x != {'override': 'true'}]:
+                                        fallback_language_order.extend(config.languages_filter[region])
+                                else:
+                                    fallback_language_order = config.region_order_languages_user
+
+                                for language in fallback_language_order:
                                     if (
                                         re.search(language, ','.join(title_1.languages))
                                         and not re.search(language, ','.join(title_2.languages))):
                                         if title_2 in title_set:
                                                 if report_on_match:
-                                                    TraceTools.trace_title('REF0097', [', '.join(config.region_order_languages_user)])
+                                                    TraceTools.trace_title('REF0097', [', '.join(fallback_language_order)])
                                                     TraceTools.trace_title('', [f'{Font.italic}({",".join(title_1.languages) + ")":<30}{Font.end} [{title_1.short_name}] {title_1.full_name}', f'{Font.italic}({",".join(title_2.languages) + ")":<30}{Font.end}{Font.disabled} [{title_2.short_name}] {title_2.full_name}{Font.end}'], keep_remove=True)
 
                                                 remove_titles.add(title_2)
@@ -747,7 +759,7 @@ def choose_language(title_set: set[DatNode], config: Config, report_on_match: bo
                                         and not re.search(language, ','.join(title_1.languages))):
                                             if title_1 in title_set:
                                                 if report_on_match:
-                                                    TraceTools.trace_title('REF0098', [', '.join(list(config.region_order_languages_user))])
+                                                    TraceTools.trace_title('REF0098', [', '.join(list(fallback_language_order))])
                                                     TraceTools.trace_title('', [f'{Font.italic}({",".join(title_2.languages) + ")":<30}{Font.end} [{title_2.short_name}] {title_2.full_name}', f'{Font.italic}({",".join(title_1.languages) + ")":<30}{Font.end}{Font.disabled} [{title_1.short_name}] {title_1.full_name}{Font.end}'], keep_remove=True)
 
                                                 remove_titles.add(title_1)
@@ -1802,7 +1814,7 @@ def choose_parent(processed_titles: dict[str, set[DatNode]], config: Config) ->
             if not (config.user_input.trace or config.user_input.single_cpu):
                 bar() # type: ignore
 
-        eprint('\033[F\033[K* Selecting 1G1R titles... done\n', end='')
+        eprint('\033[F\033[K* Selecting 1G1R titles... done.\n', end='')
 
         return processed_titles
 
@@ -2017,6 +2029,7 @@ def choose_parent_process(config: Config, potential_parents: dict[str, set[DatNo
                     if len(parent_titles) > 1: parent_titles = ParentTools.choose_version_revision(config.regex.ps3_id, parent_titles, config, report_on_match)
                     if len(parent_titles) > 1: parent_titles = ParentTools.choose_version_revision(config.regex.ps4_id, parent_titles, config, report_on_match)
                     if len(parent_titles) > 1: parent_titles = ParentTools.choose_version_revision(config.regex.psp_id, parent_titles, config, report_on_match)
+                    if len(parent_titles) > 1: parent_titles = ParentTools.choose_version_revision(config.regex.psv_id, parent_titles, config, report_on_match)
 
                     if report_on_match: TraceTools.trace_title('REF0007', [group_name], parent_titles, keep_remove=False)
 

modules/constants.py

@@ -1,6 +1,6 @@
 # Set the user files and options
 VERSION_MAJOR: str = '2.01'
-VERSION_MINOR: str = '1'
+VERSION_MINOR: str = '2'
 CLONE_LIST_METADATA_DOWNLOAD_LOCATION: str = 'https://raw.githubusercontent.com/unexpectedpanda/retool-clonelists-metadata/main'
 CLONE_LIST_METADATA_DOWNLOAD_LOCATION_KEY: str = 'cloneListMetadataUrl'
 PROGRAM_DOWNLOAD_LOCATION: str = 'https://raw.githubusercontent.com/unexpectedpanda/retool/main'

modules/dats.py

@@ -351,9 +351,15 @@ def category_assign(regexes: tuple[Any, ...], category: str) -> None:
         elif self.categories == []:
             self.categories.append('Games')
 
-        # Check if the (Demo) tag is missing from titles with the category "Demos", and
-        # add it if so
-        if 'Demos' in self.categories and '(Demo' not in self.full_name:
+        # Check if there's no (Demo) or related tags for titles with the category "Demos",
+        # and add it if so
+        is_demo: bool = False
+
+        for demo_regex in config.regex.demos:
+            if re.search(demo_regex, self.full_name):
+                is_demo = True
+
+        if not is_demo and 'Demos' in self.categories:
             self.short_name = f'{self.short_name.strip()} (Demo)'
             self.region_free_name = f'{self.region_free_name.strip()} (Demo)'
             self.tag_free_name = f'{self.tag_free_name.strip()} (Demo)'
@@ -383,6 +389,7 @@ def category_assign(regexes: tuple[Any, ...], category: str) -> None:
             language_order = config.region_order_languages_user
 
         region_order: list[str] = config.region_order_user
+
         if config.system_region_order_user:
             if {'override': 'true'} in config.system_region_order_user:
                 region_order = [str(x) for x in config.system_region_order_user if 'override' not in x]
@@ -1052,11 +1059,26 @@ def header_details(key: str) -> None:
                 eprint('|  Numbered dat: Yes')
         eprint('')
 
+        # Import system settings
+        from modules.input import import_clone_list, import_metadata, import_system_settings
+        import_system_settings(
+            config,
+            input_dat.search_name,
+            SYSTEM_LANGUAGE_ORDER_KEY,
+            SYSTEM_REGION_ORDER_KEY,
+            SYSTEM_VIDEO_ORDER_KEY,
+            SYSTEM_LIST_PREFIX_KEY,
+            SYSTEM_LIST_SUFFIX_KEY,
+            SYSTEM_OVERRIDE_EXCLUDE_KEY,
+            SYSTEM_OVERRIDE_INCLUDE_KEY,
+            SYSTEM_FILTER_KEY,
+            SYSTEM_EXCLUSIONS_OPTIONS_KEY)
+
         search_games: list[Any] = root.findall('game')
 
         if config.user_input.trace or config.user_input.single_cpu:
             alive_bar_context = nullcontext()
-            eprint('* Selecting 1G1R titles...')
+            eprint('* Processing DAT file...')
         else:
             progress_bar: str = 'smooth'
             spinner: str = 'waves'
@@ -1140,21 +1162,6 @@ def header_details(key: str) -> None:
                         input_dat.end = True
                         return input_dat
 
-            # Import system settings
-            from modules.input import import_clone_list, import_metadata, import_system_settings
-            import_system_settings(
-                config,
-                input_dat.search_name,
-                SYSTEM_LANGUAGE_ORDER_KEY,
-                SYSTEM_REGION_ORDER_KEY,
-                SYSTEM_VIDEO_ORDER_KEY,
-                SYSTEM_LIST_PREFIX_KEY,
-                SYSTEM_LIST_SUFFIX_KEY,
-                SYSTEM_OVERRIDE_EXCLUDE_KEY,
-                SYSTEM_OVERRIDE_INCLUDE_KEY,
-                SYSTEM_FILTER_KEY,
-                SYSTEM_EXCLUSIONS_OPTIONS_KEY)
-
             # Check all the overrides and post filters for invalid regex and strip it out
             if not config.user_input.no_overrides:
                 config.global_exclude = regex_test(list(config.global_exclude), 'global exclude', 'user filter')
@@ -1250,7 +1257,7 @@ def header_details(key: str) -> None:
 
                 eprint(f'{Font.end}')
 
-        eprint('\033[F\033[K* Processing DAT file... done\n', end='')
+        eprint('\033[F\033[K* Processing DAT file... done.\n', end='')
     else:
         eprint('failed.')
         if '<game' not in input_dat.contents:

modules/gui/retool_clone_list_name.py

@@ -15,8 +15,9 @@
     QFont, QFontDatabase, QGradient, QIcon,
     QImage, QKeySequence, QLinearGradient, QPainter,
     QPalette, QPixmap, QRadialGradient, QTransform)
-from PySide6.QtWidgets import (QApplication, QLabel, QLineEdit, QMainWindow,
-    QSizePolicy, QSpacerItem, QVBoxLayout, QWidget)
+from PySide6.QtWidgets import (QApplication, QCheckBox, QLabel, QLineEdit,
+    QMainWindow, QSizePolicy, QSpacerItem, QVBoxLayout,
+    QWidget)
 
 from modules.gui.custom_widgets import CustomLineEdit
 from  . import resources_rc
@@ -76,6 +77,11 @@ def setupUi(self, CloneListNameTool):
 
         self.verticalLayout.addWidget(self.lineEditEnterName)
 
+        self.checkBoxDemos = QCheckBox(self.centralwidget)
+        self.checkBoxDemos.setObjectName(u"checkBoxDemos")
+
+        self.verticalLayout.addWidget(self.checkBoxDemos)
+
         self.verticalSpacer = QSpacerItem(13, 8, QSizePolicy.Minimum, QSizePolicy.Fixed)
 
         self.verticalLayout.addItem(self.verticalSpacer)
@@ -185,6 +191,7 @@ def retranslateUi(self, CloneListNameTool):
         CloneListNameTool.setWindowTitle(QCoreApplication.translate("CloneListNameTool", u"Title tool", None))
         self.labelContribute.setText(QCoreApplication.translate("CloneListNameTool", u"<html><head/><body><p>This tool is useful if you want to contribute to Retool's clone lists or development. If you enter a title's full name, it shows you the other names Retool assigns to the title as part of its matching process. You can also enter the group name that you want to assign in an override or variants object, and see what the actual group name is that Retool assigns. <a href=\"https://unexpectedpanda.github.io/retool/naming-system/\"><span style=\" text-decoration: underline; color:#0000ff;\">Read the documentation</span></a> to learn more.</p></body></html>", None))
         self.labelEnterName.setText(QCoreApplication.translate("CloneListNameTool", u"Enter the full name as it appears in the DAT file, or your intended group name", None))
+        self.checkBoxDemos.setText(QCoreApplication.translate("CloneListNameTool", u"Title has a category of Demos (adds a tag to title names that have no recognized demo tags)", None))
         self.labelShortName.setText(QCoreApplication.translate("CloneListNameTool", u"Default short name", None))
         self.lineEditShortName.setText("")
         self.labelGroupName.setText(QCoreApplication.translate("CloneListNameTool", u"Default group name", None))