NyxErinys/crunchy-cli
1
0
Fork 0
mirror of https://github.com/crunchy-labs/crunchy-cli.git synced 2026-01-21 04:02:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replaced ioutil package with io

Browse source
This commit is contained in:
bytedream 2022-03-15 22:13:28 +01:00
parent 52a8f81356
commit 16fcf08f34
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cmd/crunchyroll-go/cmd/login.go
View file

@ -4,7 +4,6 @@ import (
"fmt" "fmt"
"github.com/ByteDream/crunchyroll-go" "github.com/ByteDream/crunchyroll-go"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"io/ioutil"
"os" "os"
"os/user" "os/user"
"path/filepath" "path/filepath"
@ -46,7 +45,7 @@ func loginCredentials(user, password string) error {
os.Exit(1) os.Exit(1)
} }
return ioutil.WriteFile(loginStorePath(), []byte(fmt.Sprintf("%s\n%s", user, password)), 0600) return os.WriteFile(loginStorePath(), []byte(fmt.Sprintf("%s\n%s", user, password)), 0600)
} }
func loginSessionID(sessionID string) error { func loginSessionID(sessionID string) error {
@ -56,7 +55,7 @@ func loginSessionID(sessionID string) error {
os.Exit(1) os.Exit(1)
} }
return ioutil.WriteFile(loginStorePath(), []byte(sessionID), 0600) return os.WriteFile(loginStorePath(), []byte(sessionID), 0600)
} }
func loginStorePath() string { func loginStorePath() string {

8
crunchyroll.go
View file

@ -5,7 +5,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"io/ioutil" "io"
"net/http" "net/http"
"net/url" "net/url"
"regexp" "regexp"
@ -68,7 +68,7 @@ func LoginWithCredentials(user string, password string, locale LOCALE, client *h
defer sessResp.Body.Close() defer sessResp.Body.Close()
var data map[string]interface{} var data map[string]interface{}
body, _ := ioutil.ReadAll(sessResp.Body) body, _ := io.ReadAll(sessResp.Body)
json.Unmarshal(body, &data) json.Unmarshal(body, &data)
sessionID := data["data"].(map[string]interface{})["session_id"].(string) sessionID := data["data"].(map[string]interface{})["session_id"].(string)
@ -211,7 +211,7 @@ func (c *Crunchyroll) request(endpoint string) (*http.Response, error) {
resp, err := c.Client.Do(req) resp, err := c.Client.Do(req)
if err == nil { if err == nil {
bodyAsBytes, _ := ioutil.ReadAll(resp.Body) bodyAsBytes, _ := io.ReadAll(resp.Body)
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode == http.StatusUnauthorized { if resp.StatusCode == http.StatusUnauthorized {
return nil, &AccessError{ return nil, &AccessError{
@ -231,7 +231,7 @@ func (c *Crunchyroll) request(endpoint string) (*http.Response, error) {
} }
} }
} }
resp.Body = ioutil.NopCloser(bytes.NewBuffer(bodyAsBytes)) resp.Body = io.NopCloser(bytes.NewBuffer(bodyAsBytes))
} }
return resp, err return resp, err
} }

5
downloader.go
View file

@ -8,7 +8,6 @@ import (
"fmt" "fmt"
"github.com/grafov/m3u8" "github.com/grafov/m3u8"
"io" "io"
"io/ioutil"
"math" "math"
"net/http" "net/http"
"os" "os"
@ -324,7 +323,7 @@ func getCrypt(format *Format, segment *m3u8.MediaSegment) (block cipher.Block, i
return nil, nil, err return nil, nil, err
} }
defer resp.Body.Close() defer resp.Body.Close()
key, err := ioutil.ReadAll(resp.Body) key, err := io.ReadAll(resp.Body)
block, err = aes.NewCipher(key) block, err = aes.NewCipher(key)
if err != nil { if err != nil {
@ -372,7 +371,7 @@ func (d Downloader) decryptSegment(client *http.Client, segment *m3u8.MediaSegme
} }
defer resp.Body.Close() defer resp.Body.Close()
raw, err := ioutil.ReadAll(resp.Body) raw, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return nil, err return nil, err
} }