Automatic merge of translations from Transifex

this is what I meant lol

.github/workflows/all.yml

@@ -29,6 +29,11 @@ jobs:
     container:
       image: ubuntu:bionic
     steps:
+      - uses: supplypike/setup-bin@v3
+        with:
+          uri: https://github.com/transifex/cli/releases/download/v1.6.7/tx-linux-amd64.tar.gz
+          name: tx
+          version: 1.6.7
       - name: Install dependencies
         env:
           DEBIAN_FRONTEND: noninteractive
@@ -64,8 +69,6 @@ jobs:
           qttools5-dev
           libsparsehash-dev
           ssh
-      - name: Install tx
-        run: pip3 install transifex-client==0.13.9
       - name: Checkout
         uses: actions/checkout@v1.2.0
       - name: git hackery
@@ -73,7 +76,7 @@ jobs:
       - name: tx init
         env:
           TX_TOKEN: ${{ secrets.TX_TOKEN }}
-        run: tx init --no-interactive --force
+        run: tx init
       - name: cmake
         working-directory: bin
         run: cmake ..
@@ -83,7 +86,7 @@ jobs:
       - name: tx config
         env:
           TX_TOKEN: ${{ secrets.TX_TOKEN }}
-        run: tx config mapping --execute -r clementine.clementineplayer -f src/translations/translations.pot -s en -t PO --expression 'src/translations/<lang>.po'
+        run: tx add --organization davidsansome --project clementine --resource clementineplayer --file-filter 'src/translations/<lang>.po' --type PO src/translations/en.po
       - name: tx push
         env:
           TX_TOKEN: ${{ secrets.TX_TOKEN }}
@@ -97,14 +100,14 @@ jobs:
       - build_bionic_64
       - build_bullseye_64
       - build_buster_64
-      - build_fedora_35
       - build_fedora_36
+      - build_fedora_37
+      - build_fedora_38
       - build_focal_64
       - build_jammy_64
-      - build_mac
+      # - build_mac
       - build_mingw
       - build_source
-      - build_stretch_64
     steps:
       - uses: actions/checkout@v1.2.0
       - uses: actions/download-artifact@v2
@@ -228,6 +231,8 @@ jobs:
           qt5-qtbase-devel
           qt5-qtx11extras-devel
           qt5-rpm-macros
+          qtsingleapplication-qt5-devel
+          qtsinglecoreapplication-qt5-devel
           rpmdevtools
           sha2-devel
           sparsehash-devel
@@ -239,7 +244,7 @@ jobs:
         run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
       - name: cmake
         working-directory: bin
-        run: cmake ..
+        run: cmake -DUSE_SYSTEM_QTSINGLEAPPLICATION=On ..
       - name: Build source tarball
         working-directory: bin
         run: ../dist/maketarball.sh
@@ -256,11 +261,11 @@ jobs:
           name: release_fedora_36
           path: ~/rpmbuild/RPMS/*/clementine-*.rpm
 
-  build_fedora_35:
+  build_fedora_37:
-    name: Build Fedora 35 RPM
+    name: Build Fedora 37 RPM
     runs-on: ubuntu-22.04
     container:
-      image: fedora:35
+      image: fedora:37
     env:
       RPM_BUILD_NCPUS: "2"
     steps:
@@ -300,6 +305,8 @@ jobs:
           qt5-qtbase-devel
           qt5-qtx11extras-devel
           qt5-rpm-macros
+          qtsingleapplication-qt5-devel
+          qtsinglecoreapplication-qt5-devel
           rpmdevtools
           sha2-devel
           sparsehash-devel
@@ -311,7 +318,7 @@ jobs:
         run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
       - name: cmake
         working-directory: bin
-        run: cmake ..
+        run: cmake -DUSE_SYSTEM_QTSINGLEAPPLICATION=On ..
       - name: Build source tarball
         working-directory: bin
         run: ../dist/maketarball.sh
@@ -325,9 +332,84 @@ jobs:
         run: rpmbuild -ba ../dist/clementine.spec
       - uses: actions/upload-artifact@v2
         with:
-          name: release_fedora_35
+          name: release_fedora_37
           path: ~/rpmbuild/RPMS/*/clementine-*.rpm
 
+  build_fedora_38:
+    name: Build Fedora 38 RPM
+    runs-on: ubuntu-22.04
+    container:
+      image: fedora:38
+    env:
+      RPM_BUILD_NCPUS: "2"
+    steps:
+      - name: Install dependencies
+        run: >
+          dnf install --assumeyes
+          @development-tools
+          alsa-lib-devel
+          boost-devel
+          cmake
+          cryptopp-devel
+          dbus-devel
+          desktop-file-utils
+          fftw-devel
+          gcc-c++
+          gettext
+          git
+          glew-devel
+          gstreamer1-devel
+          gstreamer1-plugins-base-devel
+          hicolor-icon-theme
+          libappstream-glib
+          libcdio-devel
+          libchromaprint-devel
+          libgpod-devel
+          liblastfm-qt5-devel
+          libmtp-devel
+          libnotify-devel
+          openssh
+          pkgconfig
+          protobuf-compiler
+          protobuf-devel
+          pulseaudio-libs-devel
+          qca-qt5-devel
+          qca-qt5-ossl
+          qt5-linguist
+          qt5-qtbase-devel
+          qt5-qtx11extras-devel
+          qt5-rpm-macros
+          qtsingleapplication-qt5-devel
+          qtsinglecoreapplication-qt5-devel
+          rpmdevtools
+          sha2-devel
+          sparsehash-devel
+          sqlite-devel
+          taglib-devel
+          tar
+      - uses: actions/checkout@v1.2.0
+      - name: git hackery
+        run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
+      - name: cmake
+        working-directory: bin
+        run: cmake -DUSE_SYSTEM_QTSINGLEAPPLICATION=On ..
+      - name: Build source tarball
+        working-directory: bin
+        run: ../dist/maketarball.sh
+      - name: Create rpmbuild directory
+        run: mkdir -p ~/rpmbuild/SOURCES
+      - name: Move source tarball
+        working-directory: bin
+        run: mv clementine-*.tar.xz ~/rpmbuild/SOURCES
+      - name: Build RPM
+        working-directory: bin
+        run: rpmbuild -ba ../dist/clementine.spec
+      - uses: actions/upload-artifact@v2
+        with:
+          name: release_fedora_38
+          path: ~/rpmbuild/RPMS/*/clementine-*.rpm
+
+
   build_mingw:
     name: Build Windows Installer
     runs-on: ubuntu-22.04
@@ -521,65 +603,6 @@ jobs:
           name: release_mingw
           path: dist/windows/ClementineSetup*.exe
 
-  build_stretch_64:
-    name: Build Debian Stretch 64-bit deb
-    runs-on: ubuntu-22.04
-    container:
-      image: debian:stretch
-    steps:
-      - name: Install dependencies
-        run: >
-          apt-get update && apt-get install -y
-          build-essential
-          cmake
-          gettext
-          git
-          libasound2-dev
-          libboost-dev
-          libcdio-dev
-          libchromaprint-dev
-          libcrypto++-dev
-          libdbus-1-dev
-          libfftw3-dev
-          libglew1.5-dev
-          libglib2.0-dev
-          libgpod-dev
-          libgstreamer-plugins-base1.0-dev
-          libgstreamer1.0-dev
-          liblastfm5-dev
-          libmtp-dev
-          libmygpo-qt-dev
-          libprotobuf-dev
-          libpulse-dev
-          libqt5x11extras5-dev
-          libsparsehash-dev
-          libsqlite3-dev
-          libtag1-dev
-          pkg-config
-          protobuf-compiler
-          qtbase5-dev
-          qttools5-dev-tools
-          qttools5-dev
-          ssh
-      - uses: actions/checkout@v1.2.0
-      - name: git hackery
-        run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
-      - name: cmake
-        working-directory: bin
-        run: >
-          cmake ..
-          -DWITH_DEBIAN=ON
-          -DDEB_ARCH=amd64
-          -DDEB_DIST=stretch
-          -DENABLE_SPOTIFY_BLOB=OFF
-      - name: make
-        working-directory: bin
-        run : make -j2 deb
-      - uses: actions/upload-artifact@v2
-        with:
-          name: release_stretch_64
-          path: bin/clementine_*.deb
-
   build_bionic_64:
     name: Build Ubuntu Bionic 64-bit deb
     runs-on: ubuntu-22.04
@@ -892,6 +915,7 @@ jobs:
           path: bin/clementine_*.deb
 
   build_mac:
+    if: false
     name: Build Mac DMG
     runs-on: macos-10.15
     steps:

.github/workflows/translations.yml

@@ -6,20 +6,22 @@ on:
 jobs:
   pull_translations:
     name: Pull translations from Transifex
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     container:
-      image: ubuntu:bionic
+      image: ubuntu:jammy
     steps:
+      - uses: supplypike/setup-bin@v3
+        with:
+          uri: https://github.com/transifex/cli/releases/download/v1.6.7/tx-linux-amd64.tar.gz
+          name: tx
+          version: 1.6.7
       - name: Install dependencies
         env:
           DEBIAN_FRONTEND: noninteractive
         run: >
           apt-get update && apt-get install -y
           git
-          python3-pip
           ssh
-      - name: Install tx
-        run: pip3 install transifex-client==0.13.9
       - name: Checkout
         uses: actions/checkout@v1.2.0
       - name: git hackery
@@ -29,15 +31,15 @@ jobs:
       - name: tx init
         env:
           TX_TOKEN: ${{ secrets.TX_TOKEN }}
-        run: tx init --no-interactive --force
+        run: tx init
       - name: tx config
         env:
           TX_TOKEN: ${{ secrets.TX_TOKEN }}
-        run: tx config mapping --execute -r clementine.clementineplayer -s en -t PO --expression 'src/translations/<lang>.po'
+        run: tx add --organization davidsansome --project clementine --resource clementineplayer --file-filter 'src/translations/<lang>.po' --type PO src/translations/en.po
       - name: tx pull
         env:
           TX_TOKEN: ${{ secrets.TX_TOKEN }}
-        run: tx pull --all -f --no-interactive
+        run: tx pull -f -a
       - name: Setup git SSH
         uses: webfactory/ssh-agent@v0.4.1
         with:

3rdparty/libmygpo-qt/qjsonwrapper/Json.cpp

@@ -1,128 +0,0 @@
-/* Copyright 2014, Uwe L. Korn <uwelk@xhochy.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include "Json.h"
-
-// Qt version specific includes
-#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
-    #include <QJsonDocument>
-    #include <QMetaProperty>
-#else
-    #include <qjson/parser.h>
-    #include <qjson/qobjecthelper.h>
-    #include <qjson/serializer.h>
-#endif
-
-namespace QJsonWrapper
-{
-
-QVariantMap
-qobject2qvariant( const QObject* object )
-{
-#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
-    QVariantMap map;
-    if ( object == NULL )
-    {
-        return map;
-    }
-
-    const QMetaObject* metaObject = object->metaObject();
-    for ( int i = 0; i < metaObject->propertyCount(); ++i )
-    {
-        QMetaProperty metaproperty = metaObject->property( i );
-        if ( metaproperty.isReadable() )
-        {
-            map[ QLatin1String( metaproperty.name() ) ] = object->property( metaproperty.name() );
-        }
-    }
-    return map;
-#else
-    return QJson::QObjectHelper::qobject2qvariant( object );
-#endif
-}
-
-
-void
-qvariant2qobject( const QVariantMap& variant, QObject* object )
-{
-#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
-    for ( QVariantMap::const_iterator iter = variant.begin(); iter != variant.end(); ++iter )
-    {
-        QVariant property = object->property( iter.key().toLatin1() );
-        Q_ASSERT( property.isValid() );
-        if ( property.isValid() )
-        {
-            QVariant value = iter.value();
-            if ( value.canConvert( property.type() ) )
-            {
-                value.convert( property.type() );
-                object->setProperty( iter.key().toLatin1(), value );
-            } else if ( QString( QLatin1String("QVariant") ).compare( QLatin1String( property.typeName() ) ) == 0 ) {
-                object->setProperty( iter.key().toLatin1(), value );
-            }
-        }
-    }
-#else
-    QJson::QObjectHelper::qvariant2qobject( variant, object );
-#endif
-}
-
-
-QVariant
-parseJson( const QByteArray& jsonData, bool* ok )
-{
-#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
-    QJsonParseError error;
-    QJsonDocument doc = QJsonDocument::fromJson( jsonData, &error );
-    if ( ok != NULL )
-    {
-        *ok = ( error.error == QJsonParseError::NoError );
-    }
-    return doc.toVariant();
-#else
-    QJson::Parser p;
-    return p.parse( jsonData, ok );
-#endif
-}
-
-
-QByteArray
-toJson( const QVariant &variant, bool* ok )
-{
-#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
-    QJsonDocument doc = QJsonDocument::fromVariant( variant );
-    if ( ok != NULL )
-    {
-        *ok = !doc.isNull();
-    }
-    return doc.toJson( QJsonDocument::Compact );
-#else
-    QJson::Serializer serializer;
-    QByteArray ret = serializer.serialize(variant);
-    if ( ok != NULL )
-    {
-        *ok = !ret.isNull();
-    }
-    return ret;
-#endif
-}
-
-}

3rdparty/libmygpo-qt/qjsonwrapper/Json.h

@@ -1,36 +0,0 @@
-/* Copyright 2014, Uwe L. Korn <uwelk@xhochy.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#pragma once
-#ifndef QJSONWRAPPER_JSON_H
-#define QJSONWRAPPER_JSON_H
-
-#include <QVariant>
-
-namespace QJsonWrapper
-{
-    QVariantMap qobject2qvariant( const QObject* object );
-    void qvariant2qobject( const QVariantMap& variant, QObject* object );
-    QVariant parseJson( const QByteArray& jsonData, bool* ok = 0 );
-    QByteArray toJson( const QVariant &variant, bool* ok = 0 );
-}
-
-#endif // QJSONWRAPPER_JSON_H

3rdparty/qtiocompressor/CMakeLists.txt

@@ -15,4 +15,4 @@ ADD_LIBRARY(qtiocompressor STATIC
     ${IOCOMPRESSOR-SOURCES-MOC}
 )
 
-target_link_libraries(qtiocompressor Qt5::Core)
+target_link_libraries(qtiocompressor Qt5::Core ${ZLIB_LIBRARIES})

CMakeLists.txt

@@ -1,6 +1,6 @@
+cmake_minimum_required(VERSION 3.0.0)
 project(clementine)
 
-cmake_minimum_required(VERSION 3.0.0)
 cmake_policy(SET CMP0053 OLD)
 
 include(CheckCXXCompilerFlag)
@@ -76,9 +76,7 @@ pkg_check_modules(LIBPULSE libpulse)
 pkg_check_modules(LIBXML libxml-2.0)
 pkg_check_modules(TAGLIB taglib)
 
-if (WIN32)
+find_package(ZLIB REQUIRED)
-  find_package(ZLIB REQUIRED)
-endif (WIN32)
 
 find_library(LASTFM5_LIBRARIES lastfm5)
 find_path(LASTFM5_INCLUDE_DIRS lastfm5/ws.h)
@@ -349,11 +347,18 @@ include_directories("3rdparty/qsqlite")
 
 # When/if upstream accepts our patches then these options can be used to link
 # to system installed qtsingleapplication instead.
-option(USE_SYSTEM_QTSINGLEAPPLICATION "Don't set this option unless your system QtSingleApplication library has been compiled with the Clementine patches in 3rdparty" OFF)
+option(USE_SYSTEM_QTSINGLEAPPLICATION "Use the system-provided QtSingleApplication library (needs to have clementine patches, but these seem to be in Qt5)" OFF)
 if(USE_SYSTEM_QTSINGLEAPPLICATION)
-  find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES qt5/QtSolutions)
+  find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES qt5/QtSolutions REQUIRED)
-  find_library(QTSINGLEAPPLICATION_LIBRARIES Qt5Solutions_SingleApplication-2.6)
+  find_library(QTSINGLEAPPLICATION_LIBRARIES Qt5Solutions_SingleApplication-2.6 REQUIRED)
-  find_library(QTSINGLECOREAPPLICATION_LIBRARIES Qt5Solutions_SingleCoreApplication-2.6)
+  add_library(qtsingleapplication INTERFACE)
+  target_link_libraries(qtsingleapplication INTERFACE QTSINGLEAPPLICATION_LIBRARIES)
+  target_include_directories(qtsingleapplication INTERFACE QTSINGLEAPPLICATION_INCLUDE_DIRS)
+  find_path(QTSINGLECOREAPPLICATION_INCLUDE_DIRS qtsinglecoreapplication.h PATH_SUFFIXES qt5/QtSolutions REQUIRED)
+  find_library(QTSINGLECOREAPPLICATION_LIBRARIES Qt5Solutions_SingleCoreApplication-2.6 REQUIRED)
+  add_library(qtsinglecoreapplication INTERFACE)
+  target_link_libraries(qtsinglecoreapplication INTERFACE QTSINGLECOREAPPLICATION_LIBRARIES)
+  target_include_directories(qtsinglecoreapplication INTERFACE QTSINGLECOREAPPLICATION_INCLUDE_DIRS)
 else(USE_SYSTEM_QTSINGLEAPPLICATION)
   add_subdirectory(3rdparty/qtsingleapplication)
   set(QTSINGLEAPPLICATION_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication)

README.md

@@ -41,7 +41,7 @@ Compile and install:
 
     cd bin
     cmake ..
-    make -j8
+    make -j$(nproc)
     sudo make install
 
 See the Wiki for more instructions and a list of dependencies:

data/lyrics/ultimate_providers.xml

@@ -88,17 +88,6 @@
       <item begin="&lt;/a" end="&gt;"/>
     </exclude>
   </provider>   
-  <provider name="hindilyrics.net (Bollywood songs)" title="{title} ({album})" charset="utf-8" url="http://www.hindilyrics.net/lyrics/of-{Title}.html">
-    <urlFormat replace=" _@;\/&quot;'()[]" with="%20"/>
-    <urlFormat replace="?" with=""/>
-    <extract>
-      <item begin="&lt;div class=nm&gt;Movie&lt;/div&gt;:" end="&lt;/pre&gt;"/>
-    </extract>
-    <exclude>
-      <item begin="&lt;span class=" end="&quot;&gt;"/>
-    </exclude>
-    <invalidIndicator value="Couldn't find that page."/>
-  </provider>
   <provider name="letras.mus.br" title="" charset="utf-8" url="https://www.letras.mus.br/winamp.php?musica={title}&amp;artista={artist}">
     <urlFormat replace="_@,;&amp;\/&quot;" with="_"/>
     <urlFormat replace=" " with="+"/>
@@ -114,13 +103,6 @@
     </extract>
     <invalidIndicator value="ERROR"/>
   </provider>
-  <provider name="loudson.gs" title="" charset="utf-8" url="http://www.loudson.gs/{a}/{artist}/{album}/{title}">
-    <urlFormat replace=" _@,;&amp;\/&quot;" with="-"/>
-    <urlFormat replace="." with=""/>
-    <extract>
-      <item tag="&lt;div class=&quot;middle_col_TracksLyrics &quot;&gt;"/>
-    </extract>
-  </provider>
   <provider name="lyrics.com" title="{artist} - {title} Lyrics" charset="utf-8" url="http://www.lyrics.com/lyrics/{artist}/{title}.html">
     <urlFormat replace=" _@,;&amp;\/&quot;" with="-"/>
     <urlFormat replace="'." with=""/>
@@ -194,14 +176,6 @@
     </extract>
     <invalidIndicator value="Page not Found"/>
   </provider>
-  <provider name="lyricstime.com" title="{artist} - {title} Lyrics" charset="iso-8859-1" url="http://www.lyricstime.com/{artist}-{title}-lyrics.html">
-    <urlFormat replace=" _@,;&amp;\/&quot;'" with="-"/>
-    <urlFormat replace="." with=""/>
-    <extract>
-      <item tag="&lt;div id=&quot;songlyrics&quot; &gt;"/>
-      <item tag="&lt;p&gt;"/>
-    </extract>
-  </provider>
   <provider name="lyriki.com" title="" charset="utf-8" url="http://www.lyriki.com/{artist}:{title}">
     <urlFormat replace=" _@,;&amp;\/&quot;" with="_"/>
     <urlFormat replace="." with=""/>
@@ -210,20 +184,6 @@
       <item tag="&lt;p&gt;"/>
     </extract>
   </provider>
-  <provider name="metrolyrics.com" title="{artist} - {title} LYRICS" charset="utf-8" url="http://www.metrolyrics.com/{title}-lyrics-{artist}.html">
-    <urlFormat replace=" _@,;&amp;\/&quot;" with="-"/>
-    <urlFormat replace="'." with=""/>
-    <extract>
-      <item tag="&lt;span id=&quot;lyrics&quot;&gt;"/>
-    </extract>
-    <extract>
-      <item tag="&lt;div id=&quot;lyrics&quot;&gt;"/>
-    </extract>
-    <exclude>
-      <item tag="&lt;h5&gt;"/>
-    </exclude>
-    <invalidIndicator value="These lyrics are missing"/>
-  </provider>
   <provider name="mp3lyrics.org" title="{artist} &amp;quot;{title}&amp;quot; Lyrics" charset="utf-8" url="http://www.mp3lyrics.org/{a}/{artist}/{title}/">
     <urlFormat replace=" _@,;&amp;\/&quot;" with="-"/>
     <urlFormat replace="'." with=""/>
@@ -251,13 +211,6 @@
     </exclude>
     <invalidIndicator value="We couldn't find that page."/>
   </provider>
-  <provider name="seeklyrics.com" title="{artist} - {title} Lyrics" charset="iso-8859-1" url="http://www.seeklyrics.com/lyrics/{Artist}/{Title}.html">
-    <urlFormat replace=" _@,;&amp;\/'&quot;" with="-"/>
-    <urlFormat replace="." with=""/>
-    <extract>
-      <item tag="&lt;div id=&quot;songlyrics&quot;&gt;"/>
-    </extract>
-  </provider>
   <provider name="songlyrics.com" title="{title} LYRICS - {artist}" charset="utf-8" url="http://www.songlyrics.com/{artist}/{title}-lyrics/">
     <urlFormat replace=" ._@,;&amp;\/&quot;" with="-"/>
     <urlFormat replace="'" with="_"/>

dist/clementine.spec.in

@@ -18,6 +18,7 @@ BuildRequires:  liblastfm-qt5-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libappstream-glib
+BuildRequires:  qtsingleapplication-qt5-devel
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gio-2.0)

dist/org.clementine_player.Clementine.desktop

@@ -15,6 +15,7 @@ GenericName[hi]=क्लेमेंटैन् संगीत वादक
 GenericName[is]=Clementine tónlistarspilarinn
 GenericName[pl]=Odtwarzacz muzyki Clementine
 GenericName[pt]=Reprodutor de músicas Clementine
+GenericName[ru]=Музыкальный проигрыватель Clementine
 GenericName[sl]=Predvajalnik glasbe Clementine
 GenericName[sr]=Клементина музички плејер
 GenericName[sr@ijekavian]=Клементина музички плејер
@@ -26,6 +27,7 @@ Comment[es]=Reproducción de música y flujos de Last.fm
 Comment[is]=Spilar tónlist og streymi frá last.fm
 Comment[pl]=Odtwarzanie muzyki i strumieni last.fm
 Comment[pt]=Reprodução de músicas e emissões last.fm
+Comment[ru]=Прослушивание музыки и потоков last.fm
 Comment[sl]=Predvaja glasbo in pretoke last.fm
 Comment[sr]=Репродукује музику и last.fm токове
 Comment[sr@ijekavian]=Репродукује музику и last.fm токове
@@ -38,106 +40,58 @@ Terminal=false
 Categories=AudioVideo;Player;Qt;Audio;
 StartupNotify=false
 MimeType=application/ogg;application/x-ogg;application/x-ogm-audio;audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/ogg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-flac;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-wav;video/x-ms-asf;x-content/audio-player;x-scheme-handler/zune;x-scheme-handler/itpc;x-scheme-handler/itms;x-scheme-handler/feed;
-Actions=Play;Pause;Stop;StopAfterCurrent;Previous;Next;
+Actions=Play-Pause;Stop;StopAfterCurrent;Previous;Next;
 
-[Desktop Action Play]
+[Desktop Action Play-Pause]
-Name=Play
+Name=Play/Pause
-Exec=clementine --play
+Exec=clementine --play-pause
-Name[af]=Speel
+Name[be]=Прайграць/Прыпыніць
-Name[be]=Прайграць
+Name[bg]=Възпроизвеждане/Пауза
-Name[bg]=Възпроизвеждане
+Name[br]=Lenn/Ehan
-Name[br]=Lenn
+Name[ca]=Reprodueix/Pausa
-Name[ca]=Reprodueix
+Name[cs]=Přehrát/Pozastavit
-Name[cs]=Přehrát
+Name[da]=Afspil/Pause
-Name[da]=Afspil
+Name[de]=Wiedergabe/Pause
-Name[de]=Wiedergabe
+Name[el]=Αναπαραγωγή/Παύση
-Name[el]=Αναπαραγωγή
+Name[es]=Reproducir/Pausar
-Name[es]=Reproducir
+Name[et]=Mängi/Paus
-Name[et]=Mängi
+Name[eu]=Erreproduzitu/Pausarazi
-Name[eu]=Erreproduzitu
+Name[fa]=پخش/مکث
-Name[fa]=پخش
+Name[fi]=Toista/Keskeytä
-Name[fi]=Toista
+Name[fr]=Lecture/Pause
-Name[fr]=Lecture
+Name[ga]=Seinn/Cuir ar sos
-Name[ga]=Seinn
+Name[gl]=Reproducir/Pausa
-Name[gl]=Reproducir
+Name[he]=נגן/השהה
-Name[he]=נגינה
+Name[hi]=गाना बजाएं/गाना रोकें
-Name[hi]=गाना बजाएं
+Name[hr]=Pokreni reprodukciju/Pauza
-Name[hr]=Pokreni reprodukciju
+Name[hu]=Lejátszás/Szünet
-Name[hu]=Lejátszás
+Name[is]=Spila/Setja í bið
-Name[is]=Spila
+Name[it]=Riproduci/Pausa
-Name[it]=Riproduci
+Name[ja]=再生/一時停止
-Name[ja]=再生
+Name[kk]=Ойнату/Аялдату
-Name[kk]=Ойнату
+Name[ko]=재생/일시 중지
-Name[lt]=Groti
+Name[lt]=Groti/Pristabdyti
-Name[lv]=Atskaņot
+Name[lv]=Atskaņot/Pauze
-Name[ms]=Mainkan
+Name[nb]=Spill/Pause
-Name[nb]=Spill
+Name[nl]=Afspelen/Pauze
-Name[nl]=Afspelen
+Name[oc]=Lectura/Pausa
-Name[oc]=Lectura
+Name[pl]=Odtwarzaj/Pauza
-Name[pl]=Odtwarzaj
+Name[pt]=Reproduzir/Pausa
-Name[pt]=Reproduzir
+Name[pt_BR]=Reproduzir/Pausar
-Name[pt_BR]=Reproduzir
+Name[ro]=Redă/Pauză
-Name[ro]=Redă
+Name[ru]=Играть/пауза
-Name[ru]=Воспроизвести
+Name[sk]=Hrať/Pozastaviť
-Name[sk]=Hrať
+Name[sl]=Predvajaj/Začasno ustavi
-Name[sl]=Predvajaj
+Name[sr]=Пусти/Паузирај
-Name[sr]=Пусти
+Name[sr@ijekavian]=Пусти/Паузирај
-Name[sr@ijekavian]=Пусти
+Name[sr@ijekavianlatin]=Pusti/Pauziraj
-Name[sr@ijekavianlatin]=Pusti
+Name[sr@latin]=Pusti/Pauziraj
-Name[sr@latin]=Pusti
+Name[sv]=Spela upp/Gör paus
-Name[sv]=Spela upp
+Name[tr]=Çal/Duraklat
-Name[tr]=Çal
+Name[uk]=Відтворити/Призупинити
-Name[uk]=Відтворити
+Name[vi]=Phát/Tạm dừng
-Name[vi]=Phát
+Name[zh_CN]=播放/暂停
-Name[zh_CN]=播放
+Name[zh_TW]=播放/暫停
-Name[zh_TW]=播放
-
-[Desktop Action Pause]
-Name=Pause
-Exec=clementine --pause
-Name[be]=Прыпыніць
-Name[bg]=Пауза
-Name[br]=Ehan
-Name[ca]=Pausa
-Name[cs]=Pozastavit
-Name[el]=Παύση
-Name[es]=Pausar
-Name[et]=Paus
-Name[eu]=Pausarazi
-Name[fa]=ایست
-Name[fi]=Keskeytä
-Name[ga]=Cuir ar sos
-Name[gl]=Pausa
-Name[he]=השהייה
-Name[hi]=गाना रोकें
-Name[hr]=Pauza
-Name[hu]=Szünet
-Name[is]=Setja í bið
-Name[it]=Pausa
-Name[ja]=一時停止
-Name[kk]=Аялдату
-Name[ko]=일시중지
-Name[lt]=Pristabdyti
-Name[lv]=Pauze
-Name[nl]=Pauze
-Name[oc]=Pausa
-Name[pl]=Pauza
-Name[pt]=Pausa
-Name[pt_BR]=Pausar
-Name[ro]=Pauză
-Name[ru]=Приостановить
-Name[sk]=Pozastaviť
-Name[sl]=Začasno ustavi
-Name[sr]=Паузирај
-Name[sr@ijekavian]=Паузирај
-Name[sr@ijekavianlatin]=Pauziraj
-Name[sr@latin]=Pauziraj
-Name[sv]=Gör paus
-Name[tr]=Duraklat
-Name[uk]=Призупинити
-Name[vi]=Tạm dừng
-Name[zh_CN]=暂停
-Name[zh_TW]=暫停
 
 [Desktop Action Stop]
 Name=Stop
@@ -322,7 +276,7 @@ Name[pl]=Dalej
 Name[pt]=Seguinte
 Name[pt_BR]=Próximo
 Name[ro]=Următoarea
-Name[ru]=Дальше
+Name[ru]=Следующий
 Name[sk]=Ďalšia
 Name[sl]=Naslednji
 Name[sr]=Следећа

src/CMakeLists.txt

@@ -1268,7 +1268,6 @@ target_link_libraries(clementine_lib
   ${SQLITE_LIBRARIES}
 
   Qocoa
-  z
 )
 
 link_directories(
@@ -1351,7 +1350,6 @@ target_link_libraries(clementine_lib qsqlite)
 if (WIN32)
   target_link_libraries(clementine_lib
     protobuf
-    ${ZLIB_LIBRARIES}
     tinysvcmdns
     dsound
   )

src/core/organiseformat.h

@@ -27,7 +27,7 @@
 
 #include "core/song.h"
 
-class TranscoderPreset;
+struct TranscoderPreset;
 
 class OrganiseFormat {
  public:

src/internet/digitally/digitallyimportedservicebase.h

@@ -41,16 +41,16 @@ class DigitallyImportedServiceBase : public InternetService {
                                const QString& api_service_name,
                                Application* app, InternetModel* model,
                                bool has_premium, QObject* parent = nullptr);
-  ~DigitallyImportedServiceBase();
+  ~DigitallyImportedServiceBase() override;
 
   static const char* kSettingsGroup;
   static const int kStreamsCacheDurationSecs;
 
-  QStandardItem* CreateRootItem();
+  QStandardItem* CreateRootItem() override;
-  void LazyPopulate(QStandardItem* parent);
+  void LazyPopulate(QStandardItem* parent) override;
-  void ShowContextMenu(const QPoint& global_pos);
+  void ShowContextMenu(const QPoint& global_pos) override;
 
-  void ReloadSettings();
+  void ReloadSettings() override;
 
   bool is_premium_account() const;
 

src/internet/icecast/icecastservice.h

@@ -40,7 +40,7 @@ class IcecastService : public InternetService {
 
  public:
   IcecastService(Application* app, InternetModel* parent);
-  ~IcecastService();
+  ~IcecastService() override;
 
   static const char* kServiceName;
   static const char* kDirectoryUrl;
@@ -51,12 +51,12 @@ class IcecastService : public InternetService {
     Type_Genre,
   };
 
-  QStandardItem* CreateRootItem();
+  QStandardItem* CreateRootItem() override;
-  void LazyPopulate(QStandardItem* item);
+  void LazyPopulate(QStandardItem* item) override;
 
-  void ShowContextMenu(const QPoint& global_pos);
+  void ShowContextMenu(const QPoint& global_pos) override;
 
-  QWidget* HeaderWidget() const;
+  QWidget* HeaderWidget() const override;
 
  private slots:
   void LoadDirectory();

src/internet/intergalacticfm/intergalacticfmservice.h

@@ -39,7 +39,7 @@ class IntergalacticFMServiceBase : public InternetService {
                              const QString& name, const QUrl& channel_list_url,
                              const QUrl& homepage_url,
                              const QUrl& donate_page_url, const QIcon& icon);
-  ~IntergalacticFMServiceBase();
+  ~IntergalacticFMServiceBase() override;
 
   enum ItemType {
     Type_Stream = 2000,
@@ -59,14 +59,14 @@ class IntergalacticFMServiceBase : public InternetService {
   const QString& url_scheme() const { return url_scheme_; }
   const QIcon& icon() const { return icon_; }
 
-  QStandardItem* CreateRootItem();
+  QStandardItem* CreateRootItem() override;
-  void LazyPopulate(QStandardItem* item);
+  void LazyPopulate(QStandardItem* item) override;
-  void ShowContextMenu(const QPoint& global_pos);
+  void ShowContextMenu(const QPoint& global_pos) override;
 
-  PlaylistItem::Options playlistitem_options() const;
+  PlaylistItem::Options playlistitem_options() const override;
   QNetworkAccessManager* network() const { return network_; }
 
-  void ReloadSettings();
+  void ReloadSettings() override;
 
   bool IsStreamListStale() const { return streams_.IsStale(); }
   StreamList Streams();

src/internet/internetradio/savedradio.h

@@ -34,7 +34,7 @@ class SavedRadio : public InternetService {
 
  public:
   SavedRadio(Application* app, InternetModel* parent);
-  ~SavedRadio();
+  ~SavedRadio() override;
 
   enum ItemType {
     Type_Stream = 2000,
@@ -57,10 +57,10 @@ class SavedRadio : public InternetService {
   static const char* kServiceName;
   static const char* kSettingsGroup;
 
-  QStandardItem* CreateRootItem();
+  QStandardItem* CreateRootItem() override;
-  void LazyPopulate(QStandardItem* item);
+  void LazyPopulate(QStandardItem* item) override;
 
-  void ShowContextMenu(const QPoint& global_pos);
+  void ShowContextMenu(const QPoint& global_pos) override;
 
   void Add(const QUrl& url, const QString& name = QString(),
            const QUrl& url_logo = QUrl());

src/internet/jamendo/jamendoservice.h

@@ -43,14 +43,14 @@ class JamendoService : public InternetService {
 
  public:
   JamendoService(Application* app, InternetModel* parent);
-  ~JamendoService();
+  ~JamendoService() override;
 
-  QStandardItem* CreateRootItem();
+  QStandardItem* CreateRootItem() override;
-  void LazyPopulate(QStandardItem* item);
+  void LazyPopulate(QStandardItem* item) override;
 
-  void ShowContextMenu(const QPoint& global_pos);
+  void ShowContextMenu(const QPoint& global_pos) override;
 
-  QWidget* HeaderWidget() const;
+  QWidget* HeaderWidget() const override;
 
   LibraryBackend* library_backend() const { return library_backend_.get(); }
 

src/internet/magnatune/magnatuneservice.h

@@ -38,7 +38,7 @@ class MagnatuneService : public InternetService {
 
  public:
   MagnatuneService(Application* app, InternetModel* parent);
-  ~MagnatuneService();
+  ~MagnatuneService() override;
 
   // Values are saved in QSettings and are indices into the combo box in
   // MagnatuneConfig
@@ -71,14 +71,14 @@ class MagnatuneService : public InternetService {
 
   static QString ReadElementText(QXmlStreamReader& reader);
 
-  QStandardItem* CreateRootItem();
+  QStandardItem* CreateRootItem() override;
-  void LazyPopulate(QStandardItem* item);
+  void LazyPopulate(QStandardItem* item) override;
 
-  void ShowContextMenu(const QPoint& global_pos);
+  void ShowContextMenu(const QPoint& global_pos) override;
 
-  QWidget* HeaderWidget() const;
+  QWidget* HeaderWidget() const override;
 
-  void ReloadSettings();
+  void ReloadSettings() override;
 
   // Magnatune specific stuff
   MembershipType membership_type() const { return membership_; }
@@ -99,7 +99,7 @@ class MagnatuneService : public InternetService {
 
   void Download();
   void Homepage();
-  void ShowConfig();
+  void ShowConfig() override;
 
  private:
   void EnsureMenuCreated();

src/internet/podcasts/podcastservice.h

@@ -44,7 +44,7 @@ class PodcastService : public InternetService {
 
  public:
   PodcastService(Application* app, InternetModel* parent);
-  ~PodcastService();
+  ~PodcastService() override;
 
   static const char* kServiceName;
   static const char* kSettingsGroup;
@@ -57,12 +57,12 @@ class PodcastService : public InternetService {
 
   enum Role { Role_Podcast = InternetModel::RoleCount, Role_Episode };
 
-  QStandardItem* CreateRootItem();
+  QStandardItem* CreateRootItem() override;
-  void LazyPopulate(QStandardItem* parent);
+  void LazyPopulate(QStandardItem* parent) override;
-  bool has_initial_load_settings() const { return true; }
+  bool has_initial_load_settings() const override { return true; }
-  void ShowContextMenu(const QPoint& global_pos);
+  void ShowContextMenu(const QPoint& global_pos) override;
-  void ReloadSettings();
+  void ReloadSettings() override;
-  void InitialLoadSettings();
+  void InitialLoadSettings() override;
   // Called by SongLoader when the user adds a Podcast URL directly.  Adds a
   // subscription to the podcast and displays it in the UI.  If the QVariant
   // contains an OPML file then this displays it in the Add Podcast dialog.
@@ -81,7 +81,7 @@ class PodcastService : public InternetService {
   void DeleteDownloadedData();
   void SetNew();
   void SetListened();
-  void ShowConfig();
+  void ShowConfig() override;
 
   void SubscriptionAdded(const Podcast& podcast);
   void SubscriptionRemoved(const Podcast& podcast);

src/internet/radiobrowser/radiobrowserservice.h

@@ -35,7 +35,7 @@ class RadioBrowserService : public InternetService {
 
  public:
   RadioBrowserService(Application* app, InternetModel* parent);
-  ~RadioBrowserService(){};
+  ~RadioBrowserService() override{};
 
   enum ItemType {
     Type_Stream = 2000,

src/internet/somafm/somafmservice.h

@@ -39,7 +39,7 @@ class SomaFMServiceBase : public InternetService {
                     const QString& name, const QUrl& channel_list_url,
                     const QUrl& homepage_url, const QUrl& donate_page_url,
                     const QIcon& icon);
-  ~SomaFMServiceBase();
+  ~SomaFMServiceBase() override;
 
   enum ItemType {
     Type_Stream = 2000,
@@ -59,14 +59,14 @@ class SomaFMServiceBase : public InternetService {
   const QString& url_scheme() const { return url_scheme_; }
   const QIcon& icon() const { return icon_; }
 
-  QStandardItem* CreateRootItem();
+  QStandardItem* CreateRootItem() override;
-  void LazyPopulate(QStandardItem* item);
+  void LazyPopulate(QStandardItem* item) override;
-  void ShowContextMenu(const QPoint& global_pos);
+  void ShowContextMenu(const QPoint& global_pos) override;
 
-  PlaylistItem::Options playlistitem_options() const;
+  PlaylistItem::Options playlistitem_options() const override;
   QNetworkAccessManager* network() const { return network_; }
 
-  void ReloadSettings();
+  void ReloadSettings() override;
 
   bool IsStreamListStale() const { return streams_.IsStale(); }
   StreamList Streams();

src/internet/subsonic/subsonicservice.cpp

@@ -530,6 +530,11 @@ void SubsonicLibraryScanner::OnGetAlbumFinished(QNetworkReply* reply) {
 
   // Read song information
   while (reader.readNextStartElement()) {
+    // skip multi-artist and multi-genre tags
+    if ((reader.name() == "artists") || (reader.name() == "genres")) {
+      reader.skipCurrentElement();
+      continue;
+    }
     if (reader.name() != "song") {
       ParsingError("song tag expected. Aborting scan.");
       return;

src/internet/subsonic/subsonicservice.h

@@ -42,7 +42,7 @@ class SubsonicService : public InternetService {
 
  public:
   SubsonicService(Application* app, InternetModel* parent);
-  ~SubsonicService();
+  ~SubsonicService() override;
 
   enum LoginState {
     LoginState_Loggedin,
@@ -90,11 +90,11 @@ class SubsonicService : public InternetService {
   bool IsConfigured() const;
   bool IsAmpache() const;
 
-  QStandardItem* CreateRootItem();
+  QStandardItem* CreateRootItem() override;
-  void LazyPopulate(QStandardItem* item);
+  void LazyPopulate(QStandardItem* item) override;
-  void ShowContextMenu(const QPoint& global_pos);
+  void ShowContextMenu(const QPoint& global_pos) override;
-  QWidget* HeaderWidget() const;
+  QWidget* HeaderWidget() const override;
-  void ReloadSettings();
+  void ReloadSettings() override;
 
   void Login();
   void Login(const QString& server, const QString& username,
@@ -175,7 +175,7 @@ class SubsonicService : public InternetService {
   void OnLoginStateChanged(SubsonicService::LoginState newstate);
   void OnPingFinished(QNetworkReply* reply);
 
-  void ShowConfig();
+  void ShowConfig() override;
 };
 
 class SubsonicLibraryScanner : public QObject {
@@ -184,7 +184,7 @@ class SubsonicLibraryScanner : public QObject {
  public:
   explicit SubsonicLibraryScanner(SubsonicService* service,
                                   QObject* parent = nullptr);
-  ~SubsonicLibraryScanner();
+  ~SubsonicLibraryScanner() override;
 
   void Scan();
   const SongList& GetSongs() const { return songs_; }

src/library/librarybackend.cpp

@@ -896,7 +896,7 @@ LibraryBackend::AlbumList LibraryBackend::GetAlbums(const QString& artist,
   QString last_artist;
   QString last_album_artist;
   while (query.Next()) {
-    bool compilation = query.Value(3).toBool() | query.Value(4).toBool();
+    bool compilation = query.Value(3).toBool() || query.Value(4).toBool();
 
     Album info;
     info.artist = compilation ? QString() : query.Value(1).toString();

src/moodbar/moodbarbuilder.cpp

@@ -92,12 +92,10 @@ void MoodbarBuilder::Normalize(QList<Rgb>* vals, double Rgb::*member) {
   }
 
   double avg = 0;
-  int t = 0;
   for (const Rgb& rgb : *vals) {
     const double value = rgb.*member;
     if (value != mini && value != maxi) {
       avg += value / vals->count();
-      t++;
     }
   }
 

src/networkremote/outgoingdatacreator.cpp

@@ -98,7 +98,6 @@ void OutgoingDataCreator::CheckEnabledProviders() {
                 << "lyricstime.com"
                 << "lyricsreg.com"
                 << "lyricsmania.com"
-                << "metrolyrics.com"
                 << "azlyrics.com"
                 << "songlyrics.com"
                 << "elyrics.net"
@@ -106,7 +105,6 @@ void OutgoingDataCreator::CheckEnabledProviders() {
                 << "lyrics.com"
                 << "lyricsbay.com"
                 << "directlyrics.com"
-                << "loudson.gs"
                 << "teksty.org"
                 << "tekstowo.pl (Polish translations)"
                 << "vagalume.uol.com.br"

src/playlist/playlist.cpp

@@ -1729,13 +1729,11 @@ PlaylistItemList Playlist::RemoveItemsWithoutUndo(int row, int count) {
   endRemoveRows();
 
   QList<int>::iterator it = virtual_items_.begin();
-  int i = 0;
   while (it != virtual_items_.end()) {
     if (*it >= items_.count())
       it = virtual_items_.erase(it);
     else
       ++it;
-    ++i;
   }
 
   // Reset current_virtual_index_

src/ripper/ripper.cpp

@@ -34,12 +34,6 @@
 #undef AddJob
 #endif
 
-namespace {
-const char kWavHeaderRiffMarker[] = "RIFF";
-const char kWavFileTypeFormatChunk[] = "WAVEfmt ";
-const char kWavDataString[] = "data";
-}  // namespace
-
 Ripper::Ripper(int track_count, QObject* parent)
     : QObject(parent),
       track_count_(track_count),

src/songinfo/songinfoview.cpp

@@ -90,10 +90,8 @@ void SongInfoView::ReloadSettings() {
 
   QVariantList default_order;
   default_order << "lyrics.wikia.com"
-                << "lyricstime.com"
                 << "lyricsreg.com"
                 << "lyricsmania.com"
-                << "metrolyrics.com"
                 << "azlyrics.com"
                 << "songlyrics.com"
                 << "elyrics.net"
@@ -101,7 +99,6 @@ void SongInfoView::ReloadSettings() {
                 << "lyrics.com"
                 << "lyricsbay.com"
                 << "directlyrics.com"
-                << "loudson.gs"
                 << "teksty.org"
                 << "tekstowo.pl (Polish translations)"
                 << "vagalume.uol.com.br"

src/ui/mainwindow.cpp

@@ -1262,10 +1262,14 @@ void MainWindow::TrackSkipped(PlaylistItemPtr item) {
 
     const qint64 seconds_left = (length - position) / kNsecPerSec;
     const qint64 seconds_total = length / kNsecPerSec;
+    const qint64 seconds_listened = position / kNsecPerSec;
 
     if (((0.05 * seconds_total > 60 && percentage < 0.98) ||
          percentage < 0.95) &&
-        seconds_left > 5) {  // Never count the skip if under 5 seconds left
+        (seconds_left > 5 &&
+         5 < seconds_listened)) {  // Never count the skip if under 5 seconds
+                                   // left. Or we haven't listened for more than
+                                   // 5 seconds.
       app_->library_backend()->IncrementSkipCountAsync(song.id(), percentage);
     }
   }