Jonathan Druart
9d6d641d1f
On bug 17591 we discovered that there was something weird going on with the way we export and use subroutines/modules. This patch tries to standardize our EXPORT to use EXPORT_OK only. That way we will need to explicitely define the subroutine we want to use from a module. This patch is a squashed version of: Bug 17600: After export.pl Bug 17600: After perlimport Bug 17600: Manual changes Bug 17600: Other manual changes after second perlimports run Bug 17600: Fix tests And a lot of other manual changes. export.pl is a dirty script that can be found on bug 17600. "perlimport" is: git clone https://github.com/oalders/App-perlimports.git cd App-perlimports/ cpanm --installdeps . export PERL5LIB="$PERL5LIB:/kohadevbox/koha/App-perlimports/lib" find . \( -name "*.pl" -o -name "*.pm" \) -exec perl App-perlimports/script/perlimports --inplace-edit --no-preserve-unused --filename {} \; The ideas of this patch are to: * use EXPORT_OK instead of EXPORT * perltidy the EXPORT_OK list * remove '&' before the subroutine names * remove some uneeded use statements * explicitely import the subroutines we need within the controllers or modules Note that the private subroutines (starting with _) should not be exported (and not used from outside of the module except from tests). EXPORT vs EXPORT_OK (from https://www.thegeekstuff.com/2010/06/perl-exporter-examples/) """ Export allows to export the functions and variables of modules to user’s namespace using the standard import method. This way, we don’t need to create the objects for the modules to access it’s members. @EXPORT and @EXPORT_OK are the two main variables used during export operation. @EXPORT contains list of symbols (subroutines and variables) of the module to be exported into the caller namespace. @EXPORT_OK does export of symbols on demand basis. """ If this patch caused a conflict with a patch you wrote prior to its push: * Make sure you are not reintroducing a "use" statement that has been removed * "$subroutine" is not exported by the C4::$MODULE module means that you need to add the subroutine to the @EXPORT_OK list * Bareword "$subroutine" not allowed while "strict subs" means that you didn't imported the subroutine from the module: - use $MODULE qw( $subroutine list ); You can also use the fully qualified namespace: C4::$MODULE::$subroutine Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
209 lines
5.3 KiB
Perl
209 lines
5.3 KiB
Perl
package Koha::UploadedFiles;
|
|
|
|
# Copyright Rijksmuseum 2016
|
|
#
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
|
|
use C4::Koha qw( GetAuthorisedValues );
|
|
use Koha::Database;
|
|
use Koha::DateUtils qw( dt_from_string );
|
|
use Koha::UploadedFile;
|
|
|
|
use parent qw(Koha::Objects);
|
|
|
|
=head1 NAME
|
|
|
|
Koha::UploadedFiles - Koha::Objects class for uploaded files
|
|
|
|
=head1 SYNOPSIS
|
|
|
|
use Koha::UploadedFiles;
|
|
|
|
# get one upload
|
|
my $upload01 = Koha::UploadedFiles->find( $id );
|
|
|
|
# get some uploads
|
|
my @uploads = Koha::UploadedFiles->search_term({ term => '.mrc' });
|
|
|
|
# delete all uploads
|
|
Koha::UploadedFiles->delete;
|
|
|
|
=head1 DESCRIPTION
|
|
|
|
Allows regular CRUD operations on uploaded_files via Koha::Objects / DBIx.
|
|
|
|
The delete method also takes care of deleting files. The search_term method
|
|
provides a wrapper around search to look for a term in multiple columns.
|
|
|
|
=head1 METHODS
|
|
|
|
=head2 INSTANCE METHODS
|
|
|
|
=head3 delete
|
|
|
|
Delete uploaded files.
|
|
|
|
Parameter keep_file may be used to delete records, but keep files.
|
|
|
|
Returns the number of deleted records, 0E0 or -1 (Unknown).
|
|
Please note that the number of deleted records is not automatically the same
|
|
as the number of files.
|
|
|
|
=cut
|
|
|
|
sub delete {
|
|
my ( $self, $params ) = @_;
|
|
$self = Koha::UploadedFiles->new if !ref($self); # handle class call
|
|
# We use the individual delete on each resultset record
|
|
my $rv = 0;
|
|
while( my $row = $self->next ) {
|
|
my $deleted = eval { $row->delete( $params ) };
|
|
$rv++ if $deleted && !$@;
|
|
}
|
|
return $rv==0 ? "0E0" : $rv;
|
|
}
|
|
|
|
=head3 delete_temporary
|
|
|
|
Delete_temporary is called by cleanup_database and only removes temporary
|
|
uploads older than [pref UploadPurgeTemporaryFilesDays] days.
|
|
It is possible to override the pref with the override_pref parameter.
|
|
|
|
Return value: see delete.
|
|
|
|
=cut
|
|
|
|
sub delete_temporary {
|
|
my ( $self, $params ) = @_;
|
|
my $days = C4::Context->preference('UploadPurgeTemporaryFilesDays');
|
|
if( exists $params->{override_pref} ) {
|
|
$days = $params->{override_pref};
|
|
} elsif( !defined($days) || $days eq '' ) { # allow 0, not NULL or ""
|
|
return "0E0";
|
|
}
|
|
my $dt = dt_from_string();
|
|
$dt->subtract( days => $days );
|
|
my $parser = Koha::Database->new->schema->storage->datetime_parser;
|
|
return $self->search({
|
|
permanent => [ undef, 0 ],
|
|
dtcreated => { '<' => $parser->format_datetime($dt) },
|
|
})->delete;
|
|
}
|
|
|
|
=head3 delete_missing
|
|
|
|
$cnt = Koha::UploadedFiles->delete_missing();
|
|
|
|
$cnt = Koha::UploadedFiles->delete_missing({ keep_record => 1 });
|
|
|
|
Deletes all records where the actual file is not found.
|
|
|
|
Supports a keep_record hash parameter to do a check only.
|
|
|
|
Return value: If you pass keep_record, it returns the number of records where
|
|
the file is not found, or 0E0. Otherwise it returns a number, 0E0 or -1 just
|
|
as delete does.
|
|
|
|
=cut
|
|
|
|
sub delete_missing {
|
|
my ( $self, $params ) = @_;
|
|
$self = Koha::UploadedFiles->new if !ref($self); # handle class call
|
|
my $rv = 0;
|
|
while( my $row = $self->next ) {
|
|
my $file = $row->full_path;
|
|
next if -e $file;
|
|
if( $params->{keep_record} ) {
|
|
$rv++;
|
|
next;
|
|
}
|
|
# We are passing keep_file since we already know that the file
|
|
# is missing and we do not want to see the warning
|
|
# Apply the same logic as in delete for the return value
|
|
my $deleted = eval { $row->delete({ keep_file => 1 }) };
|
|
$rv++ if $deleted && !$@;
|
|
}
|
|
return $rv==0 ? "0E0" : $rv;
|
|
}
|
|
|
|
=head3 search_term
|
|
|
|
Search_term allows you to pass a term to search in filename and hashvalue.
|
|
If you do not pass include_private, only public records are returned.
|
|
|
|
Is only a wrapper around Koha::Objects search. Has similar return value.
|
|
|
|
=cut
|
|
|
|
sub search_term {
|
|
my ( $self, $params ) = @_;
|
|
my $term = $params->{term} // '';
|
|
my %public = ();
|
|
if( !$params->{include_private} ) {
|
|
%public = ( public => 1 );
|
|
}
|
|
return $self->search(
|
|
[ { filename => { like => '%'.$term.'%' }, %public },
|
|
{ hashvalue => { like => '%'.$params->{term}.'%' }, %public } ],
|
|
{ order_by => { -asc => 'id' }},
|
|
);
|
|
}
|
|
|
|
=head2 CLASS METHODS
|
|
|
|
=head3 getCategories
|
|
|
|
getCategories returns a list of upload category codes and names
|
|
|
|
=cut
|
|
|
|
sub getCategories {
|
|
my ( $class ) = @_;
|
|
my $cats = C4::Koha::GetAuthorisedValues('UPLOAD');
|
|
[ map {{ code => $_->{authorised_value}, name => $_->{lib} }} @$cats ];
|
|
}
|
|
|
|
=head3 _type
|
|
|
|
Returns name of corresponding DBIC resultset
|
|
|
|
=cut
|
|
|
|
sub _type {
|
|
return 'UploadedFile';
|
|
}
|
|
|
|
=head3 object_class
|
|
|
|
Returns name of corresponding Koha object class
|
|
|
|
=cut
|
|
|
|
sub object_class {
|
|
return 'Koha::UploadedFile';
|
|
}
|
|
|
|
=head1 AUTHOR
|
|
|
|
Marcel de Rooy (Rijksmuseum)
|
|
|
|
Koha Development Team
|
|
|
|
=cut
|
|
|
|
1;
|