Some real GDS functionality:

- directory listings w/ working links
- some links working in source code (most don't do the right thing yet)
- use of logging

R=r
OCL=24728
CL=24728

usr/gri/pretty/gds.go

@@ -14,6 +14,8 @@ import (
 	"io";
 	"net";
 	"os";
+	"sort";
+	"log";
 
 	Utils "utils";
 	Platform "platform";
@@ -22,41 +24,86 @@ import (
 )
 
 
-var urlPrefix = "/gds"  // 6g BUG should be const
-
-
 var (
 	verbose = flag.Bool("v", false, "verbose mode");
 	port = flag.String("port", "6060", "server port");
-	//root = flag.String("root", Platform.GOROOT, "go root directory");
+	root = flag.String("root", Platform.GOROOT, "go root directory");
-	root = &Platform.GOROOT;  // TODO cannot change root w/ passing it to printer
 )
 
 
-// TODO should factor this out - also used by the parser
+// Support for directory sorting.
-func getFilename(url string) string {
+type DirArray []os.Dir
-	// strip URL prefix
+func (p DirArray) Len() int            { return len(p); }
-	if url[0 : len(urlPrefix)] != urlPrefix {
+func (p DirArray) Less(i, j int) bool  { return p[i].Name < p[j].Name; }
-		panic("server error - illegal URL prefix");
+func (p DirArray) Swap(i, j int)       { p[i], p[j] = p[j], p[i]; }
-	}
+
-	url = url[len(urlPrefix) : len(url)];
+
-	
+func isGoFile(dir *os.Dir) bool {
-	// sanitize source file name
+	ext := ".go";  // TODO 6g bug - should be const
-	return *root + Utils.TrimExt(url, ".go") + ".go";
+	return dir.IsRegular() && Utils.Contains(dir.Name, ext, len(dir.Name) - len(ext));
 }
 
 
-func docServer(c *http.Conn, req *http.Request) {
+func printLink(c *http.Conn, path, name string) {
-	if *verbose {
+	fmt.Fprintf(c, "<a href=\"%s\">%s</a><br>\n", path + name, name);
-		fmt.Printf("URL path = %s\n", req.Url.Path);
+}
+
+
+func serveDir(c *http.Conn, dirname string) {
+	fd, err1 := os.Open(*root + dirname, os.O_RDONLY, 0);
+	if err1 != nil {
+		c.WriteHeader(http.StatusNotFound);
+		fmt.Fprintf(c, "Error: %v (%s)\n", err1, dirname);
+		return;
 	}
 
-	filename := getFilename(req.Url.Path);
+	list, err2 := os.Readdir(fd, -1);
+	if err2 != nil {
+		c.WriteHeader(http.StatusNotFound);
+		fmt.Fprintf(c, "Error: %v (%s)\n", err2, dirname);
+		return;
+	}
+	
+	sort.Sort(DirArray(list));
+
+	c.SetHeader("content-type", "text/html; charset=utf-8");
+	path := dirname + "/";
+	fmt.Fprintf(c, "<b>%s</b>\n", path);
+
+	// Print contents in 3 sections: directories, go files, everything else
+	
+	// 1) directories
+	fmt.Fprintln(c, "<p>");
+	for i, entry := range list {
+		if entry.IsDirectory() {
+			printLink(c, path, entry.Name);
+		}
+	}
+
+	// 2) .go files
+	fmt.Fprintln(c, "<p>");
+	for i, entry := range list {
+		if isGoFile(&entry) {
+			printLink(c, path, entry.Name);
+		}
+	}
+
+	// 3) everything else
+	fmt.Fprintln(c, "<p>");
+	for i, entry := range list {
+		if !entry.IsDirectory() && !isGoFile(&entry) {
+			fmt.Fprintf(c, "<font color=grey>%s</font><br>\n", entry.Name);
+		}
+	}
+}
+
+
+func serveFile(c *http.Conn, filename string) {
 	var flags Compilation.Flags;
-	prog, nerrors := Compilation.Compile(filename, &flags);
+	prog, nerrors := Compilation.Compile(*root + filename, &flags);
 	if nerrors > 0 {
 		c.WriteHeader(http.StatusNotFound);
-		fmt.Fprintf(c, "compilation errors: %s\n", filename);
+		fmt.Fprintf(c, "Error: File has compilation errors (%s)\n", filename);
 		return;
 	}
 	
@@ -65,19 +112,50 @@ func docServer(c *http.Conn, req *http.Request) {
 }
 
 
-func main() {
+func serve(c *http.Conn, req *http.Request) {
-	flag.Parse();
-
 	if *verbose {
-		fmt.Printf("Go Documentation Server\n");
+		log.Stdoutf("URL = %s\n", req.RawUrl);
-		fmt.Printf("port = %s\n", *port);
-		fmt.Printf("root = %s\n", *root);
 	}
 
-	http.Handle(urlPrefix + "/", http.HandlerFunc(docServer));
+	path := Utils.SanitizePath(req.Url.Path);
-	err := http.ListenAndServe(":" + *port, nil);
+	dir, err := os.Stat(*root + path);
 	if err != nil {
-		panic("ListenAndServe: ", err.String())
+		c.WriteHeader(http.StatusNotFound);
+		fmt.Fprintf(c, "Error: %v (%s)\n", err, path);
+		return;
+	}
+
+	switch {
+	case dir.IsDirectory():
+		serveDir(c, path);
+	case isGoFile(dir):
+		serveFile(c, path);
+	default:
+		c.WriteHeader(http.StatusNotFound);
+		fmt.Fprintf(c, "Error: Not a directory or .go file (%s)\n", path);
+	}
+}
+
+
+func main() {
+	flag.Parse();
+
+	*root = Utils.SanitizePath(*root);
+	dir, err1 := os.Stat(*root);
+	if err1 != nil || !dir.IsDirectory() {
+		log.Exitf("root not found or not a directory: ", *root);
+	}
+
+	if *verbose {
+		log.Stdoutf("Go Documentation Server\n");
+		log.Stdoutf("port = %s\n", *port);
+		log.Stdoutf("root = %s\n", *root);
+	}
+
+	http.Handle("/", http.HandlerFunc(serve));
+	err2 := http.ListenAndServe(":" + *port, nil);
+	if err2 != nil {
+		log.Exitf("ListenAndServe: ", err2.String())
 	}
 }
 

usr/gri/pretty/printer.go

@@ -439,7 +439,7 @@ func (P *Printer) HtmlPackageName(pos int, name string) {
 	if P.html {
 		sname := name[1 : len(name)-1];  // strip quotes  TODO do this elsewhere eventually
 		// TODO CAPITAL HACK BELOW FIX THIS
-		P.TaggedString(pos, `"<a href="http://localhost:6060/gds/src/lib/` + sname + `.go">`, sname, `</a>"`);
+		P.TaggedString(pos, `"<a href="/src/lib/` + sname + `.go">`, sname, `</a>"`);
 	} else {
 		P.String(pos, name);
 	}

usr/gri/pretty/utils.go

@@ -18,6 +18,34 @@ func BaseName(s string) string {
 }
 
 
+func cleanPath(s string) string {
+	for i := 0; i < len(s); i++ {
+		if s[i] == '/' {
+			i++;
+			j := i;
+			for j < len(s) && s[j] == '/' {
+				j++;
+			}
+			if j > i {  // more then one '/'
+				return s[0 : i] + cleanPath(s[j : len(s)]);
+			}
+		}
+	}
+	return s;
+}
+
+
+// Reduce sequences of multiple '/'s into a single '/' and
+// strip any trailing '/' (may result in the empty string).
+func SanitizePath(s string) string {
+	s = cleanPath(s);
+	if s[len(s)-1] == '/' {  // strip trailing '/'
+		s = s[0 : len(s)-1];
+	}
+	return s;
+}
+
+
 func Contains(s, sub string, pos int) bool {
 	end := pos + len(sub);
 	return pos >= 0 && end <= len(s) && s[pos : end] == sub;