Better printing support (shows more than just the printer names)

1 files changed, 167 insertions, 39 deletions

diff --git a/hardinfo2/arch/common/printers.h b/hardinfo2/arch/common/printers.h
index 8d81e61f..4f975166 100644
--- a/hardinfo2/arch/common/printers.h
+++ b/hardinfo2/arch/common/printers.h
@@ -16,70 +16,198 @@
  *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-void
-__scan_printers(void)
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+
+typedef struct _CUPSDest	CUPSDest;
+typedef struct _CUPSOption	CUPSOption;
+
+struct _CUPSOption {
+    char *name, *value;
+};
+
+struct _CUPSDest {
+    char *name, *instance;
+    int is_default;
+    int num_options;
+    CUPSOption *options;  
+};
+
+static int (*cupsGetDests) (CUPSDest **dests) = NULL;
+static int (*cupsFreeDests) (int num_dests, CUPSDest *dests) = NULL;
+static gboolean cups_init = FALSE;
+
+
+static gboolean
+remove_printer_devices(gpointer key, gpointer value, gpointer data)
 {
-    static GModule *cups = NULL;
-    static int (*cupsGetPrinters) (char ***printers) = NULL;
-    static char *(*cupsGetDefault) (void) = NULL;
-    
-    static char *libcups[] = { "libcups",
-                               "libcups.so",
-                               "libcups.so.1",
-                               "libcups.so.2",
-                               NULL };
+    return g_str_has_prefix(key, "PRN");
+}
 
-    if (printer_list)
-	g_free(printer_list);
+static void
+__init_cups(void)
+{
+    static GModule *cups = NULL;
+    const char *libcups[] = { "libcups", "libcups.so", "libcups.so.1", "libcups.so.2", NULL };
 
-    if (!(cupsGetPrinters && cupsGetDefault)) {
+    if (!(cupsGetDests && cupsFreeDests)) {
         int i;
         
         for (i = 0; libcups[i] != NULL; i++) {
             cups = g_module_open(libcups[i], G_MODULE_BIND_LAZY);
             if (cups)
-                break;
+                break; 
         }
         
         if (!cups) {
-	    printer_list = g_strdup("[Printers]\n"
-	                            "CUPS libraries cannot be found=");
+	    cups_init = FALSE;
 	    return;
 	}
 
-	if (!g_module_symbol(cups, "cupsGetPrinters", (gpointer) & cupsGetPrinters)
-	    || !g_module_symbol(cups, "cupsGetDefault", (gpointer) & cupsGetDefault)) {
-	    printer_list = g_strdup("[Printers]\n"
-                                    "No suitable CUPS library found=");
+	if (!g_module_symbol(cups, "cupsGetDests", (gpointer) & cupsGetDests)
+	    || !g_module_symbol(cups, "cupsFreeDests", (gpointer) & cupsFreeDests)) {
             g_module_close(cups);
-	    return;
+	    cups_init = FALSE;
 	}
     }
+    
+    cups_init = TRUE;
+}
 
-    gchar **printers;
-    int noprinters, i;
-    const char *default_printer;
+gchar *__cups_callback_state(gchar *value)
+{
+  if (g_str_equal(value, "3")) {
+    return g_strdup("Idle");
+  } else if (g_str_equal(value, "4")) {
+    return g_strdup("Printing a Job");
+  } else if (g_str_equal(value, "5")) {
+    return g_strdup("Stopped");
+  } else {
+    return g_strdup("Unknown");
+  }
+}
 
-    noprinters = cupsGetPrinters(&printers);
-    default_printer = cupsGetDefault();
-    
-    if (!default_printer) {
-        default_printer = "";
+gchar *__cups_callback_state_change_time(gchar *value)
+{
+  struct tm tm;
+  char buf[255];
+  
+  strptime(value, "%s", &tm);
+  strftime(buf, sizeof(buf), "%c", &tm);
+
+  return g_strdup(buf);
+}
+
+gchar *__cups_callback_boolean(gchar *value)
+{
+  return g_strdup(g_str_equal(value, "1") ? "Yes" : "No");
+}
+
+const struct {
+  char *key, *name;
+  gchar *(*callback)(gchar *value);
+} cups_fields[] = {
+  { "Printer Information", NULL, NULL },
+  { "printer-info", "Destination Name", NULL },
+  { "printer-make-and-model", "Make and Model", NULL },
+  
+  { "Printer State", NULL, NULL },
+  { "printer-state", "State", __cups_callback_state },
+  { "printer-state-change-time", "Change Time", __cups_callback_state_change_time },
+  { "printer-state-reasons", "State Reasons" },
+  
+  { "Sharing Information", NULL, NULL },
+  { "printer-is-shared", "Shared?", __cups_callback_boolean },
+  { "printer-location", "Physical Location" },
+  { "auth-info-required", "Authentication Required", __cups_callback_boolean },
+  
+  { "Jobs", NULL, NULL },
+  { "job-hold-until", "Hold Until", NULL },
+  { "job-priority", "Priority", NULL },
+  { "printer-is-accepting-jobs", "Accepting Jobs", __cups_callback_boolean },
+  
+  { "Media", NULL, NULL },
+  { "media", "Media", NULL },
+  { "finishings", "Finishings", NULL },
+  { "copies", "Copies", NULL },
+};
+
+void
+__scan_printers(void)
+{
+    int num_dests, i, j;
+    CUPSDest *dests;
+    gchar *prn_id, *prn_moreinfo;
+
+    if (printer_list) {
+	g_free(printer_list);
+    }
+
+    if (!cups_init) {
+        printer_list = g_strdup("[Printers]\n"
+                                "No suitable CUPS library found=");
     }
+
+    /* remove old devices from global device table */
+    g_hash_table_foreach_remove(moreinfo, remove_printer_devices, NULL);
+
+    num_dests = cupsGetDests(&dests);
     
-    if (noprinters > 0) {
+    if (num_dests > 0) {
 	printer_list = g_strdup_printf("[Printers (CUPS)]\n");
-	for (i = 0; i < noprinters; i++) {
-	    printer_list = h_strdup_cprintf("\n$PRN%d$%s=%s\n",
+	for (i = 0; i < num_dests; i++) {
+	    GHashTable *options;
+	    
+	    options = g_hash_table_new(g_str_hash, g_str_equal);
+	    
+	    for (j = 0; j < dests[i].num_options; j++) {
+	      g_hash_table_insert(options,
+	                          g_strdup(dests[i].options[j].name),
+	                          g_strdup(dests[i].options[j].value));
+	    }
+	
+            prn_id = g_strdup_printf("PRN%d", i);
+	
+	    printer_list = h_strdup_cprintf("\n$%s$%s=%s\n",
 					    printer_list,
-					    i,						
-					    printers[i],
-                                            g_str_equal(default_printer, printers[i]) ?
-				            "<i>(Default)</i>" : "");
-	    g_free(printers[i]);
+					    prn_id,						
+					    dests[i].name,
+					    dests[i].is_default ? "<i>Default</i>" : "");
+
+            prn_moreinfo = g_strdup("");
+            for (j = 0; j < G_N_ELEMENTS(cups_fields); j++) {
+              if (!cups_fields[j].name) {
+                prn_moreinfo = h_strdup_cprintf("[%s]\n",
+                                                prn_moreinfo,
+                                                cups_fields[j].key);
+              } else {
+                if (cups_fields[j].callback) {
+                  gchar *temp;
+                  
+                  temp = g_hash_table_lookup(options, cups_fields[j].key);
+                  temp = cups_fields[j].callback(temp);
+                
+                  prn_moreinfo = h_strdup_cprintf("%s=%s\n",
+                                                  prn_moreinfo,
+                                                  cups_fields[j].name,
+                                                  temp);
+                  
+                  g_free(temp);
+                } else {
+                  prn_moreinfo = h_strdup_cprintf("%s=%s\n",
+                                                  prn_moreinfo,
+                                                  cups_fields[j].name,
+                                                  g_hash_table_lookup(options, cups_fields[j].key));
+                }
+              }
+            }
+            
+            g_hash_table_insert(moreinfo, prn_id, prn_moreinfo);
+            g_hash_table_destroy(options);
 	}
 	
-	g_free(printers);
+	cupsFreeDests(num_dests, dests);
     } else {
 	printer_list = g_strdup("[Printers]\n"
 	                        "No printers found=\n");