Thanks to visit codestin.com
Credit goes to github.com

Skip to content

v2 Beta 2 #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jan 7, 2025
Merged

v2 Beta 2 #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0bc084f
Merge pull request #184 from louis77/main
technosf Jan 7, 2025
c662170
Moving back to com.github
technosf Jan 7, 2025
1d68be4
Merge remote-tracking branch 'refs/remotes/origin/development' into d…
technosf Jan 7, 2025
12ecf9b
Beta 1 feedback changes
technosf Jan 7, 2025
11bba89
Merge pull request #185 from technosf/development
technosf Jan 7, 2025
8dc3f91
Req for Github build??
technosf Jan 7, 2025
5ae73ae
Github build
technosf Jan 7, 2025
96627b3
Github build debug
technosf Jan 7, 2025
e3ab997
Github build debug
technosf Jan 7, 2025
30b6a6b
Merge branch 'louis77:development' into development
technosf Jan 7, 2025
5f65cb8
Github build debug
technosf Jan 7, 2025
f4630fd
Merge remote-tracking branch 'refs/remotes/origin/development' into d…
technosf Jan 7, 2025
15fd62c
Final Github build manifest?
technosf Jan 7, 2025
3324f34
Merge pull request #186 from technosf/development
technosf Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ jobs:
- uses: actions/checkout@v4
- uses: flatpak/flatpak-github-actions/flatpak-builder@v6
with:
bundle: io.github.louis77.tuner.flatpak
manifest-path: io.github.louis77.tuner.yml
bundle: com.github.louis77.tuner.flatpak
manifest-path: com.github.louis77.tuner.yml
cache-key: flatpak-builder-${{ github.sha }}
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
# This is the name of the Bundle file we're building and can be anything you like
bundle: Tuner.flatpak
# This uses your app's RDNN ID
manifest-path: io.github.louis77.tuner.yml
manifest-path: com.github.louis77.tuner.yml

# You can automatically run any of the tests you've created as part of this workflow
run-tests: true
Expand Down
16 changes: 8 additions & 8 deletions DEVELOP.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ sudo apt install libgtk-3-dev libgee-0.8-dev libgranite-dev libgstreamer1.0-dev
```

### Building the Tuner App From Source
There are two build configurations: _debug_ and _release_. The _debug_ build (manifest _io.github.louis77.tuner.debug.yml_) is recommended for development, while the _release_ build (manifest _io.github.louis77.tuner.yml_) is for distribution. Build instructions will focus on the _debug_ build. Copy the required manifest to _io.github.louis77.tuner.xml_ before building.
There are two build configurations: _debug_ and _release_. The _debug_ build (manifest _com.github.louis77.tuner.debug.yml_) is recommended for development, while the _release_ build (manifest _com.github.louis77.tuner.yml_) is for distribution. Build instructions will focus on the _debug_ build. Copy the required manifest to _com.github.louis77.tuner.xml_ before building.


Clone the repo and drop into the Tuner directory:
Expand All @@ -64,7 +64,7 @@ Configure Meson for development debug build, build Tuner with Ninja, and run the
meson setup --buildtype=debug builddir
meson compile -C builddir
meson install -C builddir # only needed once to get the gschema in place
./builddir/io.github.louis77.tuner
./builddir/com.github.louis77.tuner
```

Tuner can be deployed to the local system to bypass flatpak if required, however it is _recommended to use flatpak_.To do deploy locally, run the following command:
Expand All @@ -87,19 +87,19 @@ flatpak install elementary io.elementary.Sdk//8 io.elementary.Platform//8

Build the flatpak in the _user_ scope:
```bash
flatpak-builder --force-clean --user --sandbox --install build-dir io.github.louis77.tuner.debug.yml
flatpak-builder --force-clean --user --sandbox --install build-dir com.github.louis77.tuner.debug.yml
```

Run the Tuner flatpack:
```bash
flatpak --user run io.github.louis77.tuner
flatpak --user run com.github.louis77.tuner
```
Check the app version to ensure that it matches the version in the manifest.

### Readying code for a Pull Request
Before a pull request can be accepted, the code must pass linting. This is done by running the following command:
```bash
flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest io.github.louis77.tuner.yml
flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest com.github.louis77.tuner.yml
```

Linting currently produces the following issues (adddressed in ticket #140):
Expand Down Expand Up @@ -143,7 +143,7 @@ Debugging from VSCode using GDB, set up the launch.json file as follows:
"name": "Debug Vala with Meson",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/builddir/io.github.louis77.tuner",
"program": "${workspaceFolder}/builddir/com.github.louis77.tuner",
"args": [],
"stopAtEntry": false,
"cwd": "${workspaceFolder}",
Expand Down Expand Up @@ -176,7 +176,7 @@ After checking out the required version, build and run the app as described abov


## Release Process
Releasing _Tuner_ comprises cutting a release of the code in [tuner github](https://github.com/louis77/tuner) and then updating the [flathub repo](https://github.com/flathub/io.github.louis77.tuner) which will automatically have the flatpak generated and rolled to Flathub for distribution.
Releasing _Tuner_ comprises cutting a release of the code in [tuner github](https://github.com/louis77/tuner) and then updating the [flathub repo](https://github.com/flathub/com.github.louis77.tuner) which will automatically have the flatpak generated and rolled to Flathub for distribution.

### Beta Releases
Beta releases should be tagged from the Tuner _development_ branch in with a version number format of _v1.\*.\*-beta.\*_
Expand All @@ -190,6 +190,6 @@ Once a beta roll is deamed a success its pull request can be merged, and a produ
### Production Releases
Production releases are generated from _development_ pull requests into _main_. The updated _main_ branch should be tagged with a version number format of _v1.\*.\*_

Once a release has been tagged, the [flathub repo](https://github.com/flathub/io.github.louis77.tuner) _main_ branch can be updated with the _release_ tag going into the manifest _.json_, and any patches and documentation updated as needed. Updates from the _main_ branch should be copied in from a direct _pull request_ of the _main_ branch. The _main_ branch **should not** come from a merge _beta_ branch to avoid triggering subsequent builds in _beta_ .
Once a release has been tagged, the [flathub repo](https://github.com/flathub/com.github.louis77.tuner) _main_ branch can be updated with the _release_ tag going into the manifest _.json_, and any patches and documentation updated as needed. Updates from the _main_ branch should be copied in from a direct _pull request_ of the _main_ branch. The _main_ branch **should not** come from a merge _beta_ branch to avoid triggering subsequent builds in _beta_ .

Once the main production release is built by flathub it will be available for installation and automatically distributed to user community.
6 changes: 3 additions & 3 deletions PACKAGING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ $ flatpak run org.freedesktop.appstream-glib validate [path-to-xml]
### Test different languages

```
$ LANGUAGE=de_DE ./io.github.louis77.tuner
$ LANGUAGE=de_DE ./com.github.louis77.tuner

```

## Flatpak

The flathub build manifest can be found here:
https://github.com/louis77/flathub/tree/io.github.louis77.tuner
https://github.com/louis77/flathub/tree/com.github.louis77.tuner

- [ ] Move over to a non-elementary base image

Expand All @@ -45,7 +45,7 @@ https://github.com/louis77/pacstall-programs
https://docs.elementary.io/develop/writing-apps/logging

```bash
$ G_MESSAGES_DEBUG=all ./io.github.louis77.tuner
$ G_MESSAGES_DEBUG=all ./com.github.louis77.tuner
```

### Available elementary Icons
Expand Down
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ Things I need help with:
### Flathub

Tuner is available asa Flatpak on Flathub:
https://flathub.org/apps/details/io.github.louis77.tuner
https://flathub.org/apps/details/com.github.louis77.tuner

### elementary OS

Install Tuner via elementary's App store:
https://appcenter.elementary.io/io.github.louis77.tuner
https://appcenter.elementary.io/com.github.louis77.tuner

### Arch Linux / AUR
Arch-based GNU/Linux users can find `Tuner` under the name [tuner-git](https://aur.archlinux.org/packages/tuner-git/) in the **AUR**:
Expand Down Expand Up @@ -100,7 +100,7 @@ While I hacked on this App, I discovered so many cool and new stations, which ma
## Environment Variables

* `TUNER_API` - a `:` separated list of API servers to read from, e.g.
* `export TUNER_API="de1.api.radio-browser.info:nl1.api.radio-browser.info"; io.github.louis77.tuner`
* `export TUNER_API="de1.api.radio-browser.info:nl1.api.radio-browser.info"; com.github.louis77.tuner`


## Build, Maintance and Development of Tuner
Expand All @@ -121,7 +121,7 @@ $ sudo apt install gstreamer1.0-libav
```

#### 'Failed to load module "xapp-gtk3-module"'
Running Tuner from the CLI with `flatpak run io.github.louis77.tuner` may produce a message like the following:
Running Tuner from the CLI with `flatpak run com.github.louis77.tuner` may produce a message like the following:

`Gtk-Message: 10:01:00.561: Failed to load module "xapp-gtk3-module"`

Expand Down
31 changes: 14 additions & 17 deletions io.github.louis77.tuner.yml → com.github.louis77.tuner.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
---
app-id: io.github.louis77.tuner
app-id: com.github.louis77.tuner

runtime: org.freedesktop.Platform
runtime-version: '24.08'

sdk: org.freedesktop.Sdk

## Commenting out - Aligning the app manifest with the flathub build
# sdk-extensions:
# - org.freedesktop.Sdk.Extension.vala
sdk-extensions:
- org.freedesktop.Sdk.Extension.vala

#base: io.elementary.BaseApp
#base-version: 'circe-24.08'

command: io.github.louis77.tuner
command: com.github.louis77.tuner

build-options:
prepend-path: /usr/lib/sdk/vala/bin/
Expand All @@ -33,7 +31,6 @@ finish-args:
- "--filesystem=xdg-run/gvfsd"
- "--filesystem=xdg-desktop"
- "--share=network"
- "--metadata=X-DConf=migrate-path=/com/github/louis77/tuner/"
- "--socket=pulseaudio"
- "--talk-name=org.freedesktop.Notifications"
- "--own-name=org.mpris.MediaPlayer2.Tuner"
Expand Down Expand Up @@ -99,16 +96,16 @@ modules:
tag: 3.6.1
commit: 8b46a93bc1cbadb22dcdbb6844d9616723376535

- name: taglib
buildsystem: cmake-ninja
config-opts:
- "-DBUILD_SHARED_LIBS=ON"
- "-DCMAKE_BUILD_TYPE=Release"
sources:
- type: git
url: https://github.com/taglib/taglib.git
tag: v2.0.2
commit: e3de03501ff66221d1f1f971022b248d5b38ba06
# - name: taglib
# buildsystem: cmake-ninja
# config-opts:
# - "-DBUILD_SHARED_LIBS=ON"
# - "-DCMAKE_BUILD_TYPE=Release"
# sources:
# - type: git
# url: https://github.com/taglib/taglib.git
# tag: v2.0.2
# commit: e3de03501ff66221d1f1f971022b248d5b38ba06

- name: gee
buildsystem: autotools
Expand Down
4 changes: 2 additions & 2 deletions io.github.louis77.tuner.yml.debug → com.github.louis77.tuner.yml.debug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
app-id: io.github.louis77.tuner
app-id: com.github.louis77.tuner
runtime: io.elementary.Platform
runtime-version: '8'
sdk: io.elementary.Sdk
command: io.github.louis77.tuner
command: com.github.louis77.tuner
finish-args:
- "--share=ipc"
- "--socket=fallback-x11"
Expand Down
4 changes: 2 additions & 2 deletions io.github.louis77.tuner.yml.release → com.github.louis77.tuner.yml.release
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
app-id: io.github.louis77.tuner
app-id: com.github.louis77.tuner
runtime: io.elementary.Platform
runtime-version: '8'
sdk: io.elementary.Sdk
command: io.github.louis77.tuner
command: com.github.louis77.tuner
finish-args:
- "--share=ipc"
- "--socket=fallback-x11"
Expand Down
6 changes: 3 additions & 3 deletions data/io.github.louis77.tuner.appdata.xml.in → data/com.github.louis77.tuner.appdata.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2020-2024 Louis Brauer / <[email protected]> -->
<component type="desktop-application">
<id>io.github.louis77.tuner</id>
<id>com.github.louis77.tuner</id>
<metadata_license>FSFAP</metadata_license>
<project_group>tuner-elementary</project_group>
<project_license>GPL-3.0+</project_license>
<name>Tuner</name>
<developer_name>Louis Brauer</developer_name>
<developer_name>technosf</developer_name>
<launchable type="desktop-id">io.github.louis77.tuner.desktop</launchable>
<launchable type="desktop-id">com.github.louis77.tuner.desktop</launchable>
<branding>
<color type="primary" scheme_preference="light">#fafafa</color>
<color type="primary" scheme_preference="dark">#abacae</color>
Expand Down Expand Up @@ -83,7 +83,7 @@
</content_rating>

<provides>
<binary>io.github.louis77.tuner</binary>
<binary>com.github.louis77.tuner</binary>
<dbus type="system">org.mpris.MediaPlayer2</dbus>
<dbus type="system">org.mpris.MediaPlayer2.Player</dbus>
</provides>
Expand Down
4 changes: 2 additions & 2 deletions data/io.github.louis77.tuner.desktop.in → data/com.github.louis77.tuner.desktop.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Name=Tuner
GenericName=Internet Radio Player
Comment=Listen to Radio Stations all over the world
Categories=AudioVideo;Audio;Video;Tuner;Player;Music;
Exec=io.github.louis77.tuner
Icon=io.github.louis77.tuner
Exec=com.github.louis77.tuner
Icon=com.github.louis77.tuner
Terminal=false
Keywords=Radio;Audio;Listen;Stations;Receiver;
0 data/io.github.louis77.tuner.gresource → data/com.github.louis77.tuner.gresource
View file
Open in desktop
File renamed without changes.
16 changes: 8 additions & 8 deletions data/io.github.louis77.tuner.gresource.xml → data/com.github.louis77.tuner.gresource.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/io/github/louis77/tuner/css">
<gresource prefix="/com/github/louis77/tuner/css">
<file alias="Tuner-system.css" compressed="true">css/Tuner-system.css</file>
<file alias="Tuner-light.css" compressed="true">css/Tuner-light.css</file>
<file alias="Tuner-dark.css" compressed="true">css/Tuner-dark.css</file>
</gresource>
<gresource prefix="/io/github/louis77/tuner/icons">
<gresource prefix="/com/github/louis77/tuner/icons">
<file alias="playlist-queue.svg" compressed="true">icons/16/playlist-queue.svg</file>
<file alias="playlist-similar.svg" compressed="true">icons/16/playlist-similar.svg</file>
<file alias="playlist.svg" compressed="true">icons/16/playlist.svg</file>
<file alias="playlist-symbolic.svg" compressed="true">icons/16/playlist-symbolic.svg</file>
<file alias="internet-radio-symbolic.svg" compressed="true">icons/16/internet-radio-symbolic.svg</file>
<file alias="internet-radio.svg" compressed="true">icons/16/internet-radio.svg</file>
<file alias="tuner-on.svg" compressed="true">icons/48/io.github.louis77.tuner.svg</file>
<file alias="tuner-off.svg" compressed="true">icons/48/io.github.louis77.tuner-symbolic.svg</file>
<file alias="jukebox.svg" compressed="true">icons/48/io.github.louis77.tuner-jukebox.svg</file>
<file alias="background-tuner" compressed="true">icons/128/io.github.louis77.tuner.svg</file>
<file alias="background-jukebox" compressed="true">icons/128/io.github.louis77.tuner-jukebox.svg</file>
<file alias="io.github.louis77.tuner.svg" compressed="true">icons/128/io.github.louis77.tuner.svg</file>
<file alias="tuner-on.svg" compressed="true">icons/48/com.github.louis77.tuner.svg</file>
<file alias="tuner-off.svg" compressed="true">icons/48/com.github.louis77.tuner-symbolic.svg</file>
<file alias="jukebox.svg" compressed="true">icons/48/com.github.louis77.tuner-jukebox.svg</file>
<file alias="background-tuner" compressed="true">icons/128/com.github.louis77.tuner.svg</file>
<file alias="background-jukebox" compressed="true">icons/128/com.github.louis77.tuner-jukebox.svg</file>
<file alias="com.github.louis77.tuner.svg" compressed="true">icons/128/com.github.louis77.tuner.svg</file>
</gresource>
</gresources>

2 changes: 1 addition & 1 deletion data/io.github.louis77.tuner.gschema.xml → data/com.github.louis77.tuner.gschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<schemalist>
<schema path="/io/github/louis77/tuner/" id="io.github.louis77.tuner">
<schema path="/com/github/louis77/tuner/" id="com.github.louis77.tuner">
<key name="pos-x" type="i">
<default>0</default>
<summary>Horizontal position</summary>
Expand Down
0 ...s/128/io.github.louis77.tuner-jukebox.svg → .../128/com.github.louis77.tuner-jukebox.svg
View file
Open in desktop
File renamed without changes
0 .../128/io.github.louis77.tuner-symbolic.png → ...128/com.github.louis77.tuner-symbolic.png
View file
Open in desktop
File renamed without changes
4 changes: 2 additions & 2 deletions .../128/io.github.louis77.tuner-symbolic.svg → ...128/com.github.louis77.tuner-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 data/icons/128/io.github.louis77.tuner.png → data/icons/128/com.github.louis77.tuner.png
View file
Open in desktop
File renamed without changes
4 changes: 2 additions & 2 deletions data/icons/128/io.github.louis77.tuner.svg → data/icons/128/com.github.louis77.tuner.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...s/16/io.github.louis77.tuner-symbolic.png → .../16/com.github.louis77.tuner-symbolic.png
View file
Open in desktop
File renamed without changes
4 changes: 2 additions & 2 deletions ...s/16/io.github.louis77.tuner-symbolic.svg → .../16/com.github.louis77.tuner-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 data/icons/16/io.github.louis77.tuner.png → data/icons/16/com.github.louis77.tuner.png
View file
Open in desktop
File renamed without changes
4 changes: 2 additions & 2 deletions data/icons/16/io.github.louis77.tuner.svg → data/icons/16/com.github.louis77.tuner.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...s/24/io.github.louis77.tuner-symbolic.png → .../24/com.github.louis77.tuner-symbolic.png
View file
Open in desktop
File renamed without changes
4 changes: 2 additions & 2 deletions ...s/24/io.github.louis77.tuner-symbolic.svg → .../24/com.github.louis77.tuner-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 data/icons/24/io.github.louis77.tuner.png → data/icons/24/com.github.louis77.tuner.png
View file
Open in desktop
File renamed without changes
4 changes: 2 additions & 2 deletions data/icons/24/io.github.louis77.tuner.svg → data/icons/24/com.github.louis77.tuner.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...s/32/io.github.louis77.tuner-symbolic.png → .../32/com.github.louis77.tuner-symbolic.png
View file
Open in desktop
File renamed without changes
4 changes: 2 additions & 2 deletions ...s/32/io.github.louis77.tuner-symbolic.svg → .../32/com.github.louis77.tuner-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 data/icons/32/io.github.louis77.tuner.png → data/icons/32/com.github.louis77.tuner.png
View file
Open in desktop
File renamed without changes
Loading
Loading