Skip to content

[OpenATVreader] v2.2 tiny bugfix #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MrServo wants to merge 1 commit into from
Closed

[OpenATVreader] v2.2 tiny bugfix #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions src/forumparser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,9 @@
titleLine = xml.title.string.replace(" - openATV Forum", "") # "LCD4linux - Seite 150"
foundpos = titleLine.rfind("Seite")
threadTitle = titleLine[:foundpos - 3] if foundpos != -1 else titleLine
active = xml.find("li", {"class": "active"}) # <li class="active"><span>2</span></li>
if active:
active = active.span.get_text()
currPage = convert2int(active, 1) if active and active.isdigit() else 1
button = xml.find("a", {"class": "button", "role": "button"}).get_text("button") # <a class="button" href="./viewtopic.php?t=69626&amp;start=20" role="button">2</a>
maxPages = convert2int(button, 1) if button and button.isdigit() else currPage
else:
currPage, maxPages = 1, 1
threadId = xml.find("input", {"name": "t", "type": "hidden"}).get("value")

Check warning on line 122 in src/forumparser.py

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Rename this local variable "threadId" to match the regular expression ^[_a-z][a-z0-9_]*$. 


See more on https://sonarcloud.io/project/issues?id=openatv_enigma2-plugin-extensions-openatv-community-reader&issues=AZzSj47zatZvORe7kwDL&open=AZzSj47zatZvORe7kwDL&pullRequest=41
pages = xml.find("a", {"class": "button button-icon-only dropdown-trigger"}).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)

Check warning on line 124 in src/forumparser.py

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Rename this local variable "currPage" to match the regular expression ^[_a-z][a-z0-9_]*$. 


See more on https://sonarcloud.io/project/issues?id=openatv_enigma2-plugin-extensions-openatv-community-reader&issues=AZzSj47zatZvORe7kwDJ&open=AZzSj47zatZvORe7kwDJ&pullRequest=41

Check warning on line 124 in src/forumparser.py

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Rename this local variable "maxPages" to match the regular expression ^[_a-z][a-z0-9_]*$. 


See more on https://sonarcloud.io/project/issues?id=openatv_enigma2-plugin-extensions-openatv-community-reader&issues=AZzSj47zatZvORe7kwDK&open=AZzSj47zatZvORe7kwDK&pullRequest=41
threadList, threadUser = [], []
for post in xml.find_all("div", {"class": compile("post has-profile bg(.*?)")}):
threadDict = {}
Expand All @@ -150,7 +145,11 @@
setThreadKey("postTime", postBody.find("time").get_text())
setThreadKey("shortContent", postBody.find("div", {"class": "content"}).get_text(separator=" ", strip=True)[:300]) # limit content as preview
threadList.append(threadDict)
return errMsg, {"threadTitle": threadTitle, "currPage": currPage, "maxPages": maxPages, "posts": threadList, "user": list(set(threadUser))}
return errMsg, {
"threadTitle": threadTitle, "threadId": threadId,
"currPage": currPage, "maxPages": maxPages,
"posts": threadList, "user": list(set(threadUser))
}

def checkServerStatus(self):
atvpglobals.BASEURL = bytes.fromhex("687474703A2F2F7265616465722E6F70656E612E7476E"[:-1]).decode()
Expand Down