diff options
| author | Lukasz Kasprzak <lukas@labunix.xyz> | 2026-07-28 12:50:31 +0200 |
|---|---|---|
| committer | Lukasz Kasprzak <lukas@labunix.xyz> | 2026-07-28 12:50:31 +0200 |
| commit | 7b220084cf3951c8cde0582efdfcf628afc64336 (patch) | |
| tree | e74bae03c61b62479ef4f68b046e3345618933c8 /cmd | |
| parent | feede51697be870ae183a95b513ef64f031dbd0f (diff) | |
| download | lectio-7b220084cf3951c8cde0582efdfcf628afc64336.tar.gz lectio-7b220084cf3951c8cde0582efdfcf628afc64336.zip | |
refactor: remove the niedziela/missalemeum scrapers, bt, traditional_lang
The daily view now computes entirely offline (previous commit), so retire the
network path and everything that served it:
- Delete internal/tradlit (missalemeum) and the niedziela scraper from
internal/liturgy (fetch/store/parse + fixtures); keep Section, DayInfo and
ExtractCitation.
- Remove the "bt" version everywhere (render gatherBT + branches, config,
i18n, web form, TUI) and bible.ToEnglishRef (Polish citation converter).
A legacy config carrying "bt" migrates to "wuj" on load (config.migrateBT).
- Remove the traditional_lang config field and the -g/--lang flag from all
three binaries.
- Drop the now-dead flags -R/--refresh, -o/--offline, -u/--update,
-C/--clean and the harvest/clean commands.
- New defaults: versions = wuj,vul,grb,drb; default_version = vul.
Update the README (offline-by-design, no harvest/update), help text, and
stale niedziela/bt doc comments. Tests updated for the offline reality;
go test ./... and go vet ./... are clean, all three binaries build and run
offline (OF + EF, compare, web).
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/lectio-ui/main.go | 21 | ||||
| -rw-r--r-- | cmd/lectio-web/main.go | 13 |
2 files changed, 6 insertions, 28 deletions
diff --git a/cmd/lectio-ui/main.go b/cmd/lectio-ui/main.go index 43fc5ab..b08188c 100644 --- a/cmd/lectio-ui/main.go +++ b/cmd/lectio-ui/main.go @@ -27,12 +27,10 @@ Flags: -a, --all show all parts (override config) -o, --offline cache/sigla only, no network -l, --lectionary WHICH new|trad (trad -> traditional) - -g, --lang LANG traditional lectionary language: pl|en -v, --version print the version and exit -h, --help this help -Versions: bt (Biblia TysiÄ…clecia) wuj (Wujek) vul (Wulgata) grb (Grecki) - drb (Douay-Rheims) +Versions: wuj (Wujek) vul (Wulgata) grb (Grecki) drb (Douay-Rheims) Flags override config. Exit codes: 0 ok, 1 runtime error, 2 usage error. ` @@ -68,14 +66,14 @@ func run(args []string, stdout, stderr io.Writer) int { } var all, offline, reader bool - var bibleVer, lectionary, lang string + var bibleVer, lectionary string fs := flag.NewFlagSet("lectio-ui", flag.ContinueOnError) fs.SetOutput(stderr) fs.Usage = func() { fmt.Fprint(stderr, helpText) } - fs.StringVar(&bibleVer, "b", "", "start on version: bt,wuj,vul,grb,drb") - fs.StringVar(&bibleVer, "bible", "", "start on version: bt,wuj,vul,grb,drb") + fs.StringVar(&bibleVer, "b", "", "start on version: wuj,vul,grb,drb") + fs.StringVar(&bibleVer, "bible", "", "start on version: wuj,vul,grb,drb") fs.BoolVar(&reader, "R", false, "open the Bible reader (fuzzy book picker) instead of the daily view") fs.BoolVar(&reader, "reader", false, "open the Bible reader (fuzzy book picker) instead of the daily view") fs.BoolVar(&all, "a", cfg.All, "show all parts (override config)") @@ -84,8 +82,6 @@ func run(args []string, stdout, stderr io.Writer) int { fs.BoolVar(&offline, "offline", cfg.Offline, "cache/sigla only, no network") fs.StringVar(&lectionary, "l", "", "new|trad") fs.StringVar(&lectionary, "lectionary", "", "new|trad") - fs.StringVar(&lang, "g", "", "pl|en") - fs.StringVar(&lang, "lang", "", "pl|en") if err := fs.Parse(rest); err != nil { return 2 @@ -100,12 +96,8 @@ func run(args []string, stdout, stderr io.Writer) int { fmt.Fprintln(stderr, "lectio-ui:", err) return 2 } - if lang != "" && lang != "pl" && lang != "en" { - fmt.Fprintf(stderr, "lectio-ui: invalid --lang %q (want pl|en)\n", lang) - return 2 - } if bibleVer != "" && !config.ValidVersion(bibleVer) { - fmt.Fprintf(stderr, "lectio-ui: unknown version %q (want one of bt, wuj, vul, grb, drb)\n", bibleVer) + fmt.Fprintf(stderr, "lectio-ui: unknown version %q (want one of wuj, vul, grb, drb)\n", bibleVer) return 2 } @@ -114,9 +106,6 @@ func run(args []string, stdout, stderr io.Writer) int { if lectionary != "" { cfg.Lectionary = lectionary } - if lang != "" { - cfg.TraditionalLang = lang - } var mdl tea.Model = tui.New(cfg, date, bibleVer) if reader { diff --git a/cmd/lectio-web/main.go b/cmd/lectio-web/main.go index 2e7fa5a..327496a 100644 --- a/cmd/lectio-web/main.go +++ b/cmd/lectio-web/main.go @@ -20,7 +20,6 @@ Flags: -p, --port N port (overrides web_port; 0 = auto) -o, --offline cache/sigla only, no network -l, --lectionary WHICH new|trad (trad -> traditional) - -g, --lang LANG traditional lectionary language: pl|en -v, --version print the version and exit -h, --help this help @@ -52,7 +51,7 @@ func run(args []string, stdout, stderr io.Writer) int { var offline bool var port int - var lectionary, lang string + var lectionary string fs := flag.NewFlagSet("lectio-web", flag.ContinueOnError) fs.SetOutput(stderr) @@ -64,8 +63,6 @@ func run(args []string, stdout, stderr io.Writer) int { fs.BoolVar(&offline, "offline", cfg.Offline, "cache/sigla only, no network") fs.StringVar(&lectionary, "l", "", "new|trad") fs.StringVar(&lectionary, "lectionary", "", "new|trad") - fs.StringVar(&lang, "g", "", "pl|en") - fs.StringVar(&lang, "lang", "", "pl|en") if err := fs.Parse(args); err != nil { return 2 @@ -80,19 +77,11 @@ func run(args []string, stdout, stderr io.Writer) int { fmt.Fprintln(stderr, "lectio-web:", err) return 2 } - if lang != "" && lang != "pl" && lang != "en" { - fmt.Fprintf(stderr, "lectio-web: invalid --lang %q (want pl|en)\n", lang) - return 2 - } - cfg.WebPort = port cfg.Offline = offline if lectionary != "" { cfg.Lectionary = lectionary } - if lang != "" { - cfg.TraditionalLang = lang - } if err := web.Run(cfg); err != nil { fmt.Fprintln(stderr, err) |
