Merge remote-tracking branch 'origin/Plasma/5.11'

dataengines/dict/CMakeLists.txt

@@ -1,3 +1,5 @@
+add_definitions(-DTRANSLATION_DOMAIN=\"plasma_engine_dict\")
+
 set(dict_engine_SRCS
     dictengine.cpp
 )
@@ -7,6 +9,7 @@ add_library(plasma_engine_dict MODULE ${dict_engine_SRCS})
 target_link_libraries (plasma_engine_dict
   KF5::Plasma
   KF5::Service
+  KF5::I18n
   Qt5::Network
 )
 

dataengines/dict/dictengine.cpp

@@ -21,6 +21,7 @@
 
 #include <QDebug>
 #include <QTcpSocket>
+#include <KLocalizedString>
 
 #include <Plasma/DataContainer>
 
@@ -49,7 +50,6 @@ void DictEngine::setServer(const QString &server)
 
 static QString wnToHtml(const QString &word, QByteArray &text)
 {
-    Q_UNUSED(word)
     QList<QByteArray> splitText = text.split('\n');
     QString def;
     def += QLatin1String("<dl>\n");
@@ -73,10 +73,13 @@ static QString wnToHtml(const QString &word, QByteArray &text)
             continue;
         }
 
+        if (currentLine.startsWith("552")) {
+            return i18n("No match found for %1", word);
+        }
+
         if (!(currentLine.startsWith(QLatin1String("150"))
            || currentLine.startsWith(QLatin1String("151"))
-           || currentLine.startsWith(QLatin1String("250"))
-           || currentLine.startsWith(QLatin1String("552")))) {
+           || currentLine.startsWith(QLatin1String("250")))) {
             currentLine.replace(linkRx,QLatin1String("<a href=\"\\1\">\\1</a>"));
 
             if (isFirst) {
@@ -104,11 +107,10 @@ void DictEngine::getDefinition()
     m_tcpSocket->readAll();
     QByteArray ret;
 
-    m_tcpSocket->write(QByteArray("DEFINE "));
-    m_tcpSocket->write(m_dictName.toLatin1());
-    m_tcpSocket->write(QByteArray(" \""));
-    m_tcpSocket->write(m_currentWord.toUtf8());
-    m_tcpSocket->write(QByteArray("\"\n"));
+
+    const QByteArray command = QByteArray("DEFINE ") + m_dictName.toLatin1() + " \"" + m_currentWord.toUtf8() + "\"\n";
+    //qDebug() << command;
+    m_tcpSocket->write(command);
     m_tcpSocket->flush();
 
     while (!ret.contains("250") && !ret.contains("552") && !ret.contains("550")) {
@@ -118,14 +120,13 @@ void DictEngine::getDefinition()
 
     connect(m_tcpSocket, &QTcpSocket::disconnected, this, &DictEngine::socketClosed);
     m_tcpSocket->disconnectFromHost();
-    //       setData(m_currentWord, m_dictName, ret);
-    //       qWarning()<<ret;
-    setData(m_currentWord, QStringLiteral("text"), wnToHtml(m_currentWord,ret));
+    const QString html = wnToHtml(m_currentWord, ret);
+    // setData(m_currentQuery, m_dictName, html);
+    setData(m_currentQuery, QStringLiteral("text"), html);
 }
 
 void DictEngine::getDicts()
 {
-    QMap<QString, QString> theHash;
     m_tcpSocket->readAll();
     QByteArray ret;
 
@@ -138,36 +139,29 @@ void DictEngine::getDicts()
         ret += m_tcpSocket->readAll();
     }
 
-    QList<QByteArray> retLines = ret.split('\n');
-    QString tmp1, tmp2;
-
-    while (!retLines.empty()) {
-        QString curr(retLines.takeFirst());
-
-        if (curr.startsWith(QLatin1String("554"))) {
+    const QList<QByteArray> retLines = ret.split('\n');
+    for (const QByteArray &curr : retLines) {
+        if (curr.startsWith("554")) {
             //TODO: What happens if no DB available?
             //TODO: Eventually there will be functionality to change the server...
             break;
         }
 
         // ignore status code and empty lines
-        if (curr.startsWith(QLatin1String("250")) || curr.startsWith(QLatin1String("110"))
+        if (curr.startsWith("250") || curr.startsWith("110")
            || curr.isEmpty()) {
             continue;
         }
 
         if (!curr.startsWith('-') && !curr.startsWith('.')) {
-            curr = curr.trimmed();
-            tmp1 = curr.section(' ', 0, 0);
-            tmp2 = curr.section(' ', 1);
-  //          theHash.insert(tmp1, tmp2);
-            //qDebug() << tmp1 + "  " + tmp2;
-            setData(QStringLiteral("list-dictionaries"), tmp1, tmp2);
+            const QString line = QString::fromUtf8(curr).trimmed();
+            const QString id = line.section(' ', 0, 0);
+            const QString description = line.section(' ', 1);
+            setData(QStringLiteral("list-dictionaries"), id, description); // this is additive
         }
     }
 
     m_tcpSocket->disconnectFromHost();
-//    setData("list-dictionaries", "dictionaries", QByteArray(theHash);
 }
 
 
@@ -219,9 +213,9 @@ bool DictEngine::sourceRequestEvent(const QString &query)
     }
 
     if (m_currentWord.simplified().isEmpty()) {
-        setData(m_currentWord, m_dictName, QString());
+        setData(m_currentQuery, m_dictName, QString());
     } else {
-        setData(m_currentWord, m_dictName, QString());
+        setData(m_currentQuery, m_dictName, QString());
         m_tcpSocket = new QTcpSocket(this);
         m_tcpSocket->abort();
         connect(m_tcpSocket, &QTcpSocket::disconnected, this, &DictEngine::socketClosed);