Driver

.travis.yml

@@ -0,0 +1,18 @@
+language: go
+dist: xenial
+
+go:
+  - "1.10.x"
+  - "1.11.x"
+  - "1.x"
+  - master
+
+os:
+  - linux
+  - osx
+
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y libcups2-dev libavahi-client-dev ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install bazaar ; fi

README.md

@@ -1,9 +1,17 @@
 # Google Cloud Print Connector
 
 ## Introduction
-Share printers from your Windows, Linux, or OS X computer with ChromeOS and Android devices, using the Cloud Print Connector. The Connector is a purpose-built system process. It can share hundreds of printers on a powerful server, or one printer on a Raspberry Pi.
+Share printers from your Windows, Linux, FreeBSD or OS X computer with ChromeOS and Android devices, using the Cloud Print Connector. The Connector is a purpose-built system process. It can share hundreds of printers on a powerful server, or one printer on a Raspberry Pi.
 
-Lots of help can be found in [the wiki](https://github.com/google/cups-connector/wiki).
+Lots of help can be found in [the wiki](https://github.com/google/cloud-print-connector/wiki).
+
+## Mailing list
+Please join the mailing list at https://groups.google.com/forum/#!forum/cloud-print-connector. Anyone can post and view messages.
+
+## Build Status
+* Linux/OSX: [![Build Status](https://travis-ci.org/google/cloud-print-connector.svg?branch=master)](https://travis-ci.org/google/cloud-print-connector)
+
+* FreeBSD: [![Build Status](http://jenkins.mouf.net/job/cloud-print-connector/badge/icon)](http://jenkins.mouf.net/job/cloud-print-connector/)
 
 ## License
 Copyright 2015 Google Inc. All rights reserved.

cdd/cdd.go

@@ -316,8 +316,7 @@ type TypedValueCapability struct {
 }
 
 type Color struct {
-	Option    []ColorOption `json:"option"`
-	VendorKey string        `json:"-"`
+	Option []ColorOption `json:"option"`
 }
 
 type ColorType string
@@ -339,8 +338,7 @@ type ColorOption struct {
 }
 
 type Duplex struct {
-	Option    []DuplexOption `json:"option"`
-	VendorKey string         `json:"-"`
+	Option []DuplexOption `json:"option"`
 }
 
 type DuplexType string
@@ -354,7 +352,6 @@ const (
 type DuplexOption struct {
 	Type      DuplexType `json:"type"`       // default = "NO_DUPLEX"
 	IsDefault bool       `json:"is_default"` // default = false
-	VendorID  string     `json:"-"`
 }
 
 type PageOrientation struct {

cups/core.go

@@ -4,11 +4,13 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-// +build linux darwin
+// +build linux darwin freebsd
 
 package cups
 
 /*
+#cgo freebsd CFLAGS: -I/usr/local/include
+#cgo freebsd LDFLAGS: -L/usr/local/lib
 #include "cups.h"
 */
 import "C"
@@ -21,8 +23,8 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/google/cups-connector/lib"
-	"github.com/google/cups-connector/log"
+	"github.com/google/cloud-print-connector/lib"
+	"github.com/google/cloud-print-connector/log"
 )
 
 const (

cups/cups.go

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-// +build linux darwin
+// +build linux darwin freebsd
 
 package cups
 
@@ -26,9 +26,9 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/google/cups-connector/cdd"
-	"github.com/google/cups-connector/lib"
-	"github.com/google/cups-connector/log"
+	"github.com/google/cloud-print-connector/cdd"
+	"github.com/google/cloud-print-connector/lib"
+	"github.com/google/cloud-print-connector/log"
 )
 
 const (
@@ -136,11 +136,15 @@ type CUPS struct {
 	printerAttributes     []string
 	systemTags            map[string]string
 	printerBlacklist      map[string]interface{}
+	printerWhitelist      map[string]interface{}
 	ignoreRawPrinters     bool
 	ignoreClassPrinters   bool
 }
 
-func NewCUPS(infoToDisplayName, prefixJobIDToJobTitle bool, displayNamePrefix string, printerAttributes []string, maxConnections uint, connectTimeout time.Duration, printerBlacklist []string, ignoreRawPrinters bool, ignoreClassPrinters bool) (*CUPS, error) {
+func NewCUPS(infoToDisplayName, prefixJobIDToJobTitle bool, displayNamePrefix string,
+	printerAttributes, vendorPPDOptions []string, maxConnections uint, connectTimeout time.Duration,
+	printerBlacklist, printerWhitelist []string, ignoreRawPrinters bool, ignoreClassPrinters bool,
+	fcmNotificationsEnable bool) (*CUPS, error) {
 	if err := checkPrinterAttributes(printerAttributes); err != nil {
 		return nil, err
 	}
@@ -149,9 +153,9 @@ func NewCUPS(infoToDisplayName, prefixJobIDToJobTitle bool, displayNamePrefix st
 	if err != nil {
 		return nil, err
 	}
-	pc := newPPDCache(cc)
+	pc := newPPDCache(cc, vendorPPDOptions)
 
-	systemTags, err := getSystemTags()
+	systemTags, err := getSystemTags(fcmNotificationsEnable)
 	if err != nil {
 		return nil, err
 	}
@@ -161,6 +165,11 @@ func NewCUPS(infoToDisplayName, prefixJobIDToJobTitle bool, displayNamePrefix st
 		pb[p] = struct{}{}
 	}
 
+	pw := map[string]interface{}{}
+	for _, p := range printerWhitelist {
+		pw[p] = struct{}{}
+	}
+
 	c := &CUPS{
 		cc:                  cc,
 		pc:                  pc,
@@ -169,6 +178,7 @@ func NewCUPS(infoToDisplayName, prefixJobIDToJobTitle bool, displayNamePrefix st
 		printerAttributes:   printerAttributes,
 		systemTags:          systemTags,
 		printerBlacklist:    pb,
+		printerWhitelist:    pw,
 		ignoreRawPrinters:   ignoreRawPrinters,
 		ignoreClassPrinters: ignoreClassPrinters,
 	}
@@ -212,7 +222,7 @@ func (c *CUPS) GetPrinters() ([]lib.Printer, error) {
 	}
 
 	printers := c.responseToPrinters(response)
-	printers = c.filterBlacklistPrinters(printers)
+
 	if c.ignoreRawPrinters {
 		printers = filterRawPrinters(printers)
 	}
@@ -241,6 +251,26 @@ func (c *CUPS) responseToPrinters(response *C.ipp_t) []lib.Printer {
 		}
 		mAttributes := attributesToMap(attributes)
 		pds, pss, name, defaultDisplayName, uuid, tags := translateAttrs(mAttributes)
+
+		// Check whitelist/blacklist in loop once we have printer name.
+		// Avoids unnecessary processing of excluded printers.
+		if _, exists := c.printerBlacklist[name]; exists {
+			log.Debugf("Ignoring blacklisted printer %s", name)
+			if a == nil {
+				break
+			}
+			continue
+		}
+		if len(c.printerWhitelist) != 0 {
+			if _, exists := c.printerWhitelist[name]; !exists {
+				log.Debugf("Ignoring non-whitelisted printer %s", name)
+				if a == nil {
+					break
+				}
+				continue
+			}
+		}
+
 		if !c.infoToDisplayName || defaultDisplayName == "" {
 			defaultDisplayName = name
 		}
@@ -263,27 +293,17 @@ func (c *CUPS) responseToPrinters(response *C.ipp_t) []lib.Printer {
 	return printers
 }
 
-func (c *CUPS) filterBlacklistPrinters(printers []lib.Printer) []lib.Printer {
+// filterClassPrinters removes class printers from the slice.
+func filterClassPrinters(printers []lib.Printer) []lib.Printer {
 	result := make([]lib.Printer, 0, len(printers))
 	for i := range printers {
-		if _, exists := c.printerBlacklist[printers[i].Name]; !exists {
+		if !lib.PrinterIsClass(printers[i]) {
 			result = append(result, printers[i])
 		}
 	}
 	return result
 }
 
-// filterClassPrinters removes class printers from the slice.
-func filterClassPrinters(printers []lib.Printer) []lib.Printer {
-        result := make([]lib.Printer, 0, len(printers))
-        for i := range printers {
-                if !lib.PrinterIsClass(printers[i]) {
-                        result = append(result, printers[i])
-                }
-        }
-        return result
-}
-
 // filterRawPrinters removes raw printers from the slice.
 func filterRawPrinters(printers []lib.Printer) []lib.Printer {
 	result := make([]lib.Printer, 0, len(printers))
@@ -304,10 +324,13 @@ func (c *CUPS) addPPDDescriptionToPrinters(printers []lib.Printer) []lib.Printer
 	for i := range printers {
 		wg.Add(1)
 		go func(p *lib.Printer) {
-			if description, manufacturer, model, err := c.pc.getPPDCacheEntry(p.Name); err == nil {
+			if description, manufacturer, model, duplexMap, err := c.pc.getPPDCacheEntry(p.Name); err == nil {
 				p.Description.Absorb(description)
 				p.Manufacturer = manufacturer
 				p.Model = model
+				if duplexMap != nil {
+					p.DuplexMap = duplexMap
+				}
 				ch <- p
 			} else {
 				log.ErrorPrinter(p.Name, err)
@@ -365,7 +388,7 @@ func uname() (string, string, string, string, string, error) {
 		C.GoString(&name.machine[0]), nil
 }
 
-func getSystemTags() (map[string]string, error) {
+func getSystemTags(fcmNotificationsEnable bool) (map[string]string, error) {
 	tags := make(map[string]string)
 
 	tags["connector-version"] = lib.BuildDate
@@ -375,7 +398,11 @@ func getSystemTags() (map[string]string, error) {
 	}
 	tags["system-arch"] = runtime.GOARCH
 	tags["system-golang-version"] = runtime.Version()
-
+	if fcmNotificationsEnable {
+		tags["system-notifications-channel"] = "fcm"
+	} else {
+		tags["system-notifications-channel"] = "xmpp"
+	}
 	sysname, nodename, release, version, machine, err := uname()
 	if err != nil {
 		return nil, fmt.Errorf("CUPS failed to call uname while initializing: %s", err)
@@ -628,3 +655,9 @@ func checkPrinterAttributes(printerAttributes []string) error {
 
 	return nil
 }
+
+// The following functions are not relevant to CUPS printing, but are required by the NativePrintSystem interface.
+
+func (c *CUPS) ReleaseJob(printerName string, jobID uint32) error {
+	return nil
+}

cups/cups.h

@@ -12,6 +12,7 @@ license that can be found in the LICENSE file or at
 #define _IPP_PRIVATE_STRUCTURES 1
 
 #include <cups/cups.h>
+#include <cups/ppd.h>
 #include <stddef.h>      // size_t
 #include <stdlib.h>      // free, calloc, malloc
 #include <sys/socket.h>  // AF_UNSPEC