Merge lp:~jonas-drange/ubuntu-settings-components/printer-add into lp:~phablet-team/ubuntu-settings-components/printer-components

[Jonas G. Drange]

* allows creation of printers in example qml, and by extension the API
* create printers by either providing a PPD file, or select a PPD from the database
* adds a DriverModel that holds printer drivers, which can be filtered
* adds testing of DriverModel

[lp:~jonas-drange/ubuntu-settings-components/printer-add]

227. By Jonas G. Drange on 2017-01-27

hides filter if providing PPD

228. By Jonas G. Drange on 2017-01-27

renames var to haystack, to fit with the narrative

229. By Jonas G. Drange on 2017-01-27

removes arbitrary size constraint on filter

230. By Jonas G. Drange on 2017-01-30

connects filterComplete to driversFilterChanged

[Andrew Hayzen (ahayzen)]

This works by manually specifying the device URI, picking the right driver, setting a name.

In the future it'd be good to have network discovery, auto selection of drivers from an IP address etc

review: Approve

=== modified file 'examples/Printers.qml'
--- examples/Printers.qml	2017-01-22 18:34:20 +0000
+++ examples/Printers.qml	2017-01-30 11:37:26 +0000
@@ -35,8 +35,8 @@
             visible: false
             property var printer
             header: PageHeader {
-               title: printer.name
-               flickable: printerFlickable
+                title: printer.name
+                flickable: printerFlickable
             }
 
             Flickable {
@@ -153,6 +153,15 @@
             header: PageHeader {
                 title: "Printers"
                 flickable: printerList
+                trailingActionBar {
+                    actions: [
+                        Action {
+                            iconName: "add"
+                            text: "Add printer"
+                            onTriggered: pageStack.push(addPrinterPageComponent)
+                        }
+                    ]
+                }
             }
             visible: false
 
@@ -179,7 +188,263 @@
                         ProgressionSlot {}
                     }
                     onClicked: pageStack.push(printerPage, { printer: model })
-                    Component.onCompleted: console.log("printer", model.name)
+                }
+            }
+        }
+    }
+
+    Component {
+        id: addPrinterPageComponent
+        Page {
+            id: addPrinterPage
+            states: [
+                State {
+                    name: "success"
+                    PropertyChanges {
+                        target: okAction
+                        enabled: false
+                    }
+                    PropertyChanges {
+                        target: closeAction
+                        enabled: false
+                    }
+                    PropertyChanges {
+                        target: addPrinterCol
+                        enabled: false
+                    }
+                    StateChangeScript {
+                        script: okTimer.start()
+                    }
+                },
+                State {
+                    name: "failure"
+                    PropertyChanges {
+                        target: errorMessageContainer
+                        visible: true
+                    }
+                }
+            ]
+            header: PageHeader {
+                title: "Add printer"
+                flickable: addPrinterFlickable
+                leadingActionBar.actions: [
+                    Action {
+                        id: closeAction
+                        iconName: "close"
+                        text: "Abort"
+                        onTriggered: pageStack.pop()
+                    }
+                ]
+                trailingActionBar {
+                    actions: [
+                        Action {
+                            id: okAction
+                            iconName: "ok"
+                            text: "Complete"
+                            onTriggered: {
+                                var ret;
+                                if (driverSelector.selectedIndex == 0) {
+                                    ret = Printers.addPrinter(
+                                        printerName.text,
+                                        driversView.selectedDriver,
+                                        printerUri.text,
+                                        printerDescription.text,
+                                        printerLocation.text
+                                    );
+                                } else {
+                                    ret = Printers.addPrinterWithPpdFile(
+                                        printerName.text,
+                                        printerPpd.text,
+                                        printerUri.text,
+                                        printerDescription.text,
+                                        printerLocation.text
+                                    );
+                                }
+                                if (ret) {
+                                    addPrinterPage.state = "success"
+                                } else {
+                                    errorMessage.text = Printers.lastMessage;
+                                    addPrinterPage.state = "failure"
+                                }
+                            }
+                        }
+                    ]
+                }
+            }
+
+            Component.onCompleted: {
+                Printers.prepareToAddPrinter();
+            }
+
+            Timer {
+                id: okTimer
+                interval: 2000
+                onTriggered: pageStack.pop();
+            }
+
+            Flickable {
+                id: addPrinterFlickable
+                anchors.fill: parent
+
+                Column {
+                    id: addPrinterCol
+                    property bool enabled: true
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                    }
+
+                    Item {
+                        id: errorMessageContainer
+                        visible: false
+                        anchors {
+                            left: parent.left
+                            right: parent.right
+                            margins: units.gu(2)
+                        }
+                        height: units.gu(6)
+                        Label {
+                            id: errorMessage
+                            anchors {
+                                top: parent.top
+                                topMargin: units.gu(2)
+                                horizontalCenter: parent.horizontalCenter
+                            }
+                        }
+
+                    }
+
+                    ListItems.Standard {
+                        text: "Device URI"
+                        control: TextField {
+                            id: printerUri
+                            placeholderText: "ipp://server.local/my-queue"
+                        }
+                        enabled: parent.enabled
+                    }
+
+                    ListItems.ValueSelector {
+                        id: driverSelector
+                        anchors {
+                            left: parent.left
+                            right: parent.right
+                        }
+                        text: "Choose driver"
+                        values: [
+                            "Select printer from database",
+                            "Provide PPD file"
+                        ]
+                        enabled: parent.enabled
+                    }
+
+                    ListItems.Standard {
+                        anchors {
+                            left: parent.left
+                            right: parent.right
+                        }
+                        text: "Filter drivers"
+                        control: TextField {
+                            id: driverFilter
+                            onTextChanged: Printers.driverFilter = text
+                        }
+                        visible: driverSelector.selectedIndex == 0
+                        enabled: parent.enabled
+                    }
+
+                    ListView {
+                        id: driversView
+                        property string selectedDriver
+                        property bool loading: true
+                        visible: driverSelector.selectedIndex == 0
+                        model: Printers.drivers
+                        anchors { left: parent.left; right: parent.right }
+                        height: units.gu(30)
+                        clip: true
+                        enabled: parent.enabled
+                        highlightFollowsCurrentItem: false
+                        highlight: Rectangle {
+                            z: 0
+                            y: driversView.currentItem.y
+                            width: driversView.currentItem.width
+                            height: driversView.currentItem.height
+                            color: theme.palette.selected.background
+                        }
+                        delegate: ListItem {
+                            height: driverLayout.height + (divider.visible ? divider.height : 0)
+                            ListItemLayout {
+                                id: driverLayout
+                                title.text: displayName
+                                subtitle.text: name
+                                summary.text: deviceId
+                            }
+                            onClicked: {
+                                driversView.selectedDriver = name
+                                driversView.currentIndex = index
+                            }
+                        }
+
+                        ActivityIndicator {
+                            anchors.centerIn: parent
+                            running: parent.loading
+                        }
+
+                        Connections {
+                            target: driversView
+                            onCountChanged: {
+                                target = null;
+                                driversView.loading = false;
+                            }
+                        }
+                    }
+
+                    ListItems.Standard {
+                        text: "PPD File"
+                        visible: driverSelector.selectedIndex == 1
+                        control: TextField {
+                            id: printerPpd
+                            placeholderText: "/usr/share/cups/foo.ppd"
+                        }
+                        enabled: parent.enabled
+                    }
+
+                    ListItems.Standard {
+                        anchors {
+                            left: parent.left
+                            right: parent.right
+                        }
+                        text: "Printer name"
+                        control: TextField {
+                            id: printerName
+                            placeholderText: "laserjet"
+                        }
+                        enabled: parent.enabled
+                    }
+
+                    ListItems.Standard {
+                        anchors {
+                            left: parent.left
+                            right: parent.right
+                        }
+                        text: "Description (optional)"
+                        control: TextField {
+                            id: printerDescription
+                            placeholderText: "HP Laserjet with Duplexer"
+                        }
+                        enabled: parent.enabled
+                    }
+
+                    ListItems.Standard {
+                        anchors {
+                            left: parent.left
+                            right: parent.right
+                        }
+                        text: "Location (optional)"
+                        control: TextField {
+                            id: printerLocation
+                            placeholderText: "Lab 1"
+                        }
+                        enabled: parent.enabled
+                    }
                 }
             }
         }

=== modified file 'plugins/Ubuntu/Settings/Printers/CMakeLists.txt'
--- plugins/Ubuntu/Settings/Printers/CMakeLists.txt	2017-01-24 12:34:23 +0000
+++ plugins/Ubuntu/Settings/Printers/CMakeLists.txt	2017-01-30 11:37:26 +0000
@@ -7,6 +7,7 @@
 find_package(Qt5Gui REQUIRED)
 find_package(Qt5PrintSupport REQUIRED)
 find_package(Qt5Qml REQUIRED)
+find_package(Qt5Concurrent REQUIRED)
 
 add_library(UbuntuSettingsPrintersQml SHARED
     backend/backend.cpp
@@ -16,6 +17,7 @@
     cups/cupspkhelper.cpp
     enums.h
     i18n.cpp
+    models/drivermodel.cpp
     models/printermodel.cpp
     printer/printer.cpp
     printer/printerjob.cpp
@@ -29,6 +31,7 @@
     Qt5::Gui
     Qt5::PrintSupport
     Qt5::Qml
+    Qt5::Concurrent
     ${CUPS_LIBRARIES}
 )
 

=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend.cpp'
--- plugins/Ubuntu/Settings/Printers/backend/backend.cpp	2017-01-22 14:21:11 +0000
+++ plugins/Ubuntu/Settings/Printers/backend/backend.cpp	2017-01-30 11:37:26 +0000
@@ -37,8 +37,8 @@
 }
 
 QString PrinterBackend::printerAdd(const QString &name,
-                                   const QUrl &uri,
-                                   const QUrl &ppdFile,
+                                   const QString &uri,
+                                   const QString &ppdFile,
                                    const QString &info,
                                    const QString &location)
 {
@@ -46,7 +46,7 @@
 }
 
 QString PrinterBackend::printerAddWithPpd(const QString &name,
-                                          const QUrl &uri,
+                                          const QString &uri,
                                           const QString &ppdFileName,
                                           const QString &info,
                                           const QString &location)
@@ -281,6 +281,10 @@
     return QString();
 }
 
+void PrinterBackend::requestAvailablePrinterDrivers()
+{
+}
+
 PrinterBackend::BackendType PrinterBackend::backendType() const
 {
     return BackendType::DefaultType;

=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend.h'
--- plugins/Ubuntu/Settings/Printers/backend/backend.h	2017-01-23 14:06:49 +0000
+++ plugins/Ubuntu/Settings/Printers/backend/backend.h	2017-01-30 11:37:26 +0000
@@ -50,13 +50,16 @@
 
     virtual bool holdsDefinition() const;
 
+    // Add a printer using an already existing ppd.
     virtual QString printerAdd(const QString &name,
-                               const QUrl &uri,
-                               const QUrl &ppdFile,
+                               const QString &uri,
+                               const QString &ppdFile,
                                const QString &info,
                                const QString &location);
+
+    // Add a printer and provide a ppd file.
     virtual QString printerAddWithPpd(const QString &name,
-                                      const QUrl &uri,
+                                      const QString &uri,
                                       const QString &ppdFileName,
                                       const QString &info,
                                       const QString &location);
@@ -135,6 +138,8 @@
     virtual Printer* getPrinter(const QString &printerName);
     virtual QString defaultPrinterName();
 
+    virtual void requestAvailablePrinterDrivers();
+
     virtual BackendType backendType() const;
 
 public Q_SLOTS:
@@ -146,6 +151,9 @@
     void printerDeleted(const QString &name);
     void printerStateChanged(const QString &name);
 
+    void printerDriversLoaded(const QList<PrinterDriver> &drivers);
+    void printerDriversFailedToLoad(const QString &errorMessage);
+
 protected:
     const QString m_printerName;
 };

=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp'
--- plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp	2017-01-24 12:42:52 +0000
+++ plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp	2017-01-30 11:37:26 +0000
@@ -19,14 +19,17 @@
 #include "i18n.h"
 #include "utils.h"
 
-#include <exception>
-#include <stdexcept>
 
 PrinterCupsBackend::PrinterCupsBackend(QObject *parent)
     : PrinterCupsBackend(new CupsFacade(), QPrinterInfo(), parent)
 {
     // If we create the CupsFacade, we're in charge of RAII.
     m_cups->setParent(this);
+
+    connect(m_cups, SIGNAL(printerDriversLoaded(const QList<PrinterDriver>&)),
+            this, SIGNAL(printerDriversLoaded(const QList<PrinterDriver>&)));
+    connect(m_cups, SIGNAL(printerDriversFailedToLoad(const QString&)),
+            this, SIGNAL(printerDriversFailedToLoad(const QString&)));
 }
 
 PrinterCupsBackend::PrinterCupsBackend(CupsFacade *cups, QPrinterInfo info,
@@ -39,25 +42,24 @@
 
 PrinterCupsBackend::~PrinterCupsBackend()
 {
-
 }
 
 QString PrinterCupsBackend::printerAdd(const QString &name,
-                                       const QUrl &uri,
-                                       const QUrl &ppdFile,
+                                       const QString &uri,
+                                       const QString &ppdFile,
                                        const QString &info,
                                        const QString &location)
 {
-
+    return m_cups->printerAdd(name, uri, ppdFile, info, location);
 }
 
 QString PrinterCupsBackend::printerAddWithPpd(const QString &name,
-                                              const QUrl &uri,
+                                              const QString &uri,
                                               const QString &ppdFileName,
                                               const QString &info,
                                               const QString &location)
 {
-
+    return m_cups->printerAddWithPpd(name, uri, ppdFileName, info, location);
 }
 
 bool PrinterCupsBackend::holdsDefinition() const
@@ -312,6 +314,11 @@
     return QPrinterInfo::defaultPrinterName();
 }
 
+void PrinterCupsBackend::requestAvailablePrinterDrivers()
+{
+    return m_cups->requestPrinterDrivers();
+}
+
 PrinterBackend::BackendType PrinterCupsBackend::backendType() const
 {
     return PrinterBackend::BackendType::CupsType;

=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend_cups.h'
--- plugins/Ubuntu/Settings/Printers/backend/backend_cups.h	2017-01-23 14:06:49 +0000
+++ plugins/Ubuntu/Settings/Printers/backend/backend_cups.h	2017-01-30 11:37:26 +0000
@@ -33,12 +33,12 @@
     virtual bool holdsDefinition() const override;
 
     virtual QString printerAdd(const QString &name,
-                               const QUrl &uri,
-                               const QUrl &ppdFile,
+                               const QString &uri,
+                               const QString &ppdFile,
                                const QString &info,
                                const QString &location) override;
     virtual QString printerAddWithPpd(const QString &name,
-                                      const QUrl &uri,
+                                      const QString &uri,
                                       const QString &ppdFileName,
                                       const QString &info,
                                       const QString &location) override;
@@ -116,6 +116,7 @@
     virtual QStringList availablePrinterNames() override;
     virtual Printer* getPrinter(const QString &printerName) override;
     virtual QString defaultPrinterName() override;
+    virtual void requestAvailablePrinterDrivers() override;
 
     virtual PrinterBackend::BackendType backendType() const override;
 

=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp'
--- plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp	2017-01-25 15:37:42 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp	2017-01-30 11:37:26 +0000
@@ -23,6 +23,7 @@
 #include <cups/ppd.h>
 
 #include <QDebug>
+#include <QThread>
 
 #define __CUPS_ADD_OPTION(dest, name, value) dest->num_options = \
     cupsAddOption(name, value, dest->num_options, &dest->options);
@@ -33,34 +34,30 @@
 
 CupsFacade::~CupsFacade()
 {
-
+    cancelPrinterDriverRequest();
 }
 
 QString CupsFacade::printerAdd(const QString &name,
-                               const QUrl &uri,
-                               const QUrl &ppdFile,
+                               const QString &uri,
+                               const QString &ppdFile,
                                const QString &info,
                                const QString &location)
 {
-    Q_UNUSED(name);
-    Q_UNUSED(uri);
-    Q_UNUSED(ppdFile);
-    Q_UNUSED(info);
-    Q_UNUSED(location);
+    if (!helper.printerAdd(name, uri, ppdFile, info, location)) {
+        return helper.getLastError();
+    }
     return QString();
 }
 
 QString CupsFacade::printerAddWithPpd(const QString &name,
-                                      const QUrl &uri,
+                                      const QString &uri,
                                       const QString &ppdFileName,
                                       const QString &info,
                                       const QString &location)
 {
-    Q_UNUSED(name);
-    Q_UNUSED(uri);
-    Q_UNUSED(ppdFileName);
-    Q_UNUSED(info);
-    Q_UNUSED(location);
+    if (!helper.printerAddWithPpdFile(name, uri, ppdFileName, info, location)) {
+        return helper.getLastError();
+    }
     return QString();
 }
 
@@ -377,3 +374,142 @@
                          dest->num_options,
                          dest->options);
 }
+
+void CupsFacade::requestPrinterDrivers(
+    const QString &deviceId, const QString &language, const QString &makeModel,
+    const QString &product, const QStringList &includeSchemes,
+    const QStringList &excludeSchemes
+)
+{
+    auto thread = new QThread;
+    auto loader = new PrinterDriverLoader(deviceId, language, makeModel,
+                                          product, includeSchemes,
+                                          excludeSchemes);
+    loader->moveToThread(thread);
+    connect(loader, SIGNAL(error(const QString&)),
+            this, SIGNAL(printerDriversFailedToLoad(const QString&)));
+    connect(this, SIGNAL(requestPrinterDriverCancel()), loader, SLOT(cancel()));
+    connect(thread, SIGNAL(started()), loader, SLOT(process()));
+    connect(loader, SIGNAL(finished()), thread, SLOT(quit()));
+    connect(loader, SIGNAL(finished()), loader, SLOT(deleteLater()));
+    connect(loader, SIGNAL(loaded(const QList<PrinterDriver>&)),
+            this, SIGNAL(printerDriversLoaded(const QList<PrinterDriver>&)));
+    connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));
+    thread->start();
+ }
+
+void CupsFacade::cancelPrinterDriverRequest()
+{
+    Q_EMIT requestPrinterDriverCancel();
+}
+
+PrinterDriverLoader::PrinterDriverLoader(
+        const QString &deviceId, const QString &language,
+        const QString &makeModel, const QString &product,
+        const QStringList &includeSchemes, const QStringList &excludeSchemes)
+    : m_deviceId(deviceId)
+    , m_language(language)
+    , m_makeModel(makeModel)
+    , m_product(product)
+    , m_includeSchemes(includeSchemes)
+    , m_excludeSchemes(excludeSchemes)
+{
+}
+
+PrinterDriverLoader::~PrinterDriverLoader()
+{
+}
+
+void PrinterDriverLoader::process()
+{
+    m_running = true;
+
+    ipp_t* response = helper.createPrinterDriversRequest(
+        m_deviceId, m_language, m_makeModel, m_product, m_includeSchemes,
+        m_excludeSchemes
+    );
+
+    // Note: if the response somehow fails, we return.
+    if (!response || ippGetStatusCode(response) > IPP_OK_CONFLICT) {
+        QString err(cupsLastErrorString());
+        qWarning() << __PRETTY_FUNCTION__ << "Cups HTTP error:" << err;
+
+        if (response)
+            ippDelete(response);
+
+        Q_EMIT error(err);
+        Q_EMIT finished();
+        return;
+    }
+
+    ipp_attribute_t *attr;
+    QByteArray ppdDeviceId;
+    QByteArray ppdLanguage;
+    QByteArray ppdMakeModel;
+    QByteArray ppdName;
+
+    // cups_option_t option;
+    QList<PrinterDriver> drivers;
+
+    for (attr = ippFirstAttribute(response); attr != NULL && m_running; attr = ippNextAttribute(response)) {
+
+        while (attr != NULL && ippGetGroupTag(attr) != IPP_TAG_PRINTER)
+            attr = ippNextAttribute(response);
+
+        if (attr == NULL)
+            break;
+
+        // Pull the needed attributes from this PPD...
+        ppdDeviceId = "NONE";
+        ppdLanguage.clear();
+        ppdMakeModel.clear();
+        ppdName.clear();
+
+        while (attr != NULL && ippGetGroupTag(attr) == IPP_TAG_PRINTER) {
+            if (!strcmp(ippGetName(attr), "ppd-device-id") &&
+                 ippGetValueTag(attr) == IPP_TAG_TEXT) {
+                ppdDeviceId = ippGetString(attr, 0, NULL);
+            } else if (!strcmp(ippGetName(attr), "ppd-natural-language") &&
+                       ippGetValueTag(attr) == IPP_TAG_LANGUAGE) {
+                ppdLanguage = ippGetString(attr, 0, NULL);
+
+            } else if (!strcmp(ippGetName(attr), "ppd-make-and-model") &&
+                       ippGetValueTag(attr) == IPP_TAG_TEXT) {
+                ppdMakeModel = ippGetString(attr, 0, NULL);
+            } else if (!strcmp(ippGetName(attr), "ppd-name") &&
+                       ippGetValueTag(attr) == IPP_TAG_NAME) {
+
+                ppdName = ippGetString(attr, 0, NULL);
+            }
+
+            attr = ippNextAttribute(response);
+        }
+
+        // See if we have everything needed...
+        if (ppdLanguage.isEmpty() || ppdMakeModel.isEmpty() ||
+            ppdName.isEmpty()) {
+            if (attr == NULL)
+                break;
+            else
+                continue;
+        }
+
+        PrinterDriver m;
+        m.name = ppdName;
+        m.deviceId = ppdDeviceId;
+        m.makeModel = ppdMakeModel;
+        m.language = ppdLanguage;
+
+        drivers.append(m);
+    }
+
+    ippDelete(response);
+
+    Q_EMIT loaded(drivers);
+    Q_EMIT finished();
+}
+
+void PrinterDriverLoader::cancel()
+{
+    m_running = false;
+}

=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h'
--- plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h	2017-01-22 14:21:11 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h	2017-01-30 11:37:26 +0000
@@ -30,7 +30,6 @@
 #include <QObject>
 #include <QString>
 #include <QStringList>
-#include <QUrl>
 #include <QVariant>
 
 class PrinterJob;
@@ -41,12 +40,12 @@
     explicit CupsFacade(QObject *parent = Q_NULLPTR);
     ~CupsFacade();
     QString printerAdd(const QString &name,
-                       const QUrl &uri,
-                       const QUrl &ppdFile,
+                       const QString &uri,
+                       const QString &ppdFile,
                        const QString &info,
                        const QString &location);
     QString printerAddWithPpd(const QString &name,
-                              const QUrl &uri,
+                              const QString &uri,
                               const QString &ppdFileName,
                               const QString &info,
                               const QString &location);
@@ -90,12 +89,28 @@
     QList<PrintQuality> printerGetSupportedQualities(const QString &name) const;
     int printFileToDest(const QString &filepath, const QString &title,
                         const cups_dest_t *dest);
+
+public Q_SLOTS:
+    void requestPrinterDrivers(
+        const QString &deviceId = "",
+        const QString &language = "",
+        const QString &makeModel = "",
+        const QString &product = "",
+        const QStringList &includeSchemes = QStringList(),
+        const QStringList &excludeSchemes = QStringList()
+    );
+    void cancelPrinterDriverRequest();
+
 Q_SIGNALS:
     void printerAdded(const QString &name);
     void printerModified(const QString &name, const bool ppdChanged);
     void printerDeleted(const QString &name);
     void printerStateChanged(const QString &name);
 
+    void requestPrinterDriverCancel();
+    void printerDriversLoaded(const QList<PrinterDriver> &drivers);
+    void printerDriversFailedToLoad(const QString &errorMessage);
+
 private:
     QString getPrinterName(const QString &name) const;
     QString getPrinterInstance(const QString &name) const;
@@ -107,4 +122,39 @@
     CupsPkHelper helper;
 };
 
+class PrinterDriverLoader : public QObject
+{
+    Q_OBJECT
+public:
+    PrinterDriverLoader(
+        const QString &deviceId = "",
+        const QString &language = "",
+        const QString &makeModel = "",
+        const QString &product = "",
+        const QStringList &includeSchemes = QStringList(),
+        const QStringList &excludeSchemes = QStringList());
+    ~PrinterDriverLoader();
+
+public Q_SLOTS:
+    void process();
+    void cancel();
+
+Q_SIGNALS:
+    void finished();
+    void loaded(const QList<PrinterDriver> &drivers);
+    void error(const QString &error);
+
+private:
+    QString m_deviceId = QString::null;
+    QString m_language = QString::null;
+    QString m_makeModel = QString::null;
+    QString m_product = QString::null;
+    QStringList m_includeSchemes;
+    QStringList m_excludeSchemes;
+
+    bool m_running = false;
+    CupsPkHelper helper;
+};
+
+
 #endif // USC_PRINTERS_CUPSFACADE_H

=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.cpp'
--- plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.cpp	2017-01-17 15:14:25 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.cpp	2017-01-30 11:37:26 +0000
@@ -44,6 +44,127 @@
         httpClose(m_connection);
 }
 
+bool CupsPkHelper::printerAdd(const QString &printerName,
+                              const QString &printerUri,
+                              const QString &ppdFile,
+                              const QString &info,
+                              const QString &location)
+{
+    ipp_t *request;
+
+    if (!isPrinterNameValid(printerName)) {
+        setInternalStatus(QString("%1 is not a valid printer name.").arg(printerName));
+        return false;
+    }
+
+    if (!isStringValid(info)) {
+        setInternalStatus(QString("%1 is not a valid description.").arg(info));
+        return false;
+    }
+
+    if (!isStringValid(location)) {
+        setInternalStatus(QString("%1 is not a valid location.").arg(location));
+        return false;
+    }
+
+    if (!isStringValid(ppdFile)) {
+        setInternalStatus(QString("%1 is not a valid ppd file.").arg(ppdFile));
+        return false;
+    }
+
+    if (!isStringValid(printerUri)) {
+        setInternalStatus(QString("%1 is not a valid printer uri.").arg(printerUri));
+        return false;
+    }
+
+
+    request = ippNewRequest (CUPS_ADD_MODIFY_PRINTER);
+    addPrinterUri(request, printerName);
+    addRequestingUsername(request, NULL);
+
+    ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_NAME,
+                 "printer-name", NULL, printerName.toUtf8());
+
+    if (!ppdFile.isEmpty()) {
+        ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_NAME,
+                     "ppd-name", NULL, ppdFile.toUtf8());
+    }
+    if (!printerUri.isEmpty()) {
+        ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_URI,
+                     "device-uri", NULL, printerUri.toUtf8());
+    }
+    if (!info.isEmpty()) {
+        ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_TEXT,
+                     "printer-info", NULL, info.toUtf8());
+    }
+    if (!location.isEmpty()) {
+            ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_TEXT,
+                         "printer-location", NULL, location.toUtf8());
+    }
+
+    return sendRequest(request, CphResourceAdmin);
+}
+
+bool CupsPkHelper::printerAddWithPpdFile(const QString &printerName,
+                                         const QString &printerUri,
+                                         const QString &ppdFileName,
+                                         const QString &info,
+                                         const QString &location)
+{
+    ipp_t *request;
+
+    if (!isPrinterNameValid(printerName)) {
+        setInternalStatus(QString("%1 is not a valid printer name.").arg(printerName));
+        return false;
+    }
+
+    if (!isStringValid(info)) {
+        setInternalStatus(QString("%1 is not a valid description.").arg(info));
+        return false;
+    }
+
+    if (!isStringValid(location)) {
+        setInternalStatus(QString("%1 is not a valid location.").arg(location));
+        return false;
+    }
+
+    if (!isStringValid(ppdFileName)) {
+        setInternalStatus(QString("%1 is not a valid ppd file name.").arg(ppdFileName));
+        return false;
+    }
+
+    if (!isStringValid(printerUri)) {
+        setInternalStatus(QString("%1 is not a valid printer uri.").arg(printerUri));
+        return false;
+    }
+
+    request = ippNewRequest(CUPS_ADD_MODIFY_PRINTER);
+    addPrinterUri(request, printerName);
+    addRequestingUsername(request, NULL);
+
+    ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_NAME,
+                 "printer-name", NULL, printerName.toUtf8());
+
+    /* In this specific case of ADD_MODIFY, the URI can be NULL/empty since
+     * we provide a complete PPD. And cups fails if we pass an empty
+     * string. */
+    if (!printerUri.isEmpty()) {
+        ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_URI,
+                     "device-uri", NULL, printerUri.toUtf8());
+    }
+
+    if (!info.isEmpty()) {
+        ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_TEXT,
+                     "printer-info", NULL, info.toUtf8());
+    }
+    if (!location.isEmpty()) {
+            ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_TEXT,
+                         "printer-location", NULL, location.toUtf8());
+    }
+
+    return postRequest(request, ppdFileName.toUtf8(), CphResourceAdmin);
+}
+
 bool CupsPkHelper::printerClassSetInfo(const QString &name,
                                        const QString &info)
 {
@@ -582,3 +703,35 @@
                             instance.toUtf8());
     return dest;
 }
+
+ipp_t* CupsPkHelper::createPrinterDriversRequest(
+    const QString &deviceId, const QString &language, const QString &makeModel,
+    const QString &product, const QStringList &includeSchemes,
+    const QStringList &excludeSchemes
+)
+{
+    Q_UNUSED(includeSchemes);
+    Q_UNUSED(excludeSchemes);
+
+    ipp_t *request;
+
+    request = ippNewRequest(CUPS_GET_PPDS);
+
+    if (!deviceId.isEmpty())
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_TEXT, "ppd-device-id",
+                 NULL, deviceId.toUtf8());
+    if (!language.isEmpty())
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "ppd-language",
+                 NULL, language.toUtf8());
+    if (!makeModel.isEmpty())
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_TEXT, "ppd-make-and-model",
+                 NULL, makeModel.toUtf8());
+    if (!product.isEmpty())
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_TEXT, "ppd-product",
+                 NULL, product.toUtf8());
+
+    // Do the request and get return the response.
+    const QString resourceChar = getResource(CphResourceRoot);
+    return cupsDoRequest(m_connection, request,
+                         resourceChar.toUtf8());
+}

=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.h'
--- plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.h	2017-01-17 15:14:25 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.h	2017-01-30 11:37:26 +0000
@@ -14,12 +14,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef USC_PRINTERS_CUPSPKHELPER_H
+#define USC_PRINTERS_CUPSPKHELPER_H
+
+#include "structs.h"
+
 #include <cups/cups.h>
 #include <cups/http.h>
 #include <cups/ipp.h>
 #include <cups/ppd.h>
 
-
 #include <QString>
 #include <QStringList>
 
@@ -31,11 +35,10 @@
 
 /* This code is only a shim for systems not running the daemon provided by
 cups-pk-helper. Once provided on all platforms, this code should be replaced
-by proper dbus bindings, and subsequently be set on fire. */
+by proper dbus bindings, and subsequently be set on fire.
 
-/* TODO: rename to CupsPkHelperShim to emphasize its transient nature.
-   FIXME: set m_internalStatus to mutable and make most of the "is..." methods
-          const.
+TODO: rename to CupsPkHelperShim to emphasize its transient nature.
+FIXME: make most of the "is..." methods const.
 */
 class CupsPkHelper
 {
@@ -43,6 +46,16 @@
     explicit CupsPkHelper();
     ~CupsPkHelper();
 
+    bool printerAdd(const QString &printerName,
+                    const QString &printerUri,
+                    const QString &ppdFile,
+                    const QString &info,
+                    const QString &location);
+    bool printerAddWithPpdFile(const QString &printerName,
+                               const QString &printerUri,
+                               const QString &ppdFileName,
+                               const QString &info,
+                               const QString &location);
     bool printerClassSetInfo(const QString &name, const QString &info);
     bool printerClassSetOption(const QString &name, const QString &option,
                                const QStringList &values);
@@ -51,6 +64,16 @@
 
     QString getLastError() const;
 
+    // This response needs to be free by the caller.
+    ipp_t* createPrinterDriversRequest(
+        const QString &deviceId = "",
+        const QString &language = "",
+        const QString &makeModel = "",
+        const QString &product = "",
+        const QStringList &includeSchemes = QStringList(),
+        const QStringList &excludeSchemes = QStringList()
+    );
+
 private:
     enum CphResource
     {
@@ -74,7 +97,6 @@
                               const int maxLength = 512);
     static bool isStringPrintable(const QString &string, const bool checkNull,
                                   const int maxLength);
-
     QString preparePpdForOptions(const QString &ppdfile,
                                  cups_option_t *options,
                                  int numOptions);
@@ -91,3 +113,6 @@
     ipp_status_t m_lastStatus = IPP_OK;
     mutable QString m_internalStatus = QString::null;
 };
+
+
+#endif // USC_PRINTERS_CUPSPKHELPER_H

=== added file 'plugins/Ubuntu/Settings/Printers/models/drivermodel.cpp'
--- plugins/Ubuntu/Settings/Printers/models/drivermodel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Printers/models/drivermodel.cpp	2017-01-30 11:37:26 +0000
@@ -0,0 +1,181 @@
+/*
+ * 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 "backend/backend_cups.h"
+#include "cups/cupsfacade.h"
+#include "models/drivermodel.h"
+
+#include <QDebug>
+#include <QtConcurrent>
+
+DriverModel::DriverModel(QObject *parent)
+    : DriverModel(new PrinterCupsBackend, parent)
+{
+}
+
+DriverModel::DriverModel(PrinterBackend *backend, QObject *parent)
+    : QAbstractListModel(parent)
+    , m_backend(backend)
+{
+    connect(m_backend, SIGNAL(printerDriversLoaded(const QList<PrinterDriver>&)),
+            this, SLOT(printerDriversLoaded(const QList<PrinterDriver>&)));
+
+    QObject::connect(&m_watcher,
+                     &QFutureWatcher<PrinterDriver>::finished,
+                     this,
+                     &DriverModel::filterFinished);
+
+}
+
+DriverModel::~DriverModel()
+{
+    cancel();
+}
+
+int DriverModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+    return m_drivers.size();
+}
+
+int DriverModel::count() const
+{
+    return rowCount();
+}
+
+QVariant DriverModel::data(const QModelIndex &index, int role) const
+{
+    QVariant ret;
+
+    if ((0 <= index.row()) && (index.row() < m_drivers.size())) {
+
+        auto driver = m_drivers[index.row()];
+
+        switch (role) {
+        case Qt::DisplayRole:
+            ret = driver.toString();
+            break;
+        case NameRole:
+            ret = driver.name;
+            break;
+        case DeviceIdRole:
+            ret = driver.deviceId;
+            break;
+        case LanguageRole:
+            ret = driver.language;
+            break;
+        case MakeModelRole:
+            ret = driver.makeModel;
+            break;
+        }
+    }
+
+    return ret;
+}
+
+QHash<int, QByteArray> DriverModel::roleNames() const
+{
+    static QHash<int,QByteArray> names;
+
+    if (Q_UNLIKELY(names.empty())) {
+        names[Qt::DisplayRole] = "displayName";
+        names[NameRole] = "name";
+        names[DeviceIdRole] = "deviceId";
+        names[LanguageRole] = "language";
+        names[MakeModelRole] = "makeModel";
+    }
+
+    return names;
+}
+
+void DriverModel::setFilter(const QString& pattern)
+{
+    QList<QByteArray> needles;
+    Q_FOREACH(const QString patternPart, pattern.toLower().split(" ")) {
+        needles.append(patternPart.toUtf8());
+    }
+    QList<PrinterDriver> list;
+
+    if (m_watcher.isRunning())
+        m_watcher.cancel();
+
+    if (pattern.isEmpty()) {
+        setModel(m_originalDrivers);
+        m_filter = pattern;
+        return;
+    }
+
+    if (!m_filter.isEmpty() && !m_drivers.isEmpty() &&
+            pattern.startsWith(m_filter))
+        list = m_drivers; // search in the smaller list
+    else
+        list = m_originalDrivers; //search in the whole list
+
+    m_filter = pattern;
+
+    QFuture<PrinterDriver> future(QtConcurrent::filtered(list,
+            [needles] (const PrinterDriver &driver) {
+                QByteArray haystack = driver.makeModel.toLower();
+                Q_FOREACH(const QByteArray needle, needles) {
+                    if (!haystack.contains(needle)) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        )
+    );
+
+    Q_EMIT filterBegin();
+
+    m_watcher.setFuture(future);
+}
+
+QString DriverModel::filter() const
+{
+    return m_filter;
+}
+
+void DriverModel::filterFinished()
+{
+    setModel(m_watcher.future().results());
+}
+
+void DriverModel::load()
+{
+    m_backend->requestAvailablePrinterDrivers();
+}
+
+void DriverModel::cancel()
+{
+    if (m_watcher.isRunning())
+        m_watcher.cancel();
+}
+
+void DriverModel::printerDriversLoaded(const QList<PrinterDriver> &drivers)
+{
+    m_originalDrivers = drivers;
+    setModel(m_originalDrivers);
+}
+
+void DriverModel::setModel(const QList<PrinterDriver> &drivers)
+{
+    beginResetModel();
+    m_drivers = drivers;
+    endResetModel();
+
+    Q_EMIT filterComplete();
+}

=== added file 'plugins/Ubuntu/Settings/Printers/models/drivermodel.h'
--- plugins/Ubuntu/Settings/Printers/models/drivermodel.h	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Printers/models/drivermodel.h	2017-01-30 11:37:26 +0000
@@ -0,0 +1,83 @@
+/*
+ * 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_PRINTER_DRIVERMODEL_H
+#define USC_PRINTER_DRIVERMODEL_H
+
+#include "printers_global.h"
+
+#include "structs.h"
+
+#include <QAbstractListModel>
+#include <QFutureWatcher>
+#include <QModelIndex>
+#include <QObject>
+#include <QVariant>
+
+class PRINTERS_DECL_EXPORT DriverModel : public QAbstractListModel
+{
+    Q_OBJECT
+    Q_PROPERTY(int count READ count NOTIFY countChanged)
+public:
+    explicit DriverModel(QObject *parent = Q_NULLPTR);
+    explicit DriverModel(PrinterBackend *backend, QObject *parent = Q_NULLPTR);
+    ~DriverModel();
+
+    enum Roles
+    {
+        // Qt::DisplayRole holds driver name
+        NameRole = Qt::UserRole,
+        DeviceIdRole,
+        LanguageRole,
+        MakeModelRole,
+        LastRole = MakeModelRole,
+    };
+
+    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;
+
+    QString filter() const;
+    void setFilter(const QString& pattern);
+
+public Q_SLOTS:
+    // Start loading the model.
+    void load();
+
+    // Cancel loading of the model.
+    void cancel();
+
+private Q_SLOTS:
+    void printerDriversLoaded(const QList<PrinterDriver> &drivers);
+    void filterFinished();
+
+Q_SIGNALS:
+    void countChanged();
+    void filterBegin();
+    void filterComplete();
+
+private:
+    void setModel(const QList<PrinterDriver> &drivers);
+    PrinterBackend *m_backend;
+    QList<PrinterDriver> m_drivers;
+    QList<PrinterDriver> m_originalDrivers;
+    QString m_filter;
+    QFutureWatcher<PrinterDriver> m_watcher;
+};
+
+#endif // USC_PRINTER_DRIVERMODEL_H

=== modified file 'plugins/Ubuntu/Settings/Printers/plugin.cpp'
--- plugins/Ubuntu/Settings/Printers/plugin.cpp	2017-01-24 12:34:23 +0000
+++ plugins/Ubuntu/Settings/Printers/plugin.cpp	2017-01-30 11:37:26 +0000
@@ -18,13 +18,15 @@
 
 #include "enums.h"
 #include "i18n.h"
+#include "structs.h"
+
 // #include "models/printermodel.h"
 #include "printer/printer.h"
 #include "printer/printerjob.h"
 #include "printers/printers.h"
 
 #include <QtQml/qqml.h>
-#include <QSharedPointer>
+#include <QList>
 
 #define I18N_DOMAIN "ubuntu-settings-components"
 
@@ -49,4 +51,5 @@
     qmlRegisterType<PrinterJob>(uri, 0, 1, "PrinterJob");
 
     qmlRegisterUncreatableType<PrinterEnum>(uri, 0, 1, "PrinterEnum", "Is an enum");
+    qRegisterMetaType<QList<PrinterDriver>>("QList<PrinterDriver>");
 }

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp'
--- plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp	2017-01-26 16:19:54 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp	2017-01-30 11:37:26 +0000
@@ -15,6 +15,7 @@
  */
 
 #include <QtCore/QDebug>
+#include <QUrl>
 
 #include "backend/backend_cups.h"
 #include "models/printermodel.h"

=== modified file 'plugins/Ubuntu/Settings/Printers/printers/printers.cpp'
--- plugins/Ubuntu/Settings/Printers/printers/printers.cpp	2017-01-22 19:31:39 +0000
+++ plugins/Ubuntu/Settings/Printers/printers/printers.cpp	2017-01-30 11:37:26 +0000
@@ -28,6 +28,7 @@
                    QObject *parent)
     : QObject(parent)
     , m_backend(backend)
+    , m_drivers(backend)
     , m_model(backend, printerUpdateIntervalMSecs)
 {
     m_allPrinters.setSourceModel(&m_model);
@@ -41,6 +42,9 @@
 
     // Let Qt be in charge of RAII.
     m_backend->setParent(this);
+
+    connect(&m_drivers, SIGNAL(filterComplete()),
+            this, SIGNAL(driverFilterChanged()));
 }
 
 Printers::~Printers()
@@ -71,11 +75,33 @@
 
 }
 
+QAbstractItemModel* Printers::drivers()
+{
+    auto ret = &m_drivers;
+    QQmlEngine::setObjectOwnership(ret, QQmlEngine::CppOwnership);
+    return ret;
+}
+
+QString Printers::driverFilter() const
+{
+    return m_drivers.filter();
+}
+
+void Printers::setDriverFilter(const QString &filter)
+{
+    m_drivers.setFilter(filter);
+}
+
 QString Printers::defaultPrinterName() const
 {
 
 }
 
+QString Printers::lastMessage() const
+{
+    return m_lastMessage;
+}
+
 void Printers::setDefaultPrinterName(const QString &name)
 {
 
@@ -90,21 +116,37 @@
 
 }
 
-QSharedPointer<Printer> Printers::addPrinter(const QString &name,
-                                             const QUrl &ppd,
-                                             const QUrl &device,
-                                             const QString &description,
-                                             const QString &location)
-{
-
-}
-
-QSharedPointer<Printer> Printers::addPrinter(const QString &name,
-                                             const QUrl &device,
-                                             const QString &description,
-                                             const QString &location)
-{
-
+void Printers::prepareToAddPrinter()
+{
+    m_drivers.load();
+}
+
+bool Printers::addPrinter(const QString &name, const QString &ppd,
+                          const QString &device, const QString &description,
+                          const QString &location)
+{
+    QString reply = m_backend->printerAdd(name, device, ppd, description,
+                                          location);
+    if (!reply.isEmpty()) {
+        m_lastMessage = reply;
+        return false;
+    }
+    return true;
+}
+
+bool Printers::addPrinterWithPpdFile(const QString &name,
+                                     const QString &ppdFileName,
+                                     const QString &device,
+                                     const QString &description,
+                                     const QString &location)
+{
+    QString reply = m_backend->printerAddWithPpd(name, device, ppdFileName,
+                                                 description, location);
+    if (!reply.isEmpty()) {
+        m_lastMessage = reply;
+        return false;
+    }
+    return true;
 }
 
 bool Printers::removePrinter(const QString &name)

=== modified file 'plugins/Ubuntu/Settings/Printers/printers/printers.h'
--- plugins/Ubuntu/Settings/Printers/printers/printers.h	2017-01-22 19:31:39 +0000
+++ plugins/Ubuntu/Settings/Printers/printers/printers.h	2017-01-30 11:37:26 +0000
@@ -20,6 +20,7 @@
 #include "printers_global.h"
 
 #include "cups/cupsfacade.h"
+#include "models/drivermodel.h"
 #include "models/printermodel.h"
 #include "printer/printer.h"
 
@@ -28,7 +29,6 @@
 #include <QScopedPointer>
 #include <QSharedPointer>
 #include <QString>
-#include <QUrl>
 
 class PRINTERS_DECL_EXPORT Printers : public QObject
 {
@@ -37,7 +37,10 @@
     Q_PROPERTY(QAbstractItemModel* allPrintersWithPdf READ allPrintersWithPdf CONSTANT)
     Q_PROPERTY(QAbstractItemModel* recentPrinters READ recentPrinters CONSTANT)
     Q_PROPERTY(QAbstractItemModel* printJobs READ printJobs CONSTANT)
+    Q_PROPERTY(QAbstractItemModel* drivers READ drivers 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)
 
 public:
     explicit Printers(int printerUpdateIntervalMSecs = 5000, QObject *parent = nullptr);
@@ -52,36 +55,46 @@
     QAbstractItemModel* allPrintersWithPdf();
     QAbstractItemModel* recentPrinters();
     QAbstractItemModel* printJobs();
+    QAbstractItemModel* drivers();
+    QString driverFilter() const;
     QString defaultPrinterName() const;
+    QString lastMessage() const;
 
     void setDefaultPrinterName(const QString &name);
+    void setDriverFilter(const QString &filter);
 
 public Q_SLOTS:
     QSharedPointer<Printer> getPrinterByName(const QString &name);
     QSharedPointer<Printer> getJobOwner(const int &jobId);
 
-    QSharedPointer<Printer> addPrinter(const QString &name,
-                                       const QUrl &ppd,
-                                       const QUrl &device,
-                                       const QString &description,
-                                       const QString &location);
+    /* Instructs us to start loading drivers and what have you. In most cases,
+    the user is likely to merely configure existing printers/jobs. Loading
+    (at least) 12.000 drivers isn't relevant to those scenarios, so in order to
+    add printers, this method should be called first. */
+    void prepareToAddPrinter();
 
-    QSharedPointer<Printer> addPrinter(const QString &name,
-                                       const QUrl &device,
-                                       const QString &description,
-                                       const QString &location);
+    bool addPrinter(const QString &name, const QString &ppd,
+                    const QString &device, const QString &description,
+                    const QString &location);
+    bool addPrinterWithPpdFile(const QString &name, const QString &ppdFileName,
+                               const QString &device,
+                               const QString &description,
+                               const QString &location);
 
     bool removePrinter(const QString &name);
 
 Q_SIGNALS:
     void defaultPrinterNameChanged();
+    void driverFilterChanged();
 
 private:
     PrinterBackend *m_backend;
+    DriverModel m_drivers;
     PrinterModel m_model;
     PrinterFilter m_allPrinters;
     PrinterFilter m_allPrintersWithPdf;
     PrinterFilter m_recentPrinters;
+    QString m_lastMessage;
 };
 
 #endif // USC_PRINTERS_H

=== modified file 'plugins/Ubuntu/Settings/Printers/structs.h'
--- plugins/Ubuntu/Settings/Printers/structs.h	2017-01-24 12:34:23 +0000
+++ plugins/Ubuntu/Settings/Printers/structs.h	2017-01-30 11:37:26 +0000
@@ -72,10 +72,28 @@
     }
 };
 
+struct PrinterDriver
+{
+public:
+    QByteArray name;
+    QByteArray deviceId;
+    QByteArray language;
+    QByteArray makeModel;
+
+    QString toString() const {
+        return QString("%1 [%2]").arg(QString::fromUtf8(makeModel))
+                                 .arg(QString::fromUtf8(language));
+    }
+};
+
 Q_DECLARE_TYPEINFO(ColorModel, Q_PRIMITIVE_TYPE);
 Q_DECLARE_METATYPE(ColorModel)
 
 Q_DECLARE_TYPEINFO(PrintQuality, Q_PRIMITIVE_TYPE);
 Q_DECLARE_METATYPE(PrintQuality)
 
+Q_DECLARE_TYPEINFO(PrinterDriver, Q_MOVABLE_TYPE);
+Q_DECLARE_METATYPE(PrinterDriver)
+Q_DECLARE_METATYPE(QList<PrinterDriver>)
+
 #endif // USC_PRINTERS_STRUCTS_H

=== modified file 'tests/unittests/Printers/CMakeLists.txt'
--- tests/unittests/Printers/CMakeLists.txt	2017-01-22 14:21:11 +0000
+++ tests/unittests/Printers/CMakeLists.txt	2017-01-30 11:37:26 +0000
@@ -28,3 +28,7 @@
 add_executable(testPrintersPrinterFilter tst_printerfilter.cpp ${MOCK_SOURCES})
 target_link_libraries(testPrintersPrinterFilter UbuntuSettingsPrintersQml Qt5::Test Qt5::Gui)
 add_test(tst_printerfilter testPrintersPrinterFilter)
+
+add_executable(testPrintersDriverModel tst_drivermodel.cpp ${MOCK_SOURCES})
+target_link_libraries(testPrintersDriverModel UbuntuSettingsPrintersQml Qt5::Test Qt5::Gui)
+add_test(tst_drivermodel testPrintersDriverModel)

=== modified file 'tests/unittests/Printers/mockbackend.h'
--- tests/unittests/Printers/mockbackend.h	2017-01-23 19:41:11 +0000
+++ tests/unittests/Printers/mockbackend.h	2017-01-30 11:37:26 +0000
@@ -35,8 +35,8 @@
     }
 
     virtual QString printerAdd(const QString &name,
-                               const QUrl &uri,
-                               const QUrl &ppdFile,
+                               const QString &uri,
+                               const QString &ppdFile,
                                const QString &info,
                                const QString &location) override
     {
@@ -49,7 +49,7 @@
     }
 
     virtual QString printerAddWithPpd(const QString &name,
-                                      const QUrl &uri,
+                                      const QString &uri,
                                       const QString &ppdFileName,
                                       const QString &info,
                                       const QString &location) override
@@ -309,6 +309,10 @@
         return m_defaultPrinterName;
     }
 
+    virtual void requestAvailablePrinterDrivers() override
+    {
+    }
+
     virtual BackendType backendType() const override
     {
         return m_backendType;
@@ -335,6 +339,16 @@
         Q_EMIT printerStateChanged(name);
     }
 
+    void mockDriversLoaded(const QList<PrinterDriver> &drivers)
+    {
+        Q_EMIT printerDriversLoaded(drivers);
+    }
+
+    void mockDriversLoaded(const QString &errorMessage)
+    {
+        Q_EMIT printerDriversFailedToLoad(errorMessage);
+    }
+
     QString returnValue = QString::null;
 
     // Map from printer to key/val.

=== added file 'tests/unittests/Printers/tst_drivermodel.cpp'
--- tests/unittests/Printers/tst_drivermodel.cpp	1970-01-01 00:00:00 +0000
+++ tests/unittests/Printers/tst_drivermodel.cpp	2017-01-30 11:37:26 +0000
@@ -0,0 +1,136 @@
+/*
+ * 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/drivermodel.h"
+
+#include <QDebug>
+#include <QObject>
+#include <QSignalSpy>
+#include <QTest>
+
+class TestDriverModel : public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void init()
+    {
+        m_backend = new MockPrinterBackend;
+        m_model = new DriverModel(m_backend);
+    }
+    void cleanup()
+    {
+        QSignalSpy destroyedSpy(m_model, SIGNAL(destroyed(QObject*)));
+        m_model->deleteLater();
+        QTRY_COMPARE(destroyedSpy.count(), 1);
+        delete m_backend;
+    }
+    void testDrivers_data()
+    {
+        QTest::addColumn<QList<PrinterDriver>>("drivers");
+        QTest::addColumn<int>("expectedCount");
+        {
+            QList<PrinterDriver> drivers;
+            QTest::newRow("none") << drivers << 0;
+        }
+        {
+            QList<PrinterDriver> drivers({PrinterDriver(), PrinterDriver()});
+            QTest::newRow("some") << drivers << 2;
+        }
+    }
+    void testDrivers()
+    {
+        QFETCH(QList<PrinterDriver>, drivers);
+        QFETCH(int, expectedCount);
+
+        m_model->load();
+        getBackend()->mockDriversLoaded(drivers);
+        QCOMPARE(m_model->rowCount(), expectedCount);
+    }
+    void testFiltering_data()
+    {
+        QTest::addColumn<QList<PrinterDriver>>("drivers");
+        QTest::addColumn<QList<PrinterDriver>>("expectedDrivers");
+        QTest::addColumn<QString>("filter");
+
+        {
+            QList<PrinterDriver> drivers;
+            QList<PrinterDriver> expectedDrivers;
+
+            PrinterDriver canon;
+            canon.makeModel = "Canon Foojet";
+
+            PrinterDriver hp;
+            hp.makeModel = "HP Laserfjert";
+
+            drivers << canon << hp;
+            expectedDrivers << hp;
+
+            QTest::newRow("filter hp") << drivers << expectedDrivers << "hp";
+        }
+        {
+            QList<PrinterDriver> drivers;
+            QList<PrinterDriver> expectedDrivers;
+
+            PrinterDriver canon;
+            canon.makeModel = "Canon 4500 Foojet";
+
+            PrinterDriver canon2;
+            canon2.makeModel = "rabble rabble canon 4500 masterjet";
+
+            PrinterDriver hp;
+            hp.makeModel = "HP Laserfjert";
+
+            drivers << canon << canon2 << hp;
+            expectedDrivers << canon << canon2;
+
+            QTest::newRow("filter canon 4500 printers") << drivers << expectedDrivers << "canon 4500";
+        }
+    }
+    void testFiltering()
+    {
+        QFETCH(QList<PrinterDriver>, drivers);
+        QFETCH(QList<PrinterDriver>, expectedDrivers);
+        QFETCH(QString, filter);
+
+        m_model->load();
+        getBackend()->mockDriversLoaded(drivers);
+
+        QSignalSpy filterCompleteSpy(m_model, SIGNAL(filterComplete()));
+        m_model->setFilter(filter);
+        QTRY_COMPARE(filterCompleteSpy.count(), 1);
+
+        QCOMPARE(m_model->rowCount(), expectedDrivers.size());
+        for (int i = 0; i < m_model->rowCount(); i++) {
+            QCOMPARE(
+                expectedDrivers.at(i).makeModel,
+                m_model->data(m_model->index(i), DriverModel::Roles::MakeModelRole).toByteArray()
+            );
+        }
+    }
+private:
+    PrinterBackend *m_backend;
+    DriverModel *m_model;
+    MockPrinterBackend* getBackend()
+    {
+        return (MockPrinterBackend*) m_backend;
+    }
+};
+
+QTEST_GUILESS_MAIN(TestDriverModel)
+#include "tst_drivermodel.moc"

=== modified file 'tests/unittests/Printers/tst_printers.cpp'
--- tests/unittests/Printers/tst_printers.cpp	2017-01-22 14:21:11 +0000
+++ tests/unittests/Printers/tst_printers.cpp	2017-01-30 11:37:26 +0000
@@ -99,6 +99,15 @@
             );
         }
     }
+    void testPrinterDrivers()
+    {
+        QString targetFilter("foo");
+        Printers printers(new MockPrinterBackend);
+        printers.setDriverFilter(targetFilter);
+
+        DriverModel *drivers = (DriverModel*) printers.drivers();
+        QCOMPARE(drivers->filter(), targetFilter);
+    }
 };
 
 QTEST_GUILESS_MAIN(TestPrinters)