MT940: Multi-Line-Varianten von Tag 86 unterstützen

[mfinanz.git] / SL / Controller / File.pm

diff --git a/SL/Controller/File.pm b/SL/Controller/File.pm
index 1429912c8af7fb4b059e983229a84c19663cb3e7..1a244f018054e9e41d8120fbfe41eabdc12fc386 100644 (file)
--- a/SL/Controller/File.pm
+++ b/SL/Controller/File.pm
@@ -17,6 +17,7 @@ use File::Slurp qw(slurp);
 use File::Spec::Unix;
 use File::Spec::Win32;
 use File::MimeInfo::Magic;
 use File::Spec::Unix;
 use File::Spec::Win32;
 use File::MimeInfo::Magic;

+use MIME::Base64;

 use SL::DB::Helper::Mappings;
 use SL::DB::Order;
 use SL::DB::DeliveryOrder;
 use SL::DB::Helper::Mappings;
 use SL::DB::Order;
 use SL::DB::DeliveryOrder;


@@ -298,7 +299,10 @@ sub action_ajax_files_uploaded {
 
 sub action_download {
   my ($self) = @_;
 
 sub action_download {
   my ($self) = @_;

-  my ($id, $version) = split /_/, $::form->{id};
+
+  my $id      = $::form->{id};
+  my $version = $::form->{version};
+

   my $file = SL::File->get(id => $id );
   $file->version($version) if $version;
   my $ref  = $file->get_content;
   my $file = SL::File->get(id => $id );
   $file->version($version) if $version;
   my $ref  = $file->get_content;


@@ -310,6 +314,20 @@ sub action_download {
   }
 }
 
   }
 }
 

+sub action_ajax_get_thumbnail {
+  my ($self) = @_;
+
+  my $file      = SL::File->get(id => $::form->{file_id});
+  my $thumbnail = _create_thumbnail($file, $::form->{size});
+
+  my $overlay_selector = '#enlarged_thumb_' . $::form->{file_id};
+  $self->js
+    ->attr($overlay_selector, 'src', 'data:' . $thumbnail->{thumbnail_img_content_type} . ';base64,' . MIME::Base64::encode_base64($thumbnail->{thumbnail_img_content}))
+    ->data($overlay_selector, 'is-overlay-loaded', '1')
+    ->render;
+}
+
+

 #
 # filters
 #
 #
 # filters
 #


@@ -381,7 +399,7 @@ sub _do_list {
   if ( $self->file_type eq 'document' ) {
     my @object_types;
     push @object_types, $self->object_type;
   if ( $self->file_type eq 'document' ) {
     my @object_types;
     push @object_types, $self->object_type;

-    push @object_types, qw(dunning dunning1 dunning2 dunning3) if $self->object_type eq 'invoice'; # hardcoded object types?
+    push @object_types, qw(dunning dunning1 dunning2 dunning3 dunning_orig_invoice) if $self->object_type eq 'invoice'; # hardcoded object types?

     @files = SL::File->get_all_versions(object_id   => $self->object_id,
                                         object_type => \@object_types,
                                         file_type   => $self->file_type,
     @files = SL::File->get_all_versions(object_id   => $self->object_id,
                                         object_type => \@object_types,
                                         file_type   => $self->file_type,


@@ -609,7 +627,9 @@ sub _get_sources {
 # ignores all errros
 # todo: cache thumbs?
 sub _create_thumbnail {
 # ignores all errros
 # todo: cache thumbs?
 sub _create_thumbnail {

-  my ($file) = @_;
+  my ($file, $size) = @_;
+
+  $size //= 64;

 
   my $filename;
   if (!eval { $filename = $file->get_file(); 1; }) {
 
   my $filename;
   if (!eval { $filename = $file->get_file(); 1; }) {


@@ -621,7 +641,7 @@ sub _create_thumbnail {
   # Maybe use mime info stored in db?
   my $mime_type = File::MimeInfo::Magic::magic($filename);
   if ($mime_type =~ m{pdf}) {
   # Maybe use mime info stored in db?
   my $mime_type = File::MimeInfo::Magic::magic($filename);
   if ($mime_type =~ m{pdf}) {

-    $filename = _convert_pdf_to_png($filename);
+    $filename = _convert_pdf_to_png($filename, size => $size);

   }
   return if !$filename;
 
   }
   return if !$filename;
 


@@ -632,7 +652,7 @@ sub _create_thumbnail {
   }
 
   my $ret;
   }
 
   my $ret;

-  if (!eval { $ret = file_probe_type($content); 1; }) {
+  if (!eval { $ret = file_probe_type($content, size => $size); 1; }) {

     $::lxdebug->message(LXDebug::WARN(), "SL::File::_create_thumbnail file_probe_type failed: " . $EVAL_ERROR);
     return;
   }
     $::lxdebug->message(LXDebug::WARN(), "SL::File::_create_thumbnail file_probe_type failed: " . $EVAL_ERROR);
     return;
   }


@@ -648,11 +668,11 @@ sub _create_thumbnail {
 }
 
 sub _convert_pdf_to_png {
 }
 
 sub _convert_pdf_to_png {

-  my ($filename) = @_;
-
-  my $sfile = SL::SessionFile::Random->new();
+  my ($filename, %params) = @_;

 
 

-  my $command = 'pdftoppm -singlefile -scale-to 64 -png' . ' ' . $filename . ' ' . $sfile->file_name;
+  my $size    = $params{size} // 64;
+  my $sfile   = SL::SessionFile::Random->new();
+  my $command = 'pdftoppm -singlefile -scale-to ' . $size . ' -png' . ' ' . $filename . ' ' . $sfile->file_name;

 
   if (system($command) == -1) {
     $::lxdebug->message(LXDebug::WARN(), "SL::File::_convert_pdf_to_png: system call failed: " . $ERRNO);
 
   if (system($command) == -1) {
     $::lxdebug->message(LXDebug::WARN(), "SL::File::_convert_pdf_to_png: system call failed: " . $ERRNO);