Merge remote-tracking branch 'origin/main'

Author: wolfgitpr

src/apps/LyricFA/util/Asr.cpp

@@ -55,9 +55,9 @@ namespace LyricFA {
 
             sf.seek(beginFrame, SEEK_SET);
             std::vector<float> tmp(frameCount);
-            const auto bytesWritten = sf.read(tmp.data(), static_cast<sf_count_t>(tmp.size()));
 
-            if (bytesWritten > 60 * 16000) {
+            if (const auto bytesWritten = sf.read(tmp.data(), static_cast<sf_count_t>(tmp.size()));
+                bytesWritten > 60 * 16000) {
                 msg = "The audio contains continuous pronunciation segments that exceed 60 seconds. Please manually "
                       "segment and rerun the recognition program.";
                 return false;

src/apps/LyricFA/util/AsrThread.cpp

@@ -13,9 +13,8 @@ namespace LyricFA {
 
     void AsrThread::run() {
         std::string asrMsg;
-        const auto asrRes = m_asr->recognize(m_wavPath.toLocal8Bit().toStdString(), asrMsg);
 
-        if (!asrRes) {
+        if (const auto asrRes = m_asr->recognize(m_wavPath.toLocal8Bit().toStdString(), asrMsg); !asrRes) {
             Q_EMIT this->oneFailed(m_filename, QString::fromStdString(asrMsg));
             return;
         }
@@ -28,7 +27,7 @@ namespace LyricFA {
         }
 
         QTextStream labIn(&labFile);
-        if (m_g2p) {
+        if (m_g2p != nullptr) {
             const auto g2pRes = m_g2p->hanziToPinyin(asrMsg, Pinyin::ManTone::NORMAL, Pinyin::Error::Default, true);
             asrMsg = g2pRes.toStdStr();
         }

src/apps/LyricFA/util/MatchLyric.cpp

@@ -27,10 +27,9 @@ namespace LyricFA {
     MatchLyric::~MatchLyric() = default;
 
     static QString get_lyrics_from_txt(const QString &lyricPath) {
-        QFile lyricFile(lyricPath);
-        if (lyricFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        if (QFile lyricFile(lyricPath); lyricFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
             auto words = QString::fromUtf8(lyricFile.readAll());
-            words.remove(QRegularExpression(u8"[^\u4E00-\u9FFF\u3400-\u4DBF\uF900-\uFAFF]"));
+            words.remove(QRegularExpression(u8"[^\u4E00-\u9FFF\u3400-\u4DBF\uF900-\uFAFF a-zA-Z]"));
             return words;
         }
         return {};
@@ -43,9 +42,8 @@ namespace LyricFA {
         }
 
         const QJsonDocument jsonDoc(jsonObject);
-        const QByteArray jsonData = jsonDoc.toJson();
 
-        if (file.write(jsonData) == -1) {
+        if (const QByteArray jsonData = jsonDoc.toJson(); file.write(jsonData) == -1) {
             return false;
         }
 
@@ -72,21 +70,20 @@ namespace LyricFA {
 
             std::vector<std::string> textList, pinyinList;
             for (const auto &item : g2pRes) {
-                textList.push_back(item.hanzi.c_str());
-                pinyinList.push_back(item.pinyin.c_str());
+                textList.emplace_back(item.hanzi.c_str());
+                pinyinList.emplace_back(item.pinyin.c_str());
             }
             m_lyricDict[lyricName] = lyricInfo{textList, pinyinList};
         }
     }
 
     bool MatchLyric::match(const QString &filename, const QString &labPath, const QString &jsonPath, QString &msg,
                            const bool &asr_rectify) const {
-        const auto lyricName = filename.left(filename.lastIndexOf('_'));
 
-        if (m_lyricDict.contains(lyricName)) {
+        if (const auto lyricName = filename.left(filename.lastIndexOf('_')); m_lyricDict.contains(lyricName)) {
             const auto asr_list = get_lyrics_from_txt(labPath).toUtf8().toStdString();
             if (asr_list.empty()) {
-                msg = "filename: Asr res is empty.";
+                msg = QString("%1: Asr result is empty.").arg(lyricName);
                 return false;
             }
             const auto textList = m_lyricDict[lyricName].text;
@@ -106,7 +103,7 @@ namespace LyricFA {
 
             std::vector<std::string> asrPinyins;
             for (const auto &item : asrG2pRes)
-                asrPinyins.push_back(item.pinyin.c_str());
+                asrPinyins.emplace_back(item.pinyin.c_str());
 
             if (!asrPinyins.empty()) {
                 auto [match_text, match_pinyin, text_step, pinyin_step] =
@@ -117,14 +114,13 @@ namespace LyricFA {
                 for (int i = 0; i < asrPinyins.size(); i++) {
                     const auto asrPinyin = asrPinyins[i];
                     const auto text = match_text[i];
-                    const auto matchPinyin = match_pinyin[i];
 
-                    if (asrPinyin != matchPinyin) {
+                    if (const auto matchPinyin = match_pinyin[i]; asrPinyin != matchPinyin) {
                         const std::vector<std::string> candidates =
                             m_mandarin->getDefaultPinyin(text, Pinyin::ManTone::NORMAL, true);
-                        const auto it = std::find(candidates.begin(), candidates.end(), asrPinyin);
 
-                        if (it != candidates.end()) {
+                        if (const auto it = std::find(candidates.begin(), candidates.end(), asrPinyin);
+                            it != candidates.end()) {
                             asr_rect_list.push_back(asrPinyin);
                             asr_rect_diff.push_back("(" + matchPinyin + "->" + asrPinyin + ", " + static_cast<char>(i) +
                                                     ")");