Changeset 18319 for gsdl/trunk/perllib/util.pm

Timestamp:

2009-01-06T18:40:53+13:00 (15 years ago)

Author:

ak19

Message:

Now plugins provide the option of base64 encoding or url encoding filenames that are to be renamed (when copied into the archives dir). Previously renamed files would always be url-encoded. URL-encoding is the default now for most plugins except MP3Plugin and OggVorbisPlugin, where the default is base64 encoding. Base64 encoding filenames upon renaming them was introduced so that more files that browsers try to open in external applications can open them, since url encoding does not seem to be implemented the same everywhere (for instance, windows media player is unable to handle url-encoded wmv filenames when such files are launched in it through the browser).

File:

• gsdl/trunk/perllib/util.pm (modified) (2 diffs)

gsdl/trunk/perllib/util.pm

@@ -28 +28 @@
 use File::Copy;
 use File::Basename;
+use MIME::Base64; # for base64 encoding
 
 use strict;
@@ -994 +995 @@
 }
 
+# returns the given filename converted using either URL encoding or 
+# base64 encoding, as specified by $rename_method
+sub rename_file {
+    my ($filename, $rename_method)  = @_;
+    
+    my ($tailname,$dirname,$suffix) = File::Basename::fileparse($filename, "\\.[^\\.]+\$");
+
+    if (!$rename_method) {
+    print STDERR "WARNING: no file renaming method specified. Defaulting to using URL encoding...\n";
+    # Debugging information
+    my ($cpackage,$cfilename,$cline,$csubr,$chas_args,$cwantarray) = caller(1);
+    print STDERR "Calling method; $cfilename:$cline $cpackage->$csubr\n";
+    }
+
+    if (!$rename_method || $rename_method eq "url") {
+    $tailname = &unicode::url_encode($tailname);
+    }
+    elsif ($rename_method eq "base64") {
+    $tailname = &MIME::Base64::encode_base64($tailname);
+    $tailname =~ s/\s*//sg;      # for some reason it adds spaces not just at end but also in middle
+    }
+        
+    $filename = "$tailname$suffix";
+    $filename = "$dirname$filename" if ($dirname ne "./");
+
+    return $filename;
+}
+
 1;