jason/cpolis
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases 58 Wiki Activity

Changed error messages

Browse Source
This commit is contained in:
Jason Streifling
2024-02-22 15:23:29 +01:00
parent 6e91253908
commit 50895249df
5 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/data/db.go
View File

@@ -19,15 +19,15 @@ func OpenDB(dbName string) (*DB, error) {
cfg.DBName = dbName
cfg.User, cfg.Passwd, err = getCredentials()
if err != nil {
return nil, fmt.Errorf("error: user credentials for DB could not be read: %v", err)
return nil, fmt.Errorf("error reading user credentials for DB: %v", err)
}
db.DB, err = sql.Open("mysql", cfg.FormatDSN())
if err != nil {
return nil, fmt.Errorf("error: DB could not be opened: %v", err)
return nil, fmt.Errorf("error opening DB: %v", err)
}
if err = db.Ping(); err != nil {
return nil, fmt.Errorf("error: DB could not be reached: %v", err)
return nil, fmt.Errorf("error pinging DB: %v", err)
}
return &db, nil

8
cmd/data/helpers.go
View File

@@ -17,7 +17,7 @@ func getUsername() (string, error) {
fmt.Printf("DB Benutzer: ")
user, err = bufio.NewReader(os.Stdin).ReadString('\n')
if err != nil {
return fmt.Errorf("error: cmd/data/helpers.go getUsername bufio.NewReader().ReadString(): %v", err)
return "", fmt.Errorf("error reading username: %v", err)
}
}
return strings.TrimSpace(user), nil
@@ -29,7 +29,7 @@ func getPassword() (string, error) {
fmt.Printf("DB Passwort: ")
bytePass, err := term.ReadPassword(int(syscall.Stdin))
if err != nil {
return fmt.Errorf("error: cmd/data/helpers.go getPassword term.ReadPassword(): %v", err)
return "", fmt.Errorf("error reading password: %v", err)
}
fmt.Println()
pass = strings.TrimSpace(string(bytePass))
@@ -40,12 +40,12 @@ func getPassword() (string, error) {
func getCredentials() (string, string, error) {
user, err := getUsername()
if err != nil {
return "", "", fmt.Errorf("error: cmd/data/helpers.go getCredentials getUsername(): %v", err)
return "", "", fmt.Errorf("error getting username: %v", err)
}
pass, err := getPassword()
if err != nil {
return "", "", fmt.Errorf("error: cmd/data/helpers.go getCredentials getPassword(): %v", err)
return "", "", fmt.Errorf("error getting password: %v", err)
}
return user, pass, nil

10
cmd/feed/rss.go
View File

@@ -26,14 +26,14 @@ func NewFeed(title, link, desc string) *Feed {
func SaveFeed(feed *Feed, filename string) error {
file, err := os.Create(filename)
if err != nil {
return fmt.Errorf("error cmd/feed/rss.go SaveFeed os.Create(): %v", err)
return fmt.Errorf("error creating file %v: %v", filename, err)
}
defer file.Close()
encoder := gob.NewEncoder(file)
err = encoder.Encode(feed)
if err != nil {
return fmt.Errorf("error cmd/feed/rss.go SaveFeed encoder.Encode(): %v", err)
return fmt.Errorf("error encoding file %v: %v", filename, err)
}
return nil
@@ -42,7 +42,7 @@ func SaveFeed(feed *Feed, filename string) error {
func OpenFeed(filename string) (*Feed, error) {
file, err := os.Open(filename)
if err != nil {
return nil, fmt.Errorf("error cmd/feed/rss.go OpenFeed os.Open(): %v", err)
return nil, fmt.Errorf("error opening file %v: %v", filename, err)
}
defer file.Close()
@@ -50,7 +50,7 @@ func OpenFeed(filename string) (*Feed, error) {
decoder := gob.NewDecoder(file)
err = decoder.Decode(feed)
if err != nil {
return nil, fmt.Errorf("error cmd/feed/rss.go OpenFeed decoder.Decode(): %v", err)
return nil, fmt.Errorf("error decoding file %v: %v", filename, err)
}
return feed, nil
@@ -67,7 +67,7 @@ func AddToFeed(feed *Feed, title, desc, content string) error {
rss, err := feed.ToRss()
if err != nil {
return fmt.Errorf("error cmd/feed/rss.go AddToFeed feed.ToRss(): %v", err)
return fmt.Errorf("error converting feed to RSS: %v", err)
}
fmt.Println(rss)