From ffca041cf847b182bbf12fcca1debfd58d76e97a Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 18 Mar 2024 21:16:39 +0100 Subject: [PATCH 01/12] Post release version increase to 0.3.5 (#85) * [flowplayer.spec] Post release version increase * [flowplayer.changes] Add stub for v0.3.5 --- rpm/flowplayer.changes | 3 +++ rpm/flowplayer.spec | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rpm/flowplayer.changes b/rpm/flowplayer.changes index a749b2b..31aebed 100644 --- a/rpm/flowplayer.changes +++ b/rpm/flowplayer.changes @@ -1,3 +1,6 @@ +* Fri Mar 15 2024 olf - 0.3.5 +- + * Thu Mar 14 2024 olf - 0.3.4 - Support Opus codec (#67) by @rubdos - Add local cover art when importing tracks (#75) by @poetaster with contributions by @dcaliste and @Olf0 diff --git a/rpm/flowplayer.spec b/rpm/flowplayer.spec index 9d9b03a..7e9db2a 100644 --- a/rpm/flowplayer.spec +++ b/rpm/flowplayer.spec @@ -10,7 +10,7 @@ Name: flowplayer Summary: Music Player for SailfishOS # The tag must adhere to semantic versioning: Among multiple other # reasons due to its use for `qmake5` in line 104. See https://semver.org/ -Version: 0.3.4 +Version: 0.3.5 # The tag comprises one of {alpha,beta,rc,release} postfixed with a # natural number greater or equal to 1 (e.g., "beta3") and may additionally be # postfixed with a plus character ("+"), the name of the packager and a release @@ -21,7 +21,7 @@ Version: 0.3.4 # build at GitHub and OBS, when configured accordingly; mind the sorting # (`adud` < `alpha`). For details and reasons, see # https://github.com/storeman-developers/harbour-storeman/wiki/Git-tag-format -Release: release2 +Release: release3 # The Group tag should comprise one of the groups listed here: # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS Group: Applications/Multimedia From 92628d56147469ce2c6c24bddbc74ab6d0fcd002 Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 25 Mar 2024 00:25:08 +0100 Subject: [PATCH 02/12] Update README.md --- translations/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/README.md b/translations/README.md index 7301b0d..373d055 100644 --- a/translations/README.md +++ b/translations/README.md @@ -16,7 +16,7 @@ lrelease flowplayer.ts ``` If you want to test your translation before publishing, you should compile it and copy the resulting `.qm` file(s) to (requires root privileges): ``` - /usr/share/flowplayer/translations +/usr/share/flowplayer/translations/ ``` FlowPlayer tries to automatically load a translation file according to your system locale setting. You can also run the application with a selected locale from the terminal. For example, for the Swedish language the command is: ``` From a8c55fea624c9b0b2d0308f795d5811187abf339 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 19:33:41 +0100 Subject: [PATCH 03/12] Translate translations/flowplayer.ts in et (#86) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 100% translated source file: 'translations/flowplayer.ts' on 'et'. Co-authored-by: Priit Jõerüüt (tlend) via transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com> --- translations/et.ts | 1401 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1401 insertions(+) create mode 100644 translations/et.ts diff --git a/translations/et.ts b/translations/et.ts new file mode 100644 index 0000000..dccc45d --- /dev/null +++ b/translations/et.ts @@ -0,0 +1,1401 @@ + + + AboutPage + + + About + Rakenduse teave + + + + Original author: + Algne autor: + + + + Contributors: + Kaasautorid: + + + + If you want to create a new translation or improve an extant one: + Kui soovid lisada uut tõlget või olemasolevat kohendada: + + + + You can support the original author of FlowPlayer by donating: + Kui soovid algset autorit toetada, siis klõpsi siin: + + + + AddFolder + + + Done + Valmis + + + + Cancel + Katkesta + + + + Select folder + Vali kaust + + + + Deleting + Kustutame + + + + Remove + Eemalda + + + + No items + Kirjeid ei leidu + + + + AddRadio + + + Done + Valmis + + + + Cancel + Katkesta + + + + Edit station + Muuda veebiraadiot + + + + Add station + Lisa veebiraadio + + + + + Station name + Veebiraadio nimi + + + + + Station url + Veebiraadio url + + + + AlbumDelegate + + + Not found + Ei leidu + + + + AlbumListView + + + Search artist image + Otsi esitaja pilti + + + + Unknown artist + Teadmata esitaja + + + + + Add to playlist + Lisa esitusloendisse + + + + Play all + Esita kõik + + + + + 1 track + 1 pala + + + + + %1 tracks + %1 pala + + + + Image not found + Pilti ei leidu + + + + 1 album + 1 album + + + + %1 albums + %1 albumit + + + + AlbumMetadata + + + Done + Valmis + + + + Cancel + Katkesta + + + + Metadata editor + Metainfo muutja + + + + Cover not found + Kaanepilti ei leidu + + + + + Artist + Esitaja + + + + + Album + Album + + + + + Year + Aasta + + + + CoverDownload + + + Download album cover + Laadi alla kaanepilt + + + + Download artist image + Laadi alla esitaja pilt + + + + Enter text to search + Sisesta otsitav tekst + + + + CoverPage + + + Cover no found + Kaanepilti ei leidu + + + + DataReader + + + Unknown artist + Teadmata esitaja + + + + Unknown album + Teadmata album + + + + Datos + + + Various artists + Erinevad esitajad + + + + 1 album + 1 album + + + + %1 albums + %1 albumit + + + + DownloadingListDelegate + + + Not found + Ei leidu + + + + No cover + Kaanepilti pole + + + + EditPreset + + + Done + Valmis + + + + Cancel + Katkesta + + + + Edit preset + Muuda eelseadistust + + + + Save preset + Salvesta eelseadistus + + + + + Preset name + Eelseadistuse nimi + + + + Equalizer + + + Save preset + Salvesta eelseadistus + + + + Equalizer + Ekvalaiser + + + + Preset + Eelseadistus + + + + FullAlbumSearch + + + Start downloading + Alusta allalaadimist + + + + Stop downloading + Lõpeta allalaadimine + + + + Download album covers + Laadi alla kaanepildid + + + + There's no missing covers in your music collection + Sinu muusikakogus pole puuduvaid kaanepilte + + + + LFM + + + + Error fetching artist information + Viga esitaja teabe laadimisel + + + + The artist could not be found + Esitajat ei leidu + + + + Error fetching album information + Viga albumi teabe laadimisel + + + + The album could not be found + Albumit ei leidu + + + + No album information available + Albumi teavet ei leidu + + + + Error fetching track information + Viga muusikapala teabe laadimisel + + + + The track could not be found + Muusikapala ei leidu + + + + No track information available + Muusikapala teavet ei leidu + + + + Fetching artist information + Laadime esitaja teavet + + + + LastFM + + + + + + Fetching artist information + Laadime esitaja teavet + + + + + + + Fetching album information + Laadime albumi teavet + + + + + + + + + Fetching track information + Laadime muusikapala teavet + + + + No artist information available + Esitaja teavet ei leidu + + + + Error fetching artist information + Viga esitaja teabe laadimisel + + + + The artist could not be found + Esitajat ei leidu + + + + No album information available + Albumi teavet ei leidu + + + + Error fetching album information + Viga albumi teabe laadimisel + + + + The album could not be found + Albumit ei leidu + + + + No track information available + Muusikapala teavet ei leidu + + + + + + Error fetching track information + Viga pala teabe laadimisel + + + + + + The track could not be found + Muusikapala ei leidu + + + + Not logged yet + Sa pole veel sisse loginud + + + + Login error. Try again + Sisselogimisviga. Palun proovi uuesti + + + + Logged as + Sisse logitud kui + + + + User + Kasutajanimi + + + + Password + Salasõna + + + + Login + Logi sisse + + + + Language + Keel + + + + Scrobble all songs + Kraasi kõiki lugusid + + + + Lyrics + + + Search in ChartLyrics + Otsi ChartLyrics saidist + + + + Search in A-Z Lyrics + Otsi A-Z saidist + + + + Search in Lyric Wiki + Otsi Lyric Wiki saidist + + + + Save lyrics + Salvesta laulusõnad + + + + Lyrics + Laulusõnad + + + + by + esitajalt + + + + Reload picture + Laadi pilt uuesti + + + + Reload info + Laadi teave uuesti + + + + Info + Teave + + + + MainPage + + + No music + Muusikat ei leidu + + + + Hide search field + Peida otsinguväli + + + + Show search field + Näita otsinguvälja + + + + + Artists + Esitajad + + + + + Albums + Albumid + + + + + Various artists + Erinevad esitajad + + + + ManageFolders + + + Add folder + Lisa kaust + + + + Manage folders + Halda kaustu + + + + Deleting + Kustutame + + + + Remove + Eemalda + + + + No folders + Kaustad on valimata + + + + Meta + + + Unknown artist + Teadmata esitaja + + + + Unknown album + Teadmata album + + + + Metadata + + + Done + Valmis + + + + Cancel + Katkesta + + + + Metadata editor + Metainfo muutja + + + + Cover not found + Kaanepilti ei leidu + + + + + Artist + Esitaja + + + + + Album + Album + + + + + Title + Pealkiri + + + + + Year + Aasta + + + + Missing + + + Various artists + Erinevad esitajad + + + + Unknown album + Teadmata album + + + + Unknown artist + Teadmata esitaja + + + + MusicModel + + + Unknown album + Teadmata album + + + + + Unknown artist + Teadmata esitaja + + + + MyPlaylist + + + Unknown artist + Teadmata esitaja + + + + Unknown album + Teadmata album + + + + NewPlaylist + + + Done + Valmis + + + + Cancel + Katkesta + + + + Rename playlist + Muuda esitusloendi nime + + + + New playlist + Uus esitusloend + + + + + Playlist name + Esitusloendi nimi + + + + NowPlaying + + + + Unknown artist + Teadmata esitaja + + + + + Unknown album + Teadmata album + + + + Equalizer + Ekvalaiser + + + + Edit metadata + Muuda metainfot + + + + Remove from favorites + Eemalda lemmikute hulgast + + + + Add to favorites + Lisa lemmikuks + + + + Add to playlist + Lisa esitusloendisse + + + + Reload info + Laadi teave uuesti + + + + Save station + Salvesta veebiraadio + + + + Cover not found + Kaanepilti ei leidu + + + + Online radio + Veebiraadio + + + + OnlineRadios + + + Add station + Lisa veebiraadio + + + + Search station + Otsi veebiraadiojaama + + + + Radio stations + Veebiraadiod + + + + Deleting + Kustutame + + + + Edit + Muuda + + + + Remove + Eemalda + + + + No saved stations + Salvestatud veebiraadiojaamu ei leidu + + + + PickFolder + + + Select folder + Vali kaust + + + + Playlist + + + Unknown artist + Teadmata esitaja + + + + Unknown album + Teadmata album + + + + PlaylistManager + + + Custom playlists + Kohandatud esitusloendid + + + + PlaylistPage + + + Queue + Lisa järjekorda + + + + Favorites + Lemmikud + + + + Rename playlist + Muuda esitusloendi nime + + + + Clear playlist + Tühjenda esitusloend + + + + Deleting + Kustutame + + + + Remove + Eemalda + + + + Playlist is empty + Esitusloend on tühi + + + + Playlists + + + New playlist + Uus esitusloend + + + + Playlists + Esitusloendid + + + + Deleting + Kustutame + + + + Rename + Muuda nime + + + + Remove + Eemalda + + + + Queue + Lisa järjekorda + + + + Favorites + Lemmikud + + + + No tracks + Palasid pole + + + + 1 track + 1 pala + + + + %1 tracks + %1 pala + + + + SearchRadio + + + Search station + Otsi veebiraadiojaama + + + + SelectLanguage + + + Done + Valmis + + + + Cancel + Katkesta + + + + SelectPlaylist + + + Done + Valmis + + + + Cancel + Katkesta + + + + Select playlist + Vali esitusloend + + + + New playlist + Uus esitusloend + + + + Queue + Lisa järjekorda + + + + SelectPreset + + + Presets + Eelseadistused + + + + Deleting + Kustutame + + + + Edit + Muuda + + + + Remove + Eemalda + + + + Settings + + + About + Rakenduse teave + + + + Settings + Seadistused + + + + General + Üldist + + + + Language + Keel + + + + *Restart to apply the new language + * Keele muutmise jõustamiseks käivita rakendus uuesti + + + + Orientation + Paigutus + + + + Automatic + Automaatne + + + + Portrait + Püstvaade + + + + Landscape + Rõhtvaade + + + + Albums view mode + Albumite vaade + + + + Flow + Karusell + + + + Grid + Ruudustik + + + + List + Loend + + + + Active cover + Tegumivaade + + + + Use album art as background + Kasuta kaanepilti taustapildina + + + + Show previous button + Näita eelmise pala nuppu + + + + List management + Loendihaldus + + + + Sort albums by + Albumite sortimise alus + + + + Albums + Albumid + + + + Artists + Esitajad + + + + Sort songs by + Muusikapalade sortimise alus + + + + Title + Pealkiri + + + + Track number + Pala number + + + + Filename + Failinimi + + + + Clear queue on exit + Rakenduse sulgemisel kustuta esitusjärjekord + + + + Lyrics + Laulusõnad + + + + Fetch lyrics automatically + Laadi laulusõnad automaatselt + + + + Save lyrics automatically + Salvesta laulusõnad automaatselt + + + + Extras + Lisamugavused + + + + Gapless playback + Pausideta taasesitus + + + + Collection + Muusikakogu + + + + Manage folders + Halda kaustu + + + + Update collection + Värskenda muusikakogu + + + + SongListView + + + Search cover + Otsi kaanepilti + + + + Unknown artist + Teadmata esitaja + + + + Unknown album + Teadmata album + + + + + Edit metadata + Muuda metainfot + + + + + Add to playlist + Lisa esitusloendisse + + + + Remove from favorites + Eemalda lemmikute hulgast + + + + Add to favorites + Lisa lemmikuks + + + + Cover not found + Kaanepilti ei leidu + + + + Various artists + Erinevad esitajad + + + + 1 track + 1 pala + + + + %1 tracks + %1 pala + + + + SongsPage + + + Hide search field + Peida otsinguväli + + + + Show search field + Näita otsinguvälja + + + + Tracks + Palad + + + + Edit metadata + Muuda metainfot + + + + Add to playlist + Lisa esitusloendisse + + + + Remove from favorites + Eemalda lemmikute hulgast + + + + Add to favorites + Lisa lemmikuks + + + + No music + Muusikat ei leidu + + + + StartPage + + + Updating music collection + Värskenda muusikakogu andmeid + + + + Cancel + Katkesta + + + + Artists + Esitajad + + + + Albums + Albumid + + + + Tracks + Palad + + + + Playlists + Esitusloendid + + + + Radio stations + Veebiraadiod + + + + Download album covers + Laadi alla kaanepildid + + + + Settings + Seadistused + + + + Equalizer + Ekvalaiser + + + + Utils + + + + + + + + No lyrics founded + Laulusõnu ei leidu + + + + Error fetching lyrics + Viga laulusõnade laadimisel + + + + Album cover not founded + Kaanepilti ei leidu + + + + flowplayer + + + (radio) + (raadio) + + + + Cover not found + Kaanepilti ei leidu + + + \ No newline at end of file From 0d619cf08b05088be70f8c564ff3811915e8ed8d Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 25 Mar 2024 20:30:21 +0100 Subject: [PATCH 04/12] [README.md] Add a feature --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 09e9b41..d9980c2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@
#### Features: -- *A pull request for [the README.md](https://github.com/sailfishos-applications/flowplayer/blob/devel/README.md) which provides a list of features will be much appreciated.* +- Gap-less playback, optionally +- *A pull request for [the README.md](https://github.com/sailfishos-applications/flowplayer/blob/devel/README.md) which provides a full list of features will be much appreciated.* Note that the functionality and / or ability to … may be broken (this is [known for internet radio](https://github.com/sailfishos-applications/flowplayer/issues/62)) due to API changes in recent SailfishOS releases.
Pull requests with fixes, improvements and enhancements are welcome! From e6dbe5e892b67f732a734a6d11590a2d7e1b75a9 Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 25 Mar 2024 20:54:16 +0100 Subject: [PATCH 05/12] [README.md] Use better link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d9980c2..249dc09 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ If you want to translate FlowPlayer to a language it does not support yet or imp The original [FlowPlayer for SailfishOS (2015 - 2016)](https://openrepos.net/content/cepiperez/flowplayer-0#content) started as a port of [FlowPlayer for MeeGo-Harmattan (2014)](https://openrepos.net/content/cepiperez/flowplayer#content). Both were solely written by [Matias Perez (CepiPerez)](https://github.com/CepiPerez). In 2021 Matias [released the source code of FlowPlayer](https://github.com/sailfishos-applications/flowplayer/commits/master?after=c4f36e1cb3a80b7c7b220a379c9bdaca3a300113+49) by creating this git repository at GitHub. -In 2023 [olf (Olf0)](https://github.com/Olf0) overhauled infrastructure aspects, such as this README, a [new OpenRepos page](https://openrepos.net/content/olf/flowplayer#content), the [Transifex integration](https://github.com/sailfishos-applications/flowplayer/pull/7), making the spec file suitable for [the Sailfish-OBS](https://build.sailfishos.org/) and [the SailfishOS:Chum community repository](https://build.sailfishos.org/project/show/sailfishos:chum) etc. +In 2023 [olf (Olf0)](https://github.com/Olf0) overhauled infrastructure aspects, such as this README, a [new OpenRepos page](https://openrepos.net/content/olf/flowplayer#content), the [Transifex integration](https://github.com/sailfishos-applications/flowplayer/pull/7), making the spec file suitable for [the Sailfish-OBS](https://build.sailfishos.org/) and [the SailfishOS:Chum community repository](https://github.com/sailfishos-chum/main#readme) etc.
From 1a05f28fc7bfd5335418f41361ef056e8e20ac5a Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 25 Mar 2024 21:44:43 +0100 Subject: [PATCH 06/12] [README.md] Minimalistic wording improvement --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 249dc09..655a9c0 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ If you want to translate FlowPlayer to a language it does not support yet or imp The original [FlowPlayer for SailfishOS (2015 - 2016)](https://openrepos.net/content/cepiperez/flowplayer-0#content) started as a port of [FlowPlayer for MeeGo-Harmattan (2014)](https://openrepos.net/content/cepiperez/flowplayer#content). Both were solely written by [Matias Perez (CepiPerez)](https://github.com/CepiPerez). In 2021 Matias [released the source code of FlowPlayer](https://github.com/sailfishos-applications/flowplayer/commits/master?after=c4f36e1cb3a80b7c7b220a379c9bdaca3a300113+49) by creating this git repository at GitHub. -In 2023 [olf (Olf0)](https://github.com/Olf0) overhauled infrastructure aspects, such as this README, a [new OpenRepos page](https://openrepos.net/content/olf/flowplayer#content), the [Transifex integration](https://github.com/sailfishos-applications/flowplayer/pull/7), making the spec file suitable for [the Sailfish-OBS](https://build.sailfishos.org/) and [the SailfishOS:Chum community repository](https://github.com/sailfishos-chum/main#readme) etc. +In 2023 [olf (Olf0)](https://github.com/Olf0) overhauled infrastructure aspects, such as this README, a [new OpenRepos page](https://openrepos.net/content/olf/flowplayer#content), the [Transifex integration](https://github.com/sailfishos-applications/flowplayer/pull/7), making the spec file suitable for [the SailfishOS-OBS](https://build.sailfishos.org/) and [the SailfishOS:Chum community repository](https://github.com/sailfishos-chum/main#readme) etc.
From 8d6fde558d5882c58d7bf575b11ad1599b040efa Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 25 Mar 2024 21:50:09 +0100 Subject: [PATCH 07/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 655a9c0..d114183 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ If you want to translate FlowPlayer to a language it does not support yet or imp The original [FlowPlayer for SailfishOS (2015 - 2016)](https://openrepos.net/content/cepiperez/flowplayer-0#content) started as a port of [FlowPlayer for MeeGo-Harmattan (2014)](https://openrepos.net/content/cepiperez/flowplayer#content). Both were solely written by [Matias Perez (CepiPerez)](https://github.com/CepiPerez). In 2021 Matias [released the source code of FlowPlayer](https://github.com/sailfishos-applications/flowplayer/commits/master?after=c4f36e1cb3a80b7c7b220a379c9bdaca3a300113+49) by creating this git repository at GitHub. -In 2023 [olf (Olf0)](https://github.com/Olf0) overhauled infrastructure aspects, such as this README, a [new OpenRepos page](https://openrepos.net/content/olf/flowplayer#content), the [Transifex integration](https://github.com/sailfishos-applications/flowplayer/pull/7), making the spec file suitable for [the SailfishOS-OBS](https://build.sailfishos.org/) and [the SailfishOS:Chum community repository](https://github.com/sailfishos-chum/main#readme) etc. +In 2023 [olf (Olf0)](https://github.com/Olf0) overhauled infrastructure aspects, such as this README, a [new OpenRepos page](https://openrepos.net/content/olf/flowplayer#content), the [Transifex integration](https://github.com/sailfishos-applications/flowplayer/pull/7), making the spec file suitable for [the SailfishOS-OBS](https://build.sailfishos.org/) and [the SailfishOS:Chum community repository](https://github.com/sailfishos-chum/main/blob/main/Metadata.md) etc.
From 75f4255405bf726cb187d32bc4fbbe3b63c69260 Mon Sep 17 00:00:00 2001 From: tuplasuhveli <139926936+tuplasuhveli@users.noreply.github.com> Date: Wed, 27 Mar 2024 21:37:40 +0000 Subject: [PATCH 08/12] Fixing a grammar error in FullAlbumSearch.qml (#88) Fixing a grammar error "there's no missing covers..." -> "there are no missing covers..." --- qml/pages/FullAlbumSearch.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/FullAlbumSearch.qml b/qml/pages/FullAlbumSearch.qml index 063e7ba..776c850 100644 --- a/qml/pages/FullAlbumSearch.qml +++ b/qml/pages/FullAlbumSearch.qml @@ -131,7 +131,7 @@ Page { ViewPlaceholder { enabled: songlist.count===0 && loaded Behavior on opacity { FadeAnimation {} } - text: qsTr("There's no missing covers in your music collection") + text: qsTr("There are no missing covers in your music collection") } } From dee0d511c02bcb4dced375c30765f3974b2783b8 Mon Sep 17 00:00:00 2001 From: tuplasuhveli <139926936+tuplasuhveli@users.noreply.github.com> Date: Wed, 27 Mar 2024 21:44:16 +0000 Subject: [PATCH 09/12] Update utils.cpp (#87) Fixing a grammar error in several instances: "founded" -> "found" --- src/utils.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/utils.cpp b/src/utils.cpp index a21d363..84a82fa 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -101,7 +101,7 @@ void Utils::readLyrics(QString artist, QString song) } else { - currentLyrics = tr("No lyrics founded"); + currentLyrics = tr("No lyrics found"); m_noLyrics = true; } } @@ -230,9 +230,9 @@ void Utils::downloaded(QNetworkReply *respuesta) x = tmp.indexOf("<"); tmp.remove(x,tmp.length()-x); tmp = tmp.trimmed(); - //qDebug() << "Image founded... downloading... " << tmp; + //qDebug() << "Image found... downloading... " << tmp; if (tmp=="") { - banner = tr("Album cover not founded"); + banner = tr("Album cover not found"); emit bannerChanged(); return; } @@ -253,7 +253,7 @@ void Utils::downloaded(QNetworkReply *respuesta) qDebug() << str; if ( str.contains("was not found on this server") ) { - currentLyrics = tr("No lyrics founded"); + currentLyrics = tr("No lyrics found"); m_noLyrics = true; } else @@ -280,7 +280,7 @@ void Utils::downloaded(QNetworkReply *respuesta) currentLyrics = tmp.replace("\n", "
"); if (currentLyrics.contains("
Date: Thu, 11 Apr 2024 21:07:40 +0200 Subject: [PATCH 10/12] Implement proper sandboxing (SailJail) configuration (#77) * [flowplayer.desktop] Implement a proper SailJail configuration Originally developed by @poetaster and reviewed by @dcaliste in PR #75, see commits 68dc7f1 and fce86cd. * [FlowPlayer.cpp] Eliminate migration functions due to conflict with sandboxing --- flowplayer.desktop | 6 ++++- src/FlowPlayer.cpp | 59 ---------------------------------------------- 2 files changed, 5 insertions(+), 60 deletions(-) diff --git a/flowplayer.desktop b/flowplayer.desktop index f87a750..25e8bb3 100644 --- a/flowplayer.desktop +++ b/flowplayer.desktop @@ -6,4 +6,8 @@ Exec=flowplayer Name=FlowPlayer [X-Sailjail] -Sandboxing=Disabled +OrganizationName=sailfishos-applications +# ApplicationName does not have to be identical to Name +ApplicationName=flowplayer +# Add the required permissions here +Permissions=UserDirs;Audio;Bluetooth;Internet;RemovableMedia diff --git a/src/FlowPlayer.cpp b/src/FlowPlayer.cpp index dfb80e5..a862eff 100644 --- a/src/FlowPlayer.cpp +++ b/src/FlowPlayer.cpp @@ -22,61 +22,6 @@ bool isDBOpened; bool databaseWorking; -static void migrateSettings() -{ - const QString oldSettings = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/cepiperez/flowplayer.conf"; - const QString newSettings = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + ".conf"; - if (QFile::exists(oldSettings)) { - if (QDir().mkpath(QFileInfo(newSettings).path()) - && !QFile::rename(oldSettings, newSettings)) { - qWarning() << "unable to move old configuration from" << oldSettings << "to" << newSettings; - } - QDir(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)).rmdir("cepiperez"); - } -} - -static void migrateDatabase() -{ - const QString olderDb = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/cepiperez/flowplayer.db"; - const QString oldDb = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/flowplayer/flowplayer/flowplayer.db"; - const QString newDb = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.db"; - if (QFile::exists(oldDb)) { - if (QDir().mkpath(QFileInfo(newDb).path()) - && !QFile::rename(oldDb, newDb)) { - qWarning() << "unable to move old database from" << oldDb << "to" << newDb; - } - QDir(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/flowplayer").rmdir("flowplayer"); - QDir(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)).rmdir("flowplayer"); - } else if (QFile::exists(olderDb)) { - if (QDir().mkpath(QFileInfo(newDb).path()) - && !QFile::rename(olderDb, newDb)) { - qWarning() << "unable to move old database from" << olderDb << "to" << newDb; - } - QDir(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)).rmdir("cepiperez"); - } -} - -static void migrateCache() -{ - const QString olderCache = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + "/flowplayer"; - const QString oldCache = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + "/flowplayer/flowplayer"; - const QString newCache = QStandardPaths::writableLocation(QStandardPaths::CacheLocation); - if (QFileInfo(oldCache).isDir()) { - if (QDir().mkpath(QFileInfo(newCache).path()) - && !QDir().rename(oldCache, newCache)) { - qWarning() << "unable to move old cache from" << oldCache << "to" << newCache; - } - QDir(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + "/flowplayer").rmdir("flowplayer"); - QDir(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation)).rmdir("flowplayer"); - } else if (QFileInfo(olderCache).isDir()) { - if (QDir().mkpath(QFileInfo(newCache).path()) - && !QDir().rename(olderCache, newCache)) { - qWarning() << "unable to move old cache from" << olderCache << "to" << newCache; - } - QDir(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation)).rmdir("flowplayer"); - } -} - int main(int argc, char *argv[]) { QTextCodec *linuxCodec = QTextCodec::codecForName("UTF-8"); @@ -86,10 +31,6 @@ int main(int argc, char *argv[]) app->setOrganizationName("sailfishos-applications"); app->setApplicationName("flowplayer"); - migrateSettings(); - migrateDatabase(); - migrateCache(); - QString lang; QTranslator translator; From 4f7dee5d76e88d0ce6e23b3ab0bc3fc11ee36f2f Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 11 Apr 2024 21:13:52 +0200 Subject: [PATCH 11/12] [rpm/flowplayer.changes] Update for v0.3.5 --- rpm/flowplayer.changes | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rpm/flowplayer.changes b/rpm/flowplayer.changes index 31aebed..85bf355 100644 --- a/rpm/flowplayer.changes +++ b/rpm/flowplayer.changes @@ -1,5 +1,7 @@ -* Fri Mar 15 2024 olf - 0.3.5 -- +* Fri Apr 12 2024 olf - 0.3.5 +- Add SailJail configuration (#77), originally by @poetaster +- Add Estonian translation (#86) by @tuplasuhveli +- Fix some source strings (#87, #88) by @tuplasuhveli * Thu Mar 14 2024 olf - 0.3.4 - Support Opus codec (#67) by @rubdos From 9bf5f53547a9d490f8f2e54c0748b66129443466 Mon Sep 17 00:00:00 2001 From: olf Date: Fri, 12 Apr 2024 02:49:40 +0200 Subject: [PATCH 12/12] [CoverPage.qml] Fix string and run `lupdate` --- qml/pages/CoverPage.qml | 2 +- translations/flowplayer.ts | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qml/pages/CoverPage.qml b/qml/pages/CoverPage.qml index 55d5ddf..ebf2219 100644 --- a/qml/pages/CoverPage.qml +++ b/qml/pages/CoverPage.qml @@ -32,7 +32,7 @@ CoverBackground { //x: Theme.paddingMedium itemimg: playingRadio? currentSongInfo.imageurl : utils.thumbnail(currentSongInfo.artist, currentSongInfo.album) textSize: Theme.fontSizeSmall - text: playingRadio? currentSongInfo.name : qsTr("Cover no found") + text: playingRadio? currentSongInfo.name : qsTr("Cover not found") opacity: showBigCover? 0.4 : 1 } diff --git a/translations/flowplayer.ts b/translations/flowplayer.ts index f6f67c9..34e2024 100644 --- a/translations/flowplayer.ts +++ b/translations/flowplayer.ts @@ -19,12 +19,12 @@ - + If you want to create a new translation or improve an extant one: - + You can support the original author of FlowPlayer by donating: @@ -219,7 +219,7 @@ CoverPage - Cover no found + Cover not found @@ -333,7 +333,7 @@ - There's no missing covers in your music collection + There are no missing covers in your music collection @@ -1373,7 +1373,7 @@ - No lyrics founded + No lyrics found @@ -1383,7 +1383,7 @@ - Album cover not founded + Album cover not found