Add editing flag to ScriptParser

Author: rdswift

picard/script/parser.py

@@ -210,8 +210,9 @@ class ScriptParser:
 
     _cache = {}
 
-    def __init__(self):
+    def __init__(self, editing=False):
         self._function_stack = LifoQueue()
+        self.editing = editing
 
     def __raise_eof(self):
         raise ScriptEndOfFile(StackItem(line=self._y, column=self._x))

picard/ui/options/renaming.py

@@ -263,7 +263,7 @@ def check(self):
             raise OptionsCheckError(_("Error"), _("The location to move files to must not be empty."))
 
     def check_format(self):
-        parser = ScriptParser()
+        parser = ScriptParser(editing=True)
         try:
             parser.eval(self.script_text)
         except Exception as e:

picard/ui/options/scripting.py

@@ -272,7 +272,7 @@ def reset_selected_item(self):
         widget.setCurrentRow(widget.bad_row)
 
     def check(self):
-        parser = ScriptParser()
+        parser = ScriptParser(editing=True)
         try:
             parser.eval(self.ui.tagger_script.toPlainText())
         except Exception as e:

picard/ui/scripteditor/__init__.py

@@ -959,7 +959,7 @@ def check_formats(self):
     def check_format(self):
         """Parse the file naming script and check for errors."""
         config = get_config()
-        parser = ScriptParser()
+        parser = ScriptParser(editing=True)
         script_text = self.get_script()
         try:
             parser.eval(script_text)

picard/ui/scripteditor/examples.py

@@ -112,7 +112,7 @@ def _example_to_filename(self, file):
             if self.settings['enable_tagger_scripts'] and not c_metadata.diff(file.orig_metadata):
                 for s in iter_tagging_scripts_from_tuples(self.settings['list_of_scripts']):
                     if s.enabled and s.content:
-                        parser = ScriptParser()
+                        parser = ScriptParser(editing=True)
                         parser.eval(s.content, c_metadata)
             filename_before = file.filename
             filename_after = file.make_filename(filename_before, c_metadata, self.settings, self.script_text)

picard/ui/widgets/scripttextedit.py

@@ -203,7 +203,7 @@ def __init__(
         # Initialize internal state before constructing QCompleter to avoid
         # accessing properties that depend on initialized attributes.
         self.last_selected = ''
-        self._parser = parser or ScriptParser()
+        self._parser = parser or ScriptParser(editing=True)
         self._variable_extractor = variable_extractor or VariableExtractor(self._parser)
         self._context_detector = context_detector or ContextDetector()
         self._user_script_scanner = user_script_scanner or UserScriptScanner(self._variable_extractor)

picard/util/scripttofilename.py

@@ -64,7 +64,7 @@ def script_to_filename_with_metadata(naming_format, metadata, file=None, setting
             sanitize_filename(str(v), repl=replace_dir_separator, win_compat=win_compat) for v in metadata.getall(name)
         ]
     naming_format = naming_format.replace('\t', '').replace('\n', '')
-    filename = ScriptParser().eval(naming_format, new_metadata, file)
+    filename = ScriptParser(editing=True).eval(naming_format, new_metadata, file)
     if settings['ascii_filenames']:
         filename = replace_non_ascii(filename, pathsave=True, win_compat=win_compat)
     # replace incompatible characters