fix dir

movsb · Dec 12, 2024 · e6bf5f1 · e6bf5f1
1 parent e372a09
commit e6bf5f1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/modules/utils/dir/dir.go b/modules/utils/dir/dir.go
@@ -1,6 +1,7 @@
 package dir
 
 import (
+	"log"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -16,6 +17,7 @@ func init() {
 		panic(err)
 	}
 	Root = rootDir
+	log.Println(`WorkingDir:`, rootDir)
 }
 
 type Dir string
@@ -25,18 +27,21 @@ func (d Dir) Join(components ...string) string {
 }
 
 func SourceRelativeDir() Dir {
+	s := strings.TrimPrefix(string(SourceAbsoluteDir()), Root)
+	s = strings.TrimPrefix(s, "/")
+	if s == "" {
+		s = "."
+	}
+	return Dir(s)
+}
+
+func SourceAbsoluteDir() Dir {
 	_, file, _, ok := runtime.Caller(1)
 	if !ok {
 		panic(`无法获取路径。`)
 	}
 	if Root == "" {
 		panic(`没有设置根目录。`)
 	}
-	dir := filepath.Dir(file)
-	s := strings.TrimPrefix(dir, Root)
-	s = strings.TrimPrefix(s, "/")
-	if s == "" {
-		s = "."
-	}
-	return Dir(s)
+	return Dir(filepath.Dir(file))
 }
diff --git a/service/modules/renderers/friends/friends.go b/service/modules/renderers/friends/friends.go
@@ -30,7 +30,7 @@ func init() {
 			string(utils.Must1(_root.ReadFile(`style.css`))),
 		},
 	}
-	sass.WatchDefaultAsync(string(dir.SourceRelativeDir()))
+	sass.WatchDefaultAsync(string(dir.SourceAbsoluteDir()))
 }
 
 type Friends struct {