Merge pull request #293 from qor/fix-modfile-path

Search the mod file when the current path is not the outermost path

admin.go

@@ -3,6 +3,7 @@ package admin
 import (
 	"html/template"
 	"log"
+	"os"
 	"path/filepath"
 	"reflect"
 
@@ -112,8 +113,11 @@ func (admin *Admin) RegisterViewPath(pth string) {
 	var err error
 	if err = admin.AssetFS.RegisterPath(filepath.Join(utils.AppRoot, "vendor", pth)); err != nil {
 		for _, gopath := range utils.GOPATH() {
-			if err = admin.AssetFS.RegisterPath(filepath.Join(gopath, getDepVersionFromMod(pth))); err == nil {
-				break
+			startDir, _ := os.Getwd()
+			if modPath := findGoModFile(startDir); modPath != "" {
+				if err = admin.AssetFS.RegisterPath(filepath.Join(gopath, getDepVersionFromMod(modPath, pth))); err == nil {
+					break
+				}
 			}
 
 			if err = admin.AssetFS.RegisterPath(filepath.Join(gopath, "src", pth)); err == nil {

utils.go

@@ -2,8 +2,8 @@ package admin
 
 import (
 	"html/template"
-	"io/ioutil"
 	"log"
+	"os"
 	"path/filepath"
 	"reflect"
 	"strings"
@@ -45,8 +45,11 @@ func RegisterViewPath(pth string) {
 	for _, assetFS := range globalAssetFSes {
 		if err = assetFS.RegisterPath(filepath.Join(utils.AppRoot, "vendor", pth)); err != nil {
 			for _, gopath := range utils.GOPATH() {
-				if err = assetFS.RegisterPath(filepath.Join(gopath, getDepVersionFromMod(pth))); err == nil {
-					break
+				startDir, _ := os.Getwd()
+				if modPath := findGoModFile(startDir); modPath != "" {
+					if err = assetFS.RegisterPath(filepath.Join(gopath, getDepVersionFromMod(modPath, pth))); err == nil {
+						break
+					}
 				}
 
 				if err = assetFS.RegisterPath(filepath.Join(gopath, "src", pth)); err == nil {
@@ -64,9 +67,9 @@ func equal(a, b interface{}) bool {
 	return reflect.DeepEqual(a, b)
 }
 
-func getDepVersionFromMod(pth string) string {
+func getDepVersionFromMod(modPath, pth string) string {
 	if len(goModDeps) == 0 {
-		if cont, err := ioutil.ReadFile("go.mod"); err == nil {
+		if cont, err := os.ReadFile(modPath); err == nil {
 			goModDeps = strings.Split(string(cont), "\n")
 		}
 	}
@@ -81,5 +84,24 @@ func getDepVersionFromMod(pth string) string {
 		return pth
 	}
 
-	return getDepVersionFromMod(pth[:strings.LastIndex(pth, "/")]) + pth[strings.LastIndex(pth, "/"):]
+	return getDepVersionFromMod(modPath, pth[:strings.LastIndex(pth, "/")]) + pth[strings.LastIndex(pth, "/"):]
+}
+
+func findGoModFile(startDir string) string {
+	currentDir := startDir
+
+	for {
+		goModPath := filepath.Join(currentDir, "go.mod")
+		if _, err := os.Stat(goModPath); err == nil {
+			return goModPath
+		}
+
+		parentDir := filepath.Dir(currentDir)
+		if parentDir == currentDir {
+			break
+		}
+		currentDir = parentDir
+	}
+
+	return ""
 }

utils_test.go

@@ -25,7 +25,7 @@ func TestGetDepVersionFromMod(t *testing.T) {
 		{view: "no/unknown/nonexistent", want: "no/unknown/nonexistent"},
 	}
 	for _, v := range cases {
-		if got := getDepVersionFromMod(v.view); v.want != got {
+		if got := getDepVersionFromMod("", v.view); v.want != got {
 			t.Errorf("GetDepVersionFromMod-viewpath: %v, want: %v, got: %v", v.view, v.want, got)
 		} else {
 			fmt.Println(got)