Skip to content

Commit 51bc815

Browse files
Change the ayah focus while listening.
1 parent e64618a commit 51bc815

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

core_functions/ayah_data.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,16 @@ def get_position(self, ayah_number: int) -> int:
6060
else:
6161
return 0
6262

63+
def get_ayah_number(self, ayah_number_in_surah: int, surah_number) -> int:
64+
"""Get ayah number by surah number and ayah number in surah."""
65+
self.cursor.execute("SELECT ayah_number FROM ayah_data WHERE ayah_number_in_surah = ? AND surah_number = ?;", (ayah_number_in_surah, surah_number))
66+
result = self.cursor.fetchone()
67+
68+
if result:
69+
return result["ayah_number"]
70+
else:
71+
return None
72+
6373
def get_ayah_range(self) -> Dict[int, List[sqlite3.Row]]:
6474
"""Fetches the maximum and minimum ayah numbers from the ayah_data table."""
6575
self.cursor.execute("""

ui/widgets/toolbar.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ def get_navigation_status(self, direction: str, ayah_step: int = 1, surah_step:
133133

134134

135135
class AudioToolBar(QToolBar):
136+
# ayahChanged = pyqtSignal(int)
137+
136138
def __init__(self, parent: Optional[object] = None):
137139
super().__init__(parent)
138140
self.parent = parent
@@ -191,9 +193,7 @@ def play_current_ayah(self):
191193
self.navigation.current_ayah = 0
192194
elif self.navigation.current_ayah > 1:
193195
self.navigation.has_basmala = False
194-
print(self.navigation.has_basmala)
195196

196-
#print(self.navigation.has_basmala)
197197
reciter_id = SettingsManager.current_settings["listening"]["reciter"]
198198
url = self.reciters.get_url(reciter_id, self.navigation.current_surah, self.navigation.current_ayah)
199199
self.audio_thread.set_audio_url(url, send_error_signal=False if self.navigation.current_ayah == 0 else True)
@@ -215,8 +215,9 @@ def OnActionAfterListening(self):
215215
action_after_listening = SettingsManager.current_settings["listening"]["action_after_listening"]
216216
if action_after_listening == 2 or self.navigation.current_ayah == 0:
217217
self.navigation.has_basmala = True if self.navigation.current_ayah < 2 else False
218-
219218
self.OnPlayNext()
219+
aya_number = self.parent.quran.ayah_data.get_ayah_number(self.navigation.current_ayah, self.navigation.current_surah)
220+
self.parent.set_focus_to_ayah(aya_number)
220221
elif action_after_listening == 1:
221222
self.play_current_ayah()
222223

0 commit comments

Comments
 (0)