egor3f/rssalchemy
1
0
Fork 0
Code Actions Packages Releases Wiki Activity

extractor small improvements and refactoring

Browse Source
This commit is contained in:
Egor Aristov 2025-03-21 12:18:01 +03:00
parent a9ee50d722
commit 0d787c90cb
Signed by: egor3f
GPG Key ID: 40482A264AAEC85F
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
cmd/extractor/extractor.go
View File

@ -3,6 +3,7 @@ package main
import (
"encoding/json"
"flag"
"fmt"
"github.com/egor3f/rssalchemy/internal/config"
dummycookies "github.com/egor3f/rssalchemy/internal/cookiemgr/dummy"
"github.com/egor3f/rssalchemy/internal/dateparser"
@ -20,6 +21,7 @@ func main() {
log.SetHeader(`${time_rfc3339_nano} ${level}`)
outFile := flag.String("o", "", "Output file name")
skipOutput := flag.Bool("s", false, "Skip json output; show just logs")
flag.Parse()
taskFileName := "task.json"
@ -38,19 +40,9 @@ func main() {
defer out.Close()
}
taskFile, err := os.Open(taskFileName)
task, err := loadTask(taskFileName)
if err != nil {
log.Panicf("open task file: %v", err)
}
//goland:noinspection GoUnhandledErrorResult
defer taskFile.Close()
fileContents, err := io.ReadAll(taskFile)
if err != nil {
log.Panicf("read file: %v", err)
}
var task models.Task
if err := json.Unmarshal(fileContents, &task); err != nil {
log.Panicf("unmarshal task: %v", err)
log.Panicf("load task: %v", err)
}
cfg, err := config.Read()
@ -94,13 +86,35 @@ func main() {
panic(err)
}
resultStr, err := json.MarshalIndent(result, "", "\t")
if err != nil {
log.Panicf("marshal result: %v", err)
if !*skipOutput {
resultStr, err := json.MarshalIndent(result, "", "\t")
if err != nil {
log.Panicf("marshal result: %v", err)
}
n, err := out.Write(resultStr)
if err != nil {
log.Panicf("write output: %v", err)
}
log.Infof("Result written (%d bytes)", n)
}
n, err := out.Write(resultStr)
if err != nil {
log.Panicf("write output: %v", err)
}
log.Infof("Result written (%d bytes)", n)
}
func loadTask(taskFileName string) (models.Task, error) {
taskFile, err := os.Open(taskFileName)
if err != nil {
return models.Task{}, fmt.Errorf("open task file: %w", err)
}
defer taskFile.Close()
fileContents, err := io.ReadAll(taskFile)
if err != nil {
return models.Task{}, fmt.Errorf("read file: %w", err)
}
var task models.Task
if err := json.Unmarshal(fileContents, &task); err != nil {
return models.Task{}, fmt.Errorf("unmarshal task: %w", err)
}
return task, err
}