Don't overwrite a key with the embedde key

serve/serve.go

@@ -2,13 +2,9 @@ package tbserve
 
 import (
 	"embed"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"path/filepath"
-	"strings"
 
 	"github.com/justinas/nosurf"
 	tbget "i2pgit.org/idk/i2p.plugins.tor-manager/get"
@@ -96,81 +92,3 @@ func (m *Client) Serve() error {
 	go m.TBS.RunTorWithLang()
 	return http.ListenAndServe("127.0.0.1:7695", nosurf.New(m))
 }
-
-func (m *Client) generateMirrorJSON() (map[string]interface{}, error) {
-	if !strings.HasSuffix(m.hostname, "/") {
-		m.hostname += "/"
-	}
-	path := filepath.Join(tbget.DOWNLOAD_PATH, "downloads.json")
-	preBytes, err := ioutil.ReadFile(path)
-	if err != nil {
-		return nil, fmt.Errorf("GenerateMirrorJSON: %s", err)
-	}
-	binpath, _, err := m.TBD.GetUpdaterForLangFromJsonBytes(preBytes, "en-US")
-	if err != nil {
-		return nil, fmt.Errorf("GenerateMirrorJSON: %s", err)
-	}
-	urlparts := strings.Split(binpath, "/")
-	replaceString := GenerateReplaceString(urlparts[:len(urlparts)-1])
-	fmt.Printf("Replacing: %s with %s\n", replaceString, m.hostname)
-	jsonBytes := []byte(strings.Replace(string(preBytes), replaceString, m.hostname, -1))
-	var JSON map[string]interface{}
-	if err := json.Unmarshal(jsonBytes, &JSON); err != nil {
-		panic(err)
-	}
-	return JSON, nil
-}
-
-func (m *Client) GenerateMirrorJSON() (string, error) {
-	JSON, err := m.generateMirrorJSON()
-	if err != nil {
-		return "", err
-	}
-	path := filepath.Join(tbget.DOWNLOAD_PATH, "downloads.json")
-	preBytes, err := ioutil.ReadFile(path)
-	if err != nil {
-		return "", fmt.Errorf("GenerateMirrorJSONBytes: %s", err)
-	}
-	binpath, _, err := m.TBD.GetUpdaterForLangFromJsonBytes(preBytes, "en-US")
-	if err != nil {
-		return "", fmt.Errorf("GenerateMirrorJSONBytes: %s", err)
-	}
-	urlparts := strings.Split(binpath, "/")
-	replaceString := GenerateReplaceString(urlparts[:len(urlparts)-1])
-
-	if platform, ok := JSON["downloads"]; ok {
-		rtp := m.TBD.GetRuntimePair()
-		for k, v := range platform.(map[string]interface{}) {
-			if k != rtp {
-				delete(platform.(map[string]interface{}), k)
-			}
-			for k2 := range v.(map[string]interface{}) {
-				if k2 != m.TBD.Lang {
-					delete(v.(map[string]interface{}), k2)
-				}
-
-			}
-		}
-		bytes, err := json.MarshalIndent(JSON, "", "  ")
-		if err != nil {
-			return "", err
-		}
-		return strings.Replace(string(bytes), replaceString, m.hostname, -1), nil
-	}
-	return "", fmt.Errorf("GenerateMirrorJSONBytes: %s", "No downloads found")
-}
-
-func GenerateReplaceString(urlparts []string) string {
-	replaceString := ""
-	for _, val := range urlparts {
-		if val == "https" {
-			replaceString += val + "//"
-		} else {
-			replaceString += val + "/"
-		}
-	}
-	if !strings.HasSuffix(replaceString, "/") {
-		replaceString += "/"
-	}
-	return replaceString
-}