fix title voor HLN en Parool; helperfuncties naar internal/util
This commit is contained in:
@@ -3,6 +3,8 @@ package main
|
||||
import (
|
||||
e "codeberg.org/pebbe/errors"
|
||||
|
||||
u "git.web.rug.nl/p209327/nlnieuws/internal/util"
|
||||
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os"
|
||||
@@ -61,13 +63,13 @@ func main() {
|
||||
x(err)
|
||||
item := getItem(b, filename)
|
||||
for _, cat := range item.Cats {
|
||||
x(fmt.Fprintf(fp, "##META text cat = %s\n", fixSpace(cat)))
|
||||
x(fmt.Fprintf(fp, "##META text cat = %s\n", u.FixSpace(cat)))
|
||||
}
|
||||
for _, tag := range item.Tags {
|
||||
x(fmt.Fprintf(fp, "##META text tag = %s\n", fixSpace(tag)))
|
||||
x(fmt.Fprintf(fp, "##META text tag = %s\n", u.FixSpace(tag)))
|
||||
}
|
||||
x(fp.WriteString(addEnd(fixSpace(item.Title))))
|
||||
x(fp.WriteString(fixSpace(item.Text)))
|
||||
x(fp.WriteString(u.AddEnd(u.FixSpace(item.Title))))
|
||||
x(fp.WriteString(u.FixSpace(item.Text)))
|
||||
x(fp.Close())
|
||||
}
|
||||
}
|
||||
@@ -90,27 +92,3 @@ func getItem(b []byte, filename string) Item {
|
||||
x(json.Unmarshal(b, &item), filename)
|
||||
return item
|
||||
}
|
||||
|
||||
func addEnd(s string) string {
|
||||
s = strings.TrimSpace(s)
|
||||
n := len(s)
|
||||
if n == 0 {
|
||||
return ""
|
||||
}
|
||||
if n > 0 {
|
||||
if strings.ContainsAny(s[n-1:], ".!?") {
|
||||
return s + "\n"
|
||||
}
|
||||
}
|
||||
if n > 1 {
|
||||
s2 := s[n-2:]
|
||||
if s2 == `."` || s2 == `!"` || s2 == `?"` || s2 == `.'` || s2 == `!'` || s2 == `?'` {
|
||||
return s + "\n"
|
||||
}
|
||||
}
|
||||
return s + ".\n"
|
||||
}
|
||||
|
||||
func fixSpace(s string) string {
|
||||
return strings.Join(strings.Fields(s), " ")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user