Improve "split to byte array views" function

1. Utilize string matcher
2. Remove split behavior parameter
   Previously `KeepEmptyParts` behavior doesn't match Qt's
   implementation and since our codebase doesn't really make use of it,
   we can just remove the parameter.
3. Add tests.

PR #22352.

.pre-commit-config.yaml

@@ -73,7 +73,7 @@ repos:
     hooks:
     - id: codespell
       name: Check spelling (codespell)
-      args: ["--ignore-words-list", "additionals,categor,curren,fo,ist,ket,notin,searchin,sectionin,superseeding,te,ths"]
+      args: ["--ignore-words-list", "additionals,categor,curren,fo,indexIn,ist,ket,notin,searchin,sectionin,superseeding,te,ths"]
       exclude: |
         (?x)^(
           .*\.desktop |

src/base/http/requestparser.cpp

@@ -279,7 +279,7 @@ bool RequestParser::parsePostMessage(const QByteArrayView data)
 
         // split data by "dash-boundary"
         const QByteArray dashDelimiter = QByteArray("--") + delimiter + CRLF;
-        QList<QByteArrayView> multipart = splitToViews(data, dashDelimiter, Qt::SkipEmptyParts);
+        QList<QByteArrayView> multipart = splitToViews(data, dashDelimiter);
         if (multipart.isEmpty())
         {
             qWarning() << Q_FUNC_INFO << "multipart empty";

src/base/search/searchpluginmanager.cpp

@@ -592,14 +592,14 @@ void SearchPluginManager::parseVersionInfo(const QByteArray &info)
     QHash<QString, PluginVersion> updateInfo;
     int numCorrectData = 0;
 
-    const QList<QByteArrayView> lines = Utils::ByteArray::splitToViews(info, "\n", Qt::SkipEmptyParts);
+    const QList<QByteArrayView> lines = Utils::ByteArray::splitToViews(info, "\n");
     for (QByteArrayView line : lines)
     {
         line = line.trimmed();
         if (line.isEmpty()) continue;
         if (line.startsWith('#')) continue;
 
-        const QList<QByteArrayView> list = Utils::ByteArray::splitToViews(line, ":", Qt::SkipEmptyParts);
+        const QList<QByteArrayView> list = Utils::ByteArray::splitToViews(line, ":");
         if (list.size() != 2) continue;
 
         const auto pluginName = QString::fromUtf8(list.first().trimmed());

src/base/utils/bytearray.cpp

@@ -30,28 +30,30 @@
 #include "bytearray.h"
 
 #include <QByteArray>
+#include <QByteArrayMatcher>
 #include <QByteArrayView>
 #include <QList>
 
-QList<QByteArrayView> Utils::ByteArray::splitToViews(const QByteArrayView in, const QByteArrayView sep, const Qt::SplitBehavior behavior)
+QList<QByteArrayView> Utils::ByteArray::splitToViews(const QByteArrayView in, const QByteArrayView sep)
 {
+    if (in.isEmpty())
+        return {};
     if (sep.isEmpty())
         return {in};
 
+    const QByteArrayMatcher matcher {sep};
     QList<QByteArrayView> ret;
-    ret.reserve((behavior == Qt::KeepEmptyParts)
+    ret.reserve(1 + (in.size() / (sep.size() + 1)));
-                ? (1 + (in.size() / sep.size()))
+    qsizetype head = 0;
-                : (1 + (in.size() / (sep.size() + 1))));
-    int head = 0;
     while (head < in.size())
     {
-        int end = in.indexOf(sep, head);
+        qsizetype end = matcher.indexIn(in, head);
         if (end < 0)
             end = in.size();
 
         // omit empty parts
-        const QByteArrayView part = in.mid(head, (end - head));
+        const QByteArrayView part = in.sliced(head, (end - head));
-        if (!part.isEmpty() || (behavior == Qt::KeepEmptyParts))
+        if (!part.isEmpty())
             ret += part;
 
         head = end + sep.size();

src/base/utils/bytearray.h

@@ -37,8 +37,8 @@ class QByteArrayView;
 
 namespace Utils::ByteArray
 {
-    // Mimic QStringView(in).split(sep, behavior)
+    // Inspired by QStringView(in).split(sep, Qt::SkipEmptyParts)
-    QList<QByteArrayView> splitToViews(QByteArrayView in, QByteArrayView sep, Qt::SplitBehavior behavior = Qt::KeepEmptyParts);
+    QList<QByteArrayView> splitToViews(QByteArrayView in, QByteArrayView sep);
     QByteArray asQByteArray(QByteArrayView view);
 
     QByteArray toBase32(const QByteArray &in);

src/base/utils/foreignapps.cpp

@@ -68,7 +68,7 @@ namespace
             // Software 'Anaconda' installs its own python interpreter
             // and `python --version` returns a string like this:
             // "Python 3.4.3 :: Anaconda 2.3.0 (64-bit)"
-            const QList<QByteArrayView> outputSplit = Utils::ByteArray::splitToViews(procOutput, " ", Qt::SkipEmptyParts);
+            const QList<QByteArrayView> outputSplit = Utils::ByteArray::splitToViews(procOutput, " ");
             if (outputSplit.size() <= 1)
                 return false;
 

src/base/utils/password.cpp

@@ -115,7 +115,7 @@ bool Utils::Password::PBKDF2::verify(const QByteArray &secret, const QString &pa
 
 bool Utils::Password::PBKDF2::verify(const QByteArray &secret, const QByteArray &password)
 {
-    const QList<QByteArrayView> list = ByteArray::splitToViews(secret, ":", Qt::SkipEmptyParts);
+    const QList<QByteArrayView> list = ByteArray::splitToViews(secret, ":");
     if (list.size() != 2)
         return false;
 

src/gui/search/searchwidget.cpp

@@ -172,8 +172,10 @@ namespace
             return nonstd::make_unexpected(readResult.error().message);
         }
 
+        const QList<QByteArrayView> lines = Utils::ByteArray::splitToViews(readResult.value(), "\n");
         QStringList history;
-        for (const QByteArrayView line : asConst(Utils::ByteArray::splitToViews(readResult.value(), "\n")))
+        history.reserve(lines.size());
+        for (const QByteArrayView line : lines)
             history.append(QString::fromUtf8(line));
 
         return history;

test/testutilsbytearray.cpp

@@ -1,5 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2025  Mike Tzou (Chocobo1)
  * Copyright (C) 2023  Vladimir Golovnev <glassez@yandex.ru>
  *
  * This program is free software; you can redistribute it and/or
@@ -26,10 +27,11 @@
  * exception statement from your version.
  */
 
+#include <QByteArray>
+#include <QLatin1StringView>
 #include <QObject>
 #include <QTest>
 
-#include "base/global.h"
 #include "base/utils/bytearray.h"
 
 class TestUtilsByteArray final : public QObject
@@ -41,8 +43,50 @@ public:
     TestUtilsByteArray() = default;
 
 private slots:
-    void testBase32Encode() const
+    void testSplitToViews() const
     {
+        using BAViews = QList<QByteArrayView>;
+
+        const auto check = [](const QByteArrayView in, const QByteArrayView sep, const BAViews expected)
+        {
+            // verify it works
+            QCOMPARE(Utils::ByteArray::splitToViews(in, sep), expected);
+
+            // verify it has the same behavior as `split(Qt::SkipEmptyParts)`
+            using Latin1Views = QList<QLatin1StringView>;
+
+            const Latin1Views reference = QLatin1StringView(in)
+                .tokenize(QLatin1StringView(sep), Qt::SkipEmptyParts).toContainer();
+            Latin1Views expectedStrings;
+            for (const auto &string : expected)
+                expectedStrings.append(QLatin1StringView(string));
+            QCOMPARE(reference, expectedStrings);
+        };
+
+        check({}, {}, {});
+        check({}, "/", {});
+        check("/", "/", {});
+        check("/a", "/", {"a"});
+        check("/a/", "/", {"a"});
+        check("/a/b", "/", (BAViews {"a", "b"}));
+        check("/a/b/", "/", (BAViews {"a", "b"}));
+        check("/a/b", "//", {"/a/b"});
+        check("//a/b", "//", {"a/b"});
+        check("//a//b", "//", (BAViews {"a", "b"}));
+        check("//a//b/", "//", (BAViews {"a", "b/"}));
+        check("//a//b//", "//", (BAViews {"a", "b"}));
+        check("///a//b//", "//", (BAViews {"/a", "b"}));
+    }
+
+    void testAsQByteArray() const
+    {
+        QCOMPARE(Utils::ByteArray::asQByteArray(""), "");
+        QCOMPARE(Utils::ByteArray::asQByteArray("12345"), "12345");
+    }
+
+    void testToBase32() const
+    {
+        QCOMPARE(Utils::ByteArray::toBase32({}), QByteArray());
         QCOMPARE(Utils::ByteArray::toBase32(""), "");
         QCOMPARE(Utils::ByteArray::toBase32("0123456789"), "GAYTEMZUGU3DOOBZ");
         QCOMPARE(Utils::ByteArray::toBase32("ABCDE"), "IFBEGRCF");