handle option reordering

Author: renanthera

scripts/execute.py

@@ -7,27 +7,44 @@
 def validate_header_option(line):
     return ParsedOption(line).validate(HEADER_OPTIONS)
 
+def handle_header_line(line, deferral_list):
+    option = ParsedOption(line)
+    if option.validate(HEADER_OPTIONS):
+        if option.scope(HEADER_OPTIONS) == 'player':
+            deferral_list.append(line)
+            return ''
+        else:
+            return line
+    return ''
+
 def generate_simc_input(profiles: list[Profile]):
     for profile in profiles:
         profile.validate()
 
         profile.params = []
+        deferred_options = []
+        push_deferred_options = False
         with open(profile) as handle:
             header = True
             for line in handle.readlines():
                 line = line.strip()
                 if not len(line):
                     continue
-                if line[0] == '#':
-                    if header and validate_header_option(line[1:].strip()):
-                        line = line[1:].strip()
-                    else:
-                        line = ''
+                if line[0] == '#' and header:
+                    line = handle_header_line(line[1:].strip(), deferred_options)
+                elif line[0] == '#' and not header:
+                    line = ''
                 else:
+                    option = ParsedOption(line)
+                    if option.validate_class(profile) and option.validate_class_value(profile):
+                        push_deferred_options = True
                     header = False
 
                 if line != '':
                     profile.params.append(line)
+                if push_deferred_options:
+                    profile.params += deferred_options
+                    deferred_options = []
 
 def run_sim(binary: Path, profiles: list[str], prefix: list[str], suffix: list[str] = []):
     proc = subprocess.Popen([binary] + prefix + profiles + suffix, stdout=sys.stdout, stderr=sys.stderr)

scripts/shared.py

@@ -24,22 +24,27 @@ class Option:
     ignore_value: bool
     values: list[str]
     case_sensitive: bool
+    scope: str
 
-    def __init__(self, key, values=[], ignore_value=False, case_sensitive=True):
+    def __init__(self, key, values=[], ignore_value=False, case_sensitive=True, scope='player'):
         self.key = key
         self.values = values
         self.ignore_value = ignore_value
         self.case_sensitive = case_sensitive
+        self.scope = scope
 
     def __eq__(self, other: ParsedOption):
-        if self.key != other.key:
-            return False
-        if self.ignore_value:
-            return True
-        if self.case_sensitive:
-            return other.value in self.values
-        else:
-            return other.value.lower() in self.values
+        if isinstance(other, ParsedOption):
+            if self.key != other.key:
+                return False
+            if self.ignore_value:
+                return True
+            if self.case_sensitive:
+                return other.value in self.values
+            else:
+                return other.value.lower() in self.values
+        assert False
+        return False
 
 class Options:
     options: list[Option]
@@ -52,6 +57,10 @@ def __init__(self, *options):
     def __contains__(self, other):
         return other in self.options
 
+    def __iter__(self):
+        for option in self.options:
+            yield option
+
 # class (handled separately as value depends on filename)
 SIMC_OPTIONS = Options(
     Option('level', ['90']),
@@ -96,14 +105,14 @@ def __contains__(self, other):
     Option('warlock.default_pet', ['sayaad', 'succubus', 'incubus', 'felguard']),
 )
 HEADER_OPTIONS = Options(
-    Option('desired_targets', ignore_value=True),
-    Option('fight_style', ['patchwerk', 'castingpatchwerk', 'dungeonslice']),
-    Option('source', ['default']),
-    Option('potion', ignore_value=True),
-    Option('flask', ignore_value=True),
-    Option('food', ignore_value=True),
-    Option('augmentation', ignore_value=True),
-    Option('temporary_enchant', ignore_value=True),
+    Option('desired_targets', ignore_value=True, scope='sim'),
+    Option('fight_style', ['patchwerk', 'castingpatchwerk', 'dungeonslice'], scope='sim'),
+    Option('source', ['default'], scope='player'),
+    Option('potion', ignore_value=True, scope='player'),
+    Option('flask', ignore_value=True, scope='player'),
+    Option('food', ignore_value=True, scope='player'),
+    Option('augmentation', ignore_value=True, scope='player'),
+    Option('temporary_enchant', ignore_value=True, scope='player'),
 )
 
 class Profile:
@@ -197,6 +206,9 @@ def __str__(self):
             return f'Invalid Option {self.key}'
         return f'{self.key}{self.operator}{self.value}'
 
+    def scope(self, options: Options):
+        return next((o for o in options if o == self)).scope
+
     def validate_class(self, profile: Profile):
         class_name, _, _ = profile.path_parts()
         return self.parsed and self.key == class_name