From 0ad9546c81f6f59bb8cd0df50e4d8a778697f7da Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20B=C3=BCren?= Date: Tue, 23 Nov 2021 12:20:36 +0100 Subject: [PATCH] get_webdav: Zeitstempel vor dem letzten . setzen und nicht aus der Nummer und anderen Infos zusammenbauen --- SL/File/Backend/Webdav.pm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/SL/File/Backend/Webdav.pm b/SL/File/Backend/Webdav.pm index b1e48edf9..c457080af 100644 --- a/SL/File/Backend/Webdav.pm +++ b/SL/File/Backend/Webdav.pm @@ -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); -- 2.20.1