aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoop <Joop Kiefte>2022-04-02 14:55:27 +0100
committerjoop <Joop Kiefte>2022-04-02 14:55:27 +0100
commitc86549d549cd7b63f3250e97745b01530d51f675 (patch)
treecbbf398c8df688fff2d55e5ea9d75c51e0fb0a86
parent147a632211be839d32771bccacab22881d589d92 (diff)
Add merge option
-rw-r--r--main.go16
1 files 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? ")