From 925f9658d3da094115805f97bde80f1134558c64 Mon Sep 17 00:00:00 2001
From: CodeByMrFinchum <mr.finchum@pm.me>
Date: Fri, 31 Jan 2025 17:29:03 +0100
Subject: [PATCH] patch: works with PyPiUpdater 0.4

---
 src/OptimaLab35/gui.py               | 19 +++++++++++++++----
 src/OptimaLab35/ui/updater_window.py | 10 +++++-----
 src/OptimaLab35/ui/updater_window.ui |  2 +-
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/OptimaLab35/gui.py b/src/OptimaLab35/gui.py
index e2d9384..6fda769 100644
--- a/src/OptimaLab35/gui.py
+++ b/src/OptimaLab35/gui.py
@@ -470,7 +470,7 @@ class UpdaterWindow(QMainWindow, Ui_Updater_Window):
         self.ui.setupUi(self)
         from PyPiUpdater import PyPiUpdater
         # Update log file location
-        self.update_log_file = os.path.expanduser("~/.config/OptimaLab35/update.log")
+        self.update_log_file = os.path.expanduser("~/.config/OptimaLab35/update_log.json")
         # Store local versions
         self.optimalab35_localversion = optimalab35_localversion
         self.optima35_localversion = optima35_localversion
@@ -478,8 +478,10 @@ class UpdaterWindow(QMainWindow, Ui_Updater_Window):
         # Create PyPiUpdater instances
         self.ppu_ol35 = PyPiUpdater("OptimaLab35", self.optimalab35_localversion, self.update_log_file)
         self.ppu_o35 = PyPiUpdater("optima35", self.optima35_localversion, self.update_log_file)
+        self.ol35_last_state = self.ppu_ol35.get_last_state()
+        self.o35_last_state = self.ppu_o35.get_last_state()
 
-        self.last_update = self.ppu_o35.last_update_date_string()
+        #self.last_update = self.ppu_o35.last_update_date_string()
 
         # Track which packages need an update
         self.updates_available = {"OptimaLab35": False, "optima35": False}
@@ -493,14 +495,20 @@ class UpdaterWindow(QMainWindow, Ui_Updater_Window):
             return
         else:
              self.ui.label_dev.setVisible(False)
+
         self.ui.label_optimalab35_localversion.setText(self.optimalab35_localversion)
         self.ui.label_optima35_localversion.setText(self.optima35_localversion)
+
+        self.ui.label_latest_version.setText("Latest version")
+        self.ui.label_optimalab35_latestversion.setText(self.ol35_last_state[1])
+        self.ui.label_optima35_latestversion.setText(self.o35_last_state[1])
+
         self.ui.update_and_restart_Button.setEnabled(False)
 
         # Connect buttons to functions
         self.ui.check_for_update_Button.clicked.connect(self.check_for_updates)
         self.ui.update_and_restart_Button.clicked.connect(self.update_and_restart)
-        self.ui.label_last_check_2.setText(self.last_update)
+        self.ui.label_last_check_2.setText(str(self.ol35_last_state[0]))
 
     def dev_mode(self):
         self.ui.update_and_restart_Button.setEnabled(False)
@@ -534,7 +542,10 @@ class UpdaterWindow(QMainWindow, Ui_Updater_Window):
             self.ui.update_and_restart_Button.setEnabled(True)
 
         self.ppu_o35.record_update_check()
-        self.ui.label_last_check_2.setText(self.ppu_o35.last_update_date_string())
+        self.ppu_ol35.record_update_check()
+        last_date = self.ppu_ol35.get_last_state()
+        self.ui.label_last_check_2.setText(last_date[0])
+        self.ui.label_latest_version.setText("Online version")
         self.ui.check_for_update_Button.setEnabled(True)
 
     def update_and_restart(self):
diff --git a/src/OptimaLab35/ui/updater_window.py b/src/OptimaLab35/ui/updater_window.py
index 13a2eb4..8ea230e 100644
--- a/src/OptimaLab35/ui/updater_window.py
+++ b/src/OptimaLab35/ui/updater_window.py
@@ -66,11 +66,11 @@ class Ui_Updater_Window(object):
 
         self.gridLayout.addWidget(self.label_optima35_latestversion, 3, 2, 1, 1)
 
-        self.label_3 = QLabel(self.widget_2)
-        self.label_3.setObjectName(u"label_3")
-        self.label_3.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter)
+        self.label_latest_version = QLabel(self.widget_2)
+        self.label_latest_version.setObjectName(u"label_latest_version")
+        self.label_latest_version.setAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter)
 
-        self.gridLayout.addWidget(self.label_3, 0, 2, 1, 1)
+        self.gridLayout.addWidget(self.label_latest_version, 0, 2, 1, 1)
 
         self.label = QLabel(self.widget_2)
         self.label.setObjectName(u"label")
@@ -135,7 +135,7 @@ class Ui_Updater_Window(object):
         self.label_optimalab35_latestversion.setText(QCoreApplication.translate("Updater_Window", u"unknown", None))
         self.label_2.setText(QCoreApplication.translate("Updater_Window", u"optima35", None))
         self.label_optima35_latestversion.setText(QCoreApplication.translate("Updater_Window", u"unknown", None))
-        self.label_3.setText(QCoreApplication.translate("Updater_Window", u"Latest version", None))
+        self.label_latest_version.setText(QCoreApplication.translate("Updater_Window", u"Latest version", None))
         self.label.setText(QCoreApplication.translate("Updater_Window", u"OptimaLab35", None))
         self.label_9.setText(QCoreApplication.translate("Updater_Window", u"Package", None))
         self.label_optimalab35_localversion.setText(QCoreApplication.translate("Updater_Window", u"0.0.0", None))
diff --git a/src/OptimaLab35/ui/updater_window.ui b/src/OptimaLab35/ui/updater_window.ui
index 0e74e74..4d8210d 100644
--- a/src/OptimaLab35/ui/updater_window.ui
+++ b/src/OptimaLab35/ui/updater_window.ui
@@ -76,7 +76,7 @@
         </widget>
        </item>
        <item row="0" column="2">
-        <widget class="QLabel" name="label_3">
+        <widget class="QLabel" name="label_latest_version">
          <property name="text">
           <string>Latest version</string>
          </property>