From 6c94e7237d37a55669b42f507cfeb521c9ec2716 Mon Sep 17 00:00:00 2001
From: Florian Bach <Leseratte10@vodafone.de>
Date: Sat, 8 Oct 2022 18:03:45 +0200
Subject: [PATCH] Fix for loan list issue mentioned in #31

---
 calibre-plugin/config.py   | 27 ++++++++++++++++++---------
 calibre-plugin/gui_main.py |  4 +++-
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/calibre-plugin/config.py b/calibre-plugin/config.py
index e97010c..84becf9 100644
--- a/calibre-plugin/config.py
+++ b/calibre-plugin/config.py
@@ -1280,16 +1280,20 @@ class ConfigWidget(QWidget):
 
 
     def show_rented_books(self):
-        self.delete_overdue_books_from_loan_list()
-
         d = RentedBooksDialog(self)
         d.exec_()
 
 
-    def delete_overdue_books_from_loan_list(self): 
+class RentedBooksDialog(QDialog):
+
+    @staticmethod
+    def remove_overdue_books_from_list():
+        # Delete rented books that are overdue: 
         overdue_books = []
 
-        for book in self.deacsmprefs["list_of_rented_books"]:
+        deacsmprefs = prefs.ACSMInput_Prefs()
+
+        for book in deacsmprefs["list_of_rented_books"]:
             try: 
                 book_time_stamp = book["validUntil"]
                 timestamp = datetime.datetime.strptime(book_time_stamp, "%Y-%m-%dT%H:%M:%SZ")
@@ -1303,24 +1307,29 @@ class ConfigWidget(QWidget):
                 overdue_books.append(book)
                 continue
 
-        templist = self.deacsmprefs["list_of_rented_books"]
+        templist = deacsmprefs["list_of_rented_books"]
 
         for book in overdue_books:
             templist.remove(book)
 
-        self.deacsmprefs.set("list_of_rented_books", templist)
-        self.deacsmprefs.writeprefs()
+        deacsmprefs.set("list_of_rented_books", templist)
+        deacsmprefs.writeprefs()
+
+
 
 
-class RentedBooksDialog(QDialog):
     def __init__(self, parent):
         QDialog.__init__(self,parent)
         self.parent = parent
 
-        self.setWindowTitle("ACSM Input: Manage loaned Books")
+        
 
+        self.setWindowTitle("ACSM Input: Manage loaned Books")
         self.deacsmprefs = prefs.ACSMInput_Prefs()
 
+        # Delete rented books that are overdue: 
+        RentedBooksDialog.remove_overdue_books_from_list()
+
         # Start Qt Gui dialog layout
         layout = QVBoxLayout(self)
         self.setLayout(layout)
diff --git a/calibre-plugin/gui_main.py b/calibre-plugin/gui_main.py
index 7bfa5ea..998847d 100644
--- a/calibre-plugin/gui_main.py
+++ b/calibre-plugin/gui_main.py
@@ -84,10 +84,12 @@ class ActualACSMInputGUIExtension(InterfaceAction):
         from calibre.gui2 import info_dialog
         deacsmprefs = prefs.ACSMInput_Prefs()
 
+        from calibre_plugins.deacsm.config import RentedBooksDialog # type: ignore
+        RentedBooksDialog.remove_overdue_books_from_list()
+
         if (len(deacsmprefs["list_of_rented_books"]) == 0):
             return info_dialog(None, "No loaned books", "You currently have no loaned books.", show=True, show_copy_button=False)
 
-        from calibre_plugins.deacsm.config import RentedBooksDialog # type: ignore
         d = RentedBooksDialog(self.gui)
         d.exec_()