Merge branch 'albayan_beta'

Author: QaisAlrefai

.github/workflows/albayan_beta.yml

@@ -33,18 +33,15 @@ jobs:
       run: |
         python setup.py build
 
-    - name: Rename main.exe to albayan.exe
-      run: |
-        Rename-Item -Path "albayan_build\main.exe" -NewName "albayan.exe"
-
+    
     - name: Download and install Inno Setup
       run: |
         Invoke-WebRequest -Uri https://jrsoftware.org/download.php/is.exe -OutFile is.exe
         Start-Process -Wait -FilePath .\is.exe -ArgumentList '/VERYSILENT', '/SUPPRESSMSGBOXES', '/NORESTART', '/SP'
 
     - name: Download Arabic and Vietnamese language files
       run: |
-        Invoke-WebRequest -Uri https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Arabic.isl -OutFile "C:\Program Files (x86)\Inno Setup 6\Languages\Arabic.isl"
+        Invoke-WebRequest -Uri https://raw.githubusercontent.com/jrsoftware/issrc/refs/heads/main/Files/Languages/Arabic.isl -OutFile "C:\Program Files (x86)\Inno Setup 6\Languages\Arabic.isl"
         Invoke-WebRequest -Uri https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Vietnamese.isl -OutFile "C:\Program Files (x86)\Inno Setup 6\Languages\Vietnamese.isl"
 
     - name: Package with Inno Setup

Albayan.ico

@@ -1,6 +1,6 @@
 #define MyAppName "Albayan"
-#define MyAppVersion "2.0.0"
-#define AppVersion "2.0.0"
+#define MyAppVersion "3.0.0"
+#define AppVersion "3.0.0"
 #define MyAppPublisher "Tecwindow"
 #define MyAppURL "https://tecwindow.net/"
 #define MyAppExeName "Albayan.exe"
@@ -22,6 +22,7 @@ AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
 ArchitecturesAllowed=x64
+SetupIconFile=Albayan.ico
 
 DefaultDirName={sd}\program files\tecwindow\{#MyAppName}
 DisableProgramGroupPage=yes
@@ -47,53 +48,57 @@ Name: "arabic"; MessagesFile: "compiler:Languages\Arabic.isl"
 arabic.AppLNGfile=Arabic
 english.DeleteSettingsPrompt=Do you want to delete the settings folder?
 arabic.DeleteSettingsPrompt=هل تريد حذف مجلد الإعدادات؟
+english.autorun=auto start albayan with windows?
+arabic.autorun=فتح برنامج البيان تلقائيا مع بدء تشغيل النظام
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
+Name: "autorun"; Description: "{cm:autorun}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
 Source: "albayan_build\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
 Source: "albayan_build\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "albayan_build\Audio\athkar\*"; DestDir: "{userappdata}\tecwindow\albayan\Audio\athkar"; Flags: ignoreversion recursesubdirs createallsubdirs
 
 [Icons]
-Name: "{autoprograms}\Albayan"; Filename: "{app}\{#MyAppExeName}"
-Name: "{autodesktop}\Albayan"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+Name: "{autoprograms}\Albayan"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{app}\Albayan.ico"
+Name: "{autodesktop}\Albayan"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{app}\Albayan.ico"; Tasks: desktopicon
 
 [INI]
-Filename: "{userappdata}\tecwindow\{#MyAppName}\Settingss.ini"; Section: "general"; Key: "language"; String: "{cm:AppLNGfile}"
+Filename: "{userappdata}\tecwindow\{#MyAppName}\config.ini"; Section: "general"; Key: "run_in_background_enabled"; String: "true"; Tasks: autorun
+Filename: "{userappdata}\tecwindow\{#MyAppName}\config.ini"; Section: "general"; Key: "auto_start_enabled"; String: "true"; Tasks: autorun
+
+[Registry]
+Root: HKCU; Subkey: "Software\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "albayan"; ValueData: "{app}\albayan.exe --minimized"; Flags: uninsdeletevalue; Tasks: autorun
+
+[UninstallRun]
+Filename: "taskkill"; Parameters: "/F /IM Albayan.exe"; Flags: runhidden
 
 [UninstallDelete]
 Type: filesandordirs; Name: "{pf}\tecwindow\Albayan"
 
+[InstallDelete]
+Type: filesandordirs; Name: "{app}\*"
+
 [Run]
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall
 
 [Code]
-procedure DeleteOldInstallation();
-begin
-  if DirExists(ExpandConstant('{sd}\program files\tecwindow\{#MyAppName}\Audio\sounds')) then
-  begin
-    DelTree(ExpandConstant('{sd}\program files\tecwindow\{#MyAppName}\Audio\sounds'), True, True, True);
-  end;
-end;
-
 function InitializeSetup(): Boolean;
 begin
-  DeleteOldInstallation();
   Result := True;
 end;
 
-procedure DeleteAthkarFolder();
-begin
-  DelTree(ExpandConstant('{app}\Audio\athkar'), True, True, True);
-end;
 
 procedure CurStepChanged(CurStep: TSetupStep);
 begin
-  if CurStep = ssPostInstall then
+  if CurStep = ssInstall then
   begin
-    DeleteAthkarFolder();
+    if FileExists(ExpandConstant('{userappdata}\tecwindow\{#MyAppName}\Settingss.ini')) then
+begin
+RenameFile(ExpandConstant('{userappdata}\tecwindow\{#MyAppName}\Settingss.ini'), ExpandConstant('{userappdata}\tecwindow\{#MyAppName}\config.ini'));
+end;
+
   end;
 end;
 
@@ -117,3 +122,4 @@ begin
     end;
   end;
 end;
+

Audio/sounds/filter clos.ogg

@@ -10,7 +10,7 @@ if /i !create_activate! equ C (
     start /wait py -3.12 -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 env\Scripts\activate.bat"
+    start cmd.exe /k "call albayan_env\Scripts\activate.bat"
 )
 
 exit

Audio/sounds/filter open.ogg

@@ -1,4 +1,5 @@
 @echo off
+title AlbayanBuild
 set VENV_DIR=albayan_env
 
 if not exist %VENV_DIR% (

albayan.iss

@@ -2,12 +2,14 @@
 import sqlite3
 from typing import List, Dict, Optional
 from functools import lru_cache
+from abc import ABC, abstractmethod
 from exceptions.database import DBNotFoundError
 
 
-class RecitersManager:
-    def __init__(self, db_path: str) -> None:
+class RecitersManager(ABC):
+    def __init__(self, db_path: str, table_name: str) -> None:
         self.db_path = db_path
+        self.table_name = table_name
 
     def _connect(self) -> sqlite3.Connection:
 
@@ -23,29 +25,55 @@ def get_reciters(self) -> List[sqlite3.Row]:
         """Fetches all reciters from the database."""
         with self._connect() as conn:
             cursor = conn.cursor()
-            cursor.execute("""
+            cursor.execute(f"""
                 SELECT *,
                     CASE
                         WHEN bitrate < 64 THEN 'Low'
                         WHEN bitrate BETWEEN 64 AND 128 THEN 'Medium'
                         ELSE 'High'
                     END AS quality
-                FROM reciters
+                FROM {self.table_name}
                 ORDER BY name, bitrate;
             """)
 
             return cursor.fetchall()
 
+    def get_reciter(self, id: int) -> sqlite3.Row:
+        with self._connect() as conn:
+            cursor = conn.cursor()
+            cursor.execute(f"SELECT * FROM {self.table_name} WHERE id = ?;", (id,))
+            return cursor.fetchone()
+
     @lru_cache(maxsize=1)
     def _get_base_url(self, reciter_id: int) -> Optional[str]:
         with self._connect() as conn:
             cursor = conn.cursor()
-            cursor.execute("SELECT url FROM reciters WHERE id = ?", (reciter_id,))
+            cursor.execute(f"SELECT url FROM {self.table_name} WHERE id = ?", (reciter_id,))
             result = cursor.fetchone()
             if result:
                 return result["url"]
         return None
 
+    @abstractmethod
+    def get_url(self, reciter_id: int, surah_number: int) -> Optional[str]:
+        pass
+
+
+class SurahReciter(RecitersManager):
+    def __init__(self, db_path: str, table_name: str ="moshaf"):
+        super().__init__(db_path, table_name)
+
+    def get_url(self, reciter_id: int, surah_number: int) -> Optional[str]:
+        base_url = self._get_base_url(reciter_id)
+        if base_url:
+            return f"{base_url}/{surah_number:03}.mp3"
+        return None
+    
+
+class AyahReciter(RecitersManager):
+    def __init__(self, db_path: str, table_name: str ="reciters"):
+        super().__init__(db_path, table_name)
+
     def get_url(self, reciter_id: int, surah_number: int, aya_number: int) -> Optional[str]:
         base_url = self._get_base_url(reciter_id)
         if base_url:

albayan_env.cmd

@@ -36,7 +36,7 @@ def create_category(self,
                         audio_path: Optional[str] = None,
                         from_time: str = "00:00",
                         to_time: str = "23:00",
-                        play_interval: int =5,
+                        play_interval: int =30,
                         audio_athkar_enabled: int = 0,
                         text_athkar_enabled: int = 0
                         ) -> int:

build.bat

@@ -1,3 +1,5 @@
+from PyQt6.QtGui import QIcon
+from PyQt6.QtWidgets import QSystemTrayIcon
 import os
 import json
 from datetime import datetime, time
@@ -10,7 +12,7 @@
 from .athkar_db_manager import AthkarDBManager
 from .athkar_refresher import AthkarRefresher
 from utils.audio_player import AthkarPlayer
-from utils.const import Globals
+from utils.const import Globals, program_icon
 from utils.logger import Logger
 from exceptions.base import ErrorMessage
 
@@ -55,7 +57,10 @@ def text_athkar_job(self, category_id: int) -> None:
             title = "البيان"
             description = text
 
-        Globals.TRAY_ICON.showMessage(title, description, msecs=5000)
+
+        icon_path = "Albayan.ico"
+
+        Globals.TRAY_ICON.showMessage(title, description, QIcon(icon_path), 5000)
 
     @staticmethod
     def _parse_time(time_str: str) -> time: