From ca4ac4160c3fb3293b53700dc9fd1a516cfeb0a0 Mon Sep 17 00:00:00 2001
From: "Mr.Servo" <mrservo@gmx.de>
Date: Sat, 14 Mar 2026 15:27:49 +0100
Subject: [PATCH 1/2] [OpenATVreader] v2.3 bugfixes

- bugfix: determining the current page and the maximum number of pages
- bugfix: now displays the 'userranking' icon even after a second call
---
 src/forumparser.py | 16 ++++++++--------
 src/plugin.py      |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/forumparser.py b/src/forumparser.py
index 17ec7f7..7d6e2aa 100644
--- a/src/forumparser.py
+++ b/src/forumparser.py
@@ -79,7 +79,7 @@ def setPostKey(key, value, replacements=[]):
 			url = topicTitle.get("href", "")
 			setPostKey("threadId", url[url.find("?t=") + 3:url.rfind("&sid=")])
 			respShow = post.find("div", class_="responsive-show")
-			userName = respShow.get_text(strip=True)[19:]  # "Letzter Beitrag von  Testomat  « 23 Okt 2025 16:26"
+			userName = respShow.get_text(strip=True)[19:]  # "Letzter Beitrag von Testomat  « 23 Okt 2025 16:26"
 			userName = userName[:userName.find("«")]
 			setPostKey("userName", userName)
 			setPostKey("latestLine", respShow, replacements=(["\t", "\n"]))
@@ -120,12 +120,12 @@ def convert2int(valueStr, fallbackInt=0):
 		foundpos = titleLine.rfind("Seite")
 		threadTitle = titleLine[:foundpos - 3] if foundpos != -1 else titleLine
 		threadId = xml.find("input", {"name": "t", "type": "hidden"}).get("value")
-		button = xml.find("a", {"class": "button button-icon-only dropdown-trigger"})
-		if button:
-			pages = button.get_text().strip("Seite ").split(" von ")
-			currPage, maxPages = (convert2int(pages[0], 1), convert2int(pages[1], 1)) if pages and len(pages) > 1 else (1, 1)
-		else:
-			currPage, maxPages = 1, 1
+		pagination = xml.find("div", {"class": "pagination"})  # <div class="pagination">   21 Beiträge   <ul>
+		pagination = pagination.get_text().strip().split(" ")[0] if pagination else "1"
+		maxPages = ((int(pagination) - 1) // 20) + 1 if pagination.isdigit() else 1
+		active = xml.find("li", {"class": "active"})  # <li class="active"><span>11</span></li>
+		active = active.get_text() if active else "1"
+		currPage = int(active) if active.isdigit() else 1
 		threadList, threadUser = [], []
 		for post in xml.find_all("div", {"class": compile("post has-profile bg(.*?)")}):
 			threadDict = {}
@@ -168,7 +168,7 @@ def setPostKey(key, value, replacements=[]):
 					for replacement in replacements:
 						text = text.replace(replacement, "")
 					postDict[key] = text
-
+		postDict = {}
 		if postId:
 			url = f"{atvpglobals.BASEURL}/viewtopic.php?p={postId}#p{postId}"
 		else:
diff --git a/src/plugin.py b/src/plugin.py
index f757a33..9a40a0e 100644
--- a/src/plugin.py
+++ b/src/plugin.py
@@ -93,7 +93,7 @@ def downloadAvatar(self, url, filePath):  # file extensions in url could be wron
 			print(f"[{self.MODULE_NAME}] ERROR in module 'downloadAvatar': {errMsg}!")
 			self.session.open(MessageBox, errMsg, MessageBox.TYPE_INFO, timeout=30, close_on_any_key=True)
 		fileParts = filePath.split(".")
-		if SUPPALLIMGS:  # use function 'detectImageType' in OpenATV 7.6.0 or newer
+		if SUPPALLIMGS:  # use new function 'detectImageType' in OpenATV 7.6.0 or newer
 			extension = {0: "png", 1: "jpg", 3: "gif", 4: "svg", 5: "webp"}.get(detectImageType(filePath), fileParts[1])
 		else:  # use DEPRECATED function 'what' in OpenATV 7.5.1 or OpenATV 7.5.1 or older
 			extension = what(filePath).replace("jpeg", "jpg")
@@ -424,6 +424,7 @@ def handleIcon(self, widget, iconUrl, callback=None):
 				filePath = join(self.AVATARPATH, fileName) if fileName else join(self.AVATARPATH, "unknown.png")
 			if filePath and exists(filePath):
 				iconPix = LoadPixmap(cached=True, path=filePath)
+				self.showPic(widget, filePath)
 			elif callback:
 					callInThread(callback, widget, iconUrl, filePath)
 		return iconPix

From f3b4f1bffa21444dd48ec9af95c8f575d4b0b175 Mon Sep 17 00:00:00 2001
From: "Mr.Servo" <mrservo@gmx.de>
Date: Sat, 14 Mar 2026 15:28:56 +0100
Subject: [PATCH 2/2] [OpenATVreader] v2.3 bugfixes

- bugfix: determining the current page and the maximum number of pages
- bugfix: now displays the 'userranking' icon even after a second call
---
 src/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/__init__.py b/src/__init__.py
index aac4a41..6a24f29 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -1,2 +1,2 @@
 
-__version__ = "2.2"
+__version__ = "2.3"