Merge lp:~jonas-drange/ubuntu-ui-extras/consolidated-devices into lp:~phablet-team/ubuntu-ui-extras/printer-staging

[Jonas G. Drange]

Adds ConsolidatedDeviceModel to make sure printers with multiple connections to it (e.g. dnssd, socket, etc.) are presented as one.

Adds ConsolidatedDeviceModel to make sure printers with multiple connections to it (e.g. dnssd, socket, etc.) are presented as one.

[Andrew Hayzen (ahayzen)]

Getting a crash when using this http://pastebin.ubuntu.com/24228896/

review: Needs Fixing

[lp:~jonas-drange/ubuntu-ui-extras/consolidated-devices]

159. By Jonas G. Drange on 2017-03-27

add ppdutils

160. By Jonas G. Drange on 2017-03-27

matching now works well for hp devices

161. By Jonas G. Drange on 2017-03-29

adds ppdutils, a IEEE 1284 parser, and other fixes to consolidate devices

162. By Jonas G. Drange on 2017-03-29

make fixmakemodel static

[Andrew Hayzen (ahayzen)]

This is looking much better than before (it doesn't crash :-) ).

Now we have Utils and PpdUtils, would it make sense to move some of the methods from Utils into PpdUtils, eg ppdChoiceToDuplexMode. Or are we not able to move them because they are used in the models and not specifically the backend?

review: Needs Information

[Jonas G. Drange (jonas-drange)]

Good point. Yeah, I think that should be doable.

[lp:~jonas-drange/ubuntu-ui-extras/consolidated-devices]

163. By Jonas G. Drange on 2017-03-30

do RAAI via parent->child semantics, and be more aggressive when to clear out the consolidated model

164. By Jonas G. Drange on 2017-03-30

pushes ppd specific utils from Utils into PpdUtils

165. By Jonas G. Drange on 2017-03-31

smaller refactor making device makemodel fixes easily testable

166. By Jonas G. Drange on 2017-03-31

fixes broken test after changing the test data

167. By Jonas G. Drange on 2017-03-31

syncs with staging and fixes a test that broke

168. By Jonas G. Drange on 2017-04-04

uses makeLower

169. By Jonas G. Drange on 2017-04-04

syncs with staging

170. By Jonas G. Drange on 2017-04-05

creates hp devices for hplip capable printers

171. By Jonas G. Drange on 2017-04-05

sets the faxid on any fax

172. By Jonas G. Drange on 2017-04-06

actually start the process, suggest hplip

173. By Jonas G. Drange on 2017-04-06

drop the device id for fax

174. By Jonas G. Drange on 2017-04-06

uses info as a last resort

175. By Jonas G. Drange on 2017-04-07

make sure non-consolidateable devices are kept

176. By Jonas G. Drange on 2017-04-07

fixes test that now broke, but had to change, and add .get to drivermodel

Unmerged revisions

176. By Jonas G. Drange on 2017-04-07

fixes test that now broke, but had to change, and add .get to drivermodel

175. By Jonas G. Drange on 2017-04-07

make sure non-consolidateable devices are kept

174. By Jonas G. Drange on 2017-04-06

uses info as a last resort

173. By Jonas G. Drange on 2017-04-06

drop the device id for fax

172. By Jonas G. Drange on 2017-04-06

actually start the process, suggest hplip

171. By Jonas G. Drange on 2017-04-05

sets the faxid on any fax

170. By Jonas G. Drange on 2017-04-05

creates hp devices for hplip capable printers

169. By Jonas G. Drange on 2017-04-04

syncs with staging

168. By Jonas G. Drange on 2017-04-04

uses makeLower

167. By Jonas G. Drange on 2017-03-31

syncs with staging and fixes a test that broke

=== modified file 'modules/Ubuntu/Components/Extras/Example/Printers.qml'
--- modules/Ubuntu/Components/Extras/Example/Printers.qml	2017-03-21 23:02:42 +0000
+++ modules/Ubuntu/Components/Extras/Example/Printers.qml	2017-03-30 13:23:27 +0000
@@ -685,7 +685,7 @@
                             verticalCenter: parent.verticalCenter
                         }
                         property var target
-                        Component.onCompleted: target = Printers.devices
+                        Component.onCompleted: target = Printers.consolidatedDevices
                         running: target.searching
                     }
                 }
@@ -699,27 +699,12 @@
                         topMargin: units.gu(2)
                     }
                     height: contentItem.childrenRect.height
-                    model: Printers.devices
+                    model: Printers.consolidatedDevices
                     delegate: ListItem {
                         height: modelLayout.height + (divider.visible ? divider.height : 0)
                         ListItemLayout {
                             id: modelLayout
                             title.text: displayName
-                            subtitle.text: {
-                                if (type == PrinterEnum.LPDType) return "LPD";
-                                if (type == PrinterEnum.IppSType) return "IppS";
-                                if (type == PrinterEnum.Ipp14Type) return "Ipp14";
-                                if (type == PrinterEnum.HttpType) return "Http";
-                                if (type == PrinterEnum.BehType) return "Beh";
-                                if (type == PrinterEnum.SocketType) return "Socket";
-                                if (type == PrinterEnum.HttpsType) return "Https";
-                                if (type == PrinterEnum.IppType) return "Ipp";
-                                if (type == PrinterEnum.HPType) return "HP";
-                                if (type == PrinterEnum.USBType) return "USB";
-                                if (type == PrinterEnum.HPFaxType) return "HPFax";
-                                if (type == PrinterEnum.DNSSDType) return "DNSSD";
-                                else return "Unknown protocol";
-                            }
 
                             Icon {
                                 id: icon
@@ -729,17 +714,22 @@
                                 SlotsLayout.position: SlotsLayout.First
                             }
 
-                            Button {
-                                text: "Select printer"
-                                onClicked: {
-                                    var suggestedPrinterName = (" " + displayName).slice(1);
-                                    suggestedPrinterName = suggestedPrinterName.replace(/\ /g, "\-");
-                                    printerUri.text = uri;
-                                    printerName.text = suggestedPrinterName;
-                                    printerDescription.text = info;
-                                    printerLocation.text = location;
-                                }
-                            }
+                            ProgressionSlot {}
+                        }
+                        onClicked: {
+                            var p = pageStack.push(chooseConnectionPage, {
+                                consolidatedDevice: model
+                            });
+                            p.onConnectionChosen.connect(function (conn) {
+                                pageStack.pop();
+
+                                var suggestedPrinterName = (" " + conn.displayName).slice(1);
+                                suggestedPrinterName = suggestedPrinterName.replace(/\ /g, "\-");
+                                printerUri.text = conn.uri;
+                                printerName.text = suggestedPrinterName;
+                                printerDescription.text = conn.info;
+                                printerLocation.text = conn.location;
+                            });
                         }
                     }
                 }
@@ -757,4 +747,59 @@
             }
         }
     }
+
+    Component {
+        id: chooseConnectionPage
+
+        Page {
+            visible: false
+            property var consolidatedDevice
+            signal connectionChosen(var conn)
+            header: PageHeader {
+                id: chooseConnectionPageHeader
+                title: "Choose connection"
+                flickable: connectionsList
+            }
+
+            ListView {
+                id: connectionsList
+                anchors.fill: parent
+                model: consolidatedDevice.devices
+                delegate: ListItem {
+                    height: modelLayout.height + (divider.visible ? divider.height : 0)
+                    ListItemLayout {
+                        id: modelLayout
+                        title.text: info
+                        subtitle.text: {
+                            if (type == PrinterEnum.LPDType) return "LPD";
+                            if (type == PrinterEnum.IppSType) return "IppS";
+                            if (type == PrinterEnum.Ipp14Type) return "Ipp14";
+                            if (type == PrinterEnum.HttpType) return "Http";
+                            if (type == PrinterEnum.BehType) return "Beh";
+                            if (type == PrinterEnum.SocketType) return "Socket";
+                            if (type == PrinterEnum.HttpsType) return "Https";
+                            if (type == PrinterEnum.IppType) return "Ipp";
+                            if (type == PrinterEnum.HPType) return "HP";
+                            if (type == PrinterEnum.USBType) return "USB";
+                            if (type == PrinterEnum.HPFaxType) return "HPFax";
+                            if (type == PrinterEnum.DNSSDType) return "DNSSD";
+                            else return "Unknown protocol";
+                        }
+                        summary.text: uri
+
+                        Icon {
+                            id: icon
+                            width: height
+                            height: units.gu(2.5)
+                            name: "network-printer-symbolic"
+                            SlotsLayout.position: SlotsLayout.First
+                        }
+
+                        ProgressionSlot {}
+                    }
+                    onClicked: connectionChosen(model)
+                }
+            }
+        }
+    }
 }

=== modified file 'modules/Ubuntu/Components/Extras/Printers/CMakeLists.txt'
--- modules/Ubuntu/Components/Extras/Printers/CMakeLists.txt	2017-03-13 12:51:16 +0000
+++ modules/Ubuntu/Components/Extras/Printers/CMakeLists.txt	2017-03-30 13:23:27 +0000
@@ -34,6 +34,7 @@
     cups/jobloader.cpp
     cups/printerdriverloader.cpp
     cups/printerloader.cpp
+    cups/ppdutils.cpp
 
     models/devicemodel.cpp
     models/drivermodel.cpp

=== modified file 'modules/Ubuntu/Components/Extras/Printers/backend/backend_cups.cpp'
--- modules/Ubuntu/Components/Extras/Printers/backend/backend_cups.cpp	2017-03-15 17:42:21 +0000
+++ modules/Ubuntu/Components/Extras/Printers/backend/backend_cups.cpp	2017-03-30 13:23:27 +0000
@@ -17,6 +17,7 @@
 #include "backend/backend_cups.h"
 #include "cups/devicesearcher.h"
 #include "cups/jobloader.h"
+#include "cups/ppdutils.h"
 #include "cups/printerdriverloader.h"
 #include "cups/printerloader.h"
 #include "utils.h"
@@ -264,9 +265,9 @@
                 ppd_choice_t* def = ppdFindChoice(ppdColorModel,
                                                   ppdColorModel->defchoice);
                 if (def) {
-                    model = Utils::parsePpdColorModel(def->choice,
-                                                      def->text,
-                                                      "ColorModel");
+                    model = PpdUtils::parsePpdColorModel(def->choice,
+                                                         def->text,
+                                                         "ColorModel");
                 }
             }
             ret[option] = QVariant::fromValue(model);
@@ -278,8 +279,8 @@
                     ppd_choice_t* def = ppdFindChoice(ppdQuality,
                                                       ppdQuality->defchoice);
                     if (def) {
-                        quality = Utils::parsePpdPrintQuality(def->choice,
-                                                              def->text, opt);
+                        quality = PpdUtils::parsePpdPrintQuality(def->choice,
+                                                                 def->text, opt);
                     }
                 }
             }
@@ -291,7 +292,7 @@
                 if (qualityOpt) {
                     for (int i = 0; i < qualityOpt->num_choices; ++i) {
                         qualities.append(
-                            Utils::parsePpdPrintQuality(
+                            PpdUtils::parsePpdPrintQuality(
                                 qualityOpt->choices[i].choice,
                                 qualityOpt->choices[i].text,
                                 opt
@@ -307,7 +308,7 @@
             if (colorModels) {
                 for (int i = 0; i < colorModels->num_choices; ++i) {
                     models.append(
-                        Utils::parsePpdColorModel(
+                        PpdUtils::parsePpdColorModel(
                             colorModels->choices[i].choice,
                             colorModels->choices[i].text,
                             QStringLiteral("ColorModel")
@@ -357,7 +358,7 @@
 
     __CUPS_ADD_OPTION(dest, "copies", QString::number(options->copies()).toLocal8Bit());
     __CUPS_ADD_OPTION(dest, "ColorModel", options->getColorModel().name.toLocal8Bit());
-    __CUPS_ADD_OPTION(dest, "Duplex", Utils::duplexModeToPpdChoice(options->getDuplexMode()).toLocal8Bit());
+    __CUPS_ADD_OPTION(dest, "Duplex", PpdUtils::duplexModeToPpdChoice(options->getDuplexMode()).toLocal8Bit());
 
     if (options->landscape()) {
         __CUPS_ADD_OPTION(dest, "landscape", "");

=== modified file 'modules/Ubuntu/Components/Extras/Printers/cups/devicesearcher.cpp'
--- modules/Ubuntu/Components/Extras/Printers/cups/devicesearcher.cpp	2017-03-08 14:47:16 +0000
+++ modules/Ubuntu/Components/Extras/Printers/cups/devicesearcher.cpp	2017-03-30 13:23:27 +0000
@@ -15,9 +15,9 @@
  */
 
 #include "cups/ippclient.h"
+#include "cups/ppdutils.h"
 #include "devicesearcher.h"
-
-#include <QUrl>
+#include "utils.h"
 
 DeviceSearcher::DeviceSearcher(IppClient *client, QObject *parent)
     : QObject(parent)
@@ -54,14 +54,45 @@
     }
 
     Device d;
+
     d.cls = deviceClass;
     d.id = deviceId;
     d.info = deviceInfo;
-    d.makeModel = deviceMakeAndModel;
+
     d.uri = deviceUri;
     d.location = deviceLocation;
-
-    searcher->deviceFound(d);
+    d.makeModel = deviceMakeAndModel;
+
+    DeviceSearcher::fixMakeModel(d);
+
+    if (!d.makeModel.isEmpty()) {
+        searcher->deviceFound(d);
+    }
+}
+
+void DeviceSearcher::fixMakeModel(Device &device)
+{
+    // We can't set make-model on devices without enough info.
+    if (device.id.isEmpty() &&
+        (device.makeModel.isEmpty() ||
+         device.makeModel == QStringLiteral("Unknown"))) {
+        device.makeModel = QString::null;
+
+        return;
+    }
+
+    QString canidateMakeModel;
+
+    if (!device.id.isEmpty()) {
+        auto idDict = Utils::parseDeviceId(device.id);
+        canidateMakeModel = QString("%1 %2").arg(idDict["MFG"], idDict["MDL"]);
+    } else if (!device.makeModel.isEmpty()) {
+        canidateMakeModel = device.makeModel;
+    }
+
+    auto split = PpdUtils::splitMakeModel(canidateMakeModel);
+    canidateMakeModel = QString("%1 %2").arg(split.first, split.second);
+    device.makeModel = canidateMakeModel;
 }
 
 void DeviceSearcher::deviceFound(const Device &device)

=== modified file 'modules/Ubuntu/Components/Extras/Printers/cups/devicesearcher.h'
--- modules/Ubuntu/Components/Extras/Printers/cups/devicesearcher.h	2017-03-08 11:29:01 +0000
+++ modules/Ubuntu/Components/Extras/Printers/cups/devicesearcher.h	2017-03-30 13:23:27 +0000
@@ -47,6 +47,7 @@
         const char *location,
         void *context);
     void deviceFound(const Device &device);
+    static void fixMakeModel(Device &device);
 
 Q_SIGNALS:
     void loaded(const Device &device);

=== added file 'modules/Ubuntu/Components/Extras/Printers/cups/ppdutils.cpp'
--- modules/Ubuntu/Components/Extras/Printers/cups/ppdutils.cpp	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Extras/Printers/cups/ppdutils.cpp	2017-03-30 13:23:27 +0000
@@ -0,0 +1,343 @@
+/*
+ * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2014, 2015 Red Hat, Inc.
+ * Copyright (C) 2006 Florian Festi <[e-mail]>
+ * Copyright (C) 2006, 2007, 2008, 2009 Tim Waugh <[e-mail]>
+ * Copyright (C) 2017 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ppdutils.h"
+
+#include <QSet>
+
+const QRegularExpression PpdUtils::versionNumbers = QRegularExpression(
+    " v(?:er\\.)?\\d(?:\\d*\\.\\d+)?(?: |$)"
+);
+const QRegularExpression PpdUtils::ignoredSuffixes = QRegularExpression(
+    ","
+    "| hpijs"
+    "| foomatic/"
+    "| - "
+    "| w/"
+    "| \\("
+    "| postscript"
+    "| ps"
+    "| pdf"
+    "| pxl"
+    "| zjs"
+    "| zxs"
+    "| pcl3"
+    "| printer"
+    "|_bt"
+    "| pcl"
+    "| ufr ii"
+    "| br-script"
+);
+const QRegularExpression PpdUtils::ignoreSeries = QRegularExpression(
+    " series| all-in-one",
+    QRegularExpression::CaseInsensitiveOption
+);
+const QList<QPair<QString, QRegularExpression>> PpdUtils::manufacturerByModels
+    = QList<QPair<QString, QRegularExpression>>({
+    QPair<QString, QRegularExpression>(
+        QStringLiteral("HP"), QRegularExpression(
+            "deskjet"
+            "|dj[ 0-9]?"
+            "|laserjet"
+            "|lj"
+            "|color laserjet"
+            "|color lj"
+            "|designjet"
+            "|officejet"
+            "|oj"
+            "|photosmart"
+            "|ps "
+            "|psc"
+            "|edgeline"
+        )
+    ),
+    QPair<QString, QRegularExpression>(
+        QStringLiteral("Epson"), QRegularExpression("stylus|aculaser")
+    ),
+    QPair<QString, QRegularExpression>(
+        QStringLiteral("Apple"), QRegularExpression(
+            "stylewriter"
+             "|imagewriter"
+             "|deskwriter"
+             "|laserwriter"
+         )
+    ),
+    QPair<QString, QRegularExpression>(
+        QStringLiteral("Canon"), QRegularExpression(
+            "pixus"
+            "|pixma"
+            "|selphy"
+            "|imagerunner"
+            "|bj"
+            "|lbp"
+        )
+    ),
+    QPair<QString, QRegularExpression>(
+        QStringLiteral("Brother"), QRegularExpression("hl|dcp|mfc")
+    ),
+    QPair<QString, QRegularExpression>(
+        QStringLiteral("Xerox"), QRegularExpression(
+            "docuprint"
+            "|docupage"
+            "|phaser"
+            "|workcentre"
+            "|homecentre"
+        )
+    ),
+    QPair<QString, QRegularExpression>(
+        QStringLiteral("Lexmark"),
+        QRegularExpression("optra|(:color )?jetprinter")
+    ),
+    QPair<QString, QRegularExpression>(
+        QStringLiteral("KONICA MINOLTA"), QRegularExpression(
+            "magicolor"
+            "|pageworks"
+            "|pagepro"
+        )
+    ),
+    QPair<QString, QRegularExpression>(
+        QStringLiteral("Kyocera"), QRegularExpression(
+            "fs-"
+            "|km-"
+            "|taskalfa"
+        )
+    ),
+    QPair<QString, QRegularExpression>(
+        QStringLiteral("Ricoh"), QRegularExpression("aficio")
+    ),
+    QPair<QString, QRegularExpression>(
+        QStringLiteral("Oce"), QRegularExpression("varioprint")
+    ),
+    QPair<QString, QRegularExpression>(
+        QStringLiteral("Oki"), QRegularExpression("okipage|microline")
+    ),
+});
+
+const QMap<QString, QString> PpdUtils::hpByModel = QMap<QString, QString>{
+    {"dj", "DeskJet"},
+    {"lj", "LaserJet"},
+    {"laserjet", "LaserJet"},
+    {"oj", "OfficeJet"},
+    {"officejet", "OfficeJet"},
+    {"color lj", "Color LaserJet"},
+    {"ps ", "PhotoSmart"},
+    {"hp ", ""},
+};
+
+QString PpdUtils::dedupeMakeModel(const QString &str)
+{
+    QSet<QString> stringSet;
+    QStringList deduped;
+    Q_FOREACH(auto m, str.split(" ")) {
+        if (!stringSet.contains(m)) {
+            deduped << m;
+        }
+        stringSet << m;
+    }
+    return deduped.join(" ");
+}
+
+QPair<QString, QString> PpdUtils::splitMakeModel(const QString &makeModel)
+{
+    const QString mm = dedupeMakeModel(makeModel);
+    const QString makeModelLower = mm.toLower();
+
+    QString make;
+    QString model;
+
+    /* Informs us whether or not the make part was produced in such a way that
+    it might need cleaning. I.e. we've made a guess at what the make is. */
+    bool cleanupMake = false;
+
+    /* If the string starts with a known model name (like "LaserJet") assume
+    that the manufacturer name is missing and add the manufacturer name
+    corresponding to the model name */
+    Q_FOREACH(auto manufacturerByModel, PpdUtils::manufacturerByModels) {
+        if (manufacturerByModel.second.match(makeModelLower).hasMatch()) {
+            make = manufacturerByModel.first;
+            model = mm;
+        }
+    }
+
+    /* Take the first word as the name of the manufacturer.
+
+    Note that we have skipped a bunch of special cases where the first word
+    isn't necessarily the manufacturer, hence the next TODO.
+
+    TODO: Handle special cases for TurboPrint, lexmark international,
+    fuji xerox, etc. */
+    int firstSpace = mm.indexOf(" ");
+    if (make.isEmpty() && firstSpace > 0) {
+        make = mm.left(firstSpace);
+        model = mm.mid(make.size() + 1);
+
+        /* We've picked the first part as the make, but it may be that we've
+        split "hewlett packard" and are left with "hewlett". */
+        cleanupMake = true;
+    }
+
+    // Standardised names for manufacturers.
+    const QString makeLower = make.toLower();
+    if (cleanupMake) {
+        if (makeLower.startsWith("hewlett") && makeLower.endsWith("packard")) {
+            make = "HP";
+            // makeLower = "hp"
+        } else if (makeLower.startsWith("konica") &&
+                   makeLower.endsWith("minolta")) {
+            make = "KONICA MINOLTA";
+            // makeLower = "konica minolta"
+        } else {
+            // Fix case errors.
+            Q_FOREACH(auto manufacturerByModel, manufacturerByModels) {
+                if (makeLower == manufacturerByModel.first.toLower()) {
+                    make = manufacturerByModel.first;
+                    break;
+                }
+            }
+        }
+    }
+
+    // Remove the word "Series" if present.
+    model = model.remove(ignoreSeries);
+
+    /* Find a version number and cut the model from there. Note that some
+    models may legitimately look like version numbers. So we cut only if the
+    version number has max one digit, or a dot with digits before and after. */
+    QString modelLower = model.toLower();
+    int versionAt = modelLower.indexOf(" v");
+    if (versionAt >= 0) {
+        // Look for v or ver. followed by digits and dots.
+        auto match = versionNumbers.match(modelLower);
+        if (match.hasMatch()) {
+            int matchAt = match.capturedStart();
+            model.truncate(matchAt);
+            modelLower.truncate(matchAt);
+        }
+    }
+
+    // Remove ignored suffixes.
+    auto suffixMatch = ignoredSuffixes.match(modelLower);
+    if (suffixMatch.hasMatch()) {
+        int matchAt = suffixMatch.capturedStart();
+        model.truncate(matchAt);
+        modelLower.truncate(matchAt);
+    }
+
+    // Replace lj or dj with LaserJet and DeskJet respectively, etc.
+    if (makeLower == "hp") {
+        Q_FOREACH(auto name, hpByModel.keys()) {
+            if (modelLower.contains(name)) {
+                int start = modelLower.indexOf(name);
+                model.remove(start, name.size());
+                model.insert(start, hpByModel[name]);
+                modelLower = model.toLower();
+            }
+        }
+    }
+
+    return QPair<QString, QString>(make, model);
+}
+
+QString PpdUtils::normalize(const QString &str)
+{
+    QString strLower = str.trimmed().toLower();
+    QString normalized;
+
+    const int BLANK = 0;
+    const int ALPHA = 1;
+    const int DIGIT = 2;
+    int lastchar = BLANK;
+
+    bool alnumfound = false;
+
+    for (int i = 0; i < strLower.size(); i++) {
+        if (strLower[i].isLetter()) {
+            if (lastchar != ALPHA && alnumfound) {
+                normalized += " ";
+            }
+            lastchar = ALPHA;
+        } else if (strLower[i].isDigit()) {
+            if (lastchar != DIGIT && alnumfound) {
+                normalized += " ";
+            }
+            lastchar = DIGIT;
+        } else {
+            lastchar = BLANK;
+        }
+
+        if (strLower[i].isLetterOrNumber()) {
+            normalized += strLower[i];
+            alnumfound = true;
+        }
+    }
+    return normalized;
+}
+
+PrinterEnum::DuplexMode PpdUtils::ppdChoiceToDuplexMode(const QString &choice)
+{
+    if (choice == "DuplexTumble")
+        return PrinterEnum::DuplexMode::DuplexShortSide;
+    else if (choice == "DuplexNoTumble")
+        return PrinterEnum::DuplexMode::DuplexLongSide;
+    else
+        return PrinterEnum::DuplexMode::DuplexNone;
+}
+
+const QString PpdUtils::duplexModeToPpdChoice(
+    const PrinterEnum::DuplexMode &mode)
+{
+    switch (mode) {
+    case PrinterEnum::DuplexMode::DuplexShortSide:
+        return "DuplexTumble";
+    case PrinterEnum::DuplexMode::DuplexLongSide:
+        return "DuplexNoTumble";
+    case PrinterEnum::DuplexMode::DuplexNone:
+    default:
+        return "None";
+    }
+}
+
+
+ColorModel PpdUtils::parsePpdColorModel(const QString &name,
+                                        const QString &text,
+                                        const QString &optionName)
+{
+    ColorModel ret;
+    ret.name = name;
+    ret.text = text;
+    ret.originalOption = optionName;
+
+    if (ret.name.contains("Gray") || ret.name.contains("Black")) {
+        ret.colorType = PrinterEnum::ColorModelType::GrayType;
+    } else {
+        ret.colorType = PrinterEnum::ColorModelType::ColorType;
+    }
+    return ret;
+}
+
+PrintQuality PpdUtils::parsePpdPrintQuality(const QString &choice,
+                                            const QString &text,
+                                            const QString &optionName)
+{
+    PrintQuality quality;
+    quality.name = choice;
+    quality.text = text;
+    quality.originalOption = optionName;
+    return quality;
+}

=== added file 'modules/Ubuntu/Components/Extras/Printers/cups/ppdutils.h'
--- modules/Ubuntu/Components/Extras/Printers/cups/ppdutils.h	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Extras/Printers/cups/ppdutils.h	2017-03-30 13:23:27 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2014, 2015 Red Hat, Inc.
+ * Copyright (C) 2006 Florian Festi <[e-mail]>
+ * Copyright (C) 2006, 2007, 2008, 2009 Tim Waugh <[e-mail]>
+ * Copyright (C) 2017 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef USC_PRINTERS_CUPS_PPDUTILS_H
+#define USC_PRINTERS_CUPS_PPDUTILS_H
+
+#include "enums.h"
+#include "i18n.h"
+#include "printers_global.h"
+#include "structs.h"
+
+#include <cups/ppd.h>
+
+#include <QList>
+#include <QMap>
+#include <QPair>
+#include <QRegularExpression>
+#include <QString>
+
+struct PRINTERS_DECL_EXPORT PpdUtils
+{
+private:
+    static const QList<QPair<QString, QRegularExpression>> manufacturerByModels;
+    static const QRegularExpression ignoredSuffixes;
+    static const QRegularExpression versionNumbers;
+    static const QRegularExpression ignoreSeries;
+    static const QMap<QString, QString> hpByModel;
+    static QString dedupeMakeModel(const QString &str);
+public:
+
+    /**
+    Split a ppd-make-and-model string into a canonical make and model pair.
+    Returns a string pair representing the make and the model.
+    */
+    static QPair<QString, QString> splitMakeModel(const QString &makeModel);
+
+    /**
+    This function normalizes manufacturer and model names for comparing.
+    The string is turned to lower case and leading and trailing white
+    space is removed. After that each sequence of non-alphanumeric
+    characters (including white space) is replaced by a single space and
+    also at each change between letters and numbers a single space is added.
+    This makes the comparison only done by alphanumeric characters and the
+    words formed from them. So mostly two strings which sound the same when
+    you pronounce them are considered equal. Printer manufacturers do not
+    market two models whose names sound the same but differ only by
+    upper/lower case, spaces, dashes, ..., but in printer drivers names can
+    be easily supplied with these details of the name written in the wrong
+    way, especially if the IEEE-1284 device ID of the printer is not known.
+    This way we get a very reliable matching of printer model names.
+    Examples:
+    - Epson PM-A820 -> epson pm a 820
+    - Epson PM A820 -> epson pm a 820
+    - HP PhotoSmart C 8100 -> hp photosmart c 8100
+    - hp Photosmart C8100  -> hp photosmart c 8100
+    */
+    static QString normalize(const QString &str);
+
+    static PrinterEnum::DuplexMode ppdChoiceToDuplexMode(
+        const QString &choice);
+    static const QString duplexModeToPpdChoice(
+        const PrinterEnum::DuplexMode &mode);
+    static ColorModel parsePpdColorModel(const QString &name,
+                                         const QString &text,
+                                         const QString &optionName);
+    static PrintQuality parsePpdPrintQuality(const QString &choice,
+                                             const QString &text,
+                                             const QString &optionName);
+};
+
+#endif // USC_PRINTERS_CUPS_PPDUTILS_H

=== modified file 'modules/Ubuntu/Components/Extras/Printers/models/devicemodel.cpp'
--- modules/Ubuntu/Components/Extras/Printers/models/devicemodel.cpp	2017-03-09 14:34:05 +0000
+++ modules/Ubuntu/Components/Extras/Printers/models/devicemodel.cpp	2017-03-30 13:23:27 +0000
@@ -15,9 +15,13 @@
  */
 
 #include "backend/backend_cups.h"
+#include "cups/ppdutils.h"
 #include "models/devicemodel.h"
 
 #include <QDebug>
+#include <QPair>
+#include <QQmlEngine>
+#include <QSet>
 
 DeviceModel::DeviceModel(PrinterBackend *backend, QObject *parent)
     : QAbstractListModel(parent)
@@ -116,8 +120,16 @@
 
 bool DeviceModel::deviceWanted(const Device &device)
 {
+    bool wanted = true;
+
+    // Skip non-uris.
     auto parts = device.uri.split(":", QString::SkipEmptyParts);
-    return parts.size() > 1;
+    wanted = wanted && parts.size() > 1;
+
+    // Skip "Unknown" make-models.
+    wanted = wanted && device.makeModel != QStringLiteral("Unknown");
+
+    return wanted;
 }
 
 void DeviceModel::clear()
@@ -147,3 +159,206 @@
     m_isSearching = false;
     Q_EMIT searchingChanged();
 }
+
+bool DeviceModel::searching()
+{
+    return m_isSearching;
+}
+
+DeviceFilter::DeviceFilter(QObject *parent) : QSortFilterProxyModel(parent)
+{
+    connect(this, SIGNAL(sourceModelChanged()), SLOT(onSourceModelChanged()));
+}
+
+DeviceFilter::~DeviceFilter()
+{
+}
+
+void DeviceFilter::onSourceModelChanged()
+{
+    connect(
+        (DeviceModel*) sourceModel(), SIGNAL(countChanged()),
+        this, SIGNAL(countChanged())
+    );
+}
+
+void DeviceFilter::onSourceModelCountChanged()
+{
+    Q_EMIT countChanged();
+}
+
+int DeviceFilter::count() const
+{
+    return rowCount();
+}
+
+void DeviceFilter::filterOnNormalizedMakeModel(
+    const QString &normalizedMakeModel)
+{
+    m_normalizedMakeModel = normalizedMakeModel;
+    m_normalizedMakeModelFilterEnabled = true;
+    invalidate();
+}
+
+void DeviceFilter::filterOnUri(const QString &uri)
+{
+    m_uri = uri;
+    m_uriFilterEnabled = true;
+    invalidate();
+}
+
+bool DeviceFilter::filterAcceptsRow(int sourceRow,
+                                    const QModelIndex &sourceParent) const
+{
+    bool accepts = true;
+    QModelIndex childIndex = sourceModel()->index(sourceRow, 0, sourceParent);
+
+    if (accepts && m_normalizedMakeModelFilterEnabled) {
+        QString makeModel = childIndex.model()->data(
+            childIndex, DeviceModel::MakeModelRole).toString();
+        accepts = m_normalizedMakeModel == PpdUtils::normalize(makeModel);
+    }
+
+    if (accepts && m_uriFilterEnabled) {
+        QString uri = childIndex.model()->data(
+            childIndex, DeviceModel::UriRole).toString();
+        accepts = m_uri == uri;
+    }
+
+    return accepts;
+}
+
+ConsolidatedDeviceModel::ConsolidatedDeviceModel(DeviceModel *deviceModel,
+                                                 QObject *parent)
+    : QAbstractListModel(parent)
+    , m_deviceModel(deviceModel)
+{
+    connect(m_deviceModel, SIGNAL(searchingChanged()),
+            this, SLOT(deviceModelSearchChanged()));
+}
+
+ConsolidatedDeviceModel::~ConsolidatedDeviceModel()
+{
+}
+
+int ConsolidatedDeviceModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+    return m_consolidatedDevices.size();
+}
+
+int ConsolidatedDeviceModel::count() const
+{
+    return rowCount();
+}
+
+bool ConsolidatedDeviceModel::searching()
+{
+    return m_deviceModel->searching();
+}
+
+bool ConsolidatedDeviceModel::makeModelIsConsolidateable(
+    const QString &makeModel) const
+{
+    return !makeModel.isEmpty() && makeModel != QStringLiteral("Unknown");
+}
+
+void ConsolidatedDeviceModel::deviceModelSearchChanged()
+{
+    int oldCount = rowCount();
+
+    beginResetModel();
+    m_consolidatedDevices.clear();
+
+    /* Device model has finished searching, so let's sync our model with it.
+    Note that if the deviceModel is searching, we simply dump our model. */
+    if (!m_deviceModel->searching()) {
+        // A set of normalized make-models.
+        QSet<QString> normalizedMakeModels;
+
+        // Used to preserve makeModels after it has been normalized.
+        QMap<QString, QString> normalizedToMakeModel;
+        for (int i = 0; i < m_deviceModel->rowCount(); i++) {
+            QModelIndex idx = m_deviceModel->index(i, 0);
+            QString makeModel = m_deviceModel->data(
+                idx, DeviceModel::MakeModelRole
+            ).toString();
+
+            // We can't do anything about a make-model-less device.
+            if (makeModel.isEmpty()) {
+                continue;
+            }
+
+            if (makeModelIsConsolidateable(makeModel)) {
+                QString normalized = PpdUtils::normalize(makeModel);
+                normalizedMakeModels << normalized;
+                normalizedToMakeModel[normalized] = makeModel;
+            }
+        }
+
+        /* For every make-and-model, create a proxy model, and install a filter
+        on it. Then do the same for those consolidated under URI (i.e. not
+        consolidated).
+        Note that a parent is set on each filter so that it is cleaned up when
+        we the consolidated model is destroyed. */
+        Q_FOREACH(auto mm, normalizedMakeModels) {
+            auto filter = new DeviceFilter(this);
+            filter->setSourceModel(m_deviceModel);
+            filter->filterOnNormalizedMakeModel(mm);
+
+            QPair<QString, DeviceFilter*> p(mm, filter);
+            m_consolidatedDevices << p;
+        }
+    }
+
+    endResetModel();
+
+    if (oldCount != rowCount()) {
+        Q_EMIT countChanged();
+    }
+    Q_EMIT searchingChanged();
+}
+
+QVariant ConsolidatedDeviceModel::data(const QModelIndex &index, int role) const
+{
+    QVariant ret;
+
+    if ((0 <= index.row()) && (index.row() < m_consolidatedDevices.size())) {
+
+        auto consolidated = m_consolidatedDevices[index.row()];
+        auto mm = consolidated.first;
+        auto filter = consolidated.second;
+
+        switch (role) {
+            case Qt::DisplayRole:
+            case ConsolidatedNameRole:
+                ret = filter->data(
+                    filter->index(0, 0), DeviceModel::Roles::MakeModelRole
+                ).toString();
+                break;
+            case DevicesRole: {
+                ret = QVariant::fromValue(filter);
+                break;
+            case ConnectionsCountRole:
+                ret = filter->count();
+                break;
+            }
+        }
+    }
+
+    return ret;
+}
+
+QHash<int, QByteArray> ConsolidatedDeviceModel::roleNames() const
+{
+    static QHash<int,QByteArray> names;
+
+    if (Q_UNLIKELY(names.empty())) {
+        names[Qt::DisplayRole] = "displayName";
+        names[ConsolidatedNameRole] = "consolidatedName";
+        names[DevicesRole] = "devices";
+        names[ConnectionsCountRole] = "connectionsCount";
+    }
+
+    return names;
+}

=== modified file 'modules/Ubuntu/Components/Extras/Printers/models/devicemodel.h'
--- modules/Ubuntu/Components/Extras/Printers/models/devicemodel.h	2017-03-09 14:34:05 +0000
+++ modules/Ubuntu/Components/Extras/Printers/models/devicemodel.h	2017-03-30 13:23:27 +0000
@@ -31,7 +31,7 @@
 {
     Q_OBJECT
     Q_PROPERTY(int count READ count NOTIFY countChanged)
-    Q_PROPERTY(bool searching MEMBER m_isSearching NOTIFY searchingChanged)
+    Q_PROPERTY(bool searching READ searching NOTIFY searchingChanged)
 public:
     explicit DeviceModel(PrinterBackend *backend, QObject *parent = Q_NULLPTR);
     ~DeviceModel();
@@ -56,6 +56,7 @@
     int count() const;
     void load();
     void clear();
+    bool searching();
 
 private Q_SLOTS:
     void deviceLoaded(const Device &device);
@@ -75,4 +76,82 @@
     bool m_isSearching;
 };
 
+
+class PRINTERS_DECL_EXPORT DeviceFilter : public QSortFilterProxyModel
+{
+    Q_OBJECT
+    Q_PROPERTY(int count READ count NOTIFY countChanged)
+public:
+    explicit DeviceFilter(QObject *parent = Q_NULLPTR);
+    ~DeviceFilter();
+
+    void filterOnNormalizedMakeModel(const QString &normalizedMakeModel);
+    void filterOnUri(const QString &uri);
+    int count() const;
+protected:
+    virtual bool filterAcceptsRow(
+        int sourceRow, const QModelIndex &sourceParent) const override;
+
+Q_SIGNALS:
+    void countChanged();
+
+private Q_SLOTS:
+    void onSourceModelChanged();
+    void onSourceModelCountChanged();
+
+private:
+    QString m_normalizedMakeModel = QString::null;
+    bool m_normalizedMakeModelFilterEnabled = false;
+
+    QString m_uri = QString::null;
+    bool m_uriFilterEnabled = false;
+};
+
+/* The ConsolidatedDeviceModel is a model of ConsolidatedDevices. A
+ConsolidatedDevice is a set of Devices that share a printer name (assuming
+unique printer names).
+
+TODO: The DeviceModel should implement the consolidation by use of e.g. a
+table model, or tree model. This model can then be deleted. */
+class PRINTERS_DECL_EXPORT ConsolidatedDeviceModel : public QAbstractListModel
+{
+    Q_OBJECT
+    Q_PROPERTY(int count READ count NOTIFY countChanged)
+    Q_PROPERTY(bool searching READ searching NOTIFY searchingChanged)
+public:
+    explicit ConsolidatedDeviceModel(DeviceModel *deviceModel,
+                                     QObject *parent = Q_NULLPTR);
+    ~ConsolidatedDeviceModel();
+
+    enum Roles
+    {
+        // Qt::DisplayRole holds consolidated device name
+        DevicesRole = Qt::UserRole,
+        ConsolidatedNameRole,
+        ConnectionsCountRole,
+        LastRole = ConnectionsCountRole,
+    };
+
+    virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    virtual QHash<int, QByteArray> roleNames() const override;
+
+    int count() const;
+    void load();
+    bool searching();
+    bool makeModelIsConsolidateable(const QString &makeModel) const;
+
+private Q_SLOTS:
+    void deviceModelSearchChanged();
+
+Q_SIGNALS:
+    void countChanged();
+    void searchingChanged();
+
+private:
+    DeviceModel *m_deviceModel;
+
+    QList<QPair<QString, DeviceFilter*>> m_consolidatedDevices;
+};
+
 #endif // USC_PRINTER_DEVICEMODEL_H

=== modified file 'modules/Ubuntu/Components/Extras/Printers/printer/printer.cpp'
--- modules/Ubuntu/Components/Extras/Printers/printer/printer.cpp	2017-03-21 13:01:42 +0000
+++ modules/Ubuntu/Components/Extras/Printers/printer/printer.cpp	2017-03-30 13:23:27 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "cups/ppdutils.h"
 #include "i18n.h"
 #include "utils.h"
 
@@ -291,7 +292,7 @@
         return;
     }
 
-    QStringList vals({Utils::duplexModeToPpdChoice(duplexMode)});
+    QStringList vals({PpdUtils::duplexModeToPpdChoice(duplexMode)});
     m_backend->printerAddOption(name(), "Duplex", vals);
 }
 

=== modified file 'modules/Ubuntu/Components/Extras/Printers/printer/printerjob.cpp'
--- modules/Ubuntu/Components/Extras/Printers/printer/printerjob.cpp	2017-03-16 15:47:11 +0000
+++ modules/Ubuntu/Components/Extras/Printers/printer/printerjob.cpp	2017-03-30 13:23:27 +0000
@@ -18,9 +18,9 @@
 #include <QUrl>
 
 #include "backend/backend_cups.h"
+#include "cups/ppdutils.h"
 #include "models/printermodel.h"
 #include "printer/printerjob.h"
-#include "utils.h"
 
 PrinterJob::PrinterJob(QString printerName,
                        PrinterBackend *backend,
@@ -166,7 +166,7 @@
 
     // No duplexMode will result in PrinterJob using defaultDuplexMode
     QString duplex = attributes.value("Duplex").toString();
-    PrinterEnum::DuplexMode duplexMode = Utils::ppdChoiceToDuplexMode(duplex);
+    PrinterEnum::DuplexMode duplexMode = PpdUtils::ppdChoiceToDuplexMode(duplex);
     for (int i=0; i < m_printer->supportedDuplexModes().length(); i++) {
         if (m_printer->supportedDuplexModes().at(i) == duplexMode) {
             setDuplexMode(i);

=== modified file 'modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp'
--- modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp	2017-03-21 14:51:38 +0000
+++ modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp	2017-03-30 13:23:27 +0000
@@ -35,6 +35,7 @@
     : QObject(parent)
     , m_backend(backend)
     , m_devices(backend)
+    , m_consolidatedDevices(&m_devices)
     , m_drivers(backend)
     , m_model(backend)
     , m_jobs(backend)
@@ -259,6 +260,14 @@
     m_devices.load();
 }
 
+QAbstractItemModel* Printers::consolidatedDevices()
+{
+    m_devices.load();
+    auto ret = &m_consolidatedDevices;
+    QQmlEngine::setObjectOwnership(ret, QQmlEngine::CppOwnership);
+    return ret;
+}
+
 bool Printers::addPrinter(const QString &name, const QString &ppd,
                           const QString &device, const QString &description,
                           const QString &location)

=== modified file 'modules/Ubuntu/Components/Extras/Printers/printers/printers.h'
--- modules/Ubuntu/Components/Extras/Printers/printers/printers.h	2017-03-21 14:51:38 +0000
+++ modules/Ubuntu/Components/Extras/Printers/printers/printers.h	2017-03-30 13:23:27 +0000
@@ -42,6 +42,7 @@
     Q_PROPERTY(QAbstractItemModel* printJobs READ printJobs CONSTANT)
     Q_PROPERTY(QAbstractItemModel* drivers READ drivers CONSTANT)
     Q_PROPERTY(QAbstractItemModel* devices READ devices CONSTANT)
+    Q_PROPERTY(QAbstractItemModel* consolidatedDevices READ consolidatedDevices CONSTANT)
     Q_PROPERTY(QString driverFilter READ driverFilter WRITE setDriverFilter NOTIFY driverFilterChanged)
     Q_PROPERTY(QString defaultPrinterName READ defaultPrinterName WRITE setDefaultPrinterName NOTIFY defaultPrinterNameChanged)
     Q_PROPERTY(QString lastMessage READ lastMessage CONSTANT)
@@ -60,6 +61,7 @@
     QAbstractItemModel* printJobs();
     QAbstractItemModel* drivers();
     QAbstractItemModel* devices();
+    QAbstractItemModel* consolidatedDevices();
     QString driverFilter() const;
     QString defaultPrinterName() const;
     QString lastMessage() const;
@@ -111,6 +113,7 @@
     void provisionPrinter(const QString &name);
     PrinterBackend *m_backend;
     DeviceModel m_devices;
+    ConsolidatedDeviceModel m_consolidatedDevices;
     DriverModel m_drivers;
     PrinterModel m_model;
     JobModel m_jobs;

=== modified file 'modules/Ubuntu/Components/Extras/Printers/structs.h'
--- modules/Ubuntu/Components/Extras/Printers/structs.h	2017-03-16 15:34:02 +0000
+++ modules/Ubuntu/Components/Extras/Printers/structs.h	2017-03-30 13:23:27 +0000
@@ -163,8 +163,6 @@
     }
 };
 
-
-
 Q_DECLARE_TYPEINFO(ColorModel, Q_PRIMITIVE_TYPE);
 Q_DECLARE_METATYPE(ColorModel)
 

=== modified file 'modules/Ubuntu/Components/Extras/Printers/utils.h'
--- modules/Ubuntu/Components/Extras/Printers/utils.h	2017-02-21 10:46:29 +0000
+++ modules/Ubuntu/Components/Extras/Printers/utils.h	2017-03-30 13:23:27 +0000
@@ -19,39 +19,14 @@
 
 #include "enums.h"
 #include "i18n.h"
-#include "structs.h"
-
-#include <cups/ppd.h>
-
+
+#include <QMap>
+#include <QPrinter>
 #include <QString>
-#include <QPrinter>
 
 class Utils
 {
 public:
-    static PrinterEnum::DuplexMode ppdChoiceToDuplexMode(const QString &choice)
-    {
-        if (choice == "DuplexTumble")
-            return PrinterEnum::DuplexMode::DuplexShortSide;
-        else if (choice == "DuplexNoTumble")
-            return PrinterEnum::DuplexMode::DuplexLongSide;
-        else
-            return PrinterEnum::DuplexMode::DuplexNone;
-    }
-
-    static const QString duplexModeToPpdChoice(const PrinterEnum::DuplexMode &mode)
-    {
-        switch (mode) {
-        case PrinterEnum::DuplexMode::DuplexShortSide:
-            return "DuplexTumble";
-        case PrinterEnum::DuplexMode::DuplexLongSide:
-            return "DuplexNoTumble";
-        case PrinterEnum::DuplexMode::DuplexNone:
-        default:
-            return "None";
-        }
-    }
-
     static const QString duplexModeToUIString(const PrinterEnum::DuplexMode &mode)
     {
         switch (mode) {
@@ -79,31 +54,55 @@
         }
     }
 
-    static ColorModel parsePpdColorModel(const QString &name, const QString &text,
-                                         const QString &optionName)
-    {
-        ColorModel ret;
-        ret.name = name;
-        ret.text = text;
-        ret.originalOption = optionName;
-
-        if (ret.name.contains("Gray") || ret.name.contains("Black")) {
-            ret.colorType = PrinterEnum::ColorModelType::GrayType;
-        } else {
-            ret.colorType = PrinterEnum::ColorModelType::ColorType;
-        }
-        return ret;
-    }
-
-    static PrintQuality parsePpdPrintQuality(const QString &choice,
-                                             const QString &text,
-                                             const QString &optionName)
-    {
-        PrintQuality quality;
-        quality.name = choice;
-        quality.text = text;
-        quality.originalOption = optionName;
-        return quality;
+    // Parse an IEEE 1284 Device ID, so that it may be indexed by field name.
+    static QMap<QString, QString> parseDeviceId(const QString &did)
+    {
+        QMap<QString, QString> idDict;
+        const auto parts = did.split(";");
+        const auto col = QStringLiteral(":");
+
+        Q_FOREACH(auto part, parts) {
+            if (!part.contains(col)) {
+                continue;
+            }
+            auto nameValue = part.split(col);
+            idDict[nameValue[0].trimmed()] = nameValue[1].trimmed();
+        }
+
+        const auto man = QStringLiteral("MANUFACTURER");
+        const auto mfg = QStringLiteral("MFG");
+        if (idDict.contains(man)) {
+            idDict.insert(mfg, idDict.value(mfg, idDict.value(man)));
+        }
+
+        const auto mod = QStringLiteral("MODEL");
+        const auto mdl = QStringLiteral("MDL");
+        if (idDict.contains(mod)) {
+            idDict.insert(mdl, idDict.value(mdl, idDict.value(mod)));
+        }
+
+        const auto com = QStringLiteral("COMMAND SET");
+        const auto cmd = QStringLiteral("CMD");
+        if (idDict.contains(com)) {
+            idDict.insert(cmd, idDict.value(cmd, idDict.value(com)));
+        }
+
+        const auto defaultNames = QStringList({
+            mfg, mdl, cmd,
+            QStringLiteral("CLS"),
+            QStringLiteral("DES"),
+            QStringLiteral("SN"),
+            QStringLiteral("S"),
+            QStringLiteral("P"),
+            QStringLiteral("J"),
+        });
+        Q_FOREACH(auto name, defaultNames) {
+            idDict.insert(name, idDict.value(name, QString::null));
+        }
+
+        // TODO: We'd make an array of CMD, but we don't currently need it.
+
+        return idDict;
     }
 };
 

=== modified file 'po/ubuntu-ui-extras.pot'
--- po/ubuntu-ui-extras.pot	2017-03-21 14:51:38 +0000
+++ po/ubuntu-ui-extras.pot	2017-03-30 13:23:27 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-ui-extras\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-21 15:33+0100\n"
+"POT-Creation-Date: 2017-03-30 15:15+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -55,7 +55,7 @@
 msgid "Idle"
 msgstr ""
 
-#: modules/Ubuntu/Components/Extras/Printers/utils.h:61
+#: modules/Ubuntu/Components/Extras/Printers/utils.h:36
 msgid "Long Edge (Standard)"
 msgstr ""
 
@@ -67,7 +67,7 @@
 msgid "Normal"
 msgstr ""
 
-#: modules/Ubuntu/Components/Extras/Printers/utils.h:64
+#: modules/Ubuntu/Components/Extras/Printers/utils.h:39
 msgid "One Sided"
 msgstr ""
 
@@ -91,7 +91,7 @@
 msgid "Rotate"
 msgstr ""
 
-#: modules/Ubuntu/Components/Extras/Printers/utils.h:59
+#: modules/Ubuntu/Components/Extras/Printers/utils.h:34
 msgid "Short Edge (Flip)"
 msgstr ""
 
@@ -99,7 +99,7 @@
 msgid "Stopped"
 msgstr ""
 
-#: modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp:387
+#: modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp:396
 msgid "Test page"
 msgstr ""
 

=== modified file 'tests/unittests/Printers/CMakeLists.txt'
--- tests/unittests/Printers/CMakeLists.txt	2017-03-10 10:28:20 +0000
+++ tests/unittests/Printers/CMakeLists.txt	2017-03-30 13:23:27 +0000
@@ -56,3 +56,19 @@
 add_executable(testPrintersDeviceModel tst_printerdevicemodel.cpp ${MOCK_SOURCES})
 target_link_libraries(testPrintersDeviceModel UbuntuComponentsExtrasPrintersQml Qt5::Test Qt5::Gui)
 add_test(tst_printerdevicemodel testPrintersDeviceModel)
+
+add_executable(testPrintersPpdUtils tst_ppdutils.cpp)
+target_link_libraries(testPrintersPpdUtils UbuntuComponentsExtrasPrintersQml Qt5::Test Qt5::Gui)
+add_test(tst_ppdutils testPrintersPpdUtils)
+
+add_executable(testPrintersUtils tst_utils.cpp)
+target_link_libraries(testPrintersUtils UbuntuComponentsExtrasPrintersQml Qt5::Test Qt5::Gui)
+add_test(tst_utils testPrintersUtils)
+
+add_executable(testPrintersDeviceFilter tst_devicefilter.cpp ${MOCK_SOURCES})
+target_link_libraries(testPrintersDeviceFilter UbuntuComponentsExtrasPrintersQml Qt5::Test Qt5::Gui)
+add_test(tst_devicefilter testPrintersDeviceFilter)
+
+add_executable(testPrintersConsolidatedDeviceModel tst_consolidateddevicemodel.cpp ${MOCK_SOURCES})
+target_link_libraries(testPrintersConsolidatedDeviceModel UbuntuComponentsExtrasPrintersQml Qt5::Test Qt5::Gui)
+add_test(tst_consolidateddevicemodel testPrintersConsolidatedDeviceModel)

=== modified file 'tests/unittests/Printers/mockbackend.h'
--- tests/unittests/Printers/mockbackend.h	2017-03-15 17:42:21 +0000
+++ tests/unittests/Printers/mockbackend.h	2017-03-30 13:23:27 +0000
@@ -18,7 +18,7 @@
 #define USC_PRINTERS_MOCK_BACKEND_H
 
 #include "backend/backend.h"
-#include "utils.h"
+#include "cups/ppdutils.h"
 
 class MockPrinterBackend : public PrinterBackend
 {
@@ -235,7 +235,7 @@
                 attributes.insert("ColorModel", job->getColorModel().name);
                 attributes.insert("CompletedTime", job->completedTime());
                 attributes.insert("CreationTime", job->creationTime());
-                attributes.insert("Duplex", Utils::duplexModeToPpdChoice(job->getDuplexMode()));
+                attributes.insert("Duplex", PpdUtils::duplexModeToPpdChoice(job->getDuplexMode()));
                 attributes.insert("impressionsCompleted", job->impressionsCompleted());
                 attributes.insert("landscape", job->landscape());
                 attributes.insert("messages", job->messages());
@@ -322,7 +322,7 @@
     virtual PrinterEnum::DuplexMode defaultDuplexMode() const override
     {
         auto ppdMode = printerGetOption(printerName(), "Duplex").toString();
-        return Utils::ppdChoiceToDuplexMode(ppdMode);
+        return PpdUtils::ppdChoiceToDuplexMode(ppdMode);
     }
 
     virtual QList<PrinterEnum::DuplexMode> supportedDuplexModes() const override

=== added file 'tests/unittests/Printers/tst_consolidateddevicemodel.cpp'
--- tests/unittests/Printers/tst_consolidateddevicemodel.cpp	1970-01-01 00:00:00 +0000
+++ tests/unittests/Printers/tst_consolidateddevicemodel.cpp	2017-03-30 13:23:27 +0000
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2017 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "mockbackend.h"
+
+#include "backend/backend.h"
+#include "models/devicemodel.h"
+#include "structs.h"
+
+#include <QDebug>
+#include <QObject>
+#include <QSignalSpy>
+#include <QTest>
+
+Q_DECLARE_METATYPE(ConsolidatedDeviceModel::Roles)
+
+class TestConsolidatedDeviceModel : public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void init()
+    {
+        m_backend = new MockPrinterBackend();
+        m_devicesModel = new DeviceModel(m_backend);
+    }
+    void cleanup()
+    {
+        QSignalSpy destroyedSpy(m_devicesModel, SIGNAL(destroyed(QObject*)));
+        m_devicesModel->deleteLater();
+        QTRY_COMPARE(destroyedSpy.count(), 1);
+        delete m_backend;
+    }
+    void testConsolidation_data()
+    {
+        QTest::addColumn<QList<Device>>("devices");
+        QTest::addColumn<int>("targetConsolidatedDeviceCount");
+
+        {
+            Device a; a.uri = "dnssd://foo/bar"; a.makeModel = "foo";
+            Device b; b.uri = "ipps://bar/qux"; b.makeModel = "bar";
+
+            QList<Device> devs({a, b});
+            QTest::newRow("no consolidation") << devs << 2;
+        }
+        {
+            Device a; a.uri = "dnssd://foo/bar"; a.makeModel = "foo";
+            Device b; b.uri = "ipps://foo/bar"; b.makeModel = "foo";
+
+            QList<Device> devs({a, b});
+            QTest::newRow("consolidation") << devs << 1;
+        }
+        {
+            Device a; a.uri = "dnssd://foo/bar"; a.makeModel = "foo";
+            Device b; b.uri = "ipps://foo/bar"; b.makeModel = "foo";
+            Device c; c.uri = "socket://baz/qux"; c.makeModel = "baz";
+
+            QList<Device> devs({a, b, c});
+            QTest::newRow("mixed") << devs << 2;
+        }
+        {
+            Device a; a.uri = "dnssd://foo/bar"; a.makeModel = "foo";
+            Device b; b.uri = "ipps://foo/bar"; b.makeModel = "";
+            Device c; c.uri = "socket://baz/qux"; c.makeModel = "";
+
+            QList<Device> devs({a, b, c});
+            QTest::newRow("don't consolidate make-and-model-less devices") << devs << 1;
+        }
+        {
+            Device a; a.uri = "dnssd://foo/bar"; a.makeModel = "Unknown";
+            Device b; b.uri = "ipps://foo/bar"; b.makeModel = "Unknown";
+            Device c; c.uri = "socket://baz/qux"; c.makeModel = "Unknown";
+
+            QList<Device> devs({a, b, c});
+            QTest::newRow("Unknown devices aren't even considered.") << devs << 0;
+        }
+    }
+    void testConsolidation()
+    {
+        QFETCH(QList<Device>, devices);
+        QFETCH(int, targetConsolidatedDeviceCount);
+
+        ConsolidatedDeviceModel model(m_devicesModel);
+
+        Q_FOREACH(auto device, devices) {
+            m_backend->mockDeviceFound(device);
+        }
+        m_backend->deviceSearchFinished();
+
+        QCOMPARE(model.rowCount(), targetConsolidatedDeviceCount);
+    }
+    void testRoles_data()
+    {
+        QTest::addColumn<ConsolidatedDeviceModel::Roles>("role");
+        QTest::addColumn<QVariant>("value");
+        QTest::addColumn<QList<Device>>("devices");
+
+        {
+            Device a; a.uri = "ipp://foo/bar"; a.makeModel = "HP LaserFjert";
+            Device b; a.uri = "ipp://foo/bar"; b.makeModel = "HP LaserFjert";
+
+            QList<Device> devs({a, b});
+
+            ConsolidatedDeviceModel::Roles role(
+                ConsolidatedDeviceModel::ConsolidatedNameRole
+            );
+            QVariant value(QString("HP LaserFjert"));
+            QTest::newRow("ConsolidatedNameRole") << role << value << devs;
+        }
+    }
+    void testRoles()
+    {
+        QFETCH(ConsolidatedDeviceModel::Roles, role);
+        QFETCH(QVariant, value);
+        QFETCH(QList<Device>, devices);
+
+        ConsolidatedDeviceModel model(m_devicesModel);
+
+        Q_FOREACH(auto device, devices) {
+            m_backend->mockDeviceFound(device);
+        }
+        m_backend->deviceSearchFinished();
+
+        QCOMPARE(model.data(model.index(0), role), value);
+    }
+    void testDevicesRole()
+    {
+        Device a; a.uri = "ipp://foo/bar"; a.makeModel = "foo";
+        Device b; b.uri = "dnssd://foo/bar"; b.makeModel = "foo";
+
+        ConsolidatedDeviceModel model(m_devicesModel);
+
+        m_backend->mockDeviceFound(a);
+        m_backend->mockDeviceFound(b);
+        m_backend->deviceSearchFinished();
+
+        auto filter = model.data(
+            model.index(0), ConsolidatedDeviceModel::Roles::DevicesRole
+        ).value<DeviceFilter*>();
+
+        QCOMPARE(filter->count(), 2);
+    }
+private:
+    MockPrinterBackend *m_backend;
+    DeviceModel *m_devicesModel;
+};
+
+QTEST_GUILESS_MAIN(TestConsolidatedDeviceModel)
+#include "tst_consolidateddevicemodel.moc"
+

=== added file 'tests/unittests/Printers/tst_devicefilter.cpp'
--- tests/unittests/Printers/tst_devicefilter.cpp	1970-01-01 00:00:00 +0000
+++ tests/unittests/Printers/tst_devicefilter.cpp	2017-03-30 13:23:27 +0000
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2017 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "mockbackend.h"
+
+#include "cups/ppdutils.h"
+#include "models/devicemodel.h"
+
+#include <QObject>
+#include <QSignalSpy>
+#include <QScopedPointer>
+#include <QTest>
+
+class TestDeviceFilter : public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void testFilterOnMakeModel()
+    {
+        QScopedPointer<MockPrinterBackend> backend(new MockPrinterBackend);
+        DeviceModel model(backend.data());
+
+        Device dev1; dev1.uri = "ipp://foo/bar";
+        dev1.makeModel = "foo";
+        Device dev2; dev2.uri = "dnssd://bar/qux";
+        dev2.makeModel = "bar";
+
+        backend->mockDeviceFound(dev1);
+        backend->mockDeviceFound(dev2);
+
+        DeviceFilter filter;
+        filter.setSourceModel(&model);
+
+        QCOMPARE(filter.count(), 2);
+
+        // Install filter.
+        filter.filterOnNormalizedMakeModel("foo");
+        QCOMPARE(filter.count(), 1);
+    }
+
+    /* Test that "Foo BazJet-5000" and "Foo BazJet 5000" are accepted in same
+    filter. */
+    void testNormalizedFiltering()
+    {
+        QScopedPointer<MockPrinterBackend> backend(new MockPrinterBackend);
+        DeviceModel model(backend.data());
+
+        Device dev1; dev1.uri = "ipp://foo/bar";
+        dev1.makeModel = "Foo BazJet 5000";
+        Device dev2; dev2.uri = "dnssd://bar/qux";
+        dev2.makeModel = "Foo BazJet-5000";
+        Device dev3; dev3.uri = "dnssd://bar/baz";
+        dev3.makeModel = "Foo DeskQux 350";
+
+        backend->mockDeviceFound(dev1);
+        backend->mockDeviceFound(dev2);
+        backend->mockDeviceFound(dev3);
+
+        DeviceFilter filter;
+        filter.setSourceModel(&model);
+
+        // Install filter.
+        filter.filterOnNormalizedMakeModel(
+            PpdUtils::normalize("Foo BazJet 5000"));
+        QCOMPARE(filter.count(), 2);
+    }
+    void testFilterOnUri()
+    {
+        QScopedPointer<MockPrinterBackend> backend(new MockPrinterBackend);
+        DeviceModel model(backend.data());
+
+        Device dev1; dev1.uri = "ipp://foo/bar";
+        dev1.id = "foo";
+        Device dev2; dev2.uri = "dnssd://bar/qux";
+        dev2.id = "bar";
+
+        backend->mockDeviceFound(dev1);
+        backend->mockDeviceFound(dev2);
+
+        DeviceFilter filter;
+        filter.setSourceModel(&model);
+
+        QCOMPARE(filter.count(), 2);
+
+        // Install filter.
+        filter.filterOnUri("ipp://foo/bar");
+        QCOMPARE(filter.count(), 1);
+    }
+};
+
+QTEST_GUILESS_MAIN(TestDeviceFilter)
+#include "tst_devicefilter.moc"
+

=== modified file 'tests/unittests/Printers/tst_jobmodel.cpp'
--- tests/unittests/Printers/tst_jobmodel.cpp	2017-03-15 17:30:21 +0000
+++ tests/unittests/Printers/tst_jobmodel.cpp	2017-03-30 13:23:27 +0000
@@ -19,6 +19,7 @@
 #include "backend/backend.h"
 #include "models/jobmodel.h"
 #include "printers/printers.h"
+#include "utils.h"
 
 #include <QDebug>
 #include <QObject>

=== added file 'tests/unittests/Printers/tst_ppdutils.cpp'
--- tests/unittests/Printers/tst_ppdutils.cpp	1970-01-01 00:00:00 +0000
+++ tests/unittests/Printers/tst_ppdutils.cpp	2017-03-30 13:23:27 +0000
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2017 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "cups/ppdutils.h"
+
+#include <QObject>
+#include <QTest>
+
+typedef QPair<QString, QString> MakeModel;
+Q_DECLARE_METATYPE(MakeModel)
+
+class TstPpdUtils : public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void testSplitMakeModel_data()
+    {
+        QTest::addColumn<QString>("makeModel");
+        QTest::addColumn<MakeModel>("expected");
+
+        {
+            QString actual("HP HP Officejet Pro 8610");
+            auto expected = MakeModel("HP", "OfficeJet Pro 8610");
+            QTest::newRow("duplicate hp") << actual << expected;
+        }
+        {
+            QString actual("Officejet Officejet Pro 8610");
+            auto expected = MakeModel("HP", "OfficeJet Pro 8610");
+            QTest::newRow("officejet officejet (yes it actually happens)") << actual << expected;
+        }
+        {
+            QString actual("laserjet 4500");
+            auto expected = MakeModel("HP", "LaserJet 4500");
+            QTest::newRow("just a hp model") << actual << expected;
+        }
+        {
+            QString actual("HP OfficeJet Pro 8600");
+            auto expected = MakeModel("HP", "OfficeJet Pro 8600");
+            QTest::newRow("a sane hp officejet") << actual << expected;
+        }
+        {
+            QString actual("HP Foo All-In-One");
+            auto expected = MakeModel("HP", "Foo");
+            QTest::newRow("remove all-in-one") << actual << expected;
+        }
+        {
+            QString actual("Hewlett-Packard SmartJet 50 v0.10");
+            auto expected = MakeModel("HP", "SmartJet 50");
+            QTest::newRow("Hewlett-Packard SmartJet 50 v0.10") << actual << expected;
+        }
+        {
+            QString actual("Foobar Bazjet 9000");
+            auto expected = MakeModel("Foobar", "Bazjet 9000");
+            QTest::newRow("the excellent foobar bazjet 9000") << actual << expected;
+        }
+        {
+            QString actual("HP LaserJet 4 Plus v2013.111 Postscript (recommended)");
+            auto expected = MakeModel("HP", "LaserJet 4 Plus");
+            QTest::newRow("example #1") << actual << expected;
+        }
+        {
+            QString actual("Canon MG4100 series Ver.3.90");
+            auto expected = MakeModel("Canon", "MG4100");
+            QTest::newRow("example #2") << actual << expected;
+        }
+        {
+            QString actual("Xerox Foo Printer");
+            auto expected = MakeModel("Xerox", "Foo");
+            QTest::newRow("remove ignored suffix 'printer'") << actual << expected;
+        }
+        {
+            QString actual("hp lj 4500");
+            auto expected = MakeModel("HP", "LaserJet 4500");
+            QTest::newRow("shortened hp model name") << actual << expected;
+        }
+        {
+            QString actual("okipage foobar");
+            auto expected = MakeModel("Oki", "okipage foobar");
+            QTest::newRow("some okipage printer") << actual << expected;
+        }
+    }
+    void testSplitMakeModel()
+    {
+        QFETCH(QString, makeModel);
+        QFETCH(MakeModel, expected);
+        auto actual = PpdUtils::splitMakeModel(makeModel);
+        QCOMPARE(actual, expected);
+    }
+    void testNormalize_data()
+    {
+        QTest::addColumn<QString>("actual");
+        QTest::addColumn<QString>("expected");
+
+        {
+            QString actual("Epson PM-A820");
+            QString expected("epson pm a 820");
+            QTest::newRow("epson with dash") << actual << expected;
+        }
+        {
+            QString actual("Epson PM A820");
+            QString expected("epson pm a 820");
+            QTest::newRow("epson without dash") << actual << expected;
+        }
+        {
+            QString actual("HP PhotoSmart C 8100");
+            QString expected("hp photosmart c 8100");
+            QTest::newRow("C 8100") << actual << expected;
+        }
+        {
+            QString actual("HP PhotoSmart C8100");
+            QString expected("hp photosmart c 8100");
+            QTest::newRow("C8100") << actual << expected;
+        }
+    }
+    void testNormalize()
+    {
+        QFETCH(QString, actual);
+        QFETCH(QString, expected);
+        actual = PpdUtils::normalize(actual);
+        QCOMPARE(actual, expected);
+    }
+};
+
+QTEST_GUILESS_MAIN(TstPpdUtils)
+#include "tst_ppdutils.moc"

=== modified file 'tests/unittests/Printers/tst_printer.cpp'
--- tests/unittests/Printers/tst_printer.cpp	2017-03-20 13:31:55 +0000
+++ tests/unittests/Printers/tst_printer.cpp	2017-03-30 13:23:27 +0000
@@ -14,12 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "utils.h"
 
 #include "mockbackend.h"
 
 #include "backend/backend.h"
 #include "backend/backend_pdf.h"
+#include "cups/ppdutils.h"
 #include "printer/printer.h"
 
 #include <QDebug>
@@ -158,7 +158,7 @@
         QStringList duplexVals = duplexVar.toStringList();
          QCOMPARE(
             duplexVals.at(0),
-            (QString) Utils::duplexModeToPpdChoice(PrinterEnum::DuplexMode::DuplexLongSide)
+            (QString) PpdUtils::duplexModeToPpdChoice(PrinterEnum::DuplexMode::DuplexLongSide)
         );
     }
     void testSetDefaultPageSize_data()

=== modified file 'tests/unittests/Printers/tst_printerdevicemodel.cpp'
--- tests/unittests/Printers/tst_printerdevicemodel.cpp	2017-03-08 16:13:02 +0000
+++ tests/unittests/Printers/tst_printerdevicemodel.cpp	2017-03-30 13:23:27 +0000
@@ -60,6 +60,11 @@
             Device d; d.uri = "dnssd:";
             QTest::newRow("non-empty uri, malformed") << d << false;
         }
+        {
+            Device d; d.uri = "dnssd://foo/bar";
+            d.makeModel = "Unknown";
+            QTest::newRow("non-empty uri, but Unknown make/model") << d << false;
+        }
     }
     void testAcceptedDevices()
     {
@@ -152,6 +157,36 @@
         m_backend->mockDeviceFound(device);
         QCOMPARE(m_model->data(m_model->index(0), role), value);
     }
+    void testFiltering_data()
+    {
+        QTest::addColumn<QList<Device>>("devices");
+        QTest::addColumn<QString>("filterId");
+        QTest::addColumn<int>("targetCount");
+        QTest::addColumn<QStringList>("targetIds");
+
+        {
+            Device a; a.uri = "dnssd://foo/bar"; a.id = "foo";
+            Device b; b.uri = "ipps://bar/qux"; b.id = "bar";
+
+            QList<Device> devs({a, b});
+            QTest::newRow("no filtering") << devs << "" << 2 << QStringList({"foo", "bar"});
+        }
+    }
+    void testFiltering()
+    {
+        QFETCH(QList<Device>, devices);
+        QFETCH(QString, filterId);
+        QFETCH(int, targetCount);
+        QFETCH(QStringList, targetIds);
+
+        Q_FOREACH(auto dev, devices) {
+            m_backend->mockDeviceFound(dev);
+        }
+
+        DeviceFilter filter;
+        filter.setSourceModel(m_model);
+        QCOMPARE(filter.count(), targetCount);
+    }
 private:
     MockPrinterBackend *m_backend;
     DeviceModel *m_model;

=== modified file 'tests/unittests/Printers/tst_printermodel.cpp'
--- tests/unittests/Printers/tst_printermodel.cpp	2017-03-10 13:15:27 +0000
+++ tests/unittests/Printers/tst_printermodel.cpp	2017-03-30 13:23:27 +0000
@@ -17,9 +17,11 @@
 #include "mockbackend.h"
 
 #include "backend/backend.h"
+#include "cups/ppdutils.h"
 #include "models/printermodel.h"
 #include "printer/printer.h"
 #include "printer/printerjob.h"
+#include "utils.h"
 
 #include <QDebug>
 #include <QObject>
@@ -231,7 +233,7 @@
         PrinterBackend* backend = new MockPrinterBackend("a-printer");
         ((MockPrinterBackend*) backend)->m_supportedDuplexModes = modes;
         ((MockPrinterBackend*) backend)->printerOptions["a-printer"].insert(
-            "Duplex", QVariant::fromValue(Utils::duplexModeToPpdChoice(PrinterEnum::DuplexMode::DuplexLongSide))
+            "Duplex", QVariant::fromValue(PpdUtils::duplexModeToPpdChoice(PrinterEnum::DuplexMode::DuplexLongSide))
         );
 
         auto printerA = QSharedPointer<Printer>(new Printer(backend));

=== added file 'tests/unittests/Printers/tst_utils.cpp'
--- tests/unittests/Printers/tst_utils.cpp	1970-01-01 00:00:00 +0000
+++ tests/unittests/Printers/tst_utils.cpp	2017-03-30 13:23:27 +0000
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2017 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "utils.h"
+
+#include <QObject>
+#include <QTest>
+
+typedef QMap<QString, QString> IdDict;
+Q_DECLARE_METATYPE(IdDict)
+
+class TstPrinterUtils : public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void tstParseDeviceId_data()
+    {
+        QTest::addColumn<QString>("deviceId");
+        QTest::addColumn<IdDict>("expected");
+
+        {
+            QString actual("MFG:Hewlett-Packard;CMD:PJL,BIDI-ECP,PCLXL,PCL,PDF,PJL,POSTSCRIPT;MDL:HP Color LaserJet CM3530 MFP;CLS:PRINTER;DES:Hewlett-Packard Color LaserJet CM3530 MFP;");
+            auto expected = QMap<QString, QString>{
+                {"MFG", "Hewlett-Packard"},
+                {"MDL", "HP Color LaserJet CM3530 MFP"},
+                {"CMD", "PJL,BIDI-ECP,PCLXL,PCL,PDF,PJL,POSTSCRIPT"},
+                {"CLS", "PRINTER"},
+                {"DES", "Hewlett-Packard Color LaserJet CM3530 MFP"},
+                {"SN", QString::null},
+                {"S", QString::null},
+                {"P", QString::null},
+                {"J", QString::null},
+            };
+            QTest::newRow("duplicate hp") << actual << expected;
+        }
+        {
+            QString actual("MFG:HP;MDL:HP Officejet Pro 8610;CMD:PCL,JPEG,URF;");
+            auto expected = QMap<QString, QString>{
+                {"MFG", "HP"},
+                {"MDL", "HP Officejet Pro 8610"},
+                {"CMD", "PCL,JPEG,URF"},
+                {"CLS", QString::null},
+                {"DES", QString::null},
+                {"SN", QString::null},
+                {"S", QString::null},
+                {"P", QString::null},
+                {"J", QString::null},
+            };
+            QTest::newRow("actual hp device id") << actual << expected;
+        }
+        {
+            QString actual("MFG:HP;MDL:Officejet Pro 8600;CMD:PCL3GUI,PCL3,PJL,JPEG,PCLM,URF,DW-PCL,802.11,802.3,DESKJET,DYN;CLS:PRINTER;DES:CM749A;CID:HPIJVIPAV2;LEDMDIS:USB#FF#CC#00,USB#07#01#02;SN:CN371DWH1V05KC;S:038080C484201021005a00800004518005a4418003c4618005a4118005a;Z:0102,05000009000008000008000008000008,0600,0700000000000000000000,0b0000000000000000000099ba0000000099b50000000099b90000000099b6,0c0,0e00000000000000000000,0f00000000000000000000,10000002000008000008000008000008,110,12002,150,17000000000000000000000000000000,181;");
+            auto expected = QMap<QString, QString>{
+                {"MFG", "HP"},
+                {"MDL", "Officejet Pro 8600"},
+                {"CMD", "PCL3GUI,PCL3,PJL,JPEG,PCLM,URF,DW-PCL,802.11,802.3,DESKJET,DYN"},
+                {"CLS", "PRINTER"},
+                {"DES", "CM749A"},
+                {"SN", "CN371DWH1V05KC"},
+                {"S", "038080C484201021005a00800004518005a4418003c4618005a4118005a"},
+                {"P", QString::null},
+                {"J", QString::null},
+                {"Z", "0102,05000009000008000008000008000008,0600,0700000000000000000000,0b0000000000000000000099ba0000000099b50000000099b90000000099b6,0c0,0e00000000000000000000,0f00000000000000000000,10000002000008000008000008000008,110,12002,150,17000000000000000000000000000000,181"},
+                {"CID", "HPIJVIPAV2"},
+                {"LEDMDIS", "USB#FF#CC#00,USB#07#01#02"}
+            };
+            QTest::newRow("actual, but crazy, hp device id") << actual << expected;
+        }
+        {
+            QString actual("MFG:EPSON;CMD:ESCPL2,BDC,D4;MDL:Stylus Photo RX420;CLS:PRINTER;DES:EPSON Stylus Photo RX420;");
+            auto expected = QMap<QString, QString>{
+                {"MFG", "EPSON"},
+                {"MDL", "Stylus Photo RX420"},
+                {"CMD", "ESCPL2,BDC,D4"},
+                {"CLS", "PRINTER"},
+                {"DES", "EPSON Stylus Photo RX420"},
+                {"SN", QString::null},
+                {"S", QString::null},
+                {"P", QString::null},
+                {"J", QString::null},
+            };
+            QTest::newRow("some epson stylus") << actual << expected;
+        }
+    }
+    void tstParseDeviceId()
+    {
+        QFETCH(QString, deviceId);
+        QFETCH(IdDict, expected);
+        QCOMPARE(Utils::parseDeviceId(deviceId), expected);
+    }
+};
+
+QTEST_GUILESS_MAIN(TstPrinterUtils)
+#include "tst_utils.moc"