Merge pull request #638 from 4gray/ci-add-github-actions-ui-fixes

ci-add-github-actions-ui-fixes

Author: 4gray

.coderabbit.yaml

@@ -1,9 +1,9 @@
 # Minimal configuration for getting started
-language: "en-US"
+language: 'en-US'
 
 reviews:
-profile: "chill"
-high_level_summary: true
+    profile: 'chill'
+    high_level_summary: true
 auto_review:
-enabled: true
-drafts: false
+    enabled: true
+    drafts: false

.github/workflows/build-and-make.yaml

@@ -0,0 +1,120 @@
+name: Build and Make Electron App
+
+on:
+    push:
+        branches:
+            - nx
+            # - master  # Uncomment this when ready to run on master branch
+        tags:
+            - 'v*.*.*'
+    pull_request:
+        branches:
+            - nx
+            # - master  # Uncomment this when ready to run on master branch
+    workflow_dispatch:
+
+jobs:
+    build:
+        name: Build on ${{ matrix.os }}
+        runs-on: ${{ matrix.os }}
+        timeout-minutes: 60
+        strategy:
+            matrix:
+                os: [macos-latest, ubuntu-latest, windows-latest]
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Install pnpm
+              uses: pnpm/action-setup@v4
+              with:
+                  version: 10
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: '22'
+                  cache: 'pnpm'
+
+            - name: Install dependencies
+              run: pnpm install --no-frozen-lockfile
+
+            - name: Build frontend
+              run: npm run build:frontend
+
+            - name: Build backend
+              run: npm run build:backend
+
+            - name: Make Electron app
+              run: npm run make:app
+
+            - name: Upload artifacts (macOS)
+              if: matrix.os == 'macos-latest'
+              uses: actions/upload-artifact@v4
+              with:
+                  name: macos-artifacts
+                  path: |
+                      dist/executables/**/*.dmg
+                      dist/executables/**/*.zip
+                  retention-days: 7
+
+            - name: Upload artifacts (Linux)
+              if: matrix.os == 'ubuntu-latest'
+              uses: actions/upload-artifact@v4
+              with:
+                  name: linux-artifacts
+                  path: |
+                      dist/executables/**/*.deb
+                      dist/executables/**/*.rpm
+                      dist/executables/**/*.snap
+                      dist/executables/**/*.AppImage
+                      dist/executables/**/*.tar.gz
+                  retention-days: 7
+
+            - name: Upload artifacts (Windows)
+              if: matrix.os == 'windows-latest'
+              uses: actions/upload-artifact@v4
+              with:
+                  name: windows-artifacts
+                  path: |
+                      dist/executables/**/*.exe
+                      dist/executables/**/*.msi
+                      dist/executables/**/*.zip
+                  retention-days: 7
+
+    create-release:
+        name: Create Draft Release
+        needs: build
+        runs-on: ubuntu-latest
+        permissions:
+            contents: write
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Download all artifacts
+              uses: actions/download-artifact@v4
+              with:
+                  path: artifacts
+
+            - name: Display structure of downloaded files
+              run: ls -R artifacts
+
+            - name: Get version from package.json
+              id: package-version
+              run: echo "version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT
+
+            - name: Create Draft Release
+              uses: softprops/action-gh-release@v2
+              with:
+                  draft: true
+                  prerelease: false
+                  name: Release v${{ steps.package-version.outputs.version }}
+                  tag_name: ${{ github.ref_name }}
+                  generate_release_notes: true
+                  files: |
+                      artifacts/**/*
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

apps/electron-backend/src/app/api/main.preload.ts

@@ -8,6 +8,10 @@ contextBridge.exposeInMainWorld('electron', {
     updatePlaylistFromFilePath: (filePath: string, title: string) =>
         ipcRenderer.invoke('update-playlist-from-file-path', filePath, title),
     openPlaylistFromFile: () => ipcRenderer.invoke('open-playlist-from-file'),
+    saveFileDialog: (defaultPath: string, filters?: { name: string; extensions: string[] }[]) =>
+        ipcRenderer.invoke('save-file-dialog', defaultPath, filters),
+    writeFile: (filePath: string, content: string) =>
+        ipcRenderer.invoke('write-file', filePath, content),
     setUserAgent: (userAgent: string, referer?: string) =>
         ipcRenderer.invoke('set-user-agent', userAgent, referer),
     openInMpv: (

apps/electron-backend/src/app/events/playlist.events.ts

@@ -7,7 +7,7 @@ import axios from 'axios';
 import { dialog, ipcMain } from 'electron';
 import { parse } from 'iptv-playlist-parser';
 import { createPlaylistObject, getFilenameFromUrl } from 'm3u-utils';
-import { readFile } from 'node:fs/promises';
+import { readFile, writeFile } from 'node:fs/promises';
 import { AUTO_UPDATE_PLAYLISTS } from 'shared-interfaces';
 
 export default class PlaylistEvents {
@@ -102,3 +102,33 @@ ipcMain.handle(AUTO_UPDATE_PLAYLISTS, async (event, playlistUrls) => {
         console.log(`Auto-updating playlist from ${url}`);
     }
 });
+
+ipcMain.handle('save-file-dialog', async (event, defaultPath, filters) => {
+    try {
+        const { canceled, filePath } = await dialog.showSaveDialog({
+            defaultPath,
+            filters: filters || [
+                { name: 'All Files', extensions: ['*'] },
+            ],
+        });
+
+        if (canceled || !filePath) {
+            return null;
+        }
+
+        return filePath;
+    } catch (error) {
+        console.error('Error showing save dialog:', error);
+        throw error;
+    }
+});
+
+ipcMain.handle('write-file', async (event, filePath, content) => {
+    try {
+        await writeFile(filePath, content, 'utf-8');
+        return { success: true };
+    } catch (error) {
+        console.error('Error writing file:', error);
+        throw error;
+    }
+});

apps/electron-backend/src/app/events/setttings.events.ts renamed to apps/electron-backend/src/app/events/settings.events.ts

@@ -1,6 +1,5 @@
 import { ipcMain } from 'electron';
 import {
-    MPV_PLAYER_PATH,
     MPV_REUSE_INSTANCE,
     store,
 } from '../services/store.service';
@@ -13,5 +12,9 @@ export default class SettingsEvents {
 
 ipcMain.handle('SETTINGS_UPDATE', (_event, arg) => {
     console.log('Received SETTINGS_UPDATE with data:', arg);
-    store.set(MPV_REUSE_INSTANCE, arg.mpvReuseInstance);
+    
+    // Only set values that are defined
+    if (arg.mpvReuseInstance !== undefined) {
+        store.set(MPV_REUSE_INSTANCE, arg.mpvReuseInstance);
+    }
 });

apps/electron-backend/src/app/services/store.service.ts

@@ -1,4 +1,4 @@
-import Store from 'electron-store';
+import { Conf } from 'electron-conf/main';
 
 export const WINDOW_BOUNDS = 'WINDOW_BOUNDS';
 export const MPV_PLAYER_PATH = 'MPV_PLAYER_PATH';
@@ -12,8 +12,5 @@ export type StoreType = {
     [MPV_REUSE_INSTANCE]: boolean;
 };
 
-// Initialize renderer support
-Store.initRenderer();
-
 // Export singleton store instance
-export const store = new Store<StoreType>();
+export const store = new Conf<StoreType>();

apps/electron-backend/src/main.ts

@@ -7,7 +7,7 @@ import ElectronEvents from './app/events/electron.events';
 import EpgEvents from './app/events/epg.events';
 import PlayerEvents from './app/events/player.events';
 import PlaylistEvents from './app/events/playlist.events';
-import SettingsEvents from './app/events/setttings.events';
+import SettingsEvents from './app/events/settings.events';
 import SharedEvents from './app/events/shared.events';
 import SquirrelEvents from './app/events/squirrel.events';
 import StalkerEvents from './app/events/stalker.events';

apps/web/src/app/app.component.ts

@@ -13,7 +13,6 @@ import {
     Language,
     OPEN_FILE,
     Settings,
-    SETTINGS_UPDATE,
     STORE_KEY,
     Theme,
     VIEW_ADD_PLAYLIST,
@@ -120,13 +119,12 @@ export class AppComponent implements OnInit, OnDestroy {
             .getValueFromLocalStorage(STORE_KEY.Settings)
             .subscribe((settings: Settings) => {
                 if (settings && Object.keys(settings).length > 0) {
-                    // Send settings to Electron main process
-                    if (window.electron) {
-                        window.electron.updateSettings(settings);
-                    }
-                    
+                    // No need to send settings to Electron on init
+                    // Settings are stored in IndexedDB and loaded by the settings store
+                    // Only specific Electron settings (MPV/VLC paths) are sent when changed in settings component
+
                     this.translate.use(settings.language ?? this.DEFAULT_LANG);
-                    
+
                     // Fetch EPG if URLs are configured
                     if (
                         window.electron &&

apps/web/src/app/settings/settings.component.ts

@@ -252,16 +252,20 @@ export class SettingsComponent implements OnInit {
     onSubmit(): void {
         this.settingsStore.updateSettings(this.settingsForm.value).then(() => {
             this.applyChangedSettings();
-            
+
             if (window.electron) {
                 window.electron.updateSettings(this.settingsForm.value);
-                
+
                 // Set player paths if using external players
                 if (this.settingsForm.value.mpvPlayerPath) {
-                    window.electron.setMpvPlayerPath(this.settingsForm.value.mpvPlayerPath);
+                    window.electron.setMpvPlayerPath(
+                        this.settingsForm.value.mpvPlayerPath
+                    );
                 }
                 if (this.settingsForm.value.vlcPlayerPath) {
-                    window.electron.setVlcPlayerPath(this.settingsForm.value.vlcPlayerPath);
+                    window.electron.setVlcPlayerPath(
+                        this.settingsForm.value.vlcPlayerPath
+                    );
                 }
             }
         });

apps/web/src/app/shared/components/mpv-player-bar/mpv-player-bar.component.html

@@ -1,4 +1,4 @@
-@if ((activeProcesses$ | async)?.length) {
+<!-- @if ((activeProcesses$ | async)?.length) {
   <div class="mpv-player-bar">
     @for (process of activeProcesses$ | async; track process.id) {
       <div class="player-item">
@@ -24,20 +24,6 @@
           </div>
         </div>
         <div class="player-controls">
-          <!-- <button
-          mat-icon-button
-          (click)="pauseStream(process.id)"
-          title="Pause"
-          >
-          <mat-icon>pause</mat-icon>
-        </button>
-        <button
-          mat-icon-button
-          (click)="playStream(process.id)"
-          title="Play"
-          >
-          <mat-icon>play_arrow</mat-icon>
-        </button> -->
         <button
           mat-icon-button
           (click)="closeStream(process.id)"
@@ -50,3 +36,4 @@
   }
 </div>
 }
+ -->