Added "link aliases" section + made routes more flexible

README.md

@@ -23,14 +23,6 @@ Upload to virustotal:
 
 $ curl -X PUT --upload-file nhgbhhj https://transfer.sh/test.txt/virustotal
 
-Create direct download link:
-
-https://transfer.sh/1lDau/test.txt --> https://transfer.sh/get/1lDau/test.txt
-
-Embed file:
-
-https://transfer.sh/1lDau/test.txt --> https://transfer.sh/embed/1lDau/test.txt
-
 ```
 ## Add alias to .bashrc or .zshrc
 ```
@@ -45,6 +37,16 @@ Now run it like this
 $ transfer test.txt
 ```
 
+## Link aliases
+
+Create direct download link:
+
+https://transfer.sh/1lDau/test.txt --> https://transfer.sh/get/1lDau/test.txt
+
+Inline file:
+
+https://transfer.sh/1lDau/test.txt --> https://transfer.sh/inline/1lDau/test.txt
+
 ### On Windows
 
 Put a file called transfer.cmd somewhere in your PATH with this inside it:

server/handlers.go

@@ -818,9 +818,10 @@ func (s *Server) headHandler(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Connection", "close")
 }
 
-func (s *Server) embedHandler(w http.ResponseWriter, r *http.Request) {
+func (s *Server) getHandler(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 
+	action := vars["action"]
 	token := vars["token"]
 	filename := vars["filename"]
 
@@ -844,45 +845,14 @@ func (s *Server) embedHandler(w http.ResponseWriter, r *http.Request) {
 
 	w.Header().Set("Content-Type", contentType)
 	w.Header().Set("Content-Length", strconv.FormatUint(contentLength, 10))
-	w.Header().Set("Content-Disposition", fmt.Sprintf("inline; filename=\"%s\"", filename))
 	w.Header().Set("Connection", "keep-alive")
 
-	if _, err = io.Copy(w, reader); err != nil {
-		log.Printf("%s", err.Error())
-		http.Error(w, "Error occurred copying to output stream", 500)
-		return
-	}
-}
-
-func (s *Server) getHandler(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-
-	token := vars["token"]
-	filename := vars["filename"]
-
-	if err := s.CheckMetadata(token, filename); err != nil {
-		log.Printf("Error metadata: %s", err.Error())
-		http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
-		return
-	}
-
-	reader, contentType, contentLength, err := s.storage.Get(token, filename)
-	if s.storage.IsNotExist(err) {
-		http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
-		return
-	} else if err != nil {
-		log.Printf("%s", err.Error())
-		http.Error(w, "Could not retrieve file.", 500)
-		return
+	if action == "inline" {
+		w.Header().Set("Content-Disposition", fmt.Sprintf("inline; filename=\"%s\"", filename))
+	} else {
+		w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", filename))
 	}
 
-	defer reader.Close()
-
-	w.Header().Set("Content-Type", contentType)
-	w.Header().Set("Content-Length", strconv.FormatUint(contentLength, 10))
-	w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", filename))
-	w.Header().Set("Connection", "keep-alive")
-
 	if _, err = io.Copy(w, reader); err != nil {
 		log.Printf("%s", err.Error())
 		http.Error(w, "Error occurred copying to output stream", 500)

server/server.go

@@ -325,8 +325,7 @@ func (s *Server) Run() {
 	r.HandleFunc("/({files:.*}).tar.gz", s.tarGzHandler).Methods("GET")
 
 	r.HandleFunc("/{token}/{filename}", s.headHandler).Methods("HEAD")
-	r.HandleFunc("/get/{token}/{filename}", s.headHandler).Methods("HEAD")
-	r.HandleFunc("/embed/{token}/{filename}", s.headHandler).Methods("HEAD")
+	r.HandleFunc("/{action}/{token}/{filename}", s.headHandler).Methods("HEAD")
 
 	r.HandleFunc("/{token}/{filename}", s.previewHandler).MatcherFunc(func(r *http.Request, rm *mux.RouteMatch) (match bool) {
 		match = false
@@ -356,8 +355,7 @@ func (s *Server) Run() {
 	}
 
 	r.HandleFunc("/{token}/{filename}", getHandlerFn).Methods("GET")
-	r.HandleFunc("/get/{token}/{filename}", getHandlerFn).Methods("GET")
-	r.HandleFunc("/embed/{token}/{filename}", s.embedHandler).Methods("GET")
+	r.HandleFunc("/{action}/{token}/{filename}", getHandlerFn).Methods("GET")
 
 	r.HandleFunc("/{filename}/virustotal", s.virusTotalHandler).Methods("PUT")
 	r.HandleFunc("/{filename}/scan", s.scanHandler).Methods("PUT")