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

Add method parameter to internal request function

Browse source
This commit is contained in:
bytedream 2022-05-30 12:08:52 +02:00
parent e31b8730da
commit 1c37c3e699
6 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crunchyroll.go
View file

@ -185,7 +185,7 @@ func postLogin(loginResp loginResponse, etpRt string, locale LOCALE, client *htt
var jsonBody map[string]any var jsonBody map[string]any
endpoint := "https://beta-api.crunchyroll.com/index/v2" endpoint := "https://beta-api.crunchyroll.com/index/v2"
resp, err := crunchy.request(endpoint) resp, err := crunchy.request(endpoint, http.MethodGet)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -205,7 +205,7 @@ func postLogin(loginResp loginResponse, etpRt string, locale LOCALE, client *htt
crunchy.Config.KeyPairID = cms["key_pair_id"].(string) crunchy.Config.KeyPairID = cms["key_pair_id"].(string)
endpoint = "https://beta-api.crunchyroll.com/accounts/v1/me" endpoint = "https://beta-api.crunchyroll.com/accounts/v1/me"
resp, err = crunchy.request(endpoint) resp, err = crunchy.request(endpoint, http.MethodGet)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -214,7 +214,7 @@ func postLogin(loginResp loginResponse, etpRt string, locale LOCALE, client *htt
crunchy.Config.ExternalID = jsonBody["external_id"].(string) crunchy.Config.ExternalID = jsonBody["external_id"].(string)
endpoint = "https://beta-api.crunchyroll.com/accounts/v1/me/profile" endpoint = "https://beta-api.crunchyroll.com/accounts/v1/me/profile"
resp, err = crunchy.request(endpoint) resp, err = crunchy.request(endpoint, http.MethodGet)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -264,8 +264,8 @@ func request(req *http.Request, client *http.Client) (*http.Response, error) {
} }
// request is a base function which handles api requests. // request is a base function which handles api requests.
func (c *Crunchyroll) request(endpoint string) (*http.Response, error) { func (c *Crunchyroll) request(endpoint string, method string) (*http.Response, error) {
req, err := http.NewRequest(http.MethodGet, endpoint, nil) req, err := http.NewRequest(method, endpoint, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -292,7 +292,7 @@ func (c *Crunchyroll) SetCaching(caching bool) {
func (c *Crunchyroll) Search(query string, limit uint) (s []*Series, m []*Movie, err error) { func (c *Crunchyroll) Search(query string, limit uint) (s []*Series, m []*Movie, err error) {
searchEndpoint := fmt.Sprintf("https://beta-api.crunchyroll.com/content/v1/search?q=%s&n=%d&type=&locale=%s", searchEndpoint := fmt.Sprintf("https://beta-api.crunchyroll.com/content/v1/search?q=%s&n=%d&type=&locale=%s",
query, limit, c.Locale) query, limit, c.Locale)
resp, err := c.request(searchEndpoint) resp, err := c.request(searchEndpoint, http.MethodGet)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }

3
episode.go
View file

@ -3,6 +3,7 @@ package crunchyroll
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"net/http"
"regexp" "regexp"
"strconv" "strconv"
"strings" "strings"
@ -85,7 +86,7 @@ func EpisodeFromID(crunchy *Crunchyroll, id string) (*Episode, error) {
crunchy.Locale, crunchy.Locale,
crunchy.Config.Signature, crunchy.Config.Signature,
crunchy.Config.Policy, crunchy.Config.Policy,
crunchy.Config.KeyPairID)) crunchy.Config.KeyPairID), http.MethodGet)
if err != nil { if err != nil {
return nil, err return nil, err
} }

5
movie_listing.go
View file

@ -3,6 +3,7 @@ package crunchyroll
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"net/http"
) )
// MovieListing contains information about something which is called // MovieListing contains information about something which is called
@ -48,7 +49,7 @@ func MovieListingFromID(crunchy *Crunchyroll, id string) (*MovieListing, error)
crunchy.Locale, crunchy.Locale,
crunchy.Config.Signature, crunchy.Config.Signature,
crunchy.Config.Policy, crunchy.Config.Policy,
crunchy.Config.KeyPairID)) crunchy.Config.KeyPairID), http.MethodGet)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -77,7 +78,7 @@ func (ml *MovieListing) AudioLocale() (LOCALE, error) {
ml.crunchy.Locale, ml.crunchy.Locale,
ml.crunchy.Config.Signature, ml.crunchy.Config.Signature,
ml.crunchy.Config.Policy, ml.crunchy.Config.Policy,
ml.crunchy.Config.KeyPairID)) ml.crunchy.Config.KeyPairID), http.MethodGet)
if err != nil { if err != nil {
return "", err return "", err
} }

3
season.go
View file

@ -3,6 +3,7 @@ package crunchyroll
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"net/http"
"regexp" "regexp"
) )
@ -94,7 +95,7 @@ func (s *Season) Episodes() (episodes []*Episode, err error) {
s.crunchy.Locale, s.crunchy.Locale,
s.crunchy.Config.Signature, s.crunchy.Config.Signature,
s.crunchy.Config.Policy, s.crunchy.Config.Policy,
s.crunchy.Config.KeyPairID)) s.crunchy.Config.KeyPairID), http.MethodGet)
if err != nil { if err != nil {
return nil, err return nil, err
} }

3
stream.go
View file

@ -4,6 +4,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/grafov/m3u8" "github.com/grafov/m3u8"
"net/http"
"regexp" "regexp"
) )
@ -72,7 +73,7 @@ func (s *Stream) Formats() ([]*Format, error) {
// fromVideoStreams returns all streams which are accessible via the endpoint. // fromVideoStreams returns all streams which are accessible via the endpoint.
func fromVideoStreams(crunchy *Crunchyroll, endpoint string) (streams []*Stream, err error) { func fromVideoStreams(crunchy *Crunchyroll, endpoint string) (streams []*Stream, err error) {
resp, err := crunchy.request(endpoint) resp, err := crunchy.request(endpoint, http.MethodGet)
if err != nil { if err != nil {
return nil, err return nil, err
} }

9
video.go
View file

@ -3,6 +3,7 @@ package crunchyroll
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"net/http"
) )
type video struct { type video struct {
@ -77,7 +78,7 @@ func MovieFromID(crunchy *Crunchyroll, id string) (*Movie, error) {
crunchy.Locale, crunchy.Locale,
crunchy.Config.Signature, crunchy.Config.Signature,
crunchy.Config.Policy, crunchy.Config.Policy,
crunchy.Config.KeyPairID)) crunchy.Config.KeyPairID), http.MethodGet)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -110,7 +111,7 @@ func (m *Movie) MovieListing() (movieListings []*MovieListing, err error) {
m.crunchy.Locale, m.crunchy.Locale,
m.crunchy.Config.Signature, m.crunchy.Config.Signature,
m.crunchy.Config.Policy, m.crunchy.Config.Policy,
m.crunchy.Config.KeyPairID)) m.crunchy.Config.KeyPairID), http.MethodGet)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -173,7 +174,7 @@ func SeriesFromID(crunchy *Crunchyroll, id string) (*Series, error) {
crunchy.Locale, crunchy.Locale,
crunchy.Config.Signature, crunchy.Config.Signature,
crunchy.Config.Policy, crunchy.Config.Policy,
crunchy.Config.KeyPairID)) crunchy.Config.KeyPairID), http.MethodGet)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -206,7 +207,7 @@ func (s *Series) Seasons() (seasons []*Season, err error) {
s.crunchy.Locale, s.crunchy.Locale,
s.crunchy.Config.Signature, s.crunchy.Config.Signature,
s.crunchy.Config.Policy, s.crunchy.Config.Policy,
s.crunchy.Config.KeyPairID)) s.crunchy.Config.KeyPairID), http.MethodGet)
if err != nil { if err != nil {
return nil, err return nil, err
} }