From 70df9d068221361d6571445e1494702b6c3e4802 Mon Sep 17 00:00:00 2001
From: Timmy Welch <timmy@narnian.us>
Date: Fri, 29 Apr 2022 16:29:01 -0700
Subject: [PATCH] Update filerenamer

Fixes an out of range exception during smart cleanup
Enforces field names to be present in format templates
Instead of removing previous text if a replacement is empty only strip
specifically "-_({[#" off the right of the string
---
 comictaggerlib/filerenamer.py | 11 ++++++-----
 tests/filenames.py            |  6 ++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/comictaggerlib/filerenamer.py b/comictaggerlib/filerenamer.py
index fc44aaa..0cd7d49 100644
--- a/comictaggerlib/filerenamer.py
+++ b/comictaggerlib/filerenamer.py
@@ -52,8 +52,8 @@ class MetadataFormatter(string.Formatter):
                 if lstrip:
                     literal_text = literal_text.lstrip("-_)}]#")
                 if self.smart_cleanup:
-                    lspace = literal_text[0].isspace()
-                    rspace = literal_text[-1].isspace()
+                    lspace = literal_text[0].isspace() if literal_text else False
+                    rspace = literal_text[-1].isspace() if literal_text else False
                     literal_text = " ".join(literal_text.split())
                     if literal_text == "":
                         literal_text = " "
@@ -66,7 +66,7 @@ class MetadataFormatter(string.Formatter):
 
             lstrip = False
             # if there's a field, output it
-            if field_name is not None:
+            if field_name is not None and field_name != "":
                 field_name = field_name.lower()
                 # this is some markup, find the object and do the formatting
 
@@ -99,7 +99,8 @@ class MetadataFormatter(string.Formatter):
                 fmt_obj = self.format_field(obj, format_spec)
                 if fmt_obj == "" and len(result) > 0 and self.smart_cleanup:
                     lstrip = True
-                    result.pop()
+                    if result:
+                        result[-1] = result[-1].rstrip("-_({[#")
                 if self.smart_cleanup:
                     fmt_obj = " ".join(fmt_obj.split())
                     fmt_obj = sanitize_filename(fmt_obj, platform=self.platform)
@@ -164,7 +165,7 @@ class FileRenamer:
                 Component = Component.replace(":", "-")
 
             new_basename = sanitize_filename(
-                fmt.vformat(Component, args=[], kwargs=Default(md_dict)), platform=self.platform
+                fmt.vformat(Component, args=None, kwargs=Default(md_dict)), platform=self.platform
             ).strip()
             new_name = os.path.join(new_name, new_basename)
 
diff --git a/tests/filenames.py b/tests/filenames.py
index a535afe..8d226f0 100644
--- a/tests/filenames.py
+++ b/tests/filenames.py
@@ -539,6 +539,12 @@ fnames = [
 ]
 
 rnames = [
+    (
+        "{series} #{issue} - {title} ({year}) ({price})",  # price should be none
+        False,
+        "universal",
+        "Cory Doctorow's Futuristic Tales of the Here and Now #001 - Anda's Game (2007).cbz",
+    ),
     (
         "{series} #{issue} - {title} ({year})",
         False,