Added CUPS options to the printer information. Options get uploaded to the cl...

chrome/service/cloud_print/printer_info_cups.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/service/cloud_print/printer_info.h"
 
 #include <cups/cups.h>
 #include <list>
 #include <map>
 
@@ skipping 14 matching lines @@
 static const char kCUPSPrinterInfoOpt[] = "printer-info";
 static const char kCUPSPrinterStateOpt[] = "printer-state";
 
 void EnumeratePrinters(PrinterList* printer_list) {
   DCHECK(printer_list);
   printer_list->clear();
 
   cups_dest_t* destinations = NULL;
   int num_dests = cupsGetDests(&destinations);
 
-  for (int i = 0; i < num_dests; i++) {
+  for (int printer_index = 0; printer_index < num_dests; printer_index++) {
+    const cups_dest_t& printer = destinations[printer_index];
+
     PrinterBasicInfo printer_info;
-    printer_info.printer_name = destinations[i].name;
+    printer_info.printer_name = printer.name;
 
     const char* info = cupsGetOption(kCUPSPrinterInfoOpt,
-        destinations[i].num_options, destinations[i].options);
+        printer.num_options, printer.options);
     if (info != NULL)
       printer_info.printer_description = info;
 
     const char* state = cupsGetOption(kCUPSPrinterStateOpt,
-        destinations[i].num_options, destinations[i].options);
+        printer.num_options, printer.options);
     if (state != NULL)
       StringToInt(state, &printer_info.printer_status);
 
+    // Store printer options.
+    for (int opt_index = 0; opt_index < printer.num_options; opt_index++) {
+      printer_info.options[printer.options[opt_index].name] =
+          printer.options[opt_index].value;
+    }
+
     printer_list->push_back(printer_info);
   }
 
   cupsFreeDests(num_dests, destinations);
+
+  DLOG(INFO) << "Enumerated " << printer_list->size() << " printers.";
 }
 
 bool GetPrinterCapsAndDefaults(const std::string& printer_name,
                                PrinterCapsAndDefaults* printer_info) {
   DCHECK(printer_info);
 
+  DLOG(INFO) << "Getting Caps and Defaults for:  " << printer_name;
+
   static Lock ppd_lock;
   // cupsGetPPD returns a filename stored in a static buffer in CUPS.
   // Protect this code with lock.
   ppd_lock.Acquire();
   FilePath ppd_path(cupsGetPPD(printer_name.c_str()));
   ppd_lock.Release();
 
   std::string content;
   bool res = file_util::ReadFileToString(ppd_path, &content);
 
@@ skipping 50 matching lines @@
 }
 
 bool SpoolPrintJob(const std::string& print_ticket,
                    const FilePath& print_data_file_path,
                    const std::string& print_data_mime_type,
                    const std::string& printer_name,
                    const std::string& job_title,
                    PlatformJobId* job_id_ret) {
   DCHECK(job_id_ret);
 
+  DLOG(INFO) << "Spooling print job for: " << printer_name;
+
   // We need to store options as char* string for the duration of the
   // cupsPrintFile call. We'll use map here to store options, since
   // Dictionary value from JSON parser returns wchat_t.
   std::map<std::string, std::string> options;
   bool res = ParsePrintTicket(print_ticket, &options);
   DCHECK(res);  // If print ticket is invalid we still print using defaults.
 
   std::vector<cups_option_t> cups_options;
   std::map<std::string, std::string>::iterator it;
   for (it = options.begin(); it != options.end(); ++it) {
@@ skipping 13 matching lines @@
     return false;
 
   *job_id_ret = job_id;
   return true;
 }
 
 bool GetJobDetails(const std::string& printer_name,
                    PlatformJobId job_id,
                    PrintJobDetails *job_details) {
   DCHECK(job_details);
+
+  DLOG(INFO) << "Getting job details for: " << printer_name <<
+      " job_id: " << job_id;
+
   cups_job_t* jobs = NULL;
   int num_jobs = cupsGetJobs(&jobs, printer_name.c_str(), 1, -1);
 
   bool found = false;
   for (int i = 0; i < num_jobs; i++) {
     if (jobs[i].id == job_id) {
       found = true;
       switch (jobs[i].state) {
         case IPP_JOB_PENDING :
         case IPP_JOB_HELD :
@@ skipping 18 matching lines @@
     }
   }
 
   cupsFreeJobs(num_jobs, jobs);
   return found;
 }
 
 bool GetPrinterInfo(const std::string& printer_name, PrinterBasicInfo* info) {
   DCHECK(info);
 
+  DLOG(INFO) << "Getting printer info for: " << printer_name;
+
   // This is not very efficient way to get specific printer info. CUPS 1.4
   // supports cupsGetNamedDest() function. However, CUPS 1.4 is not available
   // everywhere (for example, it supported from Mac OS 10.6 only).
   PrinterList printer_list;
   EnumeratePrinters(&printer_list);
 
   PrinterList::iterator it;
   for (it = printer_list.begin(); it != printer_list.end(); ++it) {
     if (it->printer_name == printer_name) {
       *info = *it;
@@ skipping 92 matching lines @@
 bool PrinterChangeNotifier::GetCurrentPrinterInfo(
     PrinterBasicInfo* printer_info) {
   if (!state_) {
     return false;
   }
   DCHECK(printer_info);
   return GetPrinterInfo(state_->printer_name(), printer_info);
 }
 }  // namespace cloud_print