Merge branch 'issue378'

Author: Ian Walls

docker/Dockerfile

@@ -44,7 +44,9 @@ RUN install_packages \
     # Print uploads filetype detection
     shared-mime-info \
     # For cli access to the database
-    mariadb-client
+    mariadb-client \
+    # for https support in PDF conversion services
+    liblwp-protocol-https-perl
 
 RUN sed -i '/disable ghostscript format types/,+6d' /etc/ImageMagick-6/policy.xml
 

lib/Libki/Controller/Public.pm

@@ -5,6 +5,19 @@ use namespace::autoclean;
 
 use Libki::Utils::Printing;
 
+use LWP::UserAgent;
+use LWP::Protocol::https;
+use HTTP::Request;
+use HTTP::Request::Common;
+use Data::Dumper;
+
+{
+    package Libki::PDFAutoConvert;
+    sub filename      { shift->{_filename} }
+    sub type          { shift->{_type} }
+    sub decoded_slurp { shift->{_content} }
+}
+
 BEGIN {extends 'Catalyst::Controller'; }
 
 =head1 NAME
@@ -51,7 +64,8 @@ sub upload_print_file :Local :Args(0) {
     my $printer_id  = $c->req->params->{printer_id};
 
     my $mime = $print_file->mimetype;
-    my $ext = $print_file->extension;
+    my ($ext) = $print_file->filename =~ /\.([^.]+)$/;
+    $ext = lc $ext if defined $ext;
 
     if ( $mime eq "application/pdf" && $ext eq "pdf" ) {
         Libki::Utils::Printing::create_print_job_and_file( $c, {
@@ -64,6 +78,38 @@ sub upload_print_file :Local :Args(0) {
         } );
 
         $c->response->redirect( $c->uri_for('/public/printing') );
+    } elsif ($ext ~~ $c->get_printer_configuration->{'pdf_conversion_service'}->{'supported_extensions'} ) {
+        my $ua = LWP::UserAgent->new(timeout => 600);
+        my $service_url = $c->get_printer_configuration->{'pdf_conversion_service'}->{'service_url'};
+
+        my $request = HTTP::Request::Common::POST(
+            $service_url,
+            Content_Type => 'form-data',
+            Content      => [
+                file => [ $print_file->tempname, $print_file->filename, $print_file->type ]
+            ]
+        );
+        my $res = $ua->request($request);
+        if ($res->is_success) {
+            my $pdf_data = $res->decoded_content(charset => 'none');
+            my $converted_upload = bless {
+                _filename => $print_file->filename . ".pdf",
+                _type     => 'application/pdf',
+                _content  => $pdf_data,
+            }, 'Libki::PDFAutoConvert';
+            Libki::Utils::Printing::create_print_job_and_file( $c, {
+                client_name => Libki::Utils::Printing::PRINT_FROM_WEB,
+                copies      => 1,
+                print_file  => $converted_upload,
+                printer_id  => $printer_id,
+                user        => $user,
+                username    => $user->username,
+            } );
+            $c->response->redirect( $c->uri_for( '/public/printing', undef, { success => 'PDF_CONV_SUCCESS' } ));
+        } else {
+            $c->response->redirect( $c->uri_for( '/public/printing', undef, { error => 'PDF_CONV_ERROR' } ));
+            # print Dumper $res;
+        }
     } else {
         $c->response->redirect( $c->uri_for( '/public/printing', undef, { error => 'INVALID_FILETYPE' } ));
     }

root/dynamic/includes/index/printing.tt

@@ -1,20 +1,37 @@
 [%- SET public_print_release = c.get_printer_configuration.public_print_release %]
+[%- SET pdf_conversion_service = c.get_printer_configuration.pdf_conversion_service %]
 <div class="container">
     <div class="row">
         <div class="col">
             <fieldset class="">
                 <legend class="">[% c.loc("Upload file to print") %]</legend>
                 [% IF c.req.params.error == "INVALID_FILETYPE" %]
                     <div class="alert alert-danger" role="alert">
-                        [% c.loc('Filetype was invalid, file uploads must be PDF.') %]
+                        [% c.loc('Filetype was invalid; PDFs work best.') %]
                         [% c.loc('If your file is not a PDF, you may use a PDF printer such as <a target="_blank" class="alert-link" href="https://www.cutepdf.com/Products/CutePDF/writer.asp">CutePDF</a>,') %]
                         [% c.loc('or a <a target="_blank" class="alert-link" href="https://www.freepdfconvert.com/">web based PDF converter</a>.') %]
                     </div>
+                [% ELSIF c.req.params.success == "PDF_CONV_SUCCESS" %]
+                    <div class="alert alert-success" role="alert">
+                        [% c.loc('File successfully converted to PDF and ready to print!') %]
+                    </div>
+                [% ELSIF c.req.params.error == "PDF_CONV_ERROR" %]
+                    <div class="alert alert-danger" role="alert">
+                        [% c.loc('Something went wrong with the automatic PDF conversion process.') %]
+                    </div>
                 [% ELSE %]
+                    [% IF pdf_conversion_service %]
+                    <div class="alert alert-warning" role="alert">
+                        [% c.loc('<strong>PDFs work best</strong>; non-PDF printing is currently experimental.  Best of luck!') %]
+                        [% c.loc('Currently supporting: ') %]
+			[% c.get_printer_configuration.pdf_conversion_service.supported_extensions.join(", ") %].
+                    </div>
+                    [% ELSE %]
                     <div class="alert alert-info" role="alert">
                         [% c.loc('If your file is not a PDF, you may use a PDF printer such as <a target="_blank" class="alert-link" href="https://www.cutepdf.com/Products/CutePDF/writer.asp">CutePDF</a>,') %]
                         [% c.loc('or a <a target="_blank" class="alert-link" href="https://www.freepdfconvert.com/">web based PDF converter</a>.') %]
                     </div>
+                    [% END %]
                 [% END %]
                 <form action="[% c.uri_for('upload_print_file') %]" method="post" enctype="multipart/form-data">
                     <div class="form-group">
@@ -23,7 +40,7 @@
                                 <span class="input-group-text" id="inputGroupFileAddon01">[% c.loc("Upload") %]</span>
                             </div>
                             <div class="custom-file">
-                                <input type="file" accept="application/pdf" class="form-control custom-file-input" name="print_file" id="print_file"
+                                <input type="file" accept="application/pdf[% IF pdf_conversion_service %],.[% c.get_printer_configuration.pdf_conversion_service.supported_extensions.join(",.") %][% END %]" class="form-control custom-file-input" name="print_file" id="print_file"
                                     aria-describedby="inputGroupFileAddon01" required/>
                                 <label class="custom-file-label" for="inputGroupFile01">[% c.loc("Choose file") %]</label>
                             </div>