added handlers and methods for downloading and deleting modpacks

Author: mroote

src/handlers.go

@@ -199,7 +199,7 @@ func DownloadMod(w http.ResponseWriter, r *http.Request) {
 
 	vars := mux.Vars(r)
 	mod := vars["mod"]
-	modFile := config.FactorioModsDir + "/" + mod
+	modFile := filepath.Join(config.FactorioModsDir, mod)
 
 	w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", mod))
 	log.Printf("%s downloading: %s", r.Host, modFile)
@@ -277,6 +277,48 @@ func ListModPacks(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
+func DownloadModPack(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json;charset=UTF-8")
+
+	vars := mux.Vars(r)
+	modpack := vars["modpack"]
+	modFile := filepath.Join(config.FactorioDir, "modpacks", modpack)
+
+	w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", modpack))
+	log.Printf("%s downloading: %s", r.Host, modFile)
+
+	http.ServeFile(w, r, modFile)
+}
+
+func DeleteModPack(w http.ResponseWriter, r *http.Request) {
+	var err error
+	resp := JSONResponse{
+		Success: false,
+	}
+
+	w.Header().Set("Content-Type", "application/json;charset=UTF-8")
+
+	vars := mux.Vars(r)
+	modPack := vars["modpack"]
+
+	err = rmModPack(modPack)
+	if err == nil {
+		// Modpack removed
+		resp.Data = fmt.Sprintf("Removed modpack: %s", modPack)
+		resp.Success = true
+		if err := json.NewEncoder(w).Encode(resp); err != nil {
+			log.Printf("Error removing modpack %s", err)
+		}
+	} else {
+		log.Printf("Error in remove modpack handler: %s", err)
+		resp.Data = fmt.Sprintf("Error in remove modpack handler: %s", err)
+
+		if err := json.NewEncoder(w).Encode(resp); err != nil {
+			log.Printf("Error removing modpack: %s", err)
+		}
+	}
+}
+
 // Lists all save files in the factorio/saves directory
 func ListSaves(w http.ResponseWriter, r *http.Request) {
 	var err error

src/mods.go

@@ -57,7 +57,7 @@ func rmMod(modName string) error {
 	for _, mod := range installedMods {
 		if strings.Contains(mod, modName) {
 			log.Printf("Removing mod: %s", mod)
-			err := os.Remove(config.FactorioModsDir + "/" + mod)
+			err := os.Remove(filepath.Join(config.FactorioModsDir, mod))
 			if err != nil {
 				log.Printf("Error removing mod %s: %s", mod, err)
 				return err
@@ -75,6 +75,39 @@ func rmMod(modName string) error {
 	return nil
 }
 
+func rmModPack(modpack string) error {
+	removed := false
+	if modpack == "" {
+		return errors.New("No mod pack name provided.")
+	}
+	// Get list of modpacks
+	modpacks, err := listModPacks(filepath.Join(config.FactorioDir, "modpacks"))
+	if err != nil {
+		log.Printf("Error listing modpacks in rmModPack: %s", err)
+		return err
+	}
+
+	for _, m := range modpacks {
+		if strings.Contains(m, modpack) {
+			log.Printf("Removing modpack: %s", m)
+			err := os.Remove(filepath.Join(config.FactorioDir, "modpacks", m))
+			if err != nil {
+				log.Printf("Error trying to remove modpack: %s: %s", m, err)
+				return err
+			}
+			removed = true
+			log.Printf("Removed modpack: %s", m)
+		}
+	}
+
+	if !removed {
+		log.Printf("Did not remove modpack: %s", modpack)
+		return errors.New(fmt.Sprintf("Did not remove modpack: %s", modpack))
+	}
+
+	return nil
+}
+
 func createModPackDir() error {
 	err := os.Mkdir(filepath.Join(config.FactorioDir, "modpacks"), 0775)
 	if err != nil {

src/routes.go

@@ -204,5 +204,15 @@ var apiRoutes = Routes{
 		"GET",
 		"/mods/packs/list",
 		ListModPacks,
+	}, {
+		"DownloadModPack",
+		"GET",
+		"/mods/packs/dl/{modpack}",
+		DownloadModPack,
+	}, {
+		"DeleteModPack",
+		"GET",
+		"/mods/packs/rm/{modpack}",
+		DeleteModPack,
 	},
 }