From c86549d549cd7b63f3250e97745b01530d51f675 Mon Sep 17 00:00:00 2001
From: joop <Joop Kiefte>
Date: Sat, 2 Apr 2022 14:55:27 +0100
Subject: Add merge option

---
 main.go | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/main.go b/main.go
index 25c0f9d..458659c 100644
--- a/main.go
+++ b/main.go
@@ -138,8 +138,8 @@ func ReadLangCSV() error {
 	return nil
 }
 
-func ReadCodeList() error {
-	file, err := os.Open("rel/code.list")
+func ReadCodeList(filename string) error {
+	file, err := os.Open(filename)
 	if err != nil {
 		return err
 	}
@@ -308,10 +308,20 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	err = ReadCodeList()
+	err = ReadCodeList("rel/code.list")
 	if err != nil {
 		panic(err)
 	}
+	fmt.Print("Do you want to merge in someone else's work? (y/n): ")
+	s := prompt.MustRead[string]()
+	if s == "y" {
+		fmt.Print("Enter the name of the file: ")
+		s = prompt.MustRead[string]()
+		err = ReadCodeList(s)
+		if err != nil {
+			fmt.Println("Could not read " + s + ": " + err.Error())
+		}
+	}
 	// Ask which languages to use as a reference and read in all prayers
 	// with a language code to PrayersWithCode
 	refLanguages := AskLanguages("Which languages do you want to reference to? ")
-- 
cgit v1.2.3-70-g09d2