FFF inline diff dir

Utumno · Utumno · commit d771e263e6df · 2025-11-05T00:17:02.000+02:00
Note we don't need to cacluylate this for autotags at all - saves some
performance
diff --git a/Mopy/bash/basher/__init__.py b/Mopy/bash/basher/__init__.py
@@ -78,8 +78,8 @@
     attrgetter_cache, deprint, dict_sort, fast_cached_property, \
     forward_compat_path_to_fn, round_size, str_to_sig, to_unix_newlines, \
     to_win_newlines, top_level_files
-from ..bosh import ModInfo, omods, DataStore, diff_tags, read_loot_tags, \
-    read_dir_tags, save_tags_to_dir
+from ..bosh import ModInfo, omods, DataStore, read_loot_tags, read_dir_tags, \
+    save_tags_to_dir
 from ..exception import BoltError, CancelError, SkipError, UnknownListener
 from ..gui import CENTER, BusyCursor, Button, CancelButton, CenteredSplash, \
     CheckListBox, Color, CopyOrMovePopup, DateAndTimeDialog, DropDown, \
@@ -1656,14 +1656,6 @@ def Execute(self):
                 _mod_details._refresh_tags()
         # Copy tags to various places
         bashTagsDesc = mod_info.getBashTagsDesc()
-        # We need to grab both the ones from the description and from LOOT,
-        # since we need to save a diff in case of Copy to BashTags
-        added_tags, deleted_tags = read_loot_tags(mod_info)
-        # Emulate the effects of applying the LOOT tags
-        old_tags = bashTagsDesc.copy()
-        old_tags |= added_tags
-        old_tags -= deleted_tags
-        dir_diff = diff_tags(mod_tags, old_tags)
         class Tags_CopyTagList(AppendableLink, ItemLink):
             _text = _('Copy Tag List')
             _help = _('Copies a list of all bash tags for this game to the '
@@ -1681,10 +1673,16 @@ class Tags_CopyToBashTags(EnabledLink):
                       'description/LOOT tags to %(bashtags_path)s.') % {
                 'bashtags_path': mod_info.tags_path()}
             def _enable(self):
-                return (not mod_info.mod_auto_bash_tags and
-                        read_dir_tags(mod_info) != dir_diff)
+                if mod_info.mod_auto_bash_tags: return False
+                # We need to grab both the ones from the description and from
+                # LOOT, to calculate the diff with automatic tags
+                added_tags, deleted_tags = read_loot_tags(mod_info)
+                # Emulate the effects of applying the LOOT tags
+                auto_tags = (bashTagsDesc | added_tags) - deleted_tags
+                self._add_rem = mod_tags - auto_tags, auto_tags - mod_tags
+                return read_dir_tags(mod_info) != self._add_rem
             def Execute(self):
-                save_tags_to_dir(mod_info, dir_diff)
+                save_tags_to_dir(mod_info, self._add_rem)
         class Tags_CopyToDescription(EnabledLink):
             """Copy manually assigned bash tags into the mod description"""
             _text = _('Copy to Description')
diff --git a/Mopy/bash/bosh/__init__.py b/Mopy/bash/bosh/__init__.py
@@ -293,14 +293,12 @@ def read_dir_tags(mod_info, ci_bt_filenames=None):
     return *map(_process_tags, (added, removed)),
 
 def save_tags_to_dir(mod_info, plugin_tag_diff): # one use!
-    """Compares plugin_tags to plugin_old_tags and saves the diff to
+    """Accepts the diff of current mod_info tags to what would be applied by
+    its description and the LOOT masterlist / userlist and saves the diff to
     Data/BashTags/PLUGIN_NAME.txt.
 
     :param mod_info: The plugin info to modify the tag file for.
-    :param plugin_tag_diff: A tuple of two sets, as returned by diff_tags,
-        representing a diff of all bash tags currently applied to the
-        plugin in question vs. all bash tags applied to the plugin
-        by its description and the LOOT masterlist / userlist.."""
+    :param plugin_tag_diff: A tuple of two sets, (added_tags, removed_tags)."""
     bass.dirs['tag_files'].makedirs()
     tag_file = mod_info.tags_path()
     # Calculate the diff and ignore the minus when sorting the result
@@ -316,10 +314,6 @@ def save_tags_to_dir(mod_info, plugin_tag_diff): # one use!
             'wb_version': bass.AppVersion})
         out.write(', '.join(processed_diff) + '\n')
 
-def diff_tags(plugin_new_tags, plugin_old_tags):
-    """Returns two sets, the first containing all added tags and the second all
-    removed tags."""
-    return plugin_new_tags - plugin_old_tags, plugin_old_tags - plugin_new_tags
 #------------------------------------------------------------------------------
 class _TabledInfo:
     """Stores some of its attributes in a pickled dict. Most of the (hacky)
