v2.00.3

unexpectedpanda · unexpectedpanda · commit 96be9588a689 · 2023-05-07T12:20:58.000+10:00
diff --git a/docs/includes/file.md b/docs/includes/file.md
@@ -1 +1 @@
-[retool-2.00.2-win-x86-64.zip](https://unexpectedpanda.github.io/files/retool-2.00.2-win-x86-64.zip)
+[retool-2.00.3-win-x86-64.zip](https://unexpectedpanda.github.io/files/retool-2.00.3-win-x86-64.zip)
diff --git a/docs/includes/sha256.md b/docs/includes/sha256.md
@@ -1 +1 @@
-ff56f5d742c1f80c57f8085cd6931997d3f67c1c68008a1ad82522e54251fe5e
+9b5d4d4de577e52c90c8409355c7ae2be068e1df00b7ded46e1add705570abef
diff --git a/modules/chooseparent.py b/modules/chooseparent.py
@@ -234,7 +234,7 @@ def length_check() -> None:
 
                 if report_on_match_compilations: TraceTools.trace_title('REF0067', [group], title_comparison_set, keep_remove=False)
 
-                # Filter by preproduction
+                # Filter by preproduction and pirate
                 group_titles = ParentTools.remove_preprod_bad(title_comparison_set, config)
 
                 if report_on_match_compilations: TraceTools.trace_title('REF0092', [group], group_titles, keep_remove=False)
@@ -1503,6 +1503,7 @@ def remove_preprod_bad(title_set: set[DatNode], config: Config) -> set[DatNode]:
 
                     pattern_list: list[Pattern[str]] = list(config.regex.preproduction)
                     pattern_list.append(config.regex.bad)
+                    pattern_list.append(config.regex.pirate)
 
                     for regex_pattern in pattern_list:
                         if (
@@ -1745,7 +1746,7 @@ def choose_parent_process(config: Config, potential_parents: dict[str, set[DatNo
         short_name_titles: dict[str, list[DatNode]] = {}
         short_name_top_languages: set[tuple[str, int, str]] = set()
 
-        # Filter out bad dumps and preproduction titles
+        # Filter out bad dumps, pirate, and preproduction titles
         for short_name in short_names:
             for title in title_set:
                 if (
@@ -1757,6 +1758,9 @@ def choose_parent_process(config: Config, potential_parents: dict[str, set[DatNo
                             if re.search(regex_pattern, title.full_name):
                                 regex_match = True
 
+                        if re.search(config.regex.pirate, title.full_name):
+                                regex_match = True
+
                         if not regex_match:
                             if short_name not in short_name_titles:
                                 short_name_titles[short_name] = []
@@ -1774,6 +1778,16 @@ def choose_parent_process(config: Config, potential_parents: dict[str, set[DatNo
                                     if title not in short_name_titles[short_name]:
                                         short_name_titles[short_name].append(title)
 
+            # Add pirate titles back in if they are the only ones in the set
+            if not short_name_titles:
+                for title in title_set:
+                    if title.short_name == short_name:
+                        if re.search(config.regex.pirate, title.full_name):
+                            if short_name not in short_name_titles:
+                                short_name_titles[short_name] = []
+                            if title not in short_name_titles[short_name]:
+                                short_name_titles[short_name].append(title)
+
             # Add bad dumps back in if they are the only ones in the set
             if not short_name_titles:
                 for title in title_set:
@@ -1811,7 +1825,7 @@ def choose_parent_process(config: Config, potential_parents: dict[str, set[DatNo
                     if report_on_match: eprint(f'\n{Font.subheading}Region: {region}{Font.end}')
                     if report_on_match: TraceTools.trace_title('REF0001', [group_name], parent_titles, keep_remove=False)
 
-                    # 1) Clean up preproduction/bad/mixed version-revision titles
+                    # 1) Clean up preproduction/bad/pirate/mixed version-revision titles
                     if len(parent_titles) > 1: parent_titles = ParentTools.remove_preprod_bad(parent_titles, config)
 
                     if report_on_match: TraceTools.trace_title('REF0003', [group_name], parent_titles, keep_remove=False)
@@ -2056,6 +2070,7 @@ def choose_parent_process(config: Config, potential_parents: dict[str, set[DatNo
             pattern_list: list[Pattern[str]] = list(config.regex.preproduction)
 
             pattern_list.append(config.regex.bad)
+            pattern_list.append(config.regex.pirate)
 
             if not config.user_input.modern:
                 pattern_list.extend(config.tags_modern_editions)
@@ -2095,6 +2110,10 @@ def choose_parent_process(config: Config, potential_parents: dict[str, set[DatNo
                                                 if re.search(config.regex.bad, original_title.full_name):
                                                     bad_match = True
 
+                                                # Candidate is a pirate title
+                                                if re.search(config.regex.pirate, original_title.full_name):
+                                                    bad_match = True
+
                                                 # Tags match
                                                 if pattern == second_pattern:
                                                     bad_match = True
diff --git a/modules/constants.py b/modules/constants.py
@@ -1,6 +1,6 @@
 # Set the user files and options
 VERSION_MAJOR: str = '2.00'
-VERSION_MINOR: str = '2'
+VERSION_MINOR: str = '3'
 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'
diff --git a/modules/titletools.py b/modules/titletools.py
@@ -1288,7 +1288,7 @@ def trace_title(trace_reference: str, variable: list[str] = [], title_set: set[D
         message: str = ''
         if trace_reference == 'REF0001': message = f'{Font.bold}[{variable[0]}]{Font.end} Original unmodified group:'
         if trace_reference == 'REF0002': message = f'{Font.bold}[{variable[0]}]{Font.end} Group after taking clone list priorities into account:'
-        if trace_reference == 'REF0003': message = f'{Font.bold}[{variable[0]}]{Font.end} Group after cleaning up preproduction/bad/mixed version-revision titles:'
+        if trace_reference == 'REF0003': message = f'{Font.bold}[{variable[0]}]{Font.end} Group after cleaning up preproduction/bad/pirate/mixed version-revision titles:'
         if trace_reference == 'REF0004': message = f'{Font.bold}[{variable[0]}]{Font.end} Group after handling modern title rips:'
         if trace_reference == 'REF0005': message = f'{Font.bold}[{variable[0]}]{Font.end} [First pass] Group after filtering by user language order:'
         if trace_reference == 'REF0006': message = f'{Font.bold}[{variable[0]}]{Font.end} Group after handling special editions:'

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-[retool-2.00.2-win-x86-64.zip](https://unexpectedpanda.github.io/files/retool-2.00.2-win-x86-64.zip)`
	`1`	`+[retool-2.00.3-win-x86-64.zip](https://unexpectedpanda.github.io/files/retool-2.00.3-win-x86-64.zip)`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-ff56f5d742c1f80c57f8085cd6931997d3f67c1c68008a1ad82522e54251fe5e`
	`1`	`+9b5d4d4de577e52c90c8409355c7ae2be068e1df00b7ded46e1add705570abef`