- Added some more archive types

[devedit.git] / modules / Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index 95b64dd8e9fa7293ff9ebca5ec7bd22729cda050..49f255b95c0ee0ef9fa14c96a3802b94b1aa274e 100644 (file)
--- a/modules/Tool.pm
+++ b/modules/Tool.pm
@@ -6,7 +6,7 @@ package Tool;
 # Some shared sub routines
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
 # Some shared sub routines
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>

-# Last modified: 2010-12-23
+# Last modified: 2011-01-05

 #
 # Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann
 # Copyright (C) 2003-2009 Patrick Canterino
 #
 # Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann
 # Copyright (C) 2003-2009 Patrick Canterino


@@ -40,12 +40,18 @@ use base qw(Exporter);
              encode_html
              equal_url
              file_name
              encode_html
              equal_url
              file_name

+             is_archive

              in_array
              is_disabled_command
              is_forbidden_file
              mode_string
              multi_string
              upper_path);
              in_array
              is_disabled_command
              is_forbidden_file
              mode_string
              multi_string
              upper_path);

+             
+my @archive_exts = ('.zip',     '.tar', '.gz',
+                    '.tar.gz',  '.tgz', '.bz2',
+                    '.tar.bz2', '.tbz', '.tbz2',
+                    '.Z');

 
 # check_path()
 #
 
 # check_path()
 #


@@ -287,8 +293,27 @@ sub in_array($$)
   return 1 if($string eq $element);
  }
 
   return 1 if($string eq $element);
  }
 

- #foreach
+ return;
+}
+
+# is_archive()
+#
+# Check if a file is an archive
+# (currently only by file extension)
+#
+# Params: Archive file name
+#
+# Return: Status code (Boolean)

 
 

+sub is_archive($)
+{
+ my $file = shift;
+ 
+ foreach my $ext(@archive_exts)
+ {
+  return 1 if(lc(substr($file,length($file)-length($ext),length($ext))) eq lc($ext));
+ }
+ 

  return;
 }
 
  return;
 }
 


@@ -308,7 +333,7 @@ sub is_disabled_command($$)
 
  foreach my $entry(@$list)
  {
 
  foreach my $entry(@$list)
  {

-  return 1 if(uc($command) eq uc($entry));
+  return 1 if(lc($command) eq lc($entry));

  }
 
  return;
  }
 
  return;