Merge lp:~ahayzen/ubuntu-settings-components/add-cancel-method into lp:~phablet-team/ubuntu-settings-components/printer-components

[Andrew Hayzen]

* Add cancel method to Printers

* Add cancel method to Printers

[Jonas G. Drange (jonas-drange)]

LGTM. We can improve the situation where a cancel operation fails later on.

review: Approve

=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend.cpp'
--- plugins/Ubuntu/Settings/Printers/backend/backend.cpp	2017-01-26 16:14:55 +0000
+++ plugins/Ubuntu/Settings/Printers/backend/backend.cpp	2017-02-02 16:02:15 +0000
@@ -189,6 +189,12 @@
     return PrintQuality();
 }
 
+void PrinterBackend::cancelJob(const QString &name, const int jobId)
+{
+    Q_UNUSED(jobId);
+    Q_UNUSED(name);
+}
+
 int PrinterBackend::printFileToDest(const QString &filepath,
                             const QString &title,
                             const cups_dest_t *dest)

=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend.h'
--- plugins/Ubuntu/Settings/Printers/backend/backend.h	2017-01-27 13:48:34 +0000
+++ plugins/Ubuntu/Settings/Printers/backend/backend.h	2017-02-02 16:02:15 +0000
@@ -113,6 +113,8 @@
     virtual QList<PrintQuality> printerGetSupportedQualities(
         const QString &name) const;
     virtual PrintQuality printerGetDefaultQuality(const QString &name) const;
+
+    virtual void cancelJob(const QString &name, const int jobId);
     virtual int printFileToDest(const QString &filepath,
                                 const QString &title,
                                 const cups_dest_t *dest);

=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp'
--- plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp	2017-01-31 12:34:18 +0000
+++ plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp	2017-02-02 16:02:15 +0000
@@ -198,6 +198,11 @@
     return printerGetOption(name, "DefaultPrintQuality").value<PrintQuality>();
 }
 
+void PrinterCupsBackend::cancelJob(const QString &name, const int jobId)
+{
+    m_cups->cancelJob(name, jobId);
+}
+
 int PrinterCupsBackend::printFileToDest(const QString &filepath,
                                         const QString &title,
                                         const cups_dest_t *dest)

=== modified file 'plugins/Ubuntu/Settings/Printers/backend/backend_cups.h'
--- plugins/Ubuntu/Settings/Printers/backend/backend_cups.h	2017-01-26 16:14:55 +0000
+++ plugins/Ubuntu/Settings/Printers/backend/backend_cups.h	2017-02-02 16:02:15 +0000
@@ -92,6 +92,8 @@
     virtual QList<PrintQuality> printerGetSupportedQualities(
         const QString &name) const override;
     virtual PrintQuality printerGetDefaultQuality(const QString &name) const;
+
+    virtual void cancelJob(const QString &name, const int jobId) override;
     virtual int printFileToDest(const QString &filepath,
                                 const QString &title,
                                 const cups_dest_t *dest) override;

=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp'
--- plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp	2017-01-31 13:06:19 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp	2017-02-02 16:02:15 +0000
@@ -367,6 +367,15 @@
     return dest;
 }
 
+void CupsFacade::cancelJob(const QString &name, const int jobId)
+{
+    int ret = cupsCancelJob(name.toLocal8Bit(), jobId);
+
+    if (!ret) {
+        qWarning() << "Failed to cancel job:" << jobId << "for" << name;
+    }
+}
+
 int CupsFacade::printFileToDest(const QString &filepath, const QString &title,
                                 const cups_dest_t *dest)
 {

=== modified file 'plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h'
--- plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h	2017-01-26 16:14:55 +0000
+++ plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h	2017-02-02 16:02:15 +0000
@@ -87,6 +87,8 @@
 
     QList<ColorModel> printerGetSupportedColorModels(const QString &name) const;
     QList<PrintQuality> printerGetSupportedQualities(const QString &name) const;
+
+    void cancelJob(const QString &name, const int jobId);
     int printFileToDest(const QString &filepath, const QString &title,
                         const cups_dest_t *dest);
 

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp'
--- plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp	2017-01-31 12:34:18 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp	2017-02-02 16:02:15 +0000
@@ -58,11 +58,6 @@
 
 }
 
-void PrinterJob::cancel()
-{
-
-}
-
 bool PrinterJob::collate() const
 {
     return m_collate;

=== modified file 'plugins/Ubuntu/Settings/Printers/printer/printerjob.h'
--- plugins/Ubuntu/Settings/Printers/printer/printerjob.h	2017-01-26 16:19:54 +0000
+++ plugins/Ubuntu/Settings/Printers/printer/printerjob.h	2017-02-02 16:02:15 +0000
@@ -72,7 +72,6 @@
     PrinterEnum::State state() const;
     QString title() const;
 public Q_SLOTS:
-    Q_INVOKABLE void cancel();
     PrinterEnum::DuplexMode getDuplexMode() const;
     ColorModel getColorModel() const;
     PrintQuality getPrintQuality() const;

=== modified file 'plugins/Ubuntu/Settings/Printers/printers/printers.cpp'
--- plugins/Ubuntu/Settings/Printers/printers/printers.cpp	2017-01-30 11:37:07 +0000
+++ plugins/Ubuntu/Settings/Printers/printers/printers.cpp	2017-02-02 16:02:15 +0000
@@ -102,6 +102,11 @@
     return m_lastMessage;
 }
 
+void Printers::cancelJob(const QString &printerName, const int jobId)
+{
+    m_backend->cancelJob(printerName, jobId);
+}
+
 void Printers::setDefaultPrinterName(const QString &name)
 {
 

=== modified file 'plugins/Ubuntu/Settings/Printers/printers/printers.h'
--- plugins/Ubuntu/Settings/Printers/printers/printers.h	2017-01-26 16:14:55 +0000
+++ plugins/Ubuntu/Settings/Printers/printers/printers.h	2017-02-02 16:02:15 +0000
@@ -60,6 +60,8 @@
     QString defaultPrinterName() const;
     QString lastMessage() const;
 
+    Q_INVOKABLE void cancelJob(const QString &printerName, const int jobId);
+
     void setDefaultPrinterName(const QString &name);
     void setDriverFilter(const QString &filter);
 

=== modified file 'tests/unittests/Printers/mockbackend.h'
--- tests/unittests/Printers/mockbackend.h	2017-01-27 13:48:34 +0000
+++ tests/unittests/Printers/mockbackend.h	2017-02-02 16:02:15 +0000
@@ -210,6 +210,11 @@
         return printerOptions[name].value("PrintQualities").value<QList<PrintQuality>>();
     }
 
+    virtual void cancelJob(const QString &name, const int jobId) override
+    {
+
+    }
+
     virtual int printFileToDest(const QString &filepath,
                                 const QString &title,
                                 const cups_dest_t *dest) override

=== modified file 'tests/unittests/Printers/tst_printerjob.cpp'
--- tests/unittests/Printers/tst_printerjob.cpp	2017-01-26 16:19:54 +0000
+++ tests/unittests/Printers/tst_printerjob.cpp	2017-02-02 16:02:15 +0000
@@ -60,11 +60,6 @@
         m_instance = new PrinterJob(m_mock_printer, m_backend);
     }
 
-    void testCancel()
-    {
-        QSKIP("Not implemented yet!");
-    }
-
     void testCollate()
     {
         QCOMPARE(m_instance->collate(), true);