Changeset 25674

Timestamp:

12/02/08 14:01:59 (5 weeks ago)

Author:

mattn

Message:

handle "c:\foo\bar.txt" as "file:///c:/foo/bar.txt"
handle "\\machine\share\bar.txt as "file://///machine/share/bar.txt"

Location:

lang/perl/Path-Class-URI/trunk/lib/Path/Class

Files:

• URI.pm (modified) (1 diff)
• Unicode.pm (modified) (2 diffs)

lang/perl/Path-Class-URI/trunk/lib/Path/Class/URI.pm

@@ -23 +23 @@
 sub Path::Class::Entity::uri {
     my $self = shift;
+    my $path = $self->stringify;
+    if ($^O eq "MSWin32") {
+        # can't use backslash as separator
+        $path =~ tr!\\!/!;
+        # make "file:///x:/foo/bar/" if path is absolute
+        $path = "/$path" if $self->is_absolute && $path !~ /^\//;
+    }
     if ($self->is_absolute) {
-        return URI->new("file://" . $self->as_foreign('Unix'));
+        return URI->new("file://$path");
     } else {
-        return URI->new("file:" . $self->as_foreign('Unix'));
+        return URI->new("file:$path");
     }
 }

lang/perl/Path-Class-URI/trunk/lib/Path/Class/Unicode.pm

@@ -23 +23 @@
 sub ufile_from_uri {
     my $uri = shift;
-    $uri = URI->new($uri) unless blessed $uri;
-    ufile(Encode::decode_utf8($uri->file('unix')));
+    if ($^O eq "MSWin32") {
+        $uri =~ s!^file:///!file://!g; # remove leading slash for absolute
+        $uri = URI->new($uri) unless blessed $uri;
+        ufile(Encode::decode_utf8($uri->file('win32')));
+    } else {
+        $uri = URI->new($uri) unless blessed $uri;
+        ufile(Encode::decode_utf8($uri->file('unix')));
+    }
 }
 
 sub udir_from_uri {
     my $uri = shift;
-    $uri = URI->new($uri) unless blessed $uri;
-    udir(Encode::decode_utf8($uri->file('unix')));
+    if ($^O eq "MSWin32") {
+        $uri =~ s!^file:///!file://!g; # remove leading slash for absolute
+        $uri = URI->new($uri) unless blessed $uri;
+        udir(Encode::decode_utf8($uri->file('win32')));
+    } else {
+        $uri = URI->new($uri) unless blessed $uri;
+        udir(Encode::decode_utf8($uri->file('unix')));
+    }
 }
 
@@ -40 +52 @@
 sub uri {
     my $self = shift;
-    my $path = Encode::encode_utf8($self->{path}->as_foreign('Unix')->stringify);
+    my $path = Encode::encode_utf8($self->{path}->stringify);
+    if ($^O eq "MSWin32") {
+        $path =~ tr!\\!/!; # can't use backslash as separator
+        $path = "/$path" if $self->is_absolute; # make "file:///x:/foo/bar/"
+    }
     if ($self->is_absolute) {
         return URI->new("file://$path");