refactoring with internal
This commit is contained in:
@@ -1,43 +1,44 @@
|
||||
package main
|
||||
package fetcher
|
||||
|
||||
import(
|
||||
"project.hechon.fr/internal/config"
|
||||
"log"
|
||||
"net/http"
|
||||
"github.com/PuerkitoBio/goquery"
|
||||
"strconv"
|
||||
"strings"
|
||||
)
|
||||
type chapter struct{
|
||||
verses []string
|
||||
}
|
||||
|
||||
type book struct{
|
||||
chapters []chapter
|
||||
}
|
||||
func FetchChapter(cfg *config.Cfg , searchedChapter string) ( error){
|
||||
|
||||
func fetchChapter(book, searchedChapter, version string) (chapter, error){
|
||||
|
||||
url := "https://www.biblegateway.com/passage/?search=" + book + "%20" + searchedChapter +"&version=" + version
|
||||
url := "https://www.biblegateway.com/passage/?search=" + cfg.Book.Name + "%20" + searchedChapter +"&version=" + cfg.Book.Version
|
||||
|
||||
res, err := http.Get(url)
|
||||
if err != nil {
|
||||
log.Printf("can’t get %s : %v\n", url, err)
|
||||
return chapter{}, err
|
||||
return err
|
||||
}
|
||||
|
||||
defer res.Body.Close()
|
||||
if res.StatusCode != http.StatusOK {
|
||||
log.Printf("error code %v: %v\n", res.StatusCode, res.Status)
|
||||
return chapter{}, err
|
||||
log.Printf("error %v\n", res.Status)
|
||||
return err
|
||||
}
|
||||
|
||||
doc, err := goquery.NewDocumentFromReader(res.Body)
|
||||
if err != nil {
|
||||
log.Printf("error reading the http response: %v\n", err)
|
||||
return chapter{}, err
|
||||
return err
|
||||
}
|
||||
|
||||
chapterText := chapter{}
|
||||
chapterNum, err := strconv.Atoi(searchedChapter)
|
||||
if err != nil{
|
||||
log.Printf("searched chapter %v is not a valid number%v", searchedChapter, err)
|
||||
}
|
||||
|
||||
chapterText := config.Chapter{
|
||||
Number: chapterNum,
|
||||
}
|
||||
replacer := strings.NewReplacer(
|
||||
"L'Éternel", "YAHWEH",
|
||||
"l'Éternel", "YAHWEH",
|
||||
@@ -59,10 +60,12 @@ func fetchChapter(book, searchedChapter, version string) (chapter, error){
|
||||
verse, _ = strings.CutPrefix(rawText, strconv.Itoa(i+1))
|
||||
}
|
||||
verse = replacer.Replace(verse)
|
||||
chapterText.verses = append(chapterText.verses, strings.TrimSpace(verse))
|
||||
chapterText.Verses = append(chapterText.Verses, strings.TrimSpace(verse))
|
||||
})
|
||||
|
||||
return chapterText, nil
|
||||
chapterText = StripAlternativeVersification(chapterText)
|
||||
cfg.Book.Chapters = append(cfg.Book.Chapters, chapterText)
|
||||
return nil
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user