Skip to content
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.

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

Bold the verse of the day in reader view #19

Merged
merged 5 commits into from
Jul 5, 2024
Merged
Changes from 3 commits
Commits
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
40 changes: 30 additions & 10 deletions src/biblenotify/core/notifications.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import json
import random
import re

from PySide6.QtCore import QDateTime, QFile, QObject, QTextStream, QTime, Slot

Expand All @@ -8,6 +9,7 @@ class Notifications(QObject):
notificationsEnabled = False
notificationSentLock = False
notificationTime = QDateTime()
currentVerse = ''
tj330 marked this conversation as resolved.
Show resolved Hide resolved

@Slot(result=bool)
def getNotificationsEnabled(self) -> bool:
Expand Down Expand Up @@ -72,17 +74,17 @@ def loadVerses(self) -> dict:
}

contents = QTextStream(file)
verses_string = contents.readAll()
versesString = contents.readAll()

verses = json.loads(verses_string)
verses = json.loads(versesString)
# Choose a random verse
verse = verses["all"][random.randint(0, len(verses["all"]))]
self.currentVerse = verses["all"][random.randint(0, len(verses["all"]))]

# TODO: Need to decide on the key names
return {
"text": verse["verse"],
"place": verse["place"],
"location": verse["data"]
"text": self.currentVerse["verse"],
"place": self.currentVerse["place"],
"location": self.currentVerse["data"]
}

@Slot(str, result="QVariant")
Expand All @@ -92,11 +94,29 @@ def loadChapter(self, location: str) -> dict:
return ["", ""]

contents = QTextStream(file)
contents_string = contents.readAll()
contentsString = contents.readAll()

contents_json = json.loads(contents_string)
verse = self.currentVerse["verse"]
contentsJson = json.loads(contentsString)

chapter = contentsJson
chapterPlace = chapter["read"][0]["chapter"]

highlightedChapter = self.highlightVerse(verse, chapter)

return {
"text": contents_json["read"][0]["text"],
"place": contents_json["read"][0]["chapter"]
"text": highlightedChapter,
"place": chapterPlace
}

def highlightVerse(self, verse, chapter):
tj330 marked this conversation as resolved.
Show resolved Hide resolved
chapterText = chapter["read"][0]["text"]

verseMatch = re.search(verse, chapterText)
tj330 marked this conversation as resolved.
Show resolved Hide resolved
slice = verseMatch.span()
tj330 marked this conversation as resolved.
Show resolved Hide resolved

toHighlight = chapterText[slice[0] : slice[1]]

highlightChapter = chapterText.replace(toHighlight, "<b>" + toHighlight + "</b>")
tj330 marked this conversation as resolved.
Show resolved Hide resolved

return highlightChapter
tj330 marked this conversation as resolved.
Show resolved Hide resolved