codeberg.org/pebbe/errors

RO/cmd/ro/ro.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/pebbe/util"
+	e "codeberg.org/pebbe/errors"
 
 	"encoding/xml"
 	"fmt"
@@ -26,7 +26,7 @@ type ItemT struct {
 }
 
 var (
-	x     = util.CheckErr
+	p     = e.PanicErr
 	agent = "AhrefsBot/7.0"
 )
 
@@ -36,22 +36,29 @@ func exists(filename string) bool {
 }
 
 func main() {
+	defer func() {
+		if e.Panicked() {
+			_ = recover()
+			os.Exit(1)
+		}
+	}()
+
 	req, err := http.NewRequest("GET", "https://reportersonline.nl/feed/", nil)
-	x(err)
+	p(err)
 	req.Header.Set("User-Agent", agent)
 
 	client := &http.Client{}
 	resp, err := client.Do(req)
-	x(err)
+	p(err)
 	body, err := io.ReadAll(resp.Body)
-	x(err)
-	x(resp.Body.Close())
+	p(err)
+	p(resp.Body.Close())
 
 	var rss Rss
-	x(xml.Unmarshal(body, &rss))
+	p(xml.Unmarshal(body, &rss))
 
 	if len(rss.Items) == 0 {
-		x(fmt.Errorf("len(rss.Items) == 0"))
+		p(fmt.Errorf("len(rss.Items) == 0"))
 	}
 
 	for _, item := range rss.Items {
@@ -59,7 +66,7 @@ func main() {
 		if err != nil {
 			t, err = time.Parse(time.RFC1123, item.PubDate)
 		}
-		x(err)
+		p(err)
 		year, week := t.ISOWeek()
 		dirname := fmt.Sprintf("/net/corpora/nlnieuws/RO/%d/%02d", year, week)
 		if exists(dirname + "/lock") {
@@ -71,19 +78,24 @@ func main() {
 		}
 		filename := dirname + "/" + url.PathEscape(basename)
 
-		x(os.MkdirAll(dirname, 0777))
-		fp, err := os.Create(filename + ".xml")
-		x(err)
-		_, err = fp.WriteString("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<item>\n")
-		x(err)
-		_, err = fmt.Fprintf(fp, "<unixTime>%d</unixTime>", t.Unix())
-		x(err)
-		_, err = fp.Write(item.Data)
-		x(err)
-		_, err = fp.WriteString("</item>\n")
-		x(err)
-		x(fp.Close())
-		x(os.Chtimes(filename+".xml", t, t))
+		p(os.MkdirAll(dirname, 0777))
+		func() {
+			var ok bool
+			defer func() {
+				if !ok {
+					_ = os.Remove(filename + ".xml")
+				}
+			}()
+			fp, err := os.Create(filename + ".xml")
+			p(err)
+			p(fp.WriteString("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<item>\n"))
+			p(fmt.Fprintf(fp, "<unixTime>%d</unixTime>", t.Unix()))
+			p(fp.Write(item.Data))
+			p(fp.WriteString("</item>\n"))
+			p(fp.Close())
+			p(os.Chtimes(filename+".xml", t, t))
+			ok = true
+		}()
 	}
 
 }