new method: getDefaultPrinterName, make printer parameter optional fo…

…r printDirect or getPrinter, added example #44
thiagoelg · Feb 12, 2015 · 0dea170 · 0dea170
1 parent 78f0e9c
commit 0dea170
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 19 deletions.
diff --git a/examples/getDefaultPrinterName.js b/examples/getDefaultPrinterName.js
@@ -0,0 +1,4 @@
+var printer = require("../lib");
+
+console.log('default printer name: ' + (printer.getDefaultPrinterName() || 'is not defined on your computer'));
+
diff --git a/examples/print_raw.js b/examples/print_raw.js
@@ -1,7 +1,7 @@
 var printer = require("../lib");
 
 printer.printDirect({data:"print from Node.JS buffer" // or simple String: "some text"
-	, printer:'Foxit Reader PDF Printer' // printer name
+	//, printer:'Foxit Reader PDF Printer' // printer name, if missing then will print to default printer
 	, type: 'RAW' // type: RAW, TEXT, PDF, JPEG, .. depends on platform
 	, success:function(jobID){
 		console.log("sent to printer with ID: "+jobID);

diff --git a/lib/printer.js b/lib/printer.js
@@ -28,6 +28,9 @@ module.exports.getSupportedJobCommands = printer_helper.getSupportedJobCommands;
  */
 module.exports.getPrinter = getPrinter;
 
+/// Return default printer name
+module.exports.getDefaultPrinterName = printer_helper.getDefaultPrinterName;
+
 /** get printer job info object
  */
 module.exports.getJob = getJob;
@@ -40,6 +43,10 @@ module.exports.setJob = setJob;
  */
 function getPrinter(printerName)
 {
+    if(!printerName) {
+        printerName = printer_helper.getDefaultPrinterName();
+    }
+
 	return correctPrinterinfo(printer_helper.getPrinter(printerName));
 }
 
@@ -77,15 +84,15 @@ function correctPrinterinfo(printer) {
     else if(status == '5'){
         status = 'STOPPED'
     }
-    
+
     // correct date type
     var k;
     for(k in printer.options) {
         if(/time$/.test(k) && printer.options[k] && !(printer.options[k] instanceof Date)) {
             printer.options[k] = new Date(printer.options[k] * 1000);
-        }    
+        }
     }
-    
+
     printer.status = status;
 }
 
@@ -100,11 +107,11 @@ parameters:
       type - String, optional, only for wind32, data type, one of the RAW, TEXT
       success - Function, optional, callback function
       error - Function, optional, callback function if exists any error
-   
+
    or
-   
+
    data - String, mandatory, data to printer
-   printer - String, mandatory, mane of the printer
+   printer - String, optional, mane of the printer, if missing, will try to print to default printer
    docname - String, optional, name of document showed in printer status
    type - String, optional, data type, one of the RAW, TEXT
    success - Function, optional, callback function with first argument job_id
@@ -117,7 +124,7 @@ function printDirect(parameters){
       , type
       , success
       , error;
-   
+
    if(arguments.length==1){
       //TODO: check parameters type
       //if (typeof parameters )
@@ -134,27 +141,32 @@ function printDirect(parameters){
       success = arguments[4];
       error = arguments[5];
    }
-   
+
    if(!success){
       success = function(){};
    }
-   
+
    if(!error){
       error = function(err){
          throw err;
       };
    }
-   
+
    if(!type){
       type = "RAW";
    }
 
+   // Set default printer name
+   if(!printer) {
+       printer = printer_helper.getDefaultPrinterName();
+   }
+
     type = type.toUpperCase();
-   
+
    if(!docname){
       docname = "node print job";
    }
-   
+
    //TODO: check parameters type
    if(printer_helper.printDirect){// call C++ binding
       try{

diff --git a/src/node_printer.cc b/src/node_printer.cc
@@ -3,6 +3,7 @@
 void initNode(v8::Handle<v8::Object> exports) {
 // only for node
   NODE_SET_METHOD(exports, "getPrinters", getPrinters);
+  NODE_SET_METHOD(exports, "getDefaultPrinterName", getDefaultPrinterName);
   NODE_SET_METHOD(exports, "getPrinter", getPrinter);
   NODE_SET_METHOD(exports, "getJob", getJob);
   NODE_SET_METHOD(exports, "setJob", setJob);

diff --git a/src/node_printer.hpp b/src/node_printer.hpp
@@ -23,6 +23,11 @@ MY_NODE_MODULE_CALLBACK(PrintDirect);
  */
 MY_NODE_MODULE_CALLBACK(getPrinters);
 
+/**
+ * Return default printer name, if null then default printer is not set
+ */
+MY_NODE_MODULE_CALLBACK(getDefaultPrinterName);
+
 /** Retrieve printer info and jobs
  * @param printer name String
  */

diff --git a/src/node_printer_posix.cc b/src/node_printer_posix.cc
@@ -84,7 +84,7 @@ namespace
                 break;
             }
         }
-        
+
         result_printer_job->Set(V8_STRING_NEW_UTF8("format"), V8_STRING_NEW_UTF8(job_format.c_str()));
         result_printer_job->Set(V8_STRING_NEW_UTF8("priority"), V8_VALUE_NEW(Number, job->priority));
         result_printer_job->Set(V8_STRING_NEW_UTF8("size"), V8_VALUE_NEW(Number, job->size));
@@ -104,9 +104,9 @@ namespace
             // A new status? report as unsupported
             std::ostringstream s;
             s << "unsupported job status: " << job->state;
-            result_printer_job_status->Set(i_status++, V8_STRING_NEW_UTF8(s.str()));
+            result_printer_job_status->Set(i_status++, V8_STRING_NEW_UTF8(s.str().c_str()));
         }
-        
+
         result_printer_job->Set(V8_STRING_NEW_UTF8("status"), result_printer_job_status);
 
         //Specific fields
@@ -118,7 +118,7 @@ namespace
         // No error. return an empty string
         return "";
     }
-    
+
     /** Parse printer info object
      * @return error string.
      */
@@ -195,6 +195,12 @@ MY_NODE_MODULE_CALLBACK(getPrinters)
     MY_NODE_MODULE_RETURN_VALUE(result);
 }
 
+MY_NODE_MODULE_CALLBACK(getDefaultPrinterName)
+{
+    MY_NODE_MODULE_HANDLESCOPE;
+    MY_NODE_MODULE_RETURN_VALUE(V8_STRING_NEW_UTF8(cupsGetDefault2(CUPS_HTTP_DEFAULT)));
+}
+
 MY_NODE_MODULE_CALLBACK(getPrinter)
 {
     MY_NODE_MODULE_HANDLESCOPE;

diff --git a/src/node_printer_win.cc b/src/node_printer_win.cc
@@ -273,7 +273,7 @@ namespace{
         //DWORD                PagesPrinted;
         result_printer_job->Set(V8_STRING_NEW_UTF8("pagesPrinted"), V8_VALUE_NEW(Number, job->PagesPrinted));
     }
-    
+
     /**
      * Returns last error code and message string
      */
@@ -473,6 +473,26 @@ MY_NODE_MODULE_CALLBACK(getPrinters)
     MY_NODE_MODULE_RETURN_VALUE(result);
 }
 
+MY_NODE_MODULE_CALLBACK(getDefaultPrinterName)
+{
+    MY_NODE_MODULE_HANDLESCOPE;
+    DWORD bSize = 0;
+    GetDefaultPrinterW(NULL, &bSize);
+
+    if(bSize == 0) {
+        MY_NODE_MODULE_RETURN_VALUE(V8_STRING_NEW_UTF8(""))
+    }
+
+    MemValue<uint16_t> bPrinterName(bSize);
+    BOOL res = GetDefaultPrinterW(bPrinterName.get(), bSize);
+
+    if(!res) {
+        MY_NODE_MODULE_RETURN_VALUE(V8_STRING_NEW_UTF8(""))
+    }
+
+    MY_NODE_MODULE_RETURN_VALUE(V8_STRING_NEW_2BYTES((uint16_t*)bPrinterName.get()));
+}
+
 MY_NODE_MODULE_CALLBACK(getPrinter)
 {
     MY_NODE_MODULE_HANDLESCOPE;
@@ -484,7 +504,7 @@ MY_NODE_MODULE_CALLBACK(getPrinter)
     if(!printerHandle)
     {
         std::string error_str("error on PrinterHandle: ");
-	error_str += getLastErrorCodeAndMessage();
+        error_str += getLastErrorCodeAndMessage();
         RETURN_EXCEPTION_STR(error_str.c_str());
     }
     DWORD printers_size_bytes = 0, dummyBytes = 0;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		var printer = require("../lib");

		console.log('default printer name: ' + (printer.getDefaultPrinterName() \|\| 'is not defined on your computer'));