clients_icons.txt added to resources with a way to override

Introduced a new option options.iconsets.clients-capsfile to set custom clients_icons.txt

Author: Ri0n

options/default.xml

@@ -695,6 +695,7 @@ QLineEdit#le_status_text {
             <activities type="QString">default</activities>
             <affiliations type="QString">default</affiliations>
             <clients type="QString">default</clients>
+            <clients-capsfile type="QString" comment="Override file for internal client_icons.txt"/>
         </iconsets>
         <messages>
             <default-outgoing-message-type type="QString">chat</default-outgoing-message-type>

psi.qrc

@@ -6,5 +6,6 @@
         <file>options/macosx.xml</file>
         <file>options/newprofile.xml</file>
         <file>README.html</file>
+        <file>client_icons.txt</file>
     </qresource>
 </RCC>

src/psiiconset.cpp

@@ -490,48 +490,58 @@ bool PsiIconset::loadClients()
             iconsId.insert(it.next()->name().section('/', 1, 1));
         }
 
-        QStringList   dirs = ApplicationInfo::dataDirs();
         ClientIconMap cm; // start part, spec[spec2[spec3]]
-        foreach (const QString &dataDir, dirs) {
-            QFile capsConv(dataDir + QLatin1String("/client_icons.txt"));
+
+        auto readClientsDesc = [&](const QString &filePath) {
+            QFile capsConv(filePath);
             /* file format: <icon res name> <left_part_of_cap1#inside1#inside2>,<left_part_of_cap2>
                 next line the same.
             */
-            if (capsConv.open(QIODevice::ReadOnly)) {
-                QTextStream stream(&capsConv);
-
-                QString line;
-                while (!(line = stream.readLine()).isNull()) {
-                    line             = line.trimmed();
-                    QString iconName = line.section(QLatin1Char(' '), 0, 0);
-                    if (!iconName.length() || !iconsId.contains(iconName)) {
-                        continue;
-                    }
-                    ClientIconCheck ic   = { iconName, QStringList() };
-                    QString         caps = line.mid(iconName.length());
-                    foreach (const QString &c, caps.split(QLatin1Char(','), QString::SkipEmptyParts)) {
-                        QString ct = c.trimmed();
-                        if (ct.length()) {
-                            QStringList spec = ct.split('#');
-                            if (spec.size() > 1) {
-                                ic.inside = spec.mid(1);
-                            } else {
-                                ic.inside.clear();
-                            }
-                            ClientIconMap::Iterator it = cm.find(spec[0]);
-                            if (it == cm.end()) {
-                                cm.insert(spec[0], QList<ClientIconCheck>() << ic);
-                            } else {
-                                it.value().append(ic);
-                            }
+            if (!capsConv.open(QIODevice::ReadOnly))
+                return false;
+
+            QTextStream stream(&capsConv);
+
+            QString line;
+            while (!(line = stream.readLine()).isNull()) {
+                line             = line.trimmed();
+                QString iconName = line.section(QLatin1Char(' '), 0, 0);
+                if (!iconName.length() || !iconsId.contains(iconName)) {
+                    continue;
+                }
+                ClientIconCheck ic   = { iconName, QStringList() };
+                QString         caps = line.mid(iconName.length());
+                for (const QString &c : caps.split(QLatin1Char(','), QString::SkipEmptyParts)) {
+                    QString ct = c.trimmed();
+                    if (ct.length()) {
+                        QStringList spec = ct.split('#');
+                        if (spec.size() > 1) {
+                            ic.inside = spec.mid(1);
+                        } else {
+                            ic.inside.clear();
+                        }
+                        ClientIconMap::Iterator it = cm.find(spec[0]);
+                        if (it == cm.end()) {
+                            cm.insert(spec[0], QList<ClientIconCheck>() << ic);
+                        } else {
+                            it.value().append(ic);
                         }
                     }
                 }
-                /* insert end boundry element to make search implementation simple */
-                cm.insert(QLatin1String("~"), QList<ClientIconCheck>());
-                break;
             }
+            /* insert end boundry element to make search implementation simple */
+            cm.insert(QLatin1String("~"), QList<ClientIconCheck>());
+            return true;
+        };
+
+        auto customPath = PsiOptions::instance()->getOption("options.iconsets.clients-capsfile").toString();
+        if (customPath.isEmpty() || !readClientsDesc(customPath)) {
+            QStringList dirs = ApplicationInfo::dataDirs();
+            for (const auto &dataDir : dirs)
+                if (readClientsDesc(dataDir + QLatin1String("/client_icons.txt")))
+                    break;
         }
+
         if (cm.isEmpty()) {
             qWarning("Failed to read client_icons.txt. Clients detection won't work");
         }