(Bugfix) Fixed issue where some maxroll aspects were not properly imported. Additionally, if an aspect can't be found, it just won't be imported instead of adding it and making the profile fail. (#515)

Author: cjshrader

src/__init__.py

@@ -2,4 +2,4 @@
 
 TP = concurrent.futures.ThreadPoolExecutor()
 
-__version__ = "7.2.1"
+__version__ = "7.2.2"

src/gui/importer/d4builds.py

@@ -213,9 +213,9 @@ def _get_legendary_aspects(data: lxml.html.HtmlElement) -> list[str]:
         aspect_name = correct_name(aspect.text.lower().replace("aspect", "").strip())
 
         if aspect_name not in Dataloader().aspect_list:
-            LOGGER.warning(f"Imported legendary aspect '{aspect_name}' that is not in our aspect data, please report a bug.")
-
-        result.append(aspect_name)
+            LOGGER.warning(f"Legendary aspect '{aspect_name}' that is not in our aspect data, unable to add to AspectUpgrades.")
+        else:
+            result.append(aspect_name)
 
     return result
 

src/gui/importer/maxroll.py

@@ -12,6 +12,7 @@
 from src.item.data.affix import Affix
 from src.item.data.item_type import ItemType
 from src.item.descr.text import clean_str, closest_match
+from src.scripts.common import correct_name
 
 LOGGER = logging.getLogger(__name__)
 
@@ -93,9 +94,11 @@ def import_maxroll(config: ImportConfig):
             legendary_aspect = _find_legendary_aspect(mapping_data, resolved_item["legendaryPower"])
             if legendary_aspect:
                 if legendary_aspect not in Dataloader().aspect_list:
-                    LOGGER.warning(f"Imported legendary aspect '{legendary_aspect}' that is not in our aspect data, please report a bug.")
-
-                aspect_upgrade_filters.append(legendary_aspect)
+                    LOGGER.warning(
+                        f"Legendary aspect '{legendary_aspect}' that is not in our aspect data, unable to add to AspectUpgrades."
+                    )
+                else:
+                    aspect_upgrade_filters.append(legendary_aspect)
             else:
                 LOGGER.warning(
                     f"Unable to find legendary aspect in maxroll data for {item_type}, can not automatically add to AspectUpgrades"
@@ -223,9 +226,9 @@ def _find_legendary_aspect(mapping_data: dict, legendary_aspect: dict) -> str |
             continue
 
         if "prefix" in affix:
-            return affix["prefix"].lower().replace(" ", "_")
+            return correct_name(affix["prefix"])
         if "suffix" in affix:
-            return affix["suffix"].lower().replace(" ", "_")
+            return correct_name(affix["suffix"])
         return None
 
     return None

src/gui/importer/mobalytics.py

@@ -200,8 +200,9 @@ def _get_legendary_aspect(name: str) -> str:
         aspect_name = correct_name(name.lower().replace("aspect", "").strip())
 
         if aspect_name not in Dataloader().aspect_list:
-            LOGGER.warning(f"Imported legendary aspect '{aspect_name}' that is not in our aspect data, please report a bug.")
-        return aspect_name
+            LOGGER.warning(f"Legendary aspect '{aspect_name}' that is not in our aspect data, unable to add to AspectUpgrades.")
+        else:
+            return aspect_name
     return ""