luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pr comments

Browse source
This commit is contained in:
Alexander Wang 2023-07-29 09:16:45 -07:00
parent 7bea22e504
commit 65f97fc7be
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
2 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
d2cli/watch.go
View file

@ -443,8 +443,10 @@ func (w *watcher) handleRoot(hw http.ResponseWriter, r *http.Request) {
</html>`, filepath.Base(w.outputPath), w.devMode) </html>`, filepath.Base(w.outputPath), w.devMode)
// if path is "/x.svg", we just want "x" // if path is "/x.svg", we just want "x"
split := strings.Split(strings.TrimPrefix(r.URL.Path, "/"), ".") boardPath := strings.TrimPrefix(r.URL.Path, "/")
boardPath := strings.Join(split[:len(split)-1], ".") if idx := strings.LastIndexByte(boardPath, '.'); idx != -1 {
boardPath = boardPath[:idx]
}
if boardPath != w.boardPath { if boardPath != w.boardPath {
w.boardPath = boardPath w.boardPath = boardPath
w.requestCompile() w.requestCompile()

38
d2target/d2target.go
View file

@ -81,53 +81,59 @@ func (d *Diagram) GetBoard(boardPath string) *Diagram {
return d return d
} }
head := path[0] return d.getBoard(path)
}
func (d *Diagram) getBoard(boardPath []string) *Diagram {
head := boardPath[0]
if head == "index" { if head == "index" {
return d return d
} }
switch head { switch head {
case "layers", "scenarios", "steps": case "layers":
if len(path) < 2 { if len(boardPath) < 2 {
return nil return nil
} }
}
switch head {
case "layers":
for _, b := range d.Layers { for _, b := range d.Layers {
if b.Name == path[1] { if b.Name == boardPath[1] {
return b.GetBoard(strings.Join(path[2:], string(os.PathSeparator))) return b.getBoard(boardPath[2:])
} }
} }
case "scenarios": case "scenarios":
if len(boardPath) < 2 {
return nil
}
for _, b := range d.Scenarios { for _, b := range d.Scenarios {
if b.Name == path[1] { if b.Name == boardPath[1] {
return b.GetBoard(strings.Join(path[2:], string(os.PathSeparator))) return b.getBoard(boardPath[2:])
} }
} }
case "steps": case "steps":
if len(boardPath) < 2 {
return nil
}
for _, b := range d.Steps { for _, b := range d.Steps {
if b.Name == path[1] { if b.Name == boardPath[1] {
return b.GetBoard(strings.Join(path[2:], string(os.PathSeparator))) return b.getBoard(boardPath[2:])
} }
} }
} }
for _, b := range d.Layers { for _, b := range d.Layers {
if b.Name == head { if b.Name == head {
return b.GetBoard(strings.Join(path[1:], string(os.PathSeparator))) return b.getBoard(boardPath[2:])
} }
} }
for _, b := range d.Scenarios { for _, b := range d.Scenarios {
if b.Name == head { if b.Name == head {
return b.GetBoard(strings.Join(path[1:], string(os.PathSeparator))) return b.getBoard(boardPath[2:])
} }
} }
for _, b := range d.Steps { for _, b := range d.Steps {
if b.Name == head { if b.Name == head {
return b.GetBoard(strings.Join(path[1:], string(os.PathSeparator))) return b.getBoard(boardPath[2:])
} }
} }
return nil return nil