X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/8fa22ab8c145eea28132f24500b2af3b7853c450..d32410ac096b:/SL/File/Backend/Webdav.pm?ds=sidebyside

diff --git a/SL/File/Backend/Webdav.pm b/SL/File/Backend/Webdav.pm
index 0e9525e05..c457080af 100644
--- a/SL/File/Backend/Webdav.pm
+++ b/SL/File/Backend/Webdav.pm
@@ -73,7 +73,7 @@ sub get_mtime {
   die "no dbfile" unless $params{dbfile};
   $main::lxdebug->message(LXDebug->DEBUG2(), "version=" .$params{version});
   my ($path, undef, undef) = $self->webdav_path($params{dbfile});
-  die "no file found in backend" if !-f $path;
+  die "No file found in Backend: " . $path unless -f $path;
   my @st = stat($path);
   my $dt = DateTime->from_epoch(epoch => $st[9])->clone();
   $main::lxdebug->message(LXDebug->DEBUG2(), "dt=" .$dt);
@@ -84,7 +84,7 @@ sub get_filepath {
   my ($self, %params) = @_;
   die "no dbfile" unless $params{dbfile};
   my ($path, undef, undef) = $self->webdav_path($params{dbfile});
-  die "Path not found: " . $path unless -f $path;
+  die "No file found in Backend: " . $path unless -f $path;
   return $path;
 }
 
@@ -186,18 +186,17 @@ sub webdav_path {
   }
   $main::lxdebug->message(LXDebug->DEBUG2(), "file_name=" . $dbfile->file_name ." number=".$number);
 
-  my @fileparts = split(/_/, $dbfile->file_name);
-  my $number_ext = pop @fileparts;
-  my ($maynumber, $ext) = split(/\./, $number_ext, 2);
-  push @fileparts, $maynumber if $maynumber ne $number;
-
-  my $basename = join('_', @fileparts);
-
   my $path = File::Spec->catdir($self->get_rootdir, "webdav", $::auth->client->{id}, $type, $number);
   if (!-d $path) {
     File::Path::make_path($path, { chmod => 0770 });
   }
-  my $fname = $basename . '_' . $number . '_' . $dbfile->itime->strftime('%Y%m%d_%H%M%S');
+  # simply add the timestring before the last .
+  # fails for .tar.gz but the number extraction algorithm failed for all
+  # '123 Storno zu 456' cases and doubled the name like:
+  # Rechnung_123_Storno_zu_456_202113104 Storno zu 456_20211123_113023
+  # TODO extension should be part of the File Model (filetype)
+  my ($filename, $ext) = split(/\.([^\.]+)$/, $dbfile->file_name);
+  my $fname = $filename . '_' . $dbfile->itime->strftime('%Y%m%d_%H%M%S');
   $fname .= '.' . $ext if $ext;
 
   $main::lxdebug->message(LXDebug->DEBUG2(), "webdav path=" . $path . " filename=" . $fname);