Changeset 11628 for trunk

Timestamp:

11/11/08 13:50:56 (8 weeks ago)

Author:

juruen@…

Message:

+ Add support for external printers configured with CUPS

Location:

trunk/client

Files:

• printers (modified) (1 prop)
• printers/ChangeLog (modified) (1 diff)
• printers/migration/0002_support_external_printers.pl (copied) (copied from branches/juruen/fix-printers/printers/migration/0002_support_external_printers.pl)
• printers/migration/Makefile.am (modified) (1 diff)
• printers/src/EBox/Printers.pm (modified) (12 diffs)
• printers/stubs/printers.conf.mas (modified) (2 diffs)
• samba (modified) (1 prop)
• samba/src/EBox/Samba.pm (modified) (4 diffs)

trunk/client/printers/ChangeLog

@@ -1 @@
-0.12.99
-        + New release
+0.12.1
+        + Add support for external printers configured with CUPS 
 0.12
         + Bugfix: Create the `job` table when installing. This readds a

trunk/client/printers/migration/Makefile.am

@@ -3 +3 @@
 Migrationsdir = @DATADIR@/ebox-printers/migration
 
-nobase_Migrations_SCRIPTS = 0001_add_ipp_service.pl
+nobase_Migrations_SCRIPTS = 0001_add_ipp_service.pl 0002_support_external_printers.pl
 
 EXTRA_DIST = $(nobase_Migrations_SCRIPTS)

trunk/client/printers/src/EBox/Printers.pm

@@ -37 +37 @@
 use EBox::PrinterLogHelper;
 use Foomatic::DB;
+use HTML::Mason::Interp;
 use Net::CUPS::Destination;
 use Net::CUPS;
@@ -46 +47 @@
 use constant CUPSD              => '/etc/cups/cupsd.conf';
 use constant CUPSPPD            => '/etc/cups/ppd/';
-
+use constant START_TAG          => '# __EBOX__ TAG #';
+use constant END_TAG            => '# END __EBOX__ TAG #';
+        
 sub _create 
 {
@@ -166 +169 @@
 }
 
-sub _setCupsConf
+sub writeOldCupsConf
 {
         my $self = shift;
@@ -185 +188 @@
         }
 
-        my @array;
-        push(@array, 'printers' => \@conf);
-        $self->writeConfFile(CUPSPRINTERS, 'printers/printers.conf.mas', \@array);
+        $self->writeConfFile(CUPSPRINTERS, 
+                        'printers/printers.conf.mas', 
+                        ['printers' => \@conf]);
+
+}
+
+sub _setCupsConf
+{
+        my $self = shift;
+
+        $self->_mergeCupsConf();
 
         # Added configuration for standalone cups
@@ -195 +206 @@
             @internalIfaces = @{$net->InternalIfaces()};
         }
-        @array = ( standaloneCups => $self->isStandaloneCupsEnabled(),
+        my @array = ( standaloneCups => $self->isStandaloneCupsEnabled(),
                    ifaces => \@internalIfaces );
         $self->writeConfFile(CUPSD, 'printers/cupsd.conf.mas', \@array);
@@ -291 +302 @@
         my $db = new Foomatic::DB;
         my @makes = sort($db->get_makes());
+        # Add Raw
+        push (@makes, 'Raw');
         return \@makes;
 }
@@ -302 +315 @@
         my $manufacturer = $self->manufacturer($id);
         my @models = sort ($db->get_models_by_make($manufacturer));
+        push (@models, 'Raw');
         return \@models;
 }
@@ -327 +341 @@
         my $maker = $self->manufacturer($id);
         my $model = $self->model($id);
+        if ($maker eq 'Raw') {
+                return 'Raw';
+        }
         my $db = new Foomatic::DB;
         return $db->get_printer_from_make_model($maker, $model);
@@ -337 +354 @@
         
         my $printer = $self->_printerIdDriver($id);
-        
+        if ($printer eq 'Raw') {
+                return ['Raw'];
+        }
         my $db = new Foomatic::DB;
-        my @drivers = grep(! /^(gimp.*)|(hpdj)/, 
-                        $db->get_drivers_for_printer($printer));
+        #my @drivers = grep(! /^(gimp.*)|(hpdj)/, 
+        my @drivers = $db->get_drivers_for_printer($printer);
         if (@drivers) {
                 return \@drivers;       
@@ -921 +940 @@
 
         my $printerid = $self->_printerFromManuModel($manufacturer, $printer);
-        $printerid or return {};
+        $printerid or return [];
         
         my $db = new Foomatic::DB;
         my $dat = $db->getdat($driver, $printerid);
 
-        my @args = keys %{$dat->{args_byname}};
-        return \@args;
+        return [ keys %{$dat->{args_byname}} ];
 }
 
@@ -1092 +1110 @@
         
         my $printer = $self->model($id);
+        if ($printer eq 'Raw') {
+                return;
+        }
         my $manufacturer = $self->manufacturer($id);
         my $driver = $self->driver($id);
@@ -1300 +1321 @@
 }
 
+sub _mergeCupsConf
+{
+        my ($self) = @_;
+
+        my  $manager = new EBox::ServiceModule::Manager();
+        if ($manager->checkUserModifications()
+            and $manager->skipModification(
+                $self->serviceModuleName(), CUPSPRINTERS)) {
+            EBox::info('Skipping modification of ' . CUPSPRINTERS);
+            #return;
+        }
+
+        my %external = map {$_ => 1} @{$self->fetchExternalCUPSPrinters};
+        my @file;
+        if ( -f CUPSPRINTERS ) {
+                my $cmd = 'cat ' . CUPSPRINTERS;
+                @file = @{root($cmd)};
+        }
+        my $startTag = START_TAG; 
+        my $endTag = END_TAG;
+        
+        my @newFile;
+        my $copy = 1;
+        for my $line (@file) {
+                if ($line =~ /$startTag/) {
+                        $copy = undef;
+                } 
+                push (@newFile, $line) if ($copy);
+                if ((not $copy) and $line =~ /$endTag/) {
+                        $copy = 1;
+                }
+        }
+        
+        my $output;
+
+        my $interp = HTML::Mason::Interp->new(comp_root => 
+                                                EBox::Config::stubs,
+                                                out_method => \$output);
+        my $comp = $interp->make_component(
+                        comp_file => 
+                        EBox::Config::stubs() . 'printers/printers.conf.mas');
+        my @conf;
+        my @idprinters = $self->all_dirs("printers");
+        for my $dirid (@idprinters){
+                my $id = $dirid;
+                $id =~  s'.*/'';
+                unless ($self->_printerConfigured($id)){
+                        $self->removePrinter($id);
+                        next;
+                }
+                $self->_setDriverOptionsToFile($id);
+                my $printer = $self->_printerInfo($id);
+                next if (exists $external{$printer->{name}});
+                $printer->{location} = $self->_location($id);
+                push (@conf, $printer );
+        }
+
+
+        $interp->exec($comp, 'printers' => \@conf);
+
+        push (@newFile, $output);
+
+        my $file = EBox::Config::tmp() . '/printers.conf.tmp';
+        open (my $fd, ">$file");
+        print $fd @newFile;
+        root("cp $file " . CUPSPRINTERS);
+        close ($fd);
+
+        $manager->updateFileDigest($self->serviceModuleName(), CUPSPRINTERS);
+}
+
+# Method: fetchExternalCUPSPrinters
+#
+#       This method returns those printers that haven been configured
+#       by the user using CUPS and not our interface. 
+#
+# Returns:
+#
+#       Array ref - containing the printer names
+#
+sub fetchExternalCUPSPrinters
+{
+    my ($self) = @_;
+
+    my %eboxPrinters = map { $_->{name} => 1 } @{$self->printers()};
+
+        my $cups = Net::CUPS->new();
+
+        my @printers;
+        foreach my $printer ($cups->getDestinations())
+        {
+                my $name = $printer->getName();
+                push (@printers, $name) unless (exists $eboxPrinters{$name});
+        }
+        return \@printers;
+}
+
+
 # Method: enableStandaloneCups
 #

trunk/client/printers/stubs/printers.conf.mas

@@ -4 +4 @@
 <%init>
 use EBox::Gettext;
+use EBox::Printers;
 </%init>
-
+<% EBox::Printers::START_TAG %>
 % foreach my $printer (@printers) {
 <Printer <% $printer->{name} %>>
@@ -19 +20 @@
 </Printer>
 % }
+<% EBox::Printers::END_TAG %>

trunk/client/samba/src/EBox/Samba.pm

@@ -718 +718 @@
     }
     else {
-        EBox::error("The user has incomplete group memberships; to be administrator he must be both member of domain Admins and Administrators group");
-        return undef;
+        EBox::error("The user has incomplete group memberships; to be administrator he must be both member of domain Admins and Administrators group");                                                        
+        return undef; 
     }
 }
@@ -882 +882 @@
     $self->set_list("printers/$name/users", "string", []);
     $self->set_list("printers/$name/groups", "string", []);
-
+    $self->set_bool("printers/external", undef);
+
+}
+
+sub _addExternalPrinter
+{
+    my ($self, $name) = @_;
+    $self->set_list("printers/$name/users", "string", []);
+    $self->set_list("printers/$name/groups", "string", []);
+    $self->set_bool("printers/$name/external", 1);
 }
 
@@ -889 +898 @@
     my $self = shift;
 
+    my $printers = EBox::Global->modInstance('printers');
+    my %external = map { $_ => 1 } @{$printers->fetchExternalCUPSPrinters()};
     my @printers;
+    my $readOnly = $self->isReadOnly();
     for my $printer (@{$self->array_from_dir("printers")}) {
+        my $name = $printer->{_dir};
+        my $key = "printers/$name/external";
+        my $isExt = $self->get_bool($key);
+        if ($isExt and not exists $external{$name}) {
+            $self->delPrinter($name) unless ($readOnly);
+            $external{$name} = 'removed';
+        }  elsif ($isExt) {
+            $external{$name} = 'exists';
+        }
         push (@printers,  $printer->{'_dir'});
     }
 
-    return \@printers;
+    unless ($readOnly) {
+        for my $newPrinter (grep { $external{$_} == 1  } keys %external) {
+            $self->_addExternalPrinter($newPrinter);
+            push (@printers, $newPrinter);
+        }
+    }
+
+    return [sort @printers];
 }
 
@@ -970 +998 @@
 
     my @printers;
-    for my $printer (@{$self->array_from_dir("printers")}) {
-        my $name = $printer->{'_dir'};
+    for my $name (@{$self->printers()}) {
         my $print = {   'name' => $name, 'allowed' => undef };
-        my $users = $printer->{'users'};
+        my $users = $self->get_list("printers/$name/users");
         if (@{$users}) {
             $print->{'allowed'} = 1 if (grep(/^$user$/, @{$users}));