Resolve string uris

src/ippdiscovery.cpp

@@ -404,6 +404,22 @@ void IppDiscovery::readPendingDatagrams()
 
 }
 
+void IppDiscovery::resolve(QUrl& url)
+{
+    QString host = url.host();
+
+    if(host.endsWith("."))
+    {
+        host.chop(1);
+    }
+
+    // TODO IPv6
+    if(_AAs.contains(host))
+    {   // TODO: retry potential other IPs
+        url.setHost(_AAs.value(host));
+    }
+}
+
 QImage IppDiscovery::requestImage(const QString &id, QSize *size, const QSize &requestedSize)
 {   //TODO: consider caching images (doesn't appear to be needed currently)
     Q_UNUSED(requestedSize);
@@ -413,19 +429,8 @@ QImage IppDiscovery::requestImage(const QString &id, QSize *size, const QSize &r
 
     QNetworkAccessManager* nam = new QNetworkAccessManager();
     QUrl url(id);
-    QString host = url.host();
 
-    if(host.endsWith("."))
+    resolve(url);
-    {
-        host.chop(1);
-    }
-
-    qDebug() << url.host() << host << _AAs;
-    // TODO IPv6
-    if(_AAs.contains(host))
-    {   // TODO: retry potential other IPs
-        url.setHost(_AAs.value(host));
-    }
 
     QNetworkRequest request(url);
     request.setHeader(QNetworkRequest::UserAgentHeader, "SeaPrint " SEAPRINT_VERSION);

src/ippdiscovery.h

@@ -21,6 +21,8 @@ public:
     Q_INVOKABLE void discover();
     Q_INVOKABLE void reset();
 
+    void resolve(QUrl& url);
+
 signals:
     void favouritesChanged();
     void ignoreSslErrorsChanged();

src/ippprinter.cpp

@@ -1,4 +1,5 @@
 #include "ippprinter.h"
+#include "ippdiscovery.h"
 #include "mimer.h"
 #include "papersizes.h"
 #include "overrider.h"
@@ -125,10 +126,11 @@ void IppPrinter::refresh() {
 
 void IppPrinter::MaybeGetStrings()
 {
-    // TODO: resolve .local
     if(_attrs.contains("printer-strings-uri") && _strings.empty())
     {
-        emit doGetStrings(QUrl(_attrs["printer-strings-uri"].toObject()["value"].toString()));
+        QUrl url(_attrs["printer-strings-uri"].toObject()["value"].toString());
+        IppDiscovery::instance()->resolve(url);
+        emit doGetStrings(url);
     }
 }