From b16cca8b3944c071a15ba57820804cfb6da9cbdb Mon Sep 17 00:00:00 2001 From: "Chuck Norris (mars.fritz.box)" Date: Thu, 28 Aug 2014 09:33:11 +0200 Subject: refactor --- Xerl/Tools/FileIO.pm | 58 ++++++++++++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 31 deletions(-) (limited to 'Xerl/Tools') diff --git a/Xerl/Tools/FileIO.pm b/Xerl/Tools/FileIO.pm index cd3e6bb..31d5c66 100644 --- a/Xerl/Tools/FileIO.pm +++ b/Xerl/Tools/FileIO.pm @@ -1,4 +1,4 @@ -# Xerl (c) 2005-2011, 2013 Dipl.-Inform. (FH) Paul C. Buetow +# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow # # E-Mail: xerl@dev.buetow.org WWW: http://xerl.buetow.org # @@ -15,9 +15,8 @@ use v5.14.0; use Xerl::Base; use Xerl::Main::Global; -sub dslurp($;$) { - my Xerl::Tools::FileIO $self = $_[0]; - +sub dslurp { + my $self = $_[0]; my $path = $self->get_path(); $path .= '/' unless $path =~ /\/$/; @@ -36,8 +35,8 @@ sub dslurp($;$) { return undef; } -sub fslurp($) { - my Xerl::Tools::FileIO $self = $_[0]; +sub fslurp { + my $self = $_[0]; my $path = _SECUREPATH( $self->get_path() ); unless ( -f $path ) { @@ -58,38 +57,36 @@ sub fslurp($) { return 0; } -sub exists($) { - my Xerl::Tools::FileIO $self = $_[0]; +sub exists { + my $self = $_[0]; my $path = _SECUREPATH( $self->get_path() ); return -e $path; } -sub fwrite($) { - my Xerl::Tools::FileIO $self = $_[0]; +sub fwrite { + my $self = $_[0]; $self->_fwrite(0); return undef; } -sub fwriteappend($) { - my Xerl::Tools::FileIO $self = $_[0]; - +sub fwriteappend { + my $self = $_[0]; $self->_fwrite(1); return undef; } -sub print($) { - my Xerl::Tools::FileIO $self = $_[0]; - +sub print { + my $self = $_[0]; print @{ $self->get_array() }; return undef; } -sub reverse_array($) { - my Xerl::Tools::FileIO $self = $_[0]; +sub reverse_array { + my $self = $_[0]; my @array = reverse @{ $self->get_array() }; $self->set_array( \@array ); @@ -97,37 +94,37 @@ sub reverse_array($) { return undef; } -sub merge($$) { - my Xerl::Tools::FileIO( $self, $other ) = @_; +sub merge { + my ($self, $other) = @_; my @merged = ( @{ $self->get_array() }, @{ $other->get_array() } ); - my Xerl::Tools::FileIO $fio = Xerl::Tools::FileIO->new(); - + my $fio = Xerl::Tools::FileIO->new(); $fio->set_array( \@merged ); + return $fio; } -sub shift($) { - my Xerl::Tools::FileIO $self = $_[0]; +sub shift { + my $self = $_[0]; chomp( my $shift = shift @{ $self->get_array() } ); return $shift; } -sub pop($) { - my Xerl::Tools::FileIO $self = $_[0]; +sub pop { + my $self = $_[0]; chomp( my $pop = pop @{ $self->get_array() } ); return $pop; } -sub str($) { - my Xerl::Tools::FileIO $self = $_[0]; +sub str { + my $self = $_[0]; return join '', @{ $self->get_array() }; } -sub _fwrite($;$) { - my Xerl::Tools::FileIO $self = $_[0]; +sub _fwrite { + my $self = $_[0]; my $append = $_[1]; my ( $path, $filename ) = @@ -164,7 +161,6 @@ use overload '+' => \&merge; sub _SECUREPATH($) { my $path = $_[0]; - $path =~ s/\.\.+\/?//g; return $path; -- cgit v1.2.3 From 11b1896cf142b490323a91b04344a20e7a25c9f4 Mon Sep 17 00:00:00 2001 From: "Chuck Norris (mars.fritz.box)" Date: Thu, 28 Aug 2014 09:36:37 +0200 Subject: un perltig --- Xerl/Tools/FileIO.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Xerl/Tools') diff --git a/Xerl/Tools/FileIO.pm b/Xerl/Tools/FileIO.pm index 31d5c66..63e2b86 100644 --- a/Xerl/Tools/FileIO.pm +++ b/Xerl/Tools/FileIO.pm @@ -95,7 +95,7 @@ sub reverse_array { } sub merge { - my ($self, $other) = @_; + my ( $self, $other ) = @_; my @merged = ( @{ $self->get_array() }, @{ $other->get_array() } ); my $fio = Xerl::Tools::FileIO->new(); @@ -124,7 +124,7 @@ sub str { } sub _fwrite { - my $self = $_[0]; + my $self = $_[0]; my $append = $_[1]; my ( $path, $filename ) = -- cgit v1.2.3 From 6dd2e1db76e167693f62027bab9a04857b693980 Mon Sep 17 00:00:00 2001 From: "Paul Buetow (europa)" Date: Sun, 31 May 2015 16:57:05 +0100 Subject: use https --- Xerl/Tools/FileIO.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Xerl/Tools') diff --git a/Xerl/Tools/FileIO.pm b/Xerl/Tools/FileIO.pm index 63e2b86..a3d21d5 100644 --- a/Xerl/Tools/FileIO.pm +++ b/Xerl/Tools/FileIO.pm @@ -1,6 +1,6 @@ # Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow # -# E-Mail: xerl@dev.buetow.org WWW: http://xerl.buetow.org +# E-Mail: xerl@dev.buetow.org WWW: https://xerl.buetow.org # # This is free software, you may use it and distribute it under the same # terms as Perl itself. -- cgit v1.2.3 From 2103e642583ad50c06c66025ffa10b790e0cfea8 Mon Sep 17 00:00:00 2001 From: "Paul Buetow (europa)" Date: Sun, 31 May 2015 16:58:10 +0100 Subject: Add 2015 --- Xerl/Tools/FileIO.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Xerl/Tools') diff --git a/Xerl/Tools/FileIO.pm b/Xerl/Tools/FileIO.pm index a3d21d5..45eb64b 100644 --- a/Xerl/Tools/FileIO.pm +++ b/Xerl/Tools/FileIO.pm @@ -1,4 +1,4 @@ -# Xerl (c) 2005-2011, 2013, 2014 by Paul Buetow +# Xerl (c) 2005-2011, 2013-2015 by Paul Buetow # # E-Mail: xerl@dev.buetow.org WWW: https://xerl.buetow.org # -- cgit v1.2.3