chore: better qt-only msvc build support

* more info in song prop label when qt-only
* editorconfig for msvc (and other IDEs)
* one more audio format

.editorconfig

@@ -0,0 +1,7 @@
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4

.github/workflows/windows.yml

@@ -7,9 +7,11 @@ jobs:
   
     strategy:
       matrix:
-        vs: ['2022']
+        include:
-        msvc_arch: ['x64']
+          - qt_ver: '6.8.0'
-        qt_ver: ['6.7.3']
+            vs: '2022'
+            aqt_arch: 'win64_msvc2022_64'
+            msvc_arch: 'x64'
 
     runs-on: windows-2022
 
@@ -18,9 +20,9 @@ jobs:
     - name: Install Qt
       uses: jurplel/install-qt-action@v4
       with:
-        arch: 'win64_msvc2019_64'
+        arch: ${{ matrix.aqt_arch }}
         version: ${{ matrix.qt_ver }}
-        modules: 'qtmultimedia'
+        modules: 'qtmultimedia qt5compat'
     - name: Build
       shell: cmd
       run: |
@@ -33,12 +35,16 @@ jobs:
         :: ------ dep ------
         set CMAKE_PREFIX_PATH=%PWD%/dependencies_bin
         mkdir dependencies_src
-        :: ===== uchardet =====
+        :: ===== ECM =====
-        echo ::group::build uchardet
+        git clone -q https://invent.kde.org/frameworks/extra-cmake-modules.git dependencies_src/extra-cmake-modules
-        git clone -q https://gitlab.freedesktop.org/BLumia/uchardet.git --branch msvc dependencies_src/uchardet
+        cmake .\dependencies_src\extra-cmake-modules -Bbuild_dependencies/extra-cmake-modules -DCMAKE_INSTALL_PREFIX="dependencies_bin" -DBUILD_TESTING=OFF || goto :error
-        cmake .\dependencies_src\uchardet -Bbuild_dependencies/uchardet -DBUILD_BINARY=OFF -DCMAKE_INSTALL_PREFIX="dependencies_bin" || goto :error
+        cmake --build build_dependencies/extra-cmake-modules --config Release --target=install || goto :error
-        cmake --build build_dependencies/uchardet --config Release --target=install -j || goto :error
+        :: ===== Gperf (required by KCodecs) =====
-        echo ::endgroup::
+        choco install gperf
+        :: ===== KCodecs =====
+        git clone -q https://invent.kde.org/frameworks/kcodecs.git dependencies_src/kcodecs
+        cmake .\dependencies_src\kcodecs -Bbuild_dependencies/kcodecs -DCMAKE_INSTALL_PREFIX="dependencies_bin" -DBUILD_TESTING=OFF || goto :error
+        cmake --build build_dependencies/kcodecs --config Release --target=install || goto :error
         :: ===== pkg-config =====
         choco install pkgconfiglite
         set PKG_CONFIG_PATH=%PWD%/dependencies_bin/lib/pkgconfig
@@ -47,16 +53,16 @@ jobs:
         cmake .\dependencies_src\taglib -Bbuild_dependencies/taglib -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="dependencies_bin" || goto :error
         cmake --build build_dependencies/taglib --config Release --target=install -j || goto :error
         :: ------ app ------
-        cmake -Bbuild . -DCMAKE_INSTALL_PREFIX="%PWD%\build\" || goto :error
+        cmake -Bbuild . -DUSE_QTEXTCODEC=ON -DCMAKE_INSTALL_PREFIX="%PWD%\build\" || goto :error
         cmake --build build --config Release -j || goto :error
-        cmake --build build --config Release --target=install
+        cmake --build build --config Release --target=install || goto :error
         :: ------ pkg ------
-        windeployqt --verbose=2 --no-quick-import --no-translations --no-opengl-sw --no-system-d3d-compiler --no-system-dxc-compiler --multimedia --skip-plugin-types tls,networkinformation build\bin\pmusic.exe
+        windeployqt --verbose=2 --no-quick-import --no-translations --no-opengl-sw --no-system-d3d-compiler --no-system-dxc-compiler --multimedia --core5compat --skip-plugin-types tls,networkinformation build\bin\pmusic.exe
         robocopy ./dependencies_bin/bin build/bin *.dll
         if ErrorLevel 8 (exit /B 1)
         copy LICENSE build/bin/
         exit /B 0
     - uses: actions/upload-artifact@v4
       with:
-        name: "windows-msvc${{ matrix.vs }}-qt${{ matrix.qt_ver }}-cmake-package"
+        name: "${{ matrix.aqt_arch }}-qt${{ matrix.qt_ver }}-cmake-package"
         path: build/bin/*

CMakeLists.txt

@@ -14,10 +14,16 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+option(USE_QTEXTCODEC "Use QTextCodec instead of QStringConverter, in case Qt is not built with ICU" OFF)
+
 find_package(Qt6 6.6 COMPONENTS Widgets Multimedia Network LinguistTools REQUIRED)
-find_package(uchardet)
+find_package(KF6Codecs 6.1.0)
 find_package(PkgConfig)
 
+if (USE_QTEXTCODEC)
+    find_package(Qt6 6.6 COMPONENTS Core5Compat REQUIRED)
+endif()
+
 if (PKG_CONFIG_FOUND)
 pkg_check_modules(TagLib taglib IMPORTED_TARGET)
 endif ()
@@ -73,14 +79,18 @@ else ()
     target_link_libraries(${EXE_NAME} PRIVATE PkgConfig::TagLib)
 endif ()
 
-if (NOT uchardet_FOUND)
+if (TARGET KF6::Codecs)
-    target_compile_definitions(${EXE_NAME} PRIVATE NO_UCHARDET=1)
+    target_compile_definitions(${EXE_NAME} PRIVATE HAVE_KCODECS=1)
-else ()
+    target_link_libraries (${EXE_NAME} PRIVATE KF6::Codecs)
-    target_link_libraries (${EXE_NAME} PRIVATE uchardet::libuchardet)
 endif ()
 
 target_link_libraries(${EXE_NAME} PRIVATE Qt::Widgets Qt::Multimedia Qt::Network)
 
+if (USE_QTEXTCODEC)
+    target_compile_definitions(${EXE_NAME} PRIVATE USE_QTEXTCODEC=1)
+    target_link_libraries(${EXE_NAME} PRIVATE Qt6::Core5Compat)
+endif()
+
 # Install settings
 if (WIN32)
     # FIXME: try to avoid install to a "bin" subfolder under windows...

appveyor.yml

@@ -22,12 +22,20 @@ build_script:
 # prepare
   - mkdir 3rdparty
   - choco install ninja
+  - choco install gperf
   - choco install pkgconfiglite
   - cd 3rdparty
-# build uchardet
+# install ECM
-  - git clone -q https://gitlab.freedesktop.org/uchardet/uchardet.git
+  - git clone -q https://invent.kde.org/frameworks/extra-cmake-modules.git
-  - cd uchardet
+  - git rev-parse HEAD
-  - cmake -G "Ninja" . -DCMAKE_INSTALL_PREFIX=%PACKAGE_INSTALL_ROOT% -DBUILD_BINARY=OFF
+  - cd extra-cmake-modules
+  - cmake -G "Ninja" . -DCMAKE_INSTALL_PREFIX=%PACKAGE_INSTALL_ROOT% -DBUILD_TESTING=OFF
+  - cmake --build . --target install
+  - cd %APPVEYOR_BUILD_FOLDER%
+# build kcodecs
+  - git clone -q https://invent.kde.org/frameworks/kcodecs.git
+  - cd kcodecs
+  - cmake -G "Ninja" . -DCMAKE_INSTALL_PREFIX=%PACKAGE_INSTALL_ROOT% -DBUILD_TESTING=OFF
   - cmake --build . --target install
   - cd %APPVEYOR_BUILD_FOLDER%
 # build taglib

lyricsmanager.cpp

@@ -9,8 +9,14 @@
 #include <QRegularExpression>
 #include <QStringConverter>
 
-#ifndef NO_UCHARDET
+#ifdef HAVE_KCODECS
-#include <uchardet/uchardet.h>
+#include <KCharsets>
+#include <KCodecs>
+#include <KEncodingProber>
+#endif
+
+#ifdef USE_QTEXTCODEC
+#include <QTextCodec>
 #endif
 
 Q_LOGGING_CATEGORY(lcLyrics, "pmusic.lyrics")
@@ -44,24 +50,38 @@ bool LyricsManager::loadLyrics(QString filepath)
         return false;
     }
     QByteArray fileContent(file.readAll());
-#ifndef NO_UCHARDET
-    uchardet_t handle = uchardet_new();
-    uchardet_handle_data(handle, fileContent.data(), fileContent.length());
-    uchardet_data_end(handle);
-    const char* encoding = uchardet_get_charset(handle);
-    qCDebug(lcLyrics) << "Detected encoding:" << (encoding == NULL ? "unknown" : encoding);
     QStringList lines;
-    if (QStringConverter::availableCodecs().contains(QString(encoding))) {
+#ifdef HAVE_KCODECS
+    KEncodingProber prober(KEncodingProber::Universal);
+    prober.feed(fileContent);
+    QByteArray encoding(prober.encoding());
+    qCDebug(lcLyrics) << "Detected encoding:" << QString(encoding) << "with confidence" << prober.confidence();
+#ifdef USE_QTEXTCODEC
+    qCDebug(lcLyrics) << "QTextCodec is used instead of QStringConverter.";
+    QTextCodec *codec = QTextCodec::codecForName(encoding);
+    if (codec) {
+        lines = codec->toUnicode(fileContent).split('\n');
+    } else {
+        lines = QString(fileContent).split('\n');
+        qCDebug(lcLyrics) << "No codec for the detected encoding. Available codecs are:" << QTextCodec::availableCodecs();
+        qCDebug(lcLyrics) << "KCodecs offers these encodings:" << KCharsets::charsets()->availableEncodingNames();
+    }
+#else // NOT USE_QTEXTCODEC
     auto toUtf16 = QStringDecoder(encoding);
+    // Don't use `QStringConverter::availableCodecs().contains(QString(encoding))` here, since the charset
+    // encoding name might not match, e.g. GB18030 (from availableCodecs) != gb18030 (from KEncodingProber)
+    if (toUtf16.isValid()) {
         QString decodedResult = toUtf16(fileContent);
         lines = decodedResult.split('\n');
     } else {
+        qCDebug(lcLyrics) << "No codec for the detected encoding. Available codecs are:" << QStringConverter::availableCodecs();
+        qCDebug(lcLyrics) << "KCodecs offers these encodings:" << KCharsets::charsets()->availableEncodingNames();
         lines = QString(fileContent).split('\n');
     }
-    uchardet_delete(handle);
+#endif // USE_QTEXTCODEC
-#else
+#else // NOT HAVE_KCODECS
-    QStringList lines = QString(fileContent).split('\n');
+    lines = QString(fileContent).split('\n');
-#endif
+#endif // HAVE_KCODECS
     file.close();
 
     // parse lyrics timestamp

mainwindow.cpp

@@ -46,7 +46,7 @@ MainWindow::MainWindow(QWidget *parent)
 {
     ui->setupUi(this);
     m_playlistManager->setAutoLoadFilterSuffixes({
-        "*.mp3", "*.wav", "*.aiff", "*.ape", "*.flac", "*.ogg", "*.oga", "*.mpga", "*.aac"
+        "*.mp3", "*.wav", "*.aiff", "*.ape", "*.flac", "*.ogg", "*.oga", "*.mpga", "*.aac", "*.tta"
     });
     m_mediaPlayer->setAudioOutput(m_audioOutput);
     m_mediaPlayer->setLoops(QMediaPlayer::Infinite);
@@ -438,6 +438,8 @@ void MainWindow::initConnections()
         setAudioMetadataForDisplay(metadata.stringValue(QMediaMetaData::Title),
                                    metadata.stringValue(QMediaMetaData::Author),
                                    metadata.stringValue(QMediaMetaData::AlbumTitle));
+        setAudioPropertyInfoForDisplay(-1, metadata.value(QMediaMetaData::AudioBitRate).toInt() / 1000,
+                                       -1, metadata.stringValue(QMediaMetaData::FileFormat));
 #endif // NO_TAGLIB
         QVariant coverArt(metadata.value(QMediaMetaData::ThumbnailImage));
         if (!coverArt.isNull()) {
@@ -616,12 +618,16 @@ void MainWindow::on_actionHelp_triggered()
         "\n\n" %
         tr("Based on the following free software libraries:") %
         "\n\n" %
-        QStringLiteral("- [Qt](https://www.qt.io/) %1\n").arg(QT_VERSION_STR) %
+        QStringLiteral("- [Qt](https://www.qt.io/) %1 with the following module(s):\n").arg(QT_VERSION_STR) %
+        QStringLiteral("  - multimedia\n") %
+#ifdef USE_QTEXTCODEC
+        QStringLiteral("  - core5compat\n") %
+#endif
 #ifndef NO_TAGLIB
         QStringLiteral("- [TagLib](https://github.com/taglib/taglib)\n") %
 #endif // NO_TAGLIB
-#ifndef NO_UCHARDET
+#ifdef HAVE_KCODECS
-        QStringLiteral("- [uchardet](https://www.freedesktop.org/wiki/Software/uchardet/)\n") %
+        QStringLiteral("- [KCodecs](https://invent.kde.org/frameworks/kcodecs)\n") %
 #endif // NO_TAGLIB
         "\n"
         "[Source Code](https://github.com/BLumia/pineapple-music)\n"