nik/signal-cli-rest-api
1
0
Fork 0
mirror of https://github.com/bbernhard/signal-cli-rest-api.git synced 2026-05-18 13:24:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
Gara Dorta 2026-05-15 19:28:57 +02:00
parent af48a4304b
commit a7c91737b8
1 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/docs/add_v1_receive_schemas.go
View File

@ -76,19 +76,21 @@ func updateDocsGo(receiveDefinitions map[string]interface{}) error {
return err return err
} }
document, err := jsonUnmarshalSafe(template, true) var document map[string]interface{}
if err != nil { if err := json.Unmarshal([]byte(toValidJson(template)), &document); err != nil {
return err return fmt.Errorf("parse document: %w", err)
} }
if err := applyReceiveSchemaUpdates(document, receiveDefinitions); err != nil { if err := applyReceiveSchemaUpdates(document, receiveDefinitions); err != nil {
return err return err
} }
updatedTemplate, err := jsonMarshalIndentSafe(document, true) raw, err := json.MarshalIndent(document, "", " ")
if err != nil { if err != nil {
return err return fmt.Errorf("marshal document: %w", err)
} }
updatedTemplate := string(raw)
updatedTemplate = encodeForGoRawString(updatedTemplate)
updated := string(content[:templateStart]) + updatedTemplate + string(content[templateEnd:]) updated := string(content[:templateStart]) + updatedTemplate + string(content[templateEnd:])
if err := os.WriteFile(goDocsPath, []byte(updated), 0644); err != nil { if err := os.WriteFile(goDocsPath, []byte(updated), 0644); err != nil {
@ -104,19 +106,20 @@ func updateSwaggerJSON(receiveDefinitions map[string]interface{}) error {
return fmt.Errorf("read %s: %w", jsonDocsPath, err) return fmt.Errorf("read %s: %w", jsonDocsPath, err)
} }
document, err := jsonUnmarshalSafe(string(content), false) var document map[string]interface{}
if err != nil { if err := json.Unmarshal(content, &document); err != nil {
return err return fmt.Errorf("parse document: %w", err)
} }
if err := applyReceiveSchemaUpdates(document, receiveDefinitions); err != nil { if err := applyReceiveSchemaUpdates(document, receiveDefinitions); err != nil {
return err return err
} }
updated, err := jsonMarshalIndentSafe(document, false) raw, err := json.MarshalIndent(document, "", " ")
if err != nil { if err != nil {
return err return fmt.Errorf("marshal document: %w", err)
} }
updated := string(raw)
if err := os.WriteFile(jsonDocsPath, []byte(updated), 0644); err != nil { if err := os.WriteFile(jsonDocsPath, []byte(updated), 0644); err != nil {
return fmt.Errorf("write %s: %w", jsonDocsPath, err) return fmt.Errorf("write %s: %w", jsonDocsPath, err)
@ -141,33 +144,16 @@ func extractDocTemplate(content string) (string, int, int, error) {
return content[start:end], start, end, nil return content[start:end], start, end, nil
} }
func jsonUnmarshalSafe(content string, applyStringConcat bool) (map[string]interface{}, error) { func toValidJson(content string) string {
if applyStringConcat { content = strings.ReplaceAll(content, "` + \"`\" + `", "`")
content = strings.ReplaceAll(content, "` + \"`\" + `", "`") content = strings.Replace(content, schemesTemplateValue, `"`+schemesPlaceholderToken+`"`, 1)
content = strings.Replace(content, schemesTemplateValue, `"`+schemesPlaceholderToken+`"`, 1) return content
}
var document map[string]interface{}
if err := json.Unmarshal([]byte(content), &document); err != nil {
return nil, fmt.Errorf("parse document: %w", err)
}
return document, nil
} }
func jsonMarshalIndentSafe(document map[string]interface{}, backTicksAsStringConcat bool) (string, error) { func encodeForGoRawString(content string) string {
raw, err := json.MarshalIndent(document, "", " ") content = strings.ReplaceAll(content, "`", "` + \"`\" + `")
if err != nil { content = strings.Replace(content, `"`+schemesPlaceholderToken+`"`, schemesTemplateValue, 1)
return "", fmt.Errorf("marshal document: %w", err) return content
}
updated := string(raw)
if backTicksAsStringConcat {
updated = strings.ReplaceAll(updated, "`", "` + \"`\" + `")
updated = strings.Replace(updated, `"`+schemesPlaceholderToken+`"`, schemesTemplateValue, 1)
}
return updated, nil
} }
func addReceiveSchemas(definitions map[string]interface{}, receiveDir string) (map[string]string, error) { func addReceiveSchemas(definitions map[string]interface{}, receiveDir string) (map[string]string, error) {