X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FFile.pm;h=25c6d96c1505161083ca14fda253d879f31172d6;hb=e655480e81e8373a08456ac6dc664195a8503573;hp=231e0622f8d184aff6c773c885921eeee795a86a;hpb=2bb452ee62e74c2a42113171eeb53de8d09bbbf5;p=kivitendo-erp.git diff --git a/SL/File.pm b/SL/File.pm index 231e0622f..25c6d96c1 100644 --- a/SL/File.pm +++ b/SL/File.pm @@ -4,12 +4,13 @@ use strict; use parent qw(Rose::Object); -use Clone qw(clone); use SL::File::Backend; use SL::File::Object; use SL::DB::History; +use SL::DB::ShopImage; use SL::DB::File; use SL::Helper::UserPreferences; +use SL::Controller::Helper::ThumbnailCreator qw(file_probe_type); use SL::JSON; use constant RENAME_OK => 0; @@ -70,12 +71,13 @@ sub get_all_versions { foreach my $fileobj (@fileobjs) { $main::lxdebug->message(LXDebug->DEBUG2(), "obj=" . $fileobj . " id=" . $fileobj->id." versions=".$fileobj->version_count); my $maxversion = $fileobj->version_count; + $fileobj->version($maxversion); push @versionobjs, $fileobj; if ($maxversion > 1) { for my $version (2..$maxversion) { $main::lxdebug->message(LXDebug->DEBUG2(), "clone for version=".($maxversion-$version+1)); eval { - my $clone = clone($fileobj); + my $clone = $fileobj->clone; $clone->version($maxversion-$version+1); $clone->newest(0); $main::lxdebug->message(LXDebug->DEBUG2(), "clone version=".$clone->version." mtime=". $clone->mtime); @@ -122,12 +124,12 @@ sub delete_all { sub delete { my ($self, %params) = @_; - die "no id or dbfile" unless $params{id} || $params{dbfile}; - my $rc = SL::DB->client->with_transaction(\&_delete, $self, %params); - if (!$rc) { - my $err = SL::DB->client->error; - die (ref $err?$$err:$err); - } + die "no id or dbfile in delete" unless $params{id} || $params{dbfile}; + my $rc = 0; + eval { + $rc = SL::DB->client->with_transaction(\&_delete, $self, %params); + 1; + } or do { die $@ }; return $rc; } @@ -149,7 +151,7 @@ sub _delete { if ($hist) { if (!$main::auth->assert('import_ar | import_ap', 1)) { - die \'no permission to unimport'; + die 'no permission to unimport'; } my $file = $backend->get_filepath(dbfile => $params{dbfile}); $main::lxdebug->message(LXDebug->DEBUG2(), "del file=" . $file . " to=" . $hist->snumbers); @@ -160,8 +162,8 @@ sub _delete { } if ($backend->delete(%params)) { my $do_delete = 0; - if ( $params{last} || $params{all_but_notlast} ) { - if ( $backend->get_version_count > 0 ) { + if ( $params{last} || $params{version} || $params{all_but_notlast} ) { + if ( $backend->get_version_count(%params) > 0 ) { $params{dbfile}->mtime(DateTime->now_local); $params{dbfile}->save; } else { @@ -179,11 +181,11 @@ sub _delete { sub save { my ($self, %params) = @_; - my $obj = SL::DB->client->with_transaction(\&_save, $self, %params); - if (!$obj) { - my $err = SL::DB->client->error; - die (ref $err?$$err:$err); - } + my $obj; + eval { + $obj = SL::DB->client->with_transaction(\&_save, $self, %params); + 1; + } or do { die $@ }; return $obj; } @@ -194,11 +196,11 @@ sub _save { if ($params{id}) { $file = SL::DB::File->new(id => $params{id})->load; - die \'dbfile not exists' unless $file; + die 'dbfile not exists' unless $file; } elsif (!$file) { $main::lxdebug->message(LXDebug->DEBUG2(), "obj_id=" .$params{object_id}); - die \'no object type set' unless $params{object_type}; - die \'no object id set' unless defined($params{object_id}); + die 'no object type set' unless $params{object_type}; + die 'no object id set' unless defined($params{object_id}); $exists = $self->get_all_count(%params); die 'filename still exist' if $exists && $params{fail_if_exists}; @@ -217,6 +219,8 @@ sub _save { title => $params{title}, description => $params{description}, ); + $file->itime($params{mtime}) if $params{mtime}; + $params{itime} = $params{mtime} if $params{mtime}; } } else { $exists = 1; @@ -233,13 +237,30 @@ sub _save { # load itime for new file $file->save->load; } - $main::lxdebug->message(LXDebug->DEBUG2(), "backend3=" .$file->backend); + + $file->mtime(DateTime->now_local) unless $params{mtime}; + $file->mtime($params{mtime} ) if $params{mtime}; + my $backend = $self->_get_backend($file->backend); $params{dbfile} = $file; $backend->save(%params); - $file->mtime(DateTime->now_local); $file->save; + #ShopImage + if($file->object_type eq "shop_image"){ + my $image_content = $params{file_contents}; + my $thumbnail = file_probe_type($image_content); + my $shopimage = SL::DB::ShopImage->new(); + $shopimage->assign_attributes( + file_id => $file->id, + thumbnail_content => $thumbnail->{thumbnail_img_content}, + org_file_height => $thumbnail->{file_image_height}, + org_file_width => $thumbnail->{file_image_width}, + thumbnail_content_type => $thumbnail->{thumbnail_img_content_type}, + object_id => $file->object_id, + ); + $shopimage->save; + } if ($params{file_type} eq 'document' && $params{source} ne 'created') { SL::DB::History->new( addition => 'IMPORT', @@ -307,7 +328,7 @@ sub sync_from_backend { return unless $params{file_type}; my $file = SL::DB::File->new; $file->file_type($params{file_type}); - my $backend = $self->_get_backend(dbfile => $file->backend); + my $backend = $self->_get_backend($self->_get_backend_by_file_type($file)); return unless $backend; $backend->sync_from_backend(%params); } @@ -319,13 +340,18 @@ sub _get_backend { my ($self, $backend_name) = @_; my $class = 'SL::File::Backend::' . $backend_name; my $obj = undef; + die $::locale->text('no backend enabled') if $backend_name eq 'None'; eval { eval "require $class"; $obj = $class->new; - die \'backend not enabled' unless $obj->enabled; + die $::locale->text('backend "#1" not enabled',$backend_name) unless $obj->enabled; 1; } or do { - die \'backend class not found'; + if ( $obj ) { + die $@; + } else { + die $::locale->text('backend "#1" not found',$backend_name); + } }; return $obj; } @@ -356,7 +382,7 @@ SL::File - The intermediate Layer for handling files =head1 SYNOPSIS # In a controller or helper ( see SL::Controller::File or SL::Helper::File ) - # you can create, remove, delete etc. a file in a backend independant way + # you can create, remove, delete etc. a file in a backend independent way my $file = SL::File->save( object_id => $self->object_id, @@ -384,7 +410,7 @@ SL::File - The intermediate Layer for handling files =head1 OVERVIEW -The Filemanagemt can handle files in a storage independant way. Internal the File +The Filemanagemt can handle files in a storage independent way. Internal the File use the configured storage backend for the type of file. These backends must be configured in L or an extra database table. @@ -704,4 +730,3 @@ The synchronization is done file_type by file_type. Martin Helmling Emartin.helmling@opendynamic.deE =cut -