Merge branch 'upgrade_to_python3.13' into albayan_beta

Author: MahmoudAtef999

albayan_env.cmd

@@ -7,7 +7,7 @@ cd /d "%~dp0"
 set /p create_activate=Do you want to Create or Activate the environment? (C/A):
 
 if /i !create_activate! equ C (
-    start /wait py -3.12 -m venv albayan_env
+    start /wait py -3.13 -m venv albayan_env
           start cmd.exe /k "call albayan_env\Scripts\activate.bat && cd /d ""%~dp0"" && pip install -r requirements.txt"
 ) else if /i !create_activate! equ A (
     start cmd.exe /k "call albayan_env\Scripts\activate.bat"

build.bat

@@ -4,7 +4,7 @@ set VENV_DIR=albayan_env
 
 if not exist %VENV_DIR% (
     echo Creating virtual environment...
-    py -3.12 -m venv %VENV_DIR%
+    py -3.13 -m venv %VENV_DIR%
 )
 
 call %VENV_DIR%\Scripts\activate

core_functions/quran_class.py

@@ -22,7 +22,7 @@
 import sqlite3
 from typing import List, Dict, Union
 from core_functions.ayah_data import AyahData
-from utils.settings import SettingsManager
+from utils.settings import Config
 from utils.const import data_folder
 from exceptions.database import DBNotFoundError
 
@@ -298,7 +298,7 @@ def get_text(self):
             last_position = current_position - 1
             ayah_data.insert(ayah[1], ayah[3], ayah[4], first_position, last_position)
 
-        text = text + "|" if SettingsManager.current_settings["reading"]["auto_page_turn"] else text.strip()
+        text = text + "|" if Config.reading.auto_page_turn else text.strip()
         self.text = text
         self.ayah_data = ayah_data
 

main.py

@@ -10,11 +10,14 @@
 from ui.quran_interface import QuranInterface
 from core_functions.athkar.athkar_scheduler import AthkarScheduler
 from utils.update import UpdateManager
-from utils.settings import SettingsManager
+from utils.settings import Config
 from utils.const import program_name, program_icon, user_db_path
 from utils.logger import Logger
 from utils.audio_player import StartupSoundEffectPlayer, VolumeController
 
+Logger.initialize_logger()
+Config.load_settings()
+
 class SingleInstanceApplication(QApplication):
     def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
@@ -70,9 +73,6 @@ def eventFilter(self, obj, event):
 
         return super().eventFilter(obj, event)
 
-
-
-    
     def setup_local_server(self) -> None:
         if not self.local_server.listen(self.server_name):
             Logger.error(f"Failed to start local server: {self.local_server.errorString()}")
@@ -111,7 +111,7 @@ def call_after_starting(parent: QuranInterface) -> None:
     basmala = StartupSoundEffectPlayer("Audio/basmala")
     basmala.play()
 
-    check_update_enabled = SettingsManager.current_settings["general"].get("check_update_enabled", False)
+    check_update_enabled = getattr(Config.general, "check_update_enabled", False)
     update_manager = UpdateManager(parent, check_update_enabled)
     update_manager.check_auto_update()
 
@@ -130,7 +130,6 @@ def main():
         call_after_starting(main_window)
         sys.exit(app.exec())
     except Exception as e:
-        print(e)
         Logger.error(str(e))
         msg_box = QMessageBox(None)
         msg_box.setIcon(QMessageBox.Icon.Critical)

ui/dialogs/find.py

@@ -18,7 +18,7 @@
 from PyQt6.QtCore import Qt, QRegularExpression
 from PyQt6.QtGui import QKeyEvent, QKeySequence,  QRegularExpressionValidator, QShortcut
 from core_functions.search import SearchCriteria, QuranSearchManager
-from utils.settings import SettingsManager
+from utils.settings import Config
 from utils.universal_speech import UniversalSpeech
 from utils.const import Globals
 
@@ -39,7 +39,7 @@ def __init__(self, parent, title):
         self.resize(500, 400)
         self.search_manager = QuranSearchManager()
         self.criteria = None
-        self.current_settings = SettingsManager.current_settings
+
         self.initUI()
 
     def initUI(self):
@@ -77,11 +77,11 @@ def initUI(self):
         self.search_to_combobox = QComboBox()
         self.search_to_combobox.setAccessibleName(self.search_to_label.text())
         self.ignore_diacritics_checkbox = QCheckBox('تجاهل التشكيل')
-        self.ignore_diacritics_checkbox.setChecked(self.current_settings["search"]["ignore_tashkeel"])
+        self.ignore_diacritics_checkbox.setChecked(Config.search.ignore_tashkeel)
         self.ignore_hamza_checkbox = QCheckBox('تجاهل الهمزات')
-        self.ignore_hamza_checkbox.setChecked(self.current_settings["search"]["ignore_hamza"])
+        self.ignore_hamza_checkbox.setChecked(Config.search.ignore_hamza)
         self.match_whole_word_checkbox = QCheckBox('تطابق الكلمة بأكملها')
-        self.match_whole_word_checkbox.setChecked(self.current_settings["search"]["match_whole_word"])
+        self.match_whole_word_checkbox.setChecked(Config.search.match_whole_word)
 
         self.search_type_layout = QVBoxLayout()
         self.search_type_layout.addWidget(self.search_type_radio_page)
@@ -134,7 +134,6 @@ def initUI(self):
         close_shortcut = QShortcut(QKeySequence("Ctrl+F4"), self)
         close_shortcut.activated.connect(self.reject)
 
-
         self.on_radio_toggled()
         self.OnEdit()
 
@@ -272,7 +271,6 @@ def keyPressEvent(self, event: QKeyEvent | None) -> None:
 
         return super().keyPressEvent(event)
 
-
     def reject(self):
         self.deleteLater()
 

ui/dialogs/settings_dialog.py

@@ -22,7 +22,8 @@
 from PyQt6.QtCore import Qt
 from core_functions.Reciters import AyahReciter
 from utils.const import data_folder, program_english_name
-from utils.settings import SettingsManager
+from utils.settings import Config
+
 from utils.audio_player import bass_initializer, AthkarPlayer, AyahPlayer, SurahPlayer, SoundEffectPlayer
 from utils.Startup import StartupManager
 import qtawesome as qta
@@ -39,6 +40,7 @@ def __init__(self, parent):
         self.set_current_settings()
 
 
+
     def init_ui(self):
         main_layout = QVBoxLayout()
         taps_layout = QHBoxLayout()
@@ -60,7 +62,6 @@ def init_ui(self):
         listening_item.setIcon(0, qta.icon("fa.headphones"))
 
 
-
         reading_item = QTreeWidgetItem(["القراءة"])
         reading_item.setIcon(0, qta.icon("fa.book"))
 
@@ -318,62 +319,49 @@ def save_settings(self):
         AthkarPlayer.apply_new_sound_card(self.athkar_device_combo.currentData())
         SoundEffectPlayer.apply_new_sound_card(self.volume_device_combo.currentData())
 
-        if SettingsManager.current_settings["general"]["auto_start_enabled"] != self.start_on_system_start_checkbox.isChecked():
+        if Config.general.auto_start_enabled != self.start_on_system_start_checkbox.isChecked():
             if self.start_on_system_start_checkbox.isChecked():
                 StartupManager.add_to_startup(program_english_name)
             else:
                 StartupManager.remove_from_startup(program_english_name)
 
-        if SettingsManager.current_settings["reading"]["font_type"] != self.font_type_combo.currentData():
+        if Config.reading.font_type != self.font_type_combo.currentData():
             self.parent.quran_view.setText(self.parent.quran.reload_quran(self.font_type_combo.currentData()))
 
-        general_settings = {
-            "run_in_background_enabled": self.run_in_background_checkbox.isChecked(),
-            "auto_start_enabled": self.start_on_system_start_checkbox.isChecked(),
-            "auto_save_position_enabled": self.auto_save_position_checkbox.isChecked(),
-            "check_update_enabled": self.update_checkbox.isChecked(),
-            "logging_enabled": self.log_checkbox.isChecked()
-        }
-
-        audio_settings = {
-            "sound_effect_enabled": self.sound_checkbox.isChecked(),
-            "start_with_basmala_enabled": self.basmala_checkbox.isChecked(),
-            "speak_actions_enabled": self.speech_checkbox.isChecked(),
-            "volume_level": self.volume.value(),
-            "volume_device": self.volume_device_combo.currentData(),
-            "ayah_volume_level": self.ayah_volume.value(),
-            "ayah_device": self.ayah_device_combo.currentData(),
-            "surah_volume_level": self.surah_volume.value(),
-            "surah_device": self.surah_device_combo.currentData(),
-            "athkar_volume_level": self.athkar_volume.value(),
-            "athkar_device": self.athkar_device_combo.currentData()
-        }
-
-        listening_settings = {
-            "reciter": self.reciters_combo.currentData(),
-            "action_after_listening": self.action_combo.currentData(),
-            "forward_time": self.duration_spinbox.value(),
-            "auto_move_focus": self.auto_move_focus_checkbox.isChecked()
-        }
-
-        reading_settings = {
-            "font_type": self.font_type_combo.currentData(),
-            "auto_page_turn": self.turn_pages_checkbox.isChecked()
-        }
-
-        search_settings = {
-            "ignore_tashkeel": self.ignore_tashkeel_checkbox.isChecked(),
-            "ignore_hamza": self.ignore_hamza_checkbox.isChecked(),
-            "match_whole_word": self.match_whole_word_checkbox.isChecked()
-        }
-
-        SettingsManager.write_settings({
-            "general": general_settings,
-            "audio": audio_settings,
-            "listening": listening_settings,
-            "reading": reading_settings,
-            "search": search_settings
-        })
+        # Update settings in Config
+        Config.general.run_in_background_enabled = self.run_in_background_checkbox.isChecked()
+        Config.general.auto_start_enabled = self.start_on_system_start_checkbox.isChecked()
+        Config.general.auto_save_position_enabled = self.auto_save_position_checkbox.isChecked()
+        Config.general.check_update_enabled = self.update_checkbox.isChecked()
+        Config.general.logging_enabled = self.log_checkbox.isChecked()
+
+        Config.audio.sound_effect_enabled = self.sound_checkbox.isChecked()
+        Config.audio.start_with_basmala_enabled = self.basmala_checkbox.isChecked()
+        Config.audio.speak_actions_enabled = self.speech_checkbox.isChecked()
+        Config.audio.volume_level = self.volume.value()
+        Config.audio.volume_device = self.volume_device_combo.currentData()
+        Config.audio.ayah_volume_level = self.ayah_volume.value()
+        Config.audio.ayah_device = self.ayah_device_combo.currentData()
+        Config.audio.surah_volume_level = self.surah_volume.value()
+        Config.audio.surah_device = self.surah_device_combo.currentData()
+        Config.audio.athkar_volume_level = self.athkar_volume.value()
+        Config.audio.athkar_device = self.athkar_device_combo.currentData()
+
+        Config.listening.reciter = self.reciters_combo.currentData()
+        Config.listening.action_after_listening = self.action_combo.currentData()
+        Config.listening.forward_time = self.duration_spinbox.value()
+        Config.listening.auto_move_focus = self.auto_move_focus_checkbox.isChecked()
+
+        Config.reading.font_type = self.font_type_combo.currentData()
+        Config.reading.auto_page_turn = self.turn_pages_checkbox.isChecked()
+
+        Config.search.ignore_tashkeel = self.ignore_tashkeel_checkbox.isChecked()
+        Config.search.ignore_hamza = self.ignore_hamza_checkbox.isChecked()
+        Config.search.match_whole_word = self.match_whole_word_checkbox.isChecked()
+
+        # Save settings to file
+        Config.save_settings()
+
         self.accept()
         self.deleteLater()
 
@@ -387,46 +375,45 @@ def OnReset(self):
         msg_box.exec()
 
         if msg_box.clickedButton() == yes_button:
-            SettingsManager.reset_settings()
+            Config.reset_settings()
             self.set_current_settings()
 
     def set_current_settings(self):
-        current_settings = SettingsManager.current_settings    
-        self.sound_checkbox.setChecked(current_settings["audio"]["sound_effect_enabled"])
-        self.basmala_checkbox.setChecked(current_settings["audio"]["start_with_basmala_enabled"])
-        self.speech_checkbox.setChecked(current_settings["audio"]["speak_actions_enabled"])
-        self.volume.setValue(current_settings["audio"]["volume_level"])
-        self.athkar_volume.setValue(current_settings["audio"]["athkar_volume_level"])
-        self.ayah_device_combo.setCurrentIndex(current_settings["audio"]["ayah_device"])
-        self.surah_device_combo.setCurrentIndex(current_settings["audio"]["surah_device"])
-        self.volume_device_combo.setCurrentIndex(current_settings["audio"]["volume_device"])
-        self.athkar_device_combo.setCurrentIndex(current_settings["audio"]["athkar_device"])
-        self.ayah_volume.setValue(current_settings["audio"]["ayah_volume_level"])
-        self.surah_volume.setValue(current_settings["audio"]["surah_volume_level"])
-        self.run_in_background_checkbox.setChecked(current_settings["general"]["run_in_background_enabled"])
-        self.turn_pages_checkbox.setChecked(current_settings["reading"]["auto_page_turn"])
-        self.start_on_system_start_checkbox.setChecked(current_settings["general"]["auto_start_enabled"])
-        self.auto_save_position_checkbox.setChecked(current_settings["general"]["auto_save_position_enabled"])
-        self.update_checkbox.setChecked(current_settings["general"]["check_update_enabled"])
-        self.duration_spinbox.setValue(current_settings["listening"]["forward_time"])
-        self.auto_move_focus_checkbox.setChecked(current_settings["listening"]["auto_move_focus"])
-        self.log_checkbox.setChecked(current_settings["general"]["logging_enabled"])
-        self.ignore_tashkeel_checkbox.setChecked(current_settings["search"]["ignore_tashkeel"])
-        self.ignore_hamza_checkbox.setChecked(current_settings["search"]["ignore_hamza"])
-        self.match_whole_word_checkbox.setChecked(current_settings["search"]["match_whole_word"])
+        self.sound_checkbox.setChecked(Config.audio.sound_effect_enabled)
+        self.basmala_checkbox.setChecked(Config.audio.start_with_basmala_enabled)
+        self.speech_checkbox.setChecked(Config.audio.speak_actions_enabled)
+        self.volume.setValue(Config.audio.volume_level)
+        self.athkar_volume.setValue(Config.audio.athkar_volume_level)
+        self.ayah_device_combo.setCurrentIndex(Config.audio.ayah_device)
+        self.surah_device_combo.setCurrentIndex(Config.audio.surah_device)
+        self.volume_device_combo.setCurrentIndex(Config.audio.volume_device)
+        self.athkar_device_combo.setCurrentIndex(Config.audio.athkar_device)
+        self.ayah_volume.setValue(Config.audio.ayah_volume_level)
+        self.surah_volume.setValue(Config.audio.surah_volume_level)
+        self.run_in_background_checkbox.setChecked(Config.general.run_in_background_enabled)
+        self.turn_pages_checkbox.setChecked(Config.reading.auto_page_turn)
+        self.start_on_system_start_checkbox.setChecked(Config.general.auto_start_enabled)
+        self.auto_save_position_checkbox.setChecked(Config.general.auto_save_position_enabled)
+        self.update_checkbox.setChecked(Config.general.check_update_enabled)
+        self.duration_spinbox.setValue(Config.listening.forward_time)
+        self.auto_move_focus_checkbox.setChecked(Config.listening.auto_move_focus)
+        self.log_checkbox.setChecked(Config.general.logging_enabled)
+        self.ignore_tashkeel_checkbox.setChecked(Config.search.ignore_tashkeel)
+        self.ignore_hamza_checkbox.setChecked(Config.search.ignore_hamza)
+        self.match_whole_word_checkbox.setChecked(Config.search.match_whole_word)
         # Update the reciter ComboBox
-        reciter_id = current_settings["listening"]["reciter"]
+        reciter_id = Config.listening.reciter
         for index in range(self.reciters_combo.count()):
             if self.reciters_combo.itemData(index) == reciter_id:
                 self.reciters_combo.setCurrentIndex(index)
                 break
 
-        stored_id = current_settings["listening"]["action_after_listening"]
+        stored_id = Config.listening.action_after_listening
         index = self.action_combo.findData(stored_id)
         if index != -1:
             self.action_combo.setCurrentIndex(index)
 
-        stored_id = current_settings["reading"]["font_type"]
+        stored_id = Config.reading.font_type
         index = self.font_type_combo.findData(stored_id)
         if index != -1:
             self.font_type_combo.setCurrentIndex(index)

ui/quran_interface.py

@@ -35,7 +35,7 @@
 from ui.sura_player_ui.sura_player_ui import SuraPlayerWindow
 from ui.widgets.system_tray import SystemTrayManager
 from ui.widgets.toolbar import AudioToolBar
-from utils.settings import SettingsManager
+from utils.settings import Config
 from utils.universal_speech import UniversalSpeech
 from utils.user_data import UserDataManager
 from utils.const import program_name, program_icon, user_db_path, data_folder, Globals
@@ -51,7 +51,7 @@ def __init__(self, title):
         self.center_window()
         self.setWindowIcon(QIcon("Albayan.ico"))
         self.quran = quran_mgr()
-        self.quran.load_quran(SettingsManager.current_settings["reading"]["font_type"])
+        self.quran.load_quran(Config.reading.font_type)
         self.user_data_manager = UserDataManager(user_db_path)
         self.sura_player_window = None
         Globals.effects_manager = SoundEffectPlayer("Audio/sounds")
@@ -202,7 +202,7 @@ def OnBack(self, is_auto_call: bool = False):
         Globals.effects_manager.play("previous")
         if self.quran.current_pos == 1:            
             self.quran_view.setFocus()
-        if SettingsManager.current_settings["reading"]["auto_page_turn"] and is_auto_call:
+        if Config.reading.auto_page_turn and is_auto_call:
             self.set_focus_to_ayah(-1)
 
     def set_text_ctrl_label(self):
@@ -517,7 +517,7 @@ def OnChangeNavigationMode(self, mode):
         Globals.effects_manager.play("change")
 
     def closeEvent(self, event):
-        if SettingsManager.current_settings["general"]["run_in_background_enabled"]:
+        if Config.general.run_in_background_enabled:
             event.ignore()
             self.hide()
             icon_path = "Albayan.ico"

ui/sura_player_ui/sura_player_ui.py

@@ -17,7 +17,8 @@
 from utils.audio_player import SurahPlayer
 from utils.universal_speech import UniversalSpeech
 from utils.user_data import PreferencesManager
-from utils.settings import SettingsManager
+from utils.settings import Config
+
 from.menubar import MenuBar
 from .key_handler import KeyHandler
 from .audio_looper import AudioLooper
@@ -339,13 +340,16 @@ def previous_reciter(self):
     def increase_volume(self):
         self.player.increase_volume()
         volume = int(self.player.volume * 100)
-        SettingsManager.write_settings({"audio": {"surah_volume_level": volume}})
+        Config.audio.surah_volume_level = volume
+        Config.save_settings()
+ 
 
     def decrease_volume(self):
         self.player.decrease_volume()
         volume = int(self.player.volume * 100)
-        SettingsManager.write_settings({"audio": {"surah_volume_level": volume}})
-
+        Config.audio.surah_volume_level = volume
+        Config.save_settings()
+ 
     def update_volume(self):
         self.player.set_volume(self.volume_slider.value())