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

[Jonas G. Drange]

improves the deviceName by dropping the CMD (note that the full string remains accessible from device.id)

improves the deviceName by dropping the CMD (note that the full string remains accessible from device.id)

[Andrew Hayzen (ahayzen)]

How do I test this? Do I need to pick a specific printer to make this happen, as I didn't notice any difference with my printers.

review: Needs Information

[Andrew Hayzen (ahayzen)]

LGTM, as discussed it is difficult to test, but the unit tests pass and there are no regressions - so approving :-)

review: Approve

=== modified file 'modules/Ubuntu/Components/Extras/Printers/structs.h'
--- modules/Ubuntu/Components/Extras/Printers/structs.h	2017-03-09 12:35:04 +0000
+++ modules/Ubuntu/Components/Extras/Printers/structs.h	2017-03-16 15:36:28 +0000
@@ -145,6 +145,13 @@
         }
         auto mfg = idMap.value("MFG", "");
         auto mdl = idMap.value("MDL", "");
+
+        /* If the MDL field contains CMD, somebody forgot to terminate, and we
+        remove it. */
+        if (mdl.contains("CMD")) {
+            mdl = mdl.split("CMD")[0];
+        }
+
         return QString("%1 %2").arg(mfg).arg(mdl);
     }
 

=== modified file 'tests/unittests/Printers/tst_printerdevice.cpp'
--- tests/unittests/Printers/tst_printerdevice.cpp	2017-03-08 16:55:21 +0000
+++ tests/unittests/Printers/tst_printerdevice.cpp	2017-03-16 15:36:28 +0000
@@ -100,9 +100,9 @@
 
         {
             Device d;
-            QTest::newRow("a hp printer")
+            QTest::newRow("a hp printer (remove CMD)")
                 << "MFG:HP;MDL:Color LaserJet 4500CMD:PDF,PS,JPEG,PNG,PWG,URF"
-                << "HP Color LaserJet 4500CMD";
+                << "HP Color LaserJet 4500";
         }
         {
             Device d; ;