archives/tweego
2
0
Fork 0
mirror of https://github.com/tmedwards/tweego.git synced 2025-07-05 06:00:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update storyout.go

Browse source
This commit is contained in:
Thomas M. Edwards 2023-11-06 16:25:22 -06:00 • committed by GitHub
parent 81d94891b0
commit 7fb1289b03
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

40
storyout.go
View file

@ -32,12 +32,17 @@ func (s *story) toJSON(startName string) []byte {
&storyJSON{ &storyJSON{
s.name, s.name,
s.ifid, s.ifid,
startName,
twine2OptionsMapToSlice(s.twine2.options),
s.twine2.format, s.twine2.format,
s.twine2.formatVersion, s.twine2.formatVersion,
twine2OptionsMapToSlice(s.twine2.options),
startName,
s.twine2.tags,
"", // s.twine2.tagColors ← twine2TagColorsMap
s.twine2.zoom,
strings.Title(tweegoName), strings.Title(tweegoName),
tweegoVersion.Version(), tweegoVersion.Version(),
"", // s.twine2.style,
"", // s.twine2.script,
passages, passages,
}, },
"", "",
@ -212,7 +217,8 @@ func (s *story) getTwine2DataChunk(startName string) []byte {
var ( var (
data []byte data []byte
startID string startID string
options string optsValue string
tagsVal string
pid uint pid uint
) )
@ -345,32 +351,42 @@ func (s *story) getTwine2DataChunk(startName string) []byte {
} }
// Add the <tw-storydata> wrapper. // Add the <tw-storydata> wrapper.
/* /*
<tw-storydata name="…" startnode="…" creator="…" creator-version="…" ifid="…" <tw-storydata name="…" startnode="…" creator="…" creator-version="…" format="…" format-version="…" ifid="…" options="…" tags="…" zoom="…" hidden>…</tw-storydata>
zoom="…" format="…" format-version="…" options="…" hidden>…</tw-storydata>
*/ */
if optCount := len(s.twine2.options); optCount > 0 { if optsCount := len(s.twine2.options); optsCount > 0 {
opts := make([]string, 0, optCount) opts := make([]string, 0, optsCount)
for opt, val := range s.twine2.options { for opt, val := range s.twine2.options {
if val { if val {
opts = append(opts, opt) opts = append(opts, opt)
} }
} }
options = strings.Join(opts, " ") optsValue = strings.Join(opts, " ")
}
if tagsCount := len(s.twine2.tags); tagsCount > 0 {
tags := make([]string, 0, tagsCount)
for tag, val := range s.twine2.tags {
if val {
tags = append(tags, tag)
}
}
tagsValue = strings.Join(tags, " ")
} }
data = append([]byte(fmt.Sprintf( data = append([]byte(fmt.Sprintf(
`<!-- UUID://%s// -->`+ `<!-- UUID://%s// -->`+
`<tw-storydata name=%q startnode=%q creator=%q creator-version=%q ifid=%q zoom=%q format=%q format-version=%q options=%q hidden>`, `<tw-storydata name=%q startnode=%q creator=%q creator-version=%q format=%q format-version=%q ifid=%q options=%q tags=%q zoom=%q hidden>`,
s.ifid, s.ifid,
attrEscapeString(s.name), attrEscapeString(s.name),
startID, startID,
attrEscapeString(strings.Title(tweegoName)), attrEscapeString(strings.Title(tweegoName)),
attrEscapeString(tweegoVersion.Version()), attrEscapeString(tweegoVersion.Version()),
attrEscapeString(s.ifid),
attrEscapeString(strconv.FormatFloat(s.twine2.zoom, 'f', -1, 32)),
attrEscapeString(s.format.name), attrEscapeString(s.format.name),
attrEscapeString(s.format.version), attrEscapeString(s.format.version),
attrEscapeString(options), attrEscapeString(s.ifid),
attrEscapeString(optsValue),
attrEscapeString(tagsValue),
attrEscapeString(strconv.FormatFloat(s.twine2.zoom, 'f', -1, 32)),
)), data...) )), data...)
data = append(data, `</tw-storydata>`...) data = append(data, `</tw-storydata>`...)