Clean up potential errors if directory name ends with period

- Clean up potential errors if directory name ends with period
bbtufty · Jan 9, 2025 · 14034df · 14034df
1 parent db7537d
commit 14034df
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -33,6 +33,7 @@ ROMParser
 General
 ~~~~~~~
 
+- Clean up potential errors if directory name ends with period
 - regex cleanup
 - Move clonelist from unexpectedpanda to Daeymon
 - Updated RA name extensions

diff --git a/romsearch/modules/romcleaner.py b/romsearch/modules/romcleaner.py
@@ -162,11 +162,6 @@ def clean_roms(
 
                 rom_dir = rom_dict[r][f]["dir_name"]
 
-                # Catch the edge case where the directory name can end with
-                # a period (e.g. Super Smash Bros.)
-                if rom_dir.endswith("."):
-                    rom_dir = rom_dir[:-1]
-
                 rom_name_w_dir = os.path.join(rom_dir, rom_name)
 
                 roms_in_dict.append(rom_name_w_dir)
@@ -207,11 +202,6 @@ def clean_roms(
                         # to a dir name
                         g_short = get_directory_name(g)
 
-                        # Catch the edge case where the directory name can end with
-                        # a period (e.g. Super Smash Bros.)
-                        if g_short.endswith("."):
-                            g_short = g_short[:-1]
-
                         for g_i in self.cache[self.platform][g]:
 
                             if found_entry_in_dict:
@@ -263,11 +253,6 @@ def clean_roms(
                 # to a dir name
                 d_short = get_directory_name(d)
 
-                # Catch the edge case where the directory name can end with
-                # a period (e.g. Super Smash Bros.)
-                if d_short.endswith("."):
-                    d_short = d_short[:-1]
-
                 for d_i in self.cache[self.platform][d]:
                     found_d_i_on_disk = False
 

diff --git a/romsearch/util/regex_matching.py b/romsearch/util/regex_matching.py
@@ -50,6 +50,11 @@ def get_directory_name(f):
     if len(f_find) > 0:
         f = f_find[0]
 
+    # Catch the edge case where the directory name can end with
+    # a period (e.g. Super Smash Bros.)
+    if f.endswith("."):
+        f = f[:-1]
+
     return f