From: Jeff Hobbs <hobbs@users.sourceforge.net>
Date: Fri, 29 Sep 2006 21:46:51 +0000 (+0000)
Subject: 	* library/httpvfs.tcl (vfs::http::geturl): wrapper around
X-Git-Tag: vfs-1-4~51
X-Git-Url: http://privyetmir.co.uk/gitweb.cgi?a=commitdiff_plain;h=d900c1524aa0d0f75cfc9b1076fec610dbe41316;p=tclvfs

	* library/httpvfs.tcl (vfs::http::geturl): wrapper around
	http::geturl that does 404 check.
---

diff --git a/ChangeLog b/ChangeLog
index d001120..afd5e89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-29  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* library/httpvfs.tcl (vfs::http::geturl): wrapper around
+	http::geturl that does 404 check.
+
 2006-09-19  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* library/httpvfs.tcl (vfs::http::urlparse): add method to
diff --git a/library/httpvfs.tcl b/library/httpvfs.tcl
index 5dd5942..1a89ced 100644
--- a/library/httpvfs.tcl
+++ b/library/httpvfs.tcl
@@ -288,6 +288,26 @@ proc vfs::http::urlname {name} {
     return $urlname
 }
 
+proc vfs::http::geturl {url args} {
+    # a wrapper around http::geturl that handles 404 or !ok status check
+    # returns error on no success, or a fully ready http token otherwise
+    set token [linsert $args 0 ::http::geturl $url]
+    http::wait $token
+
+    if {[http::ncode $token] == 404 || [http::status $token] ne "ok"} {
+	# 404 Not Found
+	set code [http::code $token]
+	http::cleanup $token
+	vfs::filesystem posixerror $::vfs::posix(ENOENT)
+	return -code error \
+	    "could not read \"$url\": no such file or directory ($code)"
+    }
+
+    # treat returned token like a regular http token
+    # call http::cleanup on it when done
+    return $token
+}
+
 # If we implement the commands below, we will have a perfect
 # virtual file system for remote http sites.
 
@@ -299,17 +319,8 @@ proc vfs::http::stat {dirurl headers name} {
     # as a file (not a directory) since with http, even directories
     # really behave as the index.html they contain.
 
-    set token [::http::geturl "$dirurl$urlname" -validate 1 -headers $headers]
-    http::wait $token
-    set ncode [http::ncode $token]
-    if {$ncode == 404 || [http::status $token] ne "ok"} {
-	# 404 Not Found
-	set code [http::code $token]
-	http::cleanup $token
-	vfs::filesystem posixerror $::vfs::posix(ENOENT)
-	return -code error \
-	    "could not read \"$name\": no such file or directory ($code)"
-    }
+    # this will through an error if the file doesn't exist
+    set token [geturl "$dirurl$urlname" -validate 1 -headers $headers]
     http::cleanup $token
     set mtime 0
     lappend res type file
@@ -326,20 +337,10 @@ proc vfs::http::access {dirurl headers name mode} {
 	return -code error "read-only"
     }
     if {$name == ""} { return 1 }
-    set token [::http::geturl "$dirurl$urlname" -validate 1 -headers $headers]
-    http::wait $token
-    set ncode [http::ncode $token]
-    if {$ncode == 404 || [http::status $token] ne "ok"} {
-	# 404 Not Found
-	set code [http::code $token]
-	http::cleanup $token
-	vfs::filesystem posixerror $::vfs::posix(ENOENT)
-	return -code error \
-	    "could not read \"$name\": no such file or directory ($code)"
-    } else {
-	http::cleanup $token
-	return 1
-    }
+    # this will through an error if the file doesn't exist
+    set token [geturl "$dirurl$urlname" -validate 1 -headers $headers]
+    http::cleanup $token
+    return 1
 }
 
 # We've chosen to implement these channels by using a memchan.
@@ -354,11 +355,9 @@ proc vfs::http::open {dirurl headers name mode permissions} {
     switch -glob -- $mode {
 	"" -
 	"r" {
-	    set token [::http::geturl "$dirurl$urlname" -headers $headers]
-
+	    set token [geturl "$dirurl$urlname" -headers $headers]
 	    set filed [vfs::memchan]
 	    fconfigure $filed -translation binary
-	    http::wait $token
 	    puts -nonewline $filed [::http::data $token]
 	    http::cleanup $token