v2 beta 5 update

Author: unexpectedpanda

changelog.md

@@ -1,20 +1,44 @@
+# 2.00.0 Beta 5
+
+* The GUI is now resizable.
+* GUI optimizations have been made. It's unlikely you'll notice a difference using it,
+  but it's easier to maintain now.
+* Europe has been moved further up the default English region order, as Retool's new
+  language prioritization bypasses any particular issues there.
+* Added an extra filter stage for compilations, checking for which title has more of the
+  user's languages.
+* Fixed titles with multiple regions not being categorized into the correct primary
+  region. For example, `(Europe, Australia)` titles were being filtered into the
+  `Australia` region instead of `Europe`, which caused some duplicates to sneak through
+  to the final output DAT.
+* The [`Export`](http://redump.org/discs/region/Ex/) region for Redump titles is now
+  treated as equivalent to `World`.
+* Fixed a problem where a new system config would populate selected languages from the
+  global config.
+* Fixed the log not outputting in the correct folder when a system output was selected.
+* Fixed the parent/clone clash warning message so it displayed the correct clone title.
+
+
 # 2.00.0 Beta 4
 
 * Pirate and unlicensed exclusions work again. Pirate titles have been added to
   the unlicensed exclude option.
 * The GUI documentation link now goes to the right place.
 
+
 # 2.00.0 Beta 3
 
 * Fixed user filter excludes not removing some excludes.
 * Fixed system name formatting in the GUI, so the right system settings file is
   referenced.
 * Unified CLI and GUI versions, as splitting them was no longer useful.
 
+
 # 2.00.0 Beta 2
 
 A minor update to fix system user filters for No-Intro's _Redump Custom DATs_.
 
+
 # 2.00.0 Beta 1
 
 Retool 2.0 is here in beta form. Ten months in the making, it'll be in beta for

docs/changelog.md

@@ -5,23 +5,47 @@ hide:
 
 # Changelog
 
-# 2.00.0 Beta 4
+## 2.00.0 Beta 5
+
+* The GUI is now resizable.
+* GUI optimizations have been made. It's unlikely you'll notice a difference using it,
+  but it's easier to maintain now.
+* Europe has been moved further up the default English region order, as Retool's new
+  language prioritization bypasses any particular issues there.
+* Added an extra filter stage for compilations, checking for which title has more of the
+  user's languages.
+* Fixed titles with multiple regions not being categorized into the correct primary
+  region. For example, `(Europe, Australia)` titles were being filtered into the
+  `Australia` region instead of `Europe`, which caused some duplicates to sneak through
+  to the final output DAT.
+* The [`Export`](http://redump.org/discs/region/Ex/) region for Redump titles is now
+  treated as equivalent to `World`.
+* Fixed a problem where a new system config would populate selected languages from the
+  global config.
+* Fixed the log not outputting in the correct folder when a system output was selected.
+* Fixed the parent/clone clash warning message so it displayed the correct clone title.
+
+
+## 2.00.0 Beta 4
 
 * Pirate and unlicensed exclusions work again. Pirate titles have been added to
   the unlicensed exclude option.
 * The GUI documentation link now goes to the right place.
 
-# 2.00.0 Beta 3
+
+## 2.00.0 Beta 3
 
 * Fixed user filter excludes not removing some excludes.
 * Fixed system name formatting in the GUI, so the right system settings file is
   referenced.
 * Unified CLI and GUI versions, as splitting them was no longer useful.
 
+
 ## 2.00.0 Beta 2
 
 A minor update to fix system user filters for No-Intro's _Redump Custom DATs_.
 
+
 ## 2.00.0 Beta 1
 
 Retool 2.0 is here in beta form. Ten months in the making, it'll be in beta for

docs/includes/file.md

@@ -1 +1 @@
-[retool-2.00.0-beta-4-win-x86-64.zip](https://unexpectedpanda.github.io/files/retool-2.00.0-beta-4-win-x86-64.zip)
+[retool-2.00.0-beta-5-win-x86-64.zip](https://unexpectedpanda.github.io/files/retool-2.00.0-beta-5-win-x86-64.zip)

docs/includes/sha256.md

@@ -1 +1 @@
-e53751dbafd1ba301d98ae1b879d25eea4c074f740be1c203a9be242fc45544f
+f574295a65c30eb96e3a32dd7d4d006dd9f1c53cdc1c6e91b3cdcc93198e2060

modules/chooseparent.py

@@ -168,6 +168,10 @@ def choose_compilations(title_set: set[DatNode], all_titles: dict[str, list[DatN
 
                 if report_on_match: TraceTools.trace_title('REF0070', [group], group_titles, keep_remove=False)
 
+                # Do a more thorough language check
+                group_titles = ParentTools.choose_language(set(titles), config, report_on_match, first_time=False)
+                if report_on_match: TraceTools.trace_title('REF0089', [group], group_titles, keep_remove=False)
+
                 # Tie breaker: if there's a compilation and an individual title remaining, choose the individual title
                 if len(group_titles) == 2:
                     individual_title: set[DatNode] = set([x for x in group_titles if not x.contains_titles])
@@ -1300,19 +1304,18 @@ def detect_parent_clone_clash(processed_titles: dict[str, list[DatNode]], config
                             if another_title.cloneof == title.full_name:
                                 parent_clash[title.full_name].add(another_title.full_name)
 
-        if config.user_input.verbose:
-            for key, values in parent_clash.items():
-                if (
-                    values
-                    and config.user_input.dev_mode):
-                        eprint(f'\n{Font.warning}* {Font.warning_bold}{key}{Font.warning} should be a parent, but is set as a clone of\n  {Font.warning_bold}{assigned_clone}{Font.warning}{Font.end}')
-                        eprint(f'\n  {Font.warning}This likely isn\'t an issue, and just a side effect of region and language settings.{Font.end}')
-                        eprint(f'\n  {Font.warning}Titles that have {Font.warning_bold}{key}{Font.warning} as a parent:{Font.end}\n')
+                        if config.user_input.verbose:
+                                if config.user_input.dev_mode:
+                                        eprint(f'\n{Font.warning}* {Font.warning_bold}{title.full_name}{Font.warning} should be a parent, but is set as a clone of\n  {Font.warning_bold}{assigned_clone}{Font.warning}{Font.end}')
+                                        eprint(f'\n  {Font.warning}This likely isn\'t an issue, and just a side effect of region and language settings.{Font.end}')
+                                        eprint(f'\n  {Font.warning}Titles that have {Font.warning_bold}{title.full_name}{Font.warning} as a parent:{Font.end}\n')
 
-                        for value in values:
-                            eprint(f'    {Font.disabled}- {value}{Font.end}')
+                                        for key, values in parent_clash.items():
+                                            if key == title.full_name:
+                                                for value in values:
+                                                    eprint(f'    {Font.disabled}- {value}{Font.end}')
 
-                        eprint(f'\n  {Font.warning}Removing clone from {Font.warning_bold}{key}{Font.end}\n')
+                                        eprint(f'\n  {Font.warning}Removing clone from {Font.warning_bold}{key}{Font.end}\n')
 
         return processed_titles
 

modules/config.py

@@ -390,7 +390,9 @@ def key_missing(section_key: str) -> None:
 
         uk_index = self.region_order_default.index('UK')
         self.region_order_default[uk_index + 1:uk_index + 1] = ['United Kingdom']
-        self.regex.region_order_default = re.compile('\\s\\((?:\\w*,\\s)*(?:' + '|'.join(self.region_order_default) + ')(?:,\\s\\w*)*\\)')
+
+        # Add "Export" to the default region order regex as a pseudo-region, which is reinterpreted as "World" later
+        self.regex.region_order_default = re.compile('\\s\\((?:\\w*,\\s)*(?:' + '|'.join(self.region_order_default + ['Export']) + ')(?:,\\s\\w*)*\\)')
 
         if 'UK' in self.languages_implied:
             self.languages_implied['United Kingdom'] = self.languages_implied['UK']

modules/constants.py

@@ -1,6 +1,6 @@
 # Set the user files and options
 VERSION_MAJOR: str = '2.00'
-VERSION_MINOR: str = '0 Beta 4'
+VERSION_MINOR: str = '0 Beta 5'
 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

@@ -197,7 +197,12 @@ def __init__(self, config: Config, input_dat: Dat, node: dict[str, Any]) -> None
             self.languages_title = tuple(sorted(set(self.languages_title_str.split(','))))
 
         self.regions_str: str = TitleTools.regions(self.full_name, config, 'get')
-        self.regions = tuple([region for region in config.region_order_default if region in self.regions_str])
+
+        # Reweight larger regions when considering multi-region titles
+        larger_regions: list[str] = ['USA', 'Europe', 'Japan', 'Asia']
+        reweighted_regions: list[str] = larger_regions + [region for region in config.region_order_default if region not in larger_regions]
+
+        self.regions = tuple([region for region in reweighted_regions if region in self.regions_str])
 
         if not self.regions:
             self.regions = ('Unknown',)
@@ -889,7 +894,7 @@ def process_dat(dat_file: str, input_type: str, gui_input: UserInput, config: Co
                                 printwrap(
                                     f'{Font.warning_bold}* Warning: {Font.warning}DAT file doesn\'t '
                                     'comply with the Logiqx DTD standard. This might have unexpected results.', 'error')
-                                printwrap(f'  DTD violation: {dtd.error_log.last_error}.' # type: ignore[attr-defined]
+                                printwrap(f'  DTD violation: {dtd.error_log.last_error}.'
                                     f'{next_status}{Font.end}', 'error')
                                 eprint('')
                                 if input_type == 'file':
@@ -984,7 +989,7 @@ def header_details(key: str) -> None:
             input_dat.numbered = True
 
             for game in root.findall('game'):
-                if not re.search('^([0-9]|x|z)([0-9]|B)[0-9]{2,2} - ', game.attrib['name']): # type: ignore
+                if not re.search('^([0-9]|x|z)([0-9]|B)[0-9]{2,2} - ', game.attrib['name']):
                     input_dat.numbered = False
 
             if not input_dat.numbered:
@@ -1024,17 +1029,17 @@ def header_details(key: str) -> None:
                 list(map(lambda d: node_dict.update({d.tag: d.text}), list(game)))
 
                 # Get multiple categories if the input DAT supports them
-                for category in game.xpath('category'): # type: ignore[union-attr]
-                    categories.append(str(category.text)) #type: ignore[union-attr]
+                for category in game.xpath('category'):
+                    categories.append(str(category.text))
 
                 if categories:
                     node_dict['category'] = categories
                 else:
                     node_dict['category'] = []
 
                 # Get the rom node attributes
-                for rom in game.xpath('rom'): # type: ignore[union-attr]
-                    roms.append(dict(rom.attrib)) # type: ignore[union-attr, arg-type]
+                for rom in game.xpath('rom'):
+                    roms.append(dict(rom.attrib))
 
                 # Check for at least a size and one hash in the rom node
                 skip_node: bool = False