Merge branch 'b-3.6.1' into mebil

[mfinanz.git] / SL / File / Backend / Filesystem.pm

diff --git a/SL/File/Backend/Filesystem.pm b/SL/File/Backend/Filesystem.pm
index 9daef35051dc2c27de954d2acd46a845e56bb505..758142bf3ef71bfb8d1dac8251b83f28d5f19653 100644 (file)
--- a/SL/File/Backend/Filesystem.pm
+++ b/SL/File/Backend/Filesystem.pm
@@ -6,6 +6,7 @@ use parent qw(SL::File::Backend);
 use SL::DB::File;
 use File::Copy;
 use File::Slurp;
 use SL::DB::File;
 use File::Copy;
 use File::Slurp;

+use File::stat;

 use File::Path qw(make_path);
 
 #
 use File::Path qw(make_path);
 
 #


@@ -66,6 +67,15 @@ sub save {
   die 'dbfile not exists' unless $params{dbfile};
   my $dbfile = $params{dbfile};
   die 'no file contents' unless $params{file_path} || $params{file_contents};
   die 'dbfile not exists' unless $params{dbfile};
   my $dbfile = $params{dbfile};
   die 'no file contents' unless $params{file_path} || $params{file_contents};

+
+  # Do not save and do not create a new version of the document if file size of last version is the same.
+  if ($dbfile->source eq 'created' && $self->get_version_count(dbfile => $dbfile)) {
+    my $new_file_size  = $params{file_path} ? stat($params{file_path})->size : length($params{file_contents});
+    my $last_file_size = stat($self->_filesystem_path($dbfile))->size;
+
+    return 1 if $last_file_size == $new_file_size;
+  }
+

   $dbfile->backend_data(0) unless $dbfile->backend_data;
   $dbfile->backend_data($dbfile->backend_data*1+1);
   $dbfile->save->load;
   $dbfile->backend_data(0) unless $dbfile->backend_data;
   $dbfile->backend_data($dbfile->backend_data*1+1);
   $dbfile->save->load;


@@ -88,7 +98,7 @@ sub save {
 sub get_version_count {
   my ($self, %params) = @_;
   die "no dbfile" unless $params{dbfile};
 sub get_version_count {
   my ($self, %params) = @_;
   die "no dbfile" unless $params{dbfile};

-  return $params{dbfile}->backend_data * 1;
+  return $params{dbfile}->backend_data//0 * 1;

 }
 
 sub get_mtime {
 }
 
 sub get_mtime {


@@ -100,8 +110,7 @@ sub get_mtime {
 
   die "No file found at $path. Expected: $params{dbfile}{file_name}, file.id: $params{dbfile}{id}" if !-f $path;
 
 
   die "No file found at $path. Expected: $params{dbfile}{file_name}, file.id: $params{dbfile}{id}" if !-f $path;
 

-  my @st = stat($path);
-  my $dt = DateTime->from_epoch(epoch => $st[9], time_zone => $::locale->get_local_time_zone()->name, locale => $::lx_office_conf{system}->{language})->clone();
+  my $dt = DateTime->from_epoch(epoch => stat($path)->mtime, time_zone => $::locale->get_local_time_zone()->name, locale => $::lx_office_conf{system}->{language})->clone();

   return $dt;
 }
 
   return $dt;
 }