Go version 1 compliance

Florian Unglaub · Florian Unglaub · commit 9f053245ed76 · 2012-06-03T16:25:09.000+02:00
diff --git a/index.html b/index.html
@@ -14,13 +14,13 @@
 	height: 500px;
 	overflow: auto;
 }
-#browser a, #playlist a { 
-	display: block; 
-	cursor: pointer; 
-	padding: 2px 4px; 
-	border-radius: 5px; 
+#browser a, #playlist a {
+	display: block;
+	cursor: pointer;
+	padding: 2px 4px;
+	border-radius: 5px;
 	overflow: hidden;
-	margin-bottom: 2px; 
+	margin-bottom: 2px;
 }
 #browser { background: #8C9A20; }
 #browser a.dir { background: #BECD53; color: black; }
@@ -30,11 +30,11 @@
 #playlist a.playing { background: #3B1E6C; color: white; }
 #browser a:hover, #playlist a:hover { background: #200A46; color: white; }
 #controls { margin-top: 10px; }
-#controls a { 
-	cursor: pointer; 
-	background: #eee; 
-	padding: 5px; 
-	border-radius: 5px; 
+#controls a {
+	cursor: pointer;
+	background: #eee;
+	padding: 5px;
+	border-radius: 5px;
 }
 </style>
 <script src="http://www.google.com/jsapi" type="text/javascript"></script>
@@ -67,7 +67,7 @@
 	var $b = $('#browser').empty();
 	function add(i, f) {
 		if (f.Name[0] == '.' || f.Name[0] == ':') return;
-		var dir = (f.Mode & 040000);
+    var dir = f.IsDir;
 		var cl = dir ? "dir" : "file";
 		f.Path = path.join('/');
 		$('<a></a>').text(f.Name).data('file', f)
@@ -127,7 +127,7 @@
 </script>
 </head>
 <body>
-<audio id="player" controls autoplay autobuffer> 
+<audio id="player" controls autoplay autobuffer>
 <p>What? Your browser doesn't support &lt;audio&gt;?! Lame.</p>
 </audio>
 <div id="browser"></div>
diff --git a/player.go b/player.go
@@ -2,18 +2,25 @@ package main
 
 import (
 	"flag"
-	"http"
-	"json"
+	"net/http"
+	"encoding/json"
 	"os"
+	"log"
 )
 
+type Entry struct {
+  Name string // name of the object
+	IsDir bool
+	Mode os.32FileMode
+}
+
 const (
 	filePrefix = "/f/"
 )
 
 var (
 	addr = flag.String("http", ":8080", "http listen address")
-	root = flag.String("root", "/store/iTunes/", "music root")
+	root = flag.String("root", "/home/flo/nfs/flo/Music/", "music root")
 )
 
 func main() {
@@ -25,38 +32,57 @@ func main() {
 
 func Index(w http.ResponseWriter, r *http.Request) {
 	http.ServeFile(w, r, "./index.html")
+	log.Print("index called")
 }
 
 func File(w http.ResponseWriter, r *http.Request) {
 	fn := *root + r.URL.Path[len(filePrefix):]
 	fi, err := os.Stat(fn)
+	log.Print("File called: ", fn)
+
 	if err != nil {
-		http.Error(w, err.String(), http.StatusNotFound)
+		http.Error(w, err.Error(), http.StatusNotFound)
 		return
 	}
-	if fi.IsDirectory() {
+	if fi.IsDir() {
 		serveDirectory(fn, w, r)
 		return
 	}
 	http.ServeFile(w, r, fn)
 }
 
-func serveDirectory(fn string, w http.ResponseWriter, r *http.Request) {
+func serveDirectory(fn string, w http.ResponseWriter,
+	r *http.Request) {
 	defer func() {
-		if err, ok := recover().(os.Error); ok {
-			http.Error(w, err.String(), http.StatusInternalServerError)
+		if err, ok := recover().(error); ok {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
 		}
 	}()
 	d, err := os.Open(fn)
 	if err != nil {
 		panic(err)
 	}
+	log.Print("serverDirectory called: ", fn)
+
 	files, err := d.Readdir(-1)
 	if err != nil {
 		panic(err)
 	}
-	j := json.NewEncoder(w)
-	if err := j.Encode(files); err != nil {
-		panic(err)
+
+	// Json Encode isn't working with the FileInfo interface,
+	// therefore populate an Array of Entry and add the Name method
+	entries := make([]Entry, len(files), len(files))
+
+	for k := range files {
+		//log.Print(files[k].Name())
+		entries[k].Name = files[k].Name()
+		entries[k].IsDir = files[k].IsDir()
+		entries[k].Mode = files[k].Mode()
+	}
+
+  j := json.NewEncoder(w)
+
+	if err := j.Encode(&entries); err != nil {
+	  panic(err)
 	}
 }
