Release 1.0.0: First release

Author: Michel Casabianca

Diff for: .gitignore

@@ -0,0 +1 @@
+build/

Diff for: CHANGELOG.yml

@@ -3,3 +3,5 @@
 - version: 1.0.0
   date:    2015-07-28
   summary: First release
+  note:
+  - "This first release can serve packages but may not accept some."

Diff for: README.md

@@ -24,4 +24,17 @@ There are binaries for following platforms:
 Usage
 -----
 
+To run the server, type on command line :
+
+    cheeseshop -port 8000 -path simple -root . -shop http://pypi.python.org
+
+Options on command line :
+
+- *-port* to set the port the server is litening (default to *8000*).
+- *-path* to set the URL path (defaults to *simple*).
+- *-root* to set the directory where packages are living (defaults to current directory).
+- *-shop* to set the URL of the shop for packages that are not found.
+
+The server outputs logs on the terminal. To get help on the console, type `cheeseshop -help`.
+
 *Enjoy!*

Diff for: cheeseshop.go

@@ -19,58 +19,104 @@ const (
 )
 
 var port = flag.Int("port", 8000, "The port CheeseShop is listening")
-var path = flag.String("path", "/simple/", "The URL path")
+var path = flag.String("path", "simple", "The URL path")
 var root = flag.String("root", ".", "The root directory for packages")
-var shop = flag.String("shop", "http://pypi.python.org", "Shop to redirect to when not found")
+var shop = flag.String("shop", "http://pypi.python.org", "Redirection when not found")
+
+func listRoot(w http.ResponseWriter, r *http.Request) {
+	log.Printf("Listing root %s", *root)
+	files, err := ioutil.ReadDir(*root)
+	if err != nil {
+		http.Error(w, fmt.Sprintf("Error listing root directory %s", *root), 500)
+		return
+	}
+	w.Write([]byte(fmt.Sprintf(LIST_HEAD, "root", "root")))
+	for _, file := range files {
+		if file.Mode().IsDir() {
+			w.Write([]byte(fmt.Sprintf(LIST_ELEMENT, *path+file.Name(), file.Name())))
+		}
+	}
+	w.Write([]byte(LIST_TAIL))
+}
 
 func listDirectory(dir string, w http.ResponseWriter, r *http.Request) {
-	files, err := ioutil.ReadDir(dir)
+	directory := filepath.Join(*root, dir)
+	if _, err := os.Stat(directory); os.IsNotExist(err) {
+		url := *shop + *path + dir
+		log.Printf("Redirecting to %s", url)
+		http.Redirect(w, r, url, 302)
+		return
+	}
+	log.Printf("Listing directory %s", directory)
+	files, err := ioutil.ReadDir(directory)
 	if err != nil {
 		http.Error(w, fmt.Sprintf("Error listing directory %s", dir), 500)
+		return
 	}
-	pkg := dir[strings.LastIndex(dir, "/")+1:]
-	w.Write([]byte(fmt.Sprintf(LIST_HEAD, pkg, pkg)))
+	w.Write([]byte(fmt.Sprintf(LIST_HEAD, dir, dir)))
 	for _, file := range files {
-		w.Write([]byte(fmt.Sprintf(LIST_ELEMENT, *path+pkg+"/"+file.Name(), file.Name())))
+		w.Write([]byte(fmt.Sprintf(LIST_ELEMENT, *path+dir+"/"+file.Name(), file.Name())))
 	}
 	w.Write([]byte(LIST_TAIL))
 }
 
-func servePackage(filename string, w http.ResponseWriter, r *http.Request) {
+func servePackage(dir, file string, w http.ResponseWriter, r *http.Request) {
+	filename := filepath.Join(*root, dir, file)
+	if _, err := os.Stat(filename); os.IsNotExist(err) {
+		url := *shop + *path + dir + "/" + file
+		log.Printf("Redirecting to %s", url)
+		http.Redirect(w, r, url, 302)
+		return
+	}
+	log.Printf("Serving file %s", filename)
 	http.ServeFile(w, r, filename)
 }
 
 func handler(w http.ResponseWriter, r *http.Request) {
-	filename := filepath.Join(*root, r.URL.Path[1:])
-	if info, err := os.Stat(filename); err != nil {
-		url := *shop + r.URL.Path
-		log.Print("Redirecting to ", url)
-		http.Redirect(w, r, url, 302)
+	parts := strings.Split(r.URL.Path[len(*path):], "/")
+	if len(parts) > 2 {
+		http.Error(w, fmt.Sprintf("%s is not a valid path", r.URL.Path), 404)
+		return
+	} else if len(parts) == 1 && parts[0] == "" {
+		listRoot(w, r)
+	} else if len(parts) == 1 {
+		listDirectory(parts[0], w, r)
 	} else {
-		switch mode := info.Mode(); {
-		case mode.IsDir():
-			log.Print("Listing directory ", filename)
-			listDirectory(filename, w, r)
-		case mode.IsRegular():
-			log.Print("Serving package ", filename)
-			servePackage(filename, w, r)
-		}
+		servePackage(parts[0], parts[1], w, r)
 	}
 }
 
 func parseCommandLine() {
 	flag.Parse()
 	absroot, err := filepath.Abs(*root)
 	if err != nil {
-		panic("Error building root directory")
+		log.Fatal("Error building root directory")
 	}
 	root = &absroot
+	info, err := os.Stat(*root)
+	if err != nil {
+		log.Fatalf("Root directory %s not found", *root)
+	}
+	if !info.Mode().IsDir() {
+		log.Fatalf("Root %s is not a directory", *root)
+	}
+	if !strings.HasPrefix(*path, "/") {
+		p := "/" + *path
+		path = &p
+	}
+	if !strings.HasSuffix(*path, "/") {
+		p := *path + "/"
+		path = &p
+	}
+	if *port > 65535 || *port < 0 {
+		log.Fatalf("Bad port number %d", *port)
+	}
 }
 
 func main() {
 	parseCommandLine()
 	http.HandleFunc(*path, handler)
-	log.Print("Starting CheeseShop version ", VERSION)
+	log.Print("Starting CheeseShop (version: ", VERSION, ", path: ", *path, ", port: ", *port, ", root: ", *root, ")")
 	log.Fatal(http.ListenAndServe(fmt.Sprintf(":%d", *port), nil))
 	log.Print("Stopping CheeseShop")
 }