Merge pull request #366 from technosf/development

Refactoring, translations

Author: technosf

EVENTS_ARCHITECTURE.md

@@ -0,0 +1,137 @@
+# Event Architecture
+
+This document tracks the event orchestration introduced in the 2026 refactor.
+
+## Files and Responsibilities
+
+- `src/Events/AppEventBus.vala`
+  - Defines typed cross-component application signals.
+  - Current signals:
+    - `connectivity_changed(bool is_online, bool is_offline)`
+
+- `src/Coordinators/StartupCoordinator.vala`
+  - Owns startup workflow orchestration.
+  - Current workflow:
+    - deferred autoplay of last station
+    - waits for online connectivity before autoplay attempt
+    - attempts autoplay once per app start
+
+- `src/Coordinators/PlaybackRecoveryCoordinator.vala`
+  - Owns restart-after-outage playback behavior.
+  - Tracks whether playback was active before loss of connectivity.
+  - Restarts playback on reconnect when `settings.play_restart` is enabled.
+
+- `src/Coordinators/UsageTrackingCoordinator.vala`
+  - Owns provider click/vote updates driven by player events.
+  - Handles both play-start click tracking and periodic tape-counter tracking.
+
+- `src/Application.vala`
+  - Owns the shared `events` bus instance.
+  - Emits `connectivity_changed` when `is_online`/`is_offline` changes.
+  - Instantiates coordinators:
+    - `PlaybackRecoveryCoordinator` during app construction.
+    - `UsageTrackingCoordinator` during app construction.
+    - `StartupCoordinator` after creating the main window.
+
+- `src/Widgets/Window.vala`
+  - Consumes app-level connectivity events to update interactive window state.
+  - No longer owns autoplay orchestration.
+
+- `src/Widgets/HeaderBar.vala`
+  - Consumes app-level connectivity and player-state events for control-state updates.
+  - No longer owns restart-after-outage orchestration.
+
+- `src/meson.build`
+  - Registers the new event/coordinator source files in build inputs.
+
+## Event Flow (Connectivity)
+
+1. `Application` detects network change.
+2. `Application` updates `is_online` and `is_offline`.
+3. `Application` emits `events.connectivity_changed(...)`.
+4. Subscribers react:
+   - `Window` updates active UI state.
+   - `HeaderBar` updates visual controls.
+   - `PlaybackRecoveryCoordinator` manages restart-after-outage behavior.
+   - `StartupCoordinator` tries deferred autoplay when online.
+
+## Design Notes
+
+- Keep local widget events in widget files.
+- Use `AppEventBus` for cross-component events that otherwise create tight coupling.
+- Use coordinators for workflows that span UI + services + application state.
+
+## Window Action Handling
+
+- `src/Widgets/Window.vala` now centralizes action-state initialization with:
+  - `sync_action_states_from_settings()`
+- Boolean toggle actions now use a shared path:
+  - `toggle_setting_action(...)`
+- This reduces copy/paste logic across action handlers and lowers the chance of mismatched setting/action wiring.
+
+## Search Debounce Ownership
+
+- `src/Widgets/HeaderBar.vala`
+  - Emits `searching_for_sig` immediately on text change.
+  - No longer owns debounce timers.
+- `src/Controllers/SearchController.vala`
+  - Owns debounce and pending-search cancellation.
+  - Uses configured `_max_search_results` instead of a hardcoded limit.
+- `src/Widgets/Display.vala`
+  - Receives search focus/query via explicit methods:
+    - `on_search_focused()`
+    - `on_search_requested(string text)`
+  - No longer routes search input through internal self-signals.
+
+## Application Bootstrap Decomposition
+
+- `src/Application.vala`
+  - Keeps construct-only property assignment in the `construct` block.
+  - Splits initialization responsibilities into helper methods:
+    - runtime storage preparation + migration
+    - connectivity monitoring setup
+    - core service factory helpers
+    - coordinator initialization
+    - action registration helpers
+  - Activation flow is split into explicit lifecycle helpers:
+    - `initialize_runtime_presentation()`
+    - `apply_runtime_preferences()`
+    - `create_main_window()`
+
+## Window Connectivity UI State
+
+- `src/Widgets/Window.vala`
+  - `check_online_status()` now delegates UI transitions to:
+    - `apply_offline_ui_state()`
+    - `apply_online_ui_state()`
+  - Keeps online/offline behavior explicit and reduces branching complexity.
+
+## Display API Cleanup
+
+- `src/Widgets/Display.vala`
+  - Removed unused public signals:
+    - `favourites_changed_sig`
+    - `refresh_starred_stations_sig`
+  - Keeps the public event surface aligned with active call paths.
+
+## Dependency Injection Sweep
+
+- Replaced singleton `app()` lookups with injected references in:
+  - `src/Widgets/HeaderBar.vala`
+  - `src/Widgets/Display.vala`
+  - `src/Services/DBusMediaPlayer.vala`
+- Constructors and initializers now receive required collaborators explicitly
+  (`Application`, `PlayerController`, `DataProvider.API`, `StarStore`), reducing
+  hidden coupling and startup-order risk.
+
+## Coordinator Connectivity Injection
+
+- Removed remaining coordinator singleton lookups by injecting `Application`
+  explicitly into:
+  - `src/Coordinators/StartupCoordinator.vala`
+  - `src/Coordinators/PlaybackRecoveryCoordinator.vala`
+- `StartupCoordinator.try_autoplay()` now checks `_app.is_offline`.
+- `PlaybackRecoveryCoordinator.on_player_state_changed()` now checks
+  `_app.is_online`.
+- `src/Application.vala` constructor wiring now passes `this` into coordinator
+  constructors, making coordinator connectivity decisions explicit and testable.

README.md

@@ -11,7 +11,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
 Minimalist radio station player - **Tuner** Version 2
 
-![Screenshot 01](docs/Tuner_2.0_discover.png?raw=true)
+<p align="center">
+  <img src="docs/Tuner_201_one.png" width="600">
+</p>
 
 >I love listening to radio while I work. There are tens of thousands of cool internet radio stations available, however I find it hard to "find" new stations by using filters and genres. As of now, this little app takes away all the filtering and just presents me with new radio stations every time I use it.
 >
@@ -114,7 +116,7 @@ Help is apreciated:
 - [technosf](https://github.com/technosf) Current maintainer and rewriter of a swarthe of Tuner for V2
 - [louis77](https://github.com/louis77) Originator and genius behind Tuner
 - [@jrthwlate](https://hosted.weblate.org/user/jrthwlate/) - Estonian translation
-- [faleksandar.com](https://faleksandar.com/) for icons and colors
+- [@yakushabb](https://github.com/yakushabb) for flathub and flatpak config help
 - [faleksandar.com](https://faleksandar.com/) for icons and colors
 - [@NathanBnm](https://github.com/NathanBnm) - French translation
 - [@DevAlien](https://github.com/DevAlien) - Italian translation

data/io.github.tuner_labs.tuner.metainfo.xml.in

@@ -111,6 +111,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
           <li>Refactored namespaces</li>
           <li>Fixed: play/stop buttons disabled #223</li>
           <li>Fixed: Jukebox stops when tuning to a dead station #256</li>
+          <li>Disabled in-app language selection for non-debug and flatpak builds</li>
         </ul>
       </description>
     </release>     

io.github.tuner_labs.tuner.debug.yml

@@ -38,6 +38,11 @@ cleanup:
   - "*.la"
   - "*.a"
 
+
+# Build flatpak with --no-separate-locales to avoid having to deal with translations in a separate module  
+separate-locales: false     # Debug builds only
+
+
 modules:
 
 - name: libgee

io.github.tuner_labs.tuner.yml

@@ -19,6 +19,7 @@ build-options:
   prepend-path: /usr/lib/sdk/vala/bin/
   prepend-ld-library-path: /usr/lib/sdk/vala/lib
 
+
 finish-args:
   - --share=ipc
   - --socket=fallback-x11
@@ -28,6 +29,7 @@ finish-args:
   - --own-name=org.mpris.MediaPlayer2.io.github.tuner_labs.tuner
   - --filesystem=xdg-desktop # Playlist import export
 
+
 cleanup:
   - /include
   - /lib/girepository-1.0
@@ -36,9 +38,7 @@ cleanup:
   - /share/vala
   - "*.la"
   - "*.a"
-  
-# Build flatpak with --no-separate-locales to avoid having to deal with translations in a separate module  
-separate-locales: false
+
 
 modules:
 

meson.build

@@ -4,7 +4,11 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 
-# Project name, programming language and version
+##
+## Tuner main meson build file
+##
+
+## Project name, programming language and version
 project (
     'io.github.tuner_labs.tuner',
     'vala', 'c',
@@ -13,16 +17,38 @@ project (
 )
 
 message('Starting build for project: ' + meson.project_name())
+
+##
+## Local debug build - let vala compiler know
+##
+
+message('opts: ' + get_option('debug').to_string() + ' prefix: ' + get_option('prefix')+ ' prefix check: ' + (get_option('prefix') != '/app').to_string()  )
+
+vala_args = []
+
+debug_local = get_option('debug') and get_option('prefix') != '/app'
+if debug_local
+  message('DEBUG_LOCAL')
+  vala_args += ['--define=DEBUG_LOCAL']
+endif
+
+##
+##
+
+
 message('Build type: ' + get_option('buildtype'))
 
 
-# Imports
+## Imports
 
 i18n = import ('i18n') # Translation module
 gnome = import('gnome') # GNOME module
 fs = import('fs')   # Filesystem
 
-# Translations and i18n handling
+
+##
+## Translations and i18n handling
+##
 
 po_script = join_paths(meson.global_source_root(),'scripts','merge-po.sh')
 
@@ -34,21 +60,27 @@ endif
 subdir ('po')
 
 
-# Project arguments
+## Project arguments
 add_project_arguments (
     '-DGETTEXT_PACKAGE="@0@"'.format (meson.project_name ()),
     language: 'c'
 )
 
 config_data = configuration_data()
 
-## Enable local debug of translations if we're doing a local debug build
-if get_option('debug') and get_option('prefix') != '/app'
-## Local debug build, install translations to build dir
-  config_data.set_quoted('LOCALEDIR', join_paths(meson.global_build_root(), 'po'))
+#
+# Enable local debug of translations if we're doing a local debug build
+#
+if debug_local
+
+    ## Local debug build, install translations to build dir
+    config_data.set_quoted('LOCALEDIR', join_paths(meson.global_build_root(), 'po'))
+
 else
-## Everything else, install translations to prefix
-  config_data.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
+
+    ## Everything else, install translations to prefix
+    config_data.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
+
 endif
 
 config_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
@@ -59,21 +91,24 @@ config_file = configure_file(
     configuration: config_data
 )
 
-# Compiling resources
+##
+## Compiling resources
+##
 asresources = gnome.compile_resources (
     'as-resources',
     join_paths ('data', meson.project_name ()) + '.gresource.xml',
     source_dir: 'data',
     c_name: 'as'
 )
 
-# Listing dependencies
+##
+## Listing dependencies
+##
 dependencies = [
     dependency ('glib-2.0'),
     dependency ('gtk+-3.0'),
     dependency ('gee-0.8'),
     dependency ('gio-2.0'),
-    # dependency ('granite'),
     dependency ('gstreamer-1.0'),
     dependency ('gstreamer-player-1.0'),
     dependency ('libsoup-3.0'),
@@ -82,14 +117,16 @@ dependencies = [
 
 subdir ('src')
 
-# Executable
+##
+## Executable
+##
 executable (
     meson.project_name (),
     asresources,
     config_file,
     sources,
     dependencies: dependencies,
-    vala_args: ['--pkg', 'posix'],
+    vala_args: vala_args + ['--pkg', 'posix'],
     install: true
 )