Show display name within list cloud printer script

simoncadman · Oct 8, 2013 · 0f576cf · 0f576cf
1 parent d6beac3
commit 0f576cf
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 9 deletions.
diff --git a/backend.py b/backend.py
@@ -20,7 +20,7 @@
 
 if len(sys.argv) == 2 and sys.argv[1] == 'version':
     # line below is replaced on commit
-    CCPVersion = "20131006 200957"
+    CCPVersion = "20131008 210502"
     print "CUPS Cloud Print CUPS Backend Version " + CCPVersion
     sys.exit(0)
 

diff --git a/deleteaccount.py b/deleteaccount.py
@@ -20,7 +20,7 @@
 
 if len(sys.argv) == 2 and sys.argv[1] == 'version':
     # line below is replaced on commit
-    CCPVersion = "20131006 200957"
+    CCPVersion = "20131008 210502"
     print "CUPS Cloud Print Delete Account Script Version " + CCPVersion
     sys.exit(0)
 

diff --git a/dynamicppd.py b/dynamicppd.py
@@ -19,7 +19,7 @@
 
 if len(sys.argv) == 2 and sys.argv[1] == 'version':
     # line below is replaced on commit
-    CCPVersion = "20131006 200957"
+    CCPVersion = "20131008 210502"
     print "CUPS Cloud Print Dynamic PPD Generator Version " + CCPVersion
     sys.exit(0)
 

diff --git a/listcloudprinters.py b/listcloudprinters.py
@@ -21,7 +21,7 @@
 
 if len(sys.argv) == 2 and sys.argv[1] == 'version':
     # line below is replaced on commit
-    CCPVersion = "20131006 200957"
+    CCPVersion = "20131008 210502"
     print "CUPS Cloud Print Printer Lister Version " + CCPVersion
     sys.exit(0)
 
@@ -33,4 +33,7 @@
   sys.exit(1)
 
 for foundprinter in printers:
-  print(foundprinter['name'].encode('ascii', 'replace') + ' - ' + printer.printerNameToUri(foundprinter['account'], foundprinter['name'].encode('ascii', 'replace')) + " - " + foundprinter['account'])
+  printerName = foundprinter['name']
+  if 'displayName' in foundprinter:
+      printerName = foundprinter['displayName']
+  print(printerName.encode('ascii', 'replace') + ' - ' + printer.printerNameToUri(foundprinter['account'], foundprinter['name'].encode('ascii', 'replace')) + " - " + foundprinter['account'])
diff --git a/reportissues.py b/reportissues.py
@@ -19,7 +19,7 @@
 
 if len(sys.argv) == 2 and sys.argv[1] == 'version':
     # line below is replaced on commit
-    CCPVersion = "20131006 200957"
+    CCPVersion = "20131008 210502"
     print "CUPS Cloud Print Issue Reporting Script Version " + CCPVersion
     sys.exit(0)
 

diff --git a/setupcloudprint.py b/setupcloudprint.py
@@ -21,7 +21,7 @@
 
 if len(sys.argv) == 2 and sys.argv[1] == 'version':
     # line below is replaced on commit
-    CCPVersion = "20131006 200957"
+    CCPVersion = "20131008 210502"
     print "CUPS Cloud Print Setup Script Version " + CCPVersion
     sys.exit(0)
 

diff --git a/submitjob.py b/submitjob.py
@@ -21,7 +21,7 @@
 
 if len(sys.argv) == 2 and sys.argv[1] == 'version':
     # line below is replaced on commit
-    CCPVersion = "20131006 200957"
+    CCPVersion = "20131008 210502"
     print "CUPS Cloud Print Submit Job Version " + CCPVersion
     sys.exit(0)
 

diff --git a/upgrade.py b/upgrade.py
@@ -22,7 +22,7 @@
 
 if len(sys.argv) == 2 and sys.argv[1] == 'version':
     # line below is replaced on commit
-    CCPVersion = "20131006 200957"
+    CCPVersion = "20131008 210502"
     print "CUPS Cloud Print Upgrade Script Version " + CCPVersion
     sys.exit(0)