xevion/scla-unsubscribe
1
0
Fork 0
mirror of https://github.com/Xevion/scla-unsubscribe.git synced 2025-12-11 00:08:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Wrap errors instead of fmt.Error[f]

Browse Source
This commit is contained in:
Xevion
2023-12-29 14:14:54 -06:00
parent f2354d0cc9
commit c86a80fcc0
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
directory.go
View File

@@ -21,7 +21,7 @@ func Login(username string, password string) error {
ApplyUtsaHeaders(request) ApplyUtsaHeaders(request)
response, err := DoRequestNoRead(request) response, err := DoRequestNoRead(request)
if err != nil { if err != nil {
return nil return errors.Wrap(err, "error sending initial request")
} }
// Verify that we were redirected to the login page // Verify that we were redirected to the login page
@@ -111,7 +111,7 @@ func Login(username string, password string) error {
ApplyUtsaHeaders(request) ApplyUtsaHeaders(request)
response, err = DoRequestNoRead(request) response, err = DoRequestNoRead(request)
if err != nil { if err != nil {
return err return errors.Wrap(err, "error sending redirect request")
} else if response.StatusCode != 200 { } else if response.StatusCode != 200 {
return fmt.Errorf("non-200 status after login attempt") return fmt.Errorf("non-200 status after login attempt")
} }
@@ -119,7 +119,7 @@ func Login(username string, password string) error {
// Parse the response body // Parse the response body
doc, err = goquery.NewDocumentFromReader(response.Body) doc, err = goquery.NewDocumentFromReader(response.Body)
if err != nil { if err != nil {
return fmt.Errorf("error parsing response body") return errors.Wrap(err, "error parsing response body")
} }
// Look for field validation errors (untested) // Look for field validation errors (untested)
@@ -167,7 +167,7 @@ func CheckLoggedIn() (bool, error) {
ApplyUtsaHeaders(request) ApplyUtsaHeaders(request)
response, err := DoRequestNoRead(request) response, err := DoRequestNoRead(request)
if err != nil { if err != nil {
return false, fmt.Errorf("could not send redirect check request") return false, errors.Wrap(err, "could not send redirect check request")
} }
// If it's not a 302 // If it's not a 302
@@ -180,7 +180,7 @@ func CheckLoggedIn() (bool, error) {
// Parse the response document // Parse the response document
doc, err := goquery.NewDocumentFromReader(response.Body) doc, err := goquery.NewDocumentFromReader(response.Body)
if err != nil { if err != nil {
return false, fmt.Errorf("error parsing response body") return false, errors.Wrap(err, "error parsing response body")
} }
// Try to find the log out button // Try to find the log out button
@@ -210,14 +210,14 @@ func GetDirectoryCached(letter string) ([]Entry, error) {
if err == badger.ErrKeyNotFound { if err == badger.ErrKeyNotFound {
return nil return nil
} else if err != nil { } else if err != nil {
return err return errors.Wrap(err, "failed to get directory cache")
} }
// Try to read the value // Try to read the value
entries = make([]Entry, 0, 500) entries = make([]Entry, 0, 500)
return directoryItem.Value(func(val []byte) error { return directoryItem.Value(func(val []byte) error {
err := json.Unmarshal(val, &entries) err := json.Unmarshal(val, &entries)
return err return errors.Wrap(err, "failed to unmarshal directory entries")
}) })
}) })