v2 final

changelog.md

@@ -1,3 +1,8 @@
+# 2.00.0
+
+* Fixed grouping of titles with oddly-named video standards in the filename.
+
+
 # 2.00.0 Beta 9
 
 * Fixed conditional override priorities not working.

docs/changelog.md

@@ -5,6 +5,10 @@ hide:
 
 # Changelog
 
+# 2.00.0
+
+* Fixed grouping of titles with oddly-named video standards in the filename.
+
 
 # 2.00.0 Beta 9
 

docs/contribute-clone-lists.md

@@ -1050,5 +1050,5 @@ The SHA256 hashes in that file are then compared against the clone lists on the
 disk. If a clone list hash doesn't match, then a new version of that file is downloaded
 from the same location as listed above.
 
-When submitting PRs for clone lists, make sure to also update the appropriate `hash.json`
-file with the SHA256 hash of the updated or new clone list.
+After your PR has been merged, the `hash.json` is updated by unexpectedpanda with the
+SHA256 hash of the updated or new clone lists.

docs/includes/file.md

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

docs/includes/sha256.md

@@ -1 +1 @@
-3da9506dcc2225593dc36dfbb2a746a1642e1ed3a080ae0b1e216cd6be80cf08
+9848f744e29f856217e1614b04e83c770b3eec5610cb5b7101473b64085fd7d6

mkdocs.yml

@@ -56,10 +56,11 @@ nav:
   - download.md
   - changelog.md
   - Understanding Retool:
+    - terminology.md
     - retool-1g1r.md
     - clone-lists.md
+    - what-qualifies-as-a-clone.md
     - dat-support.md
-    - terminology.md
   - How to use Retool:
     - 'Retool GUI': how-to-use-retool-gui.md
     - 'Retool CLI': how-to-use-retool-cli.md

modules/constants.py

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

@@ -644,14 +644,14 @@ def __init__(self, LANGUAGES: str) -> None:
         self.sega_panasonic_ring_code: Pattern[str] = re.compile('\\((?:(?:[0-9]{1,2}[ABCMRS],? ?)*|R[E]?[-]?[0-9]*)\\)')
 
         # Video standards
-        self.mpal_1: Pattern[str] = re.compile('( -)?[( ]MPAL[ \\)]')
-        self.ntsc_1: Pattern[str] = re.compile('( -)?[( ]NTSC[ \\)]')
+        self.mpal_1: Pattern[str] = re.compile('(?:-)?[( ]MPAL\\)?')
+        self.ntsc_1: Pattern[str] = re.compile('(?:-)?[( ]NTSC\\)?')
         self.ntsc_2: Pattern[str] = re.compile('\\[(.*)?NTSC(.*)?\\]')
         self.ntsc_pal: Pattern[str] = re.compile('[( ]NTSC-PAL(\\))?')
-        self.pal_1: Pattern[str] = re.compile('( -)?[( ]PAL(?: [a-zA-Z]+| 50Hz)?(?:\\)| (?=\\())')
+        self.pal_1: Pattern[str] = re.compile('( -)?[( ]PAL(?: [a-zA-Z]+| 50[Hh]z)?(?:\\)?| (?=\\())')
         self.pal_2: Pattern[str] = re.compile('\\[(.*)?PAL(?!P)(.*)?\\]')
-        self.pal_60: Pattern[str] = re.compile('\\(PAL 60Hz\\)')
-        self.secam_1: Pattern[str] = re.compile('( -)?[( ]SECAM[ \\)]')
+        self.pal_60: Pattern[str] = re.compile('\\(PAL 60[Hh]z\\)')
+        self.secam_1: Pattern[str] = re.compile('(?:-)?[( ]SECAM\\)?')
         self.secam_2: Pattern[str] = re.compile('\\[(.*)?SECAM(.*)?\\]')
 
         # Other tags
@@ -1112,6 +1112,23 @@ def get_group_name(name: str, config: Config) -> str:
         if re.search(config.regex.version_non_parens, name):
             name = re.sub(config.regex.version_non_parens, '', name)
 
+        # Video standard compensation
+        for pattern in config.regex.ntsc:
+            if re.search(pattern, name):
+                name = re.sub(pattern, '', name)
+
+        for pattern in config.regex.pal:
+            if re.search(pattern, name):
+                name = re.sub(pattern, '', name)
+
+        for pattern in config.regex.pal_60hz:
+            if re.search(pattern, name):
+                name = re.sub(pattern, '', name)
+
+        for pattern in config.regex.secam:
+            if re.search(pattern, name):
+                name = re.sub(pattern, '', name)
+
         return name.lower().replace('  ', ' ').strip()
 
 
@@ -1277,7 +1294,7 @@ def trace_title(trace_reference: str, variable: list[str] = [], title_set: set[D
         if trace_reference == 'REF0006': message = f'{Font.bold}[{variable[0]}]{Font.end} Group after handling special editions:'
         if trace_reference == 'REF0007': message = f'{Font.bold}[{variable[0]}]{Font.end} Group after handling versions and revisions:'
         if trace_reference == 'REF0008': message = f'{Font.bold}[{variable[0]}]{Font.end} Group after handling modern title rips:'
-        if trace_reference == 'REF0009': message = f'{Font.bold}[{variable[0]}]{Font.end} Group after choosing dates:'
+        if trace_reference == 'REF0009': message = f'{Font.bold}[{variable[0]}]{Font.end} Group after choosing video standard:'
         if trace_reference == 'REF0010': message = f'{Font.bold}[{variable[0]}]{Font.end} Group after choosing good, original versions over alternatives:'
         if trace_reference == 'REF0011': message = f'{Font.bold}[{variable[0]}]{Font.end} Group after handling promotions and demotions:'
         if trace_reference == 'REF0012': message = f'{Font.bold}[{variable[0]}]{Font.end} Group after handling "Made in" titles:'

readme.md

@@ -1,13 +1,5 @@
 # Retool
 
-> **:mega: Retool v2 is now available**
->
-> Retool v2 is much faster, with several new features and better accuracy.
->
-> A working version of Retool v1 is still available for download from the [v1 branch](https://github.com/unexpectedpanda/retool/tree/v1),
-however it's unsupported and issues should only be filed for v2. Clone lists and metadata
-are only being updated for v2.
-
 **This is the source repository for Retool. For downloads, installation instructions, and
 documentation, see the [website](https://unexpectedpanda.github.io/retool/).**