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

[Jonas G. Drange]

adds removal of printer

adds removal of printer

[Andrew Hayzen (ahayzen)]

After deleting a printer from the QML UI, the listview of printers freezes for me. I'm able to click add new printer, but not able to click on any printer delegates or right click on them - I have to restart the app.

review: Needs Fixing

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

227. By Jonas G. Drange on 2017-02-03

syncs with prereq branch

Unmerged revisions

227. By Jonas G. Drange on 2017-02-03

syncs with prereq branch

226. By Jonas G. Drange on 2017-02-02

adds removal of printer

=== modified file 'examples/Printers.qml'
--- examples/Printers.qml	2017-01-27 14:07:29 +0000
+++ examples/Printers.qml	2017-02-03 12:27:16 +0000
@@ -171,6 +171,18 @@
                 model: Printers.allPrintersWithPdf
                 delegate: ListItem {
                     height: modelLayout.height + (divider.visible ? divider.height : 0)
+                    trailingActions: ListItemActions {
+                        actions: [
+                            Action {
+                                iconName: "delete"
+                                onTriggered: {
+                                    if (!Printers.removePrinter(model.name)) {
+                                        console.error('failed to remove printer', Printers.lastMessage);
+                                    }
+                                }
+                            }
+                        ]
+                    }
                     ListItemLayout {
                         id: modelLayout
                         title.text: displayName

=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp'
--- plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp	2017-02-03 12:27:16 +0000
+++ plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp	2017-02-03 12:27:16 +0000
@@ -96,7 +96,7 @@
 
 QString PrinterCupsBackend::printerDelete(const QString &name)
 {
-
+    return m_cups->printerDelete(name);
 }
 
 QString PrinterCupsBackend::printerSetEnabled(const QString &name,

=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp'
--- plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp	2017-02-03 12:27:16 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp	2017-02-03 12:27:16 +0000
@@ -63,7 +63,9 @@
 
 QString CupsFacade::printerDelete(const QString &name)
 {
-    Q_UNUSED(name);
+    if (!helper.printerDelete(name)) {
+        return helper.getLastError();
+    }
     return QString();
 }
 

=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.cpp'
--- plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.cpp	2017-02-03 12:27:16 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.cpp	2017-02-03 12:27:16 +0000
@@ -44,6 +44,12 @@
         httpClose(m_connection);
 }
 
+bool CupsPkHelper::printerDelete(const QString &printerName)
+{
+    return sendNewSimpleRequest(CUPS_DELETE_PRINTER, printerName.toUtf8(),
+                                CphResource::CphResourceAdmin);
+}
+
 bool CupsPkHelper::printerAdd(const QString &printerName,
                               const QString &printerUri,
                               const QString &ppdFile,
@@ -796,3 +802,19 @@
 
     ippDelete(resp);
 }
+
+bool CupsPkHelper::sendNewSimpleRequest(
+    ipp_op_t op, const QString &printerName,
+    const CupsPkHelper::CphResource &resource)
+{
+    ipp_t *request;
+
+    if (!isPrinterNameValid(printerName))
+        return false;
+
+    request = ippNewRequest(op);
+    addPrinterUri(request, printerName);
+    addRequestingUsername(request, NULL);
+
+    return sendRequest(request, resource);
+}

=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.h'
--- plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.h	2017-02-03 12:27:16 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.h	2017-02-03 12:27:16 +0000
@@ -46,6 +46,7 @@
     explicit CupsPkHelper();
     ~CupsPkHelper();
 
+    bool printerDelete(const QString &printerName);
     bool printerAdd(const QString &printerName,
                     const QString &printerUri,
                     const QString &ppdFile,
@@ -89,6 +90,9 @@
                                     ipp_tag_t type,
                                     const QString &name,
                                     const QString &value);
+    bool sendNewSimpleRequest(ipp_op_t op, const QString &printerName,
+                              const CupsPkHelper::CphResource &resource);
+
     static void addPrinterUri(ipp_t *request, const QString &name);
     static void addRequestingUsername(ipp_t *request, const QString &username);
     static const QString getResource(const CphResource &resource);

=== modified file 'plugins/Ubuntu/Settings/Printers/printers/printers.cpp'
--- plugins/Ubuntu/Settings/Printers/printers/printers.cpp	2017-02-03 12:27:16 +0000
+++ plugins/Ubuntu/Settings/Printers/printers/printers.cpp	2017-02-03 12:27:16 +0000
@@ -158,5 +158,11 @@
 
 bool Printers::removePrinter(const QString &name)
 {
+    QString reply = m_backend->printerDelete(name);
 
+    if (!reply.isEmpty()) {
+        m_lastMessage = reply;
+        return false;
+    }
+    return true;
 }

=== modified file 'tests/unittests/Printers/mockbackend.h'
--- tests/unittests/Printers/mockbackend.h	2017-02-03 12:27:16 +0000
+++ tests/unittests/Printers/mockbackend.h	2017-02-03 12:27:16 +0000
@@ -64,7 +64,12 @@
 
     virtual QString printerDelete(const QString &name) override
     {
-        Q_UNUSED(name);
+        Q_FOREACH(Printer *p, m_availablePrinters) {
+            if (p->name() == name) {
+                m_availablePrinters.removeOne(p);
+                break;
+            }
+        }
         return returnValue;
     }
 

=== modified file 'tests/unittests/Printers/tst_printers.cpp'
--- tests/unittests/Printers/tst_printers.cpp	2017-02-03 12:27:16 +0000
+++ tests/unittests/Printers/tst_printers.cpp	2017-02-03 12:27:16 +0000
@@ -108,6 +108,20 @@
         DriverModel *drivers = (DriverModel*) printers.drivers();
         QCOMPARE(drivers->filter(), targetFilter);
     }
+    void testPrinterRemove()
+    {
+        auto aBackend = new MockPrinterBackend("printer-a");
+        auto a = new Printer(aBackend);
+
+        QList<Printer*> list({a});
+
+        MockPrinterBackend* backend = new MockPrinterBackend;
+        backend->m_availablePrinters = list;
+
+        Printers printers(backend);
+        printers.removePrinter(a->name());
+        QCOMPARE(backend->m_availablePrinters.size(), 0);
+    }
 };
 
 QTEST_GUILESS_MAIN(TestPrinters)