fix: update description regex

Author: ezbooz

gui/main_window.py

@@ -3,16 +3,40 @@
 
 from PyQt6.QtCore import QPropertyAnimation, Qt, QTimer, QUrl
 from PyQt6.QtGui import QColor, QDesktopServices
-from PyQt6.QtWidgets import (QApplication, QComboBox, QHBoxLayout, QHeaderView,
-                             QLabel, QMainWindow, QMessageBox, QPushButton,
-                             QStyle, QStyledItemDelegate, QTableWidget,
-                             QTableWidgetItem, QVBoxLayout, QWidget)
-
-from __version__ import __version__ as version, __version_description__
-from gui.styles import (COMBO_BOX, COPY_LABEL, FOOTER, FOOTER_LABEL, HEADER,
-                        HEADER_LABEL, MAIN_WINDOW, MESSAGE_BOX, START_BUTTON,
-                        STATUS_LABEL, TABLE_WIDGET, UPDATE_BUTTON,
-                        get_update_message)
+from PyQt6.QtWidgets import (
+    QApplication,
+    QComboBox,
+    QHBoxLayout,
+    QHeaderView,
+    QLabel,
+    QMainWindow,
+    QMessageBox,
+    QPushButton,
+    QStyle,
+    QStyledItemDelegate,
+    QTableWidget,
+    QTableWidgetItem,
+    QVBoxLayout,
+    QWidget,
+)
+
+from __version__ import __version__ as version
+from __version__ import __version_description__
+from gui.styles import (
+    COMBO_BOX,
+    COPY_LABEL,
+    FOOTER,
+    FOOTER_LABEL,
+    HEADER,
+    HEADER_LABEL,
+    MAIN_WINDOW,
+    MESSAGE_BOX,
+    START_BUTTON,
+    STATUS_LABEL,
+    TABLE_WIDGET,
+    UPDATE_BUTTON,
+    get_update_message,
+)
 from poeNinja.ninjaAPI import PoeNinja
 from utils.utils import Utils
 
@@ -45,7 +69,9 @@ def _setup_ui(self) -> None:
 
     def _configure_main_window(self) -> None:
         """Configure main window properties."""
-        self.setWindowTitle(f"Path of Exile Card Flipper v{version} | github.com/ezbooz")
+        self.setWindowTitle(
+            f"Path of Exile Card Flipper v{version} | github.com/ezbooz"
+        )
         self.setFixedSize(1070, 700)
         self.central_widget = QWidget(self)
         self.setCentralWidget(self.central_widget)
@@ -94,7 +120,9 @@ def _create_table(self) -> None:
         self.table_widget.setShowGrid(False)
         self.table_widget.verticalHeader().setVisible(False)
         self.table_widget.setEditTriggers(QTableWidget.EditTrigger.NoEditTriggers)
-        self.table_widget.setSelectionBehavior(QTableWidget.SelectionBehavior.SelectRows)
+        self.table_widget.setSelectionBehavior(
+            QTableWidget.SelectionBehavior.SelectRows
+        )
         self.table_widget.setSelectionMode(QTableWidget.SelectionMode.SingleSelection)
 
     def _create_controls(self) -> None:
@@ -182,11 +210,7 @@ def _fetch_and_process_data(self) -> Optional[List[Dict]]:
         highscores = self.utils.calculate_highscores(
             divination_data, currency_data, unique_items
         )
-        return sorted(
-            highscores.values(),
-            key=lambda x: x["Profit"],
-            reverse=True
-        )
+        return sorted(highscores.values(), key=lambda x: x["Profit"], reverse=True)
 
     def _display_results(self, highscores_sorted: List[Dict]) -> None:
         """Display processed results in the table."""
@@ -204,10 +228,12 @@ def _get_divine_orb_value(self) -> Optional[float]:
             with open("Data\\Currency.json", "r") as file:
                 data = json.load(file)
                 return next(
-                    (line["receive"]["value"]
-                     for line in data["lines"]
-                     if line["currencyTypeName"] == "Divine Orb"),
-                    None
+                    (
+                        line["receive"]["value"]
+                        for line in data["lines"]
+                        if line["currencyTypeName"] == "Divine Orb"
+                    ),
+                    None,
                 )
         except (FileNotFoundError, json.JSONDecodeError):
             return None
@@ -216,10 +242,18 @@ def _setup_table_structure(self, data: List[Dict]) -> None:
         """Configure table structure and headers."""
         self.table_widget.setRowCount(len(data))
         self.table_widget.setColumnCount(8)
-        self.table_widget.setHorizontalHeaderLabels([
-            "#", "Name", "Type", "Total profit", "Profit per card",
-            "1 card price", "Total set price", "Reward price"
-        ])
+        self.table_widget.setHorizontalHeaderLabels(
+            [
+                "#",
+                "Name",
+                "Type",
+                "Total profit",
+                "Profit per card",
+                "1 card price",
+                "Total set price",
+                "Reward price",
+            ]
+        )
 
         header = self.table_widget.horizontalHeader()
         for col in range(self.table_widget.columnCount()):
@@ -255,9 +289,7 @@ def to_divine(value: float) -> float:
         self._create_table_item(row, 0, str(row + 1))
         self._create_table_item(row, 1, item["Name"], align_left=True)
         self._create_table_item(row, 2, item["Type"], align_left=True)
-        self._create_table_item(
-            row, 3, f"{int(item['Profit'])} c ({profit_divine} d)"
-        )
+        self._create_table_item(row, 3, f"{int(item['Profit'])} c ({profit_divine} d)")
         self._create_table_item(
             row, 4, f"{int(item['Profitpercard'])} c ({profit_per_card_divine} d)"
         )
@@ -267,8 +299,9 @@ def to_divine(value: float) -> float:
             row, 7, f"{int(item['Sellprice'])} c ({sellprice_divine} d)"
         )
 
-    def _create_table_item(self, row: int, col: int, text: str,
-                           align_left: bool = False) -> QTableWidgetItem:
+    def _create_table_item(
+        self, row: int, col: int, text: str, align_left: bool = False
+    ) -> QTableWidgetItem:
         """Create and configure a table widget item."""
         item = QTableWidgetItem(text)
         item.setBackground(QColor(0, 0, 0, 0))
@@ -340,9 +373,7 @@ def _hide_copy_label(self) -> None:
         self.fade_animation.setDuration(200)
         self.fade_animation.setStartValue(1)
         self.fade_animation.setEndValue(0)
-        self.fade_animation.finished.connect(
-            lambda: self.copy_label.setVisible(False)
-        )
+        self.fade_animation.finished.connect(lambda: self.copy_label.setVisible(False))
         self.fade_animation.start()
 
     def check_for_updates(self) -> None:
@@ -363,7 +394,9 @@ def check_for_updates(self) -> None:
             self.show_notification("You have the latest version")
             self.status_label.setText("You have the latest version")
 
-    def _show_update_message(self, remote_version: str, remote_description: str) -> None:
+    def _show_update_message(
+        self, remote_version: str, remote_description: str
+    ) -> None:
         """Show update available message box."""
         msg_box = QMessageBox(self)
         msg_box.setWindowTitle("Update Available")
@@ -383,12 +416,14 @@ def generate_trade_link(self, row: int, column: int) -> None:
             "query": {
                 "status": {"option": "online"},
                 "type": item_name,
-                "stats": [{"type": "and", "filters": []}]
+                "stats": [{"type": "and", "filters": []}],
             },
-            "sort": {"price": "asc"}
+            "sort": {"price": "asc"},
         }
 
         encoded_query = json.dumps(trade_query)
-        trade_url = f"https://www.pathofexile.com/trade/search/{league}?q={encoded_query}"
+        trade_url = (
+            f"https://www.pathofexile.com/trade/search/{league}?q={encoded_query}"
+        )
 
-        QDesktopServices.openUrl(QUrl(trade_url))
+        QDesktopServices.openUrl(QUrl(trade_url))

gui/styles.py

@@ -192,11 +192,11 @@
 """
 
 
-def get_update_message(remote_version, current_version, current_description="") -> str:
+def get_update_message(remote_version, current_version, description) -> str:
     return f"""
-        <p style='font-size:14px;'>A new version (<b>v{remote_version}</b>) is available!</p>
+        <p style='font-size:14px;'><b>A new version (v{remote_version}) is available!</b></p>
         <p style='font-size:13px;'>Current version: v{current_version}</p>
-        <p style='font-size:13px;'><i>What's new in your version:</i><br>{current_description}</p><br>
+        <p style='font-size:13px;'><b>What's new in your version:</b><br>{description }</p><br>
         <p style='font-size:14px;'>Download update: 
         <a href='https://github.com/ezbooz/Path-of-Exile-divination-cards-flipper-POE' 
         style='color:#4CAF50; text-decoration:none;'><b>GitHub Repository</b></a></p>

poeNinja/ninjaAPI.py

@@ -1,4 +1,5 @@
 from typing import Dict, List, Union
+
 from utils.utils import Utils
 
 
@@ -35,14 +36,20 @@ def _build_endpoints(self, league_name: str) -> Dict[str, Union[str, List[str]]]
         """
         return {
             "currency": self._build_url("currencyoverview", league_name, "Currency"),
-            "divination": self._build_url("itemoverview", league_name, "DivinationCard"),
+            "divination": self._build_url(
+                "itemoverview", league_name, "DivinationCard"
+            ),
             "uniques": [
                 self._build_url("itemoverview", league_name, unique_type)
                 for unique_type in [
-                    "UniqueMap", "UniqueJewel", "UniqueFlask",
-                    "UniqueWeapon", "UniqueArmour", "UniqueAccessory"
+                    "UniqueMap",
+                    "UniqueJewel",
+                    "UniqueFlask",
+                    "UniqueWeapon",
+                    "UniqueArmour",
+                    "UniqueAccessory",
                 ]
-            ]
+            ],
         }
 
     def _build_url(self, endpoint: str, league_name: str, item_type: str) -> str:
@@ -102,4 +109,4 @@ def _generate_filename(self, url: str, directory: str) -> str:
             Full file path string
         """
         item_name = self.utils.get_item_name(url)
-        return f"{directory}//{item_name}.json"
+        return f"{directory}//{item_name}.json"

utils/utils.py

@@ -18,7 +18,7 @@ class Utils:
     ITEM_NAME_MAPPINGS = {
         "Master Cartographer's Sextant": "Awakened Sextant",
         "Charan's Sword": "Oni-Goroshi",
-        "Azyran's Reward": "The Anima Stone"
+        "Azyran's Reward": "The Anima Stone",
     }
 
     def __init__(self):
@@ -72,7 +72,7 @@ def save_data_to_file(data: Union[Dict, List], file_path: str) -> None:
             data: Data to save (dict or list)
             file_path: Path to save file
         """
-        with open(file_path, "w+", encoding='utf-8') as outfile:
+        with open(file_path, "w+", encoding="utf-8") as outfile:
             json.dump(data, outfile, ensure_ascii=False, indent=2)
 
     @staticmethod
@@ -85,24 +85,32 @@ def load_data() -> Tuple[Dict, Dict, Dict]:
                 - Currency data
                 - Unique items data
         """
-        with open("Data\\DivinationCard.json", "r", encoding='utf-8') as f:
+        with open("Data\\DivinationCard.json", "r", encoding="utf-8") as f:
             divination_data = json.load(f)
 
-        with open("Data\\Currency.json", "r", encoding='utf-8') as f:
+        with open("Data\\Currency.json", "r", encoding="utf-8") as f:
             currency_data = json.load(f)
 
         unique_items = {}
         for file in os.listdir("Uniquedata"):
             file_path = os.path.join("Uniquedata", file)
-            with open(file_path, "r", encoding='utf-8') as f:
+            with open(file_path, "r", encoding="utf-8") as f:
                 data = json.load(f)
                 for item in data["lines"]:
                     unique_items[item["name"]] = item["chaosValue"]
 
         return divination_data, currency_data, unique_items
 
     @staticmethod
-    def process_card(name, chaos_value, stack_size, explicit_modifiers, currency, unique_items, divination_data):
+    def process_card(
+        name,
+        chaos_value,
+        stack_size,
+        explicit_modifiers,
+        currency,
+        unique_items,
+        divination_data,
+    ):
         total_cost = chaos_value * stack_size
         type_info = explicit_modifiers[0]["text"]
         match = re.match("<(.*)>{(.*)}", type_info)
@@ -117,7 +125,9 @@ def process_card(name, chaos_value, stack_size, explicit_modifiers, currency, un
                 try:
                     reward_value = currency.get(items[1], 0) * float(items[0])
                 except KeyError:
-                    print(f"KeyError: Item '{items[1]}' not found in currency data for card '{name}'")
+                    print(
+                        f"KeyError: Item '{items[1]}' not found in currency data for card '{name}'"
+                    )
                     return None
             elif match.group(1) == "uniqueitem":
                 reward_type = "Unique"
@@ -129,15 +139,19 @@ def process_card(name, chaos_value, stack_size, explicit_modifiers, currency, un
                 try:
                     reward_value = unique_items.get(item_reward, 0)
                 except KeyError:
-                    print(f"KeyError: Item '{item_reward}' not found in unique items data for card '{name}'")
+                    print(
+                        f"KeyError: Item '{item_reward}' not found in unique items data for card '{name}'"
+                    )
                     return None
             else:
                 reward_type = "Divination"
                 item_reward = match.group(2)
                 try:
                     reward_value = divination_data.get(item_reward, 0)
                 except KeyError:
-                    print(f"KeyError: Item '{item_reward}' not found in divination data for card '{name}'")
+                    print(
+                        f"KeyError: Item '{item_reward}' not found in divination data for card '{name}'"
+                    )
                     return None
             profit = round((reward_value - total_cost), 2)
             return {
@@ -148,7 +162,7 @@ def process_card(name, chaos_value, stack_size, explicit_modifiers, currency, un
                 "Stack": stack_size,
                 "Profitpercard": round(profit / stack_size, 2),
                 "Total": total_cost,
-                "Sellprice": reward_value
+                "Sellprice": reward_value,
             }
         return None
 
@@ -160,10 +174,7 @@ def _handle_special_names(card_name: str, reward_content: str) -> str:
         return Utils.ITEM_NAME_MAPPINGS.get(reward_content, reward_content)
 
     def calculate_highscores(
-            self,
-            divination_data: Dict,
-            currency_data: Dict,
-            unique_items: Dict[str, float]
+        self, divination_data: Dict, currency_data: Dict, unique_items: Dict[str, float]
     ) -> Dict[str, Dict]:
         """Calculate profit highscores for divination cards.
 
@@ -201,7 +212,9 @@ def get_current_leagues() -> List[Dict]:
             List of active league dictionaries
         """
         try:
-            req = Request(Utils.POE_API_LEAGUES_URL, headers={"User-Agent": Utils.USER_AGENT})
+            req = Request(
+                Utils.POE_API_LEAGUES_URL, headers={"User-Agent": Utils.USER_AGENT}
+            )
             with urlopen(req) as response:
                 leagues = json.loads(response.read().decode("utf-8"))
 
@@ -244,15 +257,22 @@ def check_for_updates() -> Optional[tuple[str, str]]:
                 content = response.read().decode()
 
                 version_match = re.search(r'__version__ = "(.*?)"', content)
-                description_match = re.search(r'__version_description__ = "(.*?)"', content)
+                description_match = re.search(
+                    r'__version_description__ = """([\s\S]*?)"""',
+                    content,
+                )
 
                 if not version_match:
                     return None
 
                 version = version_match.group(1)
-                description = description_match.group(1) if description_match else "No description available."
+                description = (
+                    description_match.group(1)
+                    if description_match
+                    else "No description available."
+                )
                 return version, description
 
         except Exception as e:
             print(f"Error checking for updates: {e}")
-            return None
+            return None