devel→master: Commits for v0.3.6 (#109)

* Translate translations/flowplayer.ts in sv (#90) 100% translated source file: 'translations/flowplayer.ts' on 'sv'. Co-authored-by: @eson57 via transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com> * Translate translations/flowplayer.ts in de (#91) 100% translated source file: 'translations/flowplayer.ts' on 'de'. Co-authored-by: @Olf0 via transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com> * Translate translations/flowplayer.ts in et (#92) 100% translated source file: 'translations/flowplayer.ts' on 'et'. Co-authored-by: @Olf0 via transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com> * [Tx: translations/flowplayer.ts] Add Finnish translation (fi) #94 100% translated source file: 'translations/flowplayer.ts' on 'fi'. Co-authored-by: @tuplasuhveli (Elmeri Länsiharju) via transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com> * [Tx] Updates for file translations/flowplayer.ts in fi (#95) * Translate translations/flowplayer.ts in fi 100% translated source file: 'translations/flowplayer.ts' on 'fi'. * Translate translations/flowplayer.ts in fi 100% translated source file: 'translations/flowplayer.ts' on 'fi'. * Translate translations/flowplayer.ts in fi 100% translated source file: 'translations/flowplayer.ts' on 'fi'. * Translate translations/flowplayer.ts in fi 100% translated source file: 'translations/flowplayer.ts' on 'fi'. * Translate translations/flowplayer.ts in fi 100% translated source file: 'translations/flowplayer.ts' on 'fi'. * Translate translations/flowplayer.ts in fi 100% translated source file: 'translations/flowplayer.ts' on 'fi'. * Translate translations/flowplayer.ts in fi 100% translated source file: 'translations/flowplayer.ts' on 'fi'. * Translate translations/flowplayer.ts in fi 100% translated source file: 'translations/flowplayer.ts' on 'fi'. * Translate translations/flowplayer.ts in fi 100% translated source file: 'translations/flowplayer.ts' on 'fi'. --------- Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com> * Translate translations/flowplayer.ts in fi (#96) 100% translated source file: 'translations/flowplayer.ts' on 'fi'. Authored-by: @tuplasuhveli via transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com> * [extras/Lockscreen.qml] Add reference to issue #102 (#103) Denote that this file currently comprises dead, problematic code; for details see issue #102. * [src/utils.cpp] Remove function `startMafw` … …, because it appears to be dead code; for details see issue #101. * [src/utils.h] Remove function declaration `startMafw` … …, because it appears to be dead code; for details see issue #101. * [src/datareader.cpp] Omit superfluous `QString oFile` (#100) For details, see #75 (comment) * Use the app config dir to save the QSettings file (#105) Sailjail is not mounting the generic config dir, so the QSettings file should be under org/app/ dir and not under the org/ dir. * [flowplayer/extras/Lockscreen.qml] Denote status in comments (#108) See issue #102 for details. * [flowplayer/src/playlist.cpp] Convert unused `/home/nemo` references, too (#107) As discussed in issue #101. * [flowplayer.changes] Add changelog entries for v0.3.6 * [flowplayer.spec] Pre-release version increase * [README.md] Add Elmeri Länsiharju (tuplasuhveli) as contributor * [flowplayer.changes] Beautify two atributions * [flowplayer.changes] Another round of name beautifying --------- Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com> Co-authored-by: Damien Caliste <[email protected]>
sailfishos-applications · Nov 29, 2024 · ef1eba6 · ef1eba6
2 parents 13ba8be + 501fa77
commit ef1eba6
Show file tree

Hide file tree

Showing 22 changed files with 1,495 additions and 119 deletions.
diff --git a/README.md b/README.md
@@ -47,6 +47,7 @@ In 2023 [olf (Olf0)](https://github.com/Olf0) overhauled infrastructure aspects,
 #### Contributors
 - [Damien Caliste (dcaliste)](https://github.com/dcaliste)
 - [David Llewellyn-Jones (llewelld / flypig)](https://github.com/llewelld)
+- [Elmeri Länsiharju (tuplasuhveli)](https://github.com/tuplasuhveli)
 - [Mark Washeim (poetaster)](https://github.com/poetaster)
 - [olf (Olf0)](https://github.com/Olf0)
 - [Ruben de Smet (rubdos)](https://github.com/rubdos)

diff --git a/extras/Lockscreen.qml b/extras/Lockscreen.qml
@@ -5,6 +5,10 @@
 **
 ****************************************************************************/
 
+/***********************************************
+** This file bears some issues, see issue #102.
+***********************************************/
+
 import QtQuick 2.0
 import org.nemomobile.lipstick 0.1
 import Sailfish.Silica 1.0
@@ -432,6 +436,7 @@ MouseArea {
                     onTextChanged: {
                         setDefaultMarqueeOffset()
                         if (text!=="") {
+                            // Do not worry about this hardcoded path, see issues #101 and #102.
                             coverArt.source = "/home/nemo/.cache/currentAlbumArt.jpeg";
                             coverArt.sourceSize.width = 0
                             coverArt.sourceSize.height = 0

diff --git a/rpm/flowplayer.changes b/rpm/flowplayer.changes
@@ -1,7 +1,14 @@
+* Thu Nov 28 2024 olf <[email protected]> - 0.3.6
+- Update translations: SV (#90 by @eson57), DE (#91), ET (#92)
+- Add Finnish (FI) translation (#94, #95, #96) by @tuplasuhveli
+- Clean up multiple code sections (#100, #104, #107)
+- Document status of `extras/Lockscreen.qml` (#102, #103, #108)
+- Use the app config dir to save the QSettings file (#105 by @dcaliste), closes issue #99
+
 * Fri Apr 12 2024 olf <[email protected]> - 0.3.5
 - Add SailJail configuration (#77), originally by @poetaster
-- Add Estonian translation (#86) by @tuplasuhveli
-- Fix some source strings (#87, #88) by @tuplasuhveli
+- Add Estonian translation (#86) by Priit Jõerüüt (tlend@transifex)
+- Fix some source strings (#87, #88) by @tuplasuhveli & @olf
 
 * Thu Mar 14 2024 olf <[email protected]> - 0.3.4
 - Support Opus codec (#67) by @rubdos

diff --git a/rpm/flowplayer.spec b/rpm/flowplayer.spec
@@ -10,7 +10,7 @@ Name:       flowplayer
 Summary:    Music Player for SailfishOS
 # The <version> 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.5
+Version:    0.3.6
 # The <release> 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.5
 # 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:    release3
+Release:    release4
 # The Group tag should comprise one of the groups listed here:
 # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
 Group:      Applications/Multimedia

diff --git a/src/FlowPlayer.cpp b/src/FlowPlayer.cpp
@@ -7,6 +7,8 @@
 #include <sailfishapp.h>
 #include <QObject>
 #include <QTextCodec>
+#include <QSettings>
+#include <QStandardPaths>
 
 #include "playlistmanager.h"
 #include "utils.h"
@@ -34,7 +36,7 @@ int main(int argc, char *argv[])
     QString lang;
     QTranslator translator;
 
-    QSettings settings;
+    QSettings settings(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     lang = settings.value("Language", "undefined").toString();
 
     if (lang=="undefined")

diff --git a/src/coversearch.cpp b/src/coversearch.cpp
@@ -7,6 +7,7 @@
 #include <QStringList>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QSettings>
 #include <QStandardPaths>
 
 #define BING_ID "A16EECFD14108C2794E4BC29D4DE59C308685B4A"
@@ -165,7 +166,7 @@ void CoverSearch::remove(const QString &file)
     QString nf = file;
     if ( nf.startsWith("//") )
         nf.remove(0, 1);
-    QSettings settings;
+    QSettings settings(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     QStringList entries = settings.value("CoverSearch","").toStringList();
     QStringList newfiles;
     for (int i=0; i< entries.count(); ++i)

diff --git a/src/datareader.cpp b/src/datareader.cpp
@@ -187,10 +187,6 @@ TagLib::File* DataReader::getFileByMimeType(QString file)
 
 void DataReader::readFile(QString file)
 {
-    // Is oFile used somewhere? (I failed to find a location.)
-    // If not, what is this new line good for?  For details, see PR #75.
-    QString oFile = file;
-
     file.remove("file://");
     TagLib::File* tf = getFileByMimeType(file);
 
@@ -271,7 +267,7 @@ void DataReader::run()
     favFiles.clear();
     map.clear();
 
-    QSettings settings;
+    QSettings settings(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     QStringList folders = settings.value("Folders","").toString().split("<separator>");
     folders.removeAll("");
 

diff --git a/src/datos.cpp b/src/datos.cpp
@@ -233,7 +233,7 @@ void Datos::addFilterToQueue()
     }*/
 
     QString norder;
-    QSettings settings;
+    QSettings settings(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     QString order = settings.value("TrackOrder", "title").toString();
 
     if (order=="title") norder="title";
@@ -429,7 +429,7 @@ QString Datos::getArtistsCovers()
             dato1.append(coverart);
     }
 
-    QSettings settings;
+    QSettings settings(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     int first = settings.value("LastArtistItem", 0).toInt();
 
     if (first >= dato1.count()) {
@@ -463,7 +463,7 @@ QString Datos::getAlbumsCovers()
             dato1.append(coverart);
     }
 
-    QSettings settings;
+    QSettings settings(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     int first = settings.value("LastAlbumItem", 0).toInt();
 
     if (first >= dato1.count()) {

diff --git a/src/lfm.cpp b/src/lfm.cpp
@@ -31,7 +31,7 @@ LFM::LFM(QQuickItem *parent)
     //connect(datos5, SIGNAL(finished(QNetworkReply*)), this, SLOT(downloaded5(QNetworkReply*)));
     //connect(datos6, SIGNAL(finished(QNetworkReply*)), this, SLOT(downloaded6(QNetworkReply*)));
 
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     lang = sets.value("LastFMlang", "en").toString();
 }
 
@@ -277,7 +277,7 @@ void LFM::getBio(QString artist)
 
     //if ( reply1 && reply1->isRunning() )
     //    reply1->abort();
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     lang = sets.value("Language", "en").toString();
     artistInfo = tr("Fetching artist information");
     artistInfoLarge = "";
@@ -301,7 +301,7 @@ void LFM::getAlbumBio(QString artist, QString album)
 {
     /*if ( reply2 && reply2->isRunning() )
         reply2->abort();
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     lang = sets.value("LastFMlang", "en").toString();
     albumInfo = tr("Fetching album information");
     albumInfoLarge = "";
@@ -316,7 +316,7 @@ void LFM::getSongBio(QString artist, QString song)
 {
     /*if ( reply3 && reply3->isRunning() )
         reply3->abort();
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     lang = sets.value("LastFMlang", "en").toString();
     songInfo = tr("Fetching track information");
     songInfoLarge = "";

diff --git a/src/loadimage.cpp b/src/loadimage.cpp
@@ -6,7 +6,6 @@
 #include <qfileinfo.h>
 #include <qdir.h>
 #include <QImage>
-#include <QSettings>
 #include <QDebug>
 #include <QStandardPaths>
 

diff --git a/src/loadwebimage.cpp b/src/loadwebimage.cpp
@@ -7,7 +7,6 @@
 #include <qfileinfo.h>
 #include <qdir.h>
 #include <QImage>
-#include <QSettings>
 #include <QDebug>
 #include <QDateTime>
 #include <QStandardPaths>

diff --git a/src/missing.cpp b/src/missing.cpp
@@ -8,7 +8,6 @@
 #include <QImage>
 #include <QStringList>
 #include <QXmlStreamReader>
-#include <QSettings>
 #include <QStandardPaths>
 
 bool namefileLess(const QStringList &d1, const QStringList &d2)

diff --git a/src/musicmodel.cpp b/src/musicmodel.cpp
@@ -57,7 +57,7 @@ void MusicModel::loadData(QString artist, QString album, QString various)
 
     if (!isDBOpened) openDatabase();
 
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     QString torder = sets.value("TrackOrder", "title").toString();
     QString order;
     if (torder=="title") order="title";

diff --git a/src/player.cpp b/src/player.cpp
@@ -3,6 +3,7 @@
 
 #include <QTimer>
 #include <QSettings>
+#include <QStandardPaths>
 #include "QVariantMap"
 
 extern bool databaseWorking;
@@ -20,7 +21,7 @@ static gboolean bus_cb (GstBus *bus, GstMessage *msg, gpointer data)
 static void prepare_next_stream(GstElement *obj, gpointer data) {
     qDebug() << "ABOUT TO FINISH";
 
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     if (sets.value("GaplessPlayback", "no").toString()=="no")
         return;
 
@@ -421,7 +422,7 @@ void Player::backend_deinit()
 void Player::setEq(bool enabled)
 {
     qDebug() << "Setting eq: " << enabled;
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     sets.setValue("Equalizer", enabled? "Yes" : "No");
     sets.sync();
 
@@ -472,7 +473,7 @@ void Player::setEqualizerReal(int band, int value)
 
 void Player::loadEqualizer()
 {
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     m_eqenabled = sets.value("Equalizer", "No").toString()=="Yes";
     emit eqEnabledChanged();
 

diff --git a/src/playlist.cpp b/src/playlist.cpp
@@ -24,14 +24,14 @@ int Playlist::current()
 
 QString Playlist::active() const
 {
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     QString t = sets.value("Active", "false").toString();
     return t;
 }
 
 QString Playlist::unknown() const
 {
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     QString t = sets.value("Unknown", "false").toString();
     return t;
 }
@@ -258,10 +258,10 @@ void Playlist::addAlbumToList(QString artist, QString album, QString various)
 
 void Playlist::saveList(QString list)
 {
-    //qDebug() << "Saving playlist :" << list;
+    //qDebug() << "Saving playlist: " << list;
 
     /*QString archivo;
-    archivo = "/home/nemo/.config/cepiperez/playlists/" + list + ".xml";
+    archivo = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/playlists/" + list + ".xml";
     QFile file( archivo );
     file.open( QIODevice::Truncate | QIODevice::Text | QIODevice::ReadWrite);
     QTextStream out(&file);
@@ -352,7 +352,7 @@ void Playlist::clearList(QString list)
     listado.clear();
     //saveList(list);
     /*QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
-    QString path("/home/nemo/.config/cepiperez/flowplayer.db");
+    QString path(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.db");
     db.setDatabaseName(path);
     db.open();
 
@@ -416,7 +416,7 @@ void Playlist::changeUnknown(bool active)
 {
     //qDebug() << "CHANGING UKNOWN: " << active;
 
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     sets.setValue("Unknown", active);
     sets.sync();
 }
@@ -425,7 +425,7 @@ void Playlist::changeMode(QString mode)
 {
     //qDebug() << "CHANGING MODE: " << mode;
 
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     sets.setValue("Mode", mode);
     sets.sync();
 }

diff --git a/src/playlistmanager.cpp b/src/playlistmanager.cpp
@@ -1,6 +1,7 @@
 #include "playlistmanager.h"
 
 #include <QSettings>
+#include <QStandardPaths>
 #include <QFileInfo>
 #include <QXmlStreamReader>
 #include <QDir>
@@ -89,7 +90,7 @@ void PlaylistManager::addAlbumToList(QString list, QString artist, QString album
 
     if (!isDBOpened) openDatabase();
 
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     QString torder = sets.value("TrackOrder", "title").toString();
     QString order;
     if (torder=="title") order="title";
@@ -431,7 +432,7 @@ void PlaylistManager::loadAlbum(QString artist, QString album, QString various)
 
     if (!isDBOpened) openDatabase();
 
-    QSettings sets;
+    QSettings sets(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/flowplayer.conf", QSettings::NativeFormat);
     QString torder = sets.value("TrackOrder", "title").toString();
     QString order;
     if (torder=="title") order="title";