Skip to content

Commit 4610837

Browse files
30523052
committed
+ return &sourceVar, true
1 parent df6d99c commit 4610837

File tree

13 files changed

+101
-101
lines changed

13 files changed

+101
-101
lines changed

‎amc/amc.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@ func (a *Auth) SeriesDetail(id int64) (*Child, error) {
189189
return &value.Data, nil
190190
}
191191

192-
func (p *Playback) License(source1 *Source, data []byte) ([]byte, error) {
192+
func (p *Playback) License(sourceVar *Source, data []byte) ([]byte, error) {
193193
req, err := http.NewRequest(
194-
"POST", source1.KeySystems.Widevine.LicenseUrl, bytes.NewReader(data),
194+
"POST", sourceVar.KeySystems.Widevine.LicenseUrl, bytes.NewReader(data),
195195
)
196196
if err != nil {
197197
return nil, err
@@ -215,8 +215,6 @@ type Source struct {
215215
Type string
216216
}
217217

218-
///
219-
220218
type Byte[T any] []byte
221219

222220
type Child struct {
@@ -288,9 +286,9 @@ type Playback struct {
288286
}
289287

290288
func (p *Playback) Dash() (*Source, bool) {
291-
for _, source1 := range p.Body.Data.PlaybackJsonData.Sources {
292-
if source1.Type == "application/dash+xml" {
293-
return &source1, true
289+
for _, sourceVar := range p.Body.Data.PlaybackJsonData.Sources {
290+
if sourceVar.Type == "application/dash+xml" {
291+
return &sourceVar, true
294292
}
295293
}
296294
return nil, false

‎canal/canal.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -110,26 +110,26 @@ func (t *Ticket) Token(username, password string) (*Token, error) {
110110
if err != nil {
111111
return nil, err
112112
}
113-
var client1 client
114-
err = client1.New(req.URL, data)
113+
var clientVar client
114+
err = clientVar.New(req.URL, data)
115115
if err != nil {
116116
return nil, err
117117
}
118-
req.Header.Set("authorization", client1.String())
118+
req.Header.Set("authorization", clientVar.String())
119119
resp, err := http.DefaultClient.Do(req)
120120
if err != nil {
121121
return nil, err
122122
}
123123
defer resp.Body.Close()
124-
var token1 Token
125-
err = json.NewDecoder(resp.Body).Decode(&token1)
124+
var tokenVar Token
125+
err = json.NewDecoder(resp.Body).Decode(&tokenVar)
126126
if err != nil {
127127
return nil, err
128128
}
129-
if token1.Label != "sg.ui.sso.success.login" {
130-
return nil, errors.New(token1.Label)
129+
if tokenVar.Label != "sg.ui.sso.success.login" {
130+
return nil, errors.New(tokenVar.Label)
131131
}
132-
return &token1, nil
132+
return &tokenVar, nil
133133
}
134134

135135
type Ticket struct {
@@ -157,12 +157,12 @@ func (t *Ticket) New() error {
157157
if err != nil {
158158
return err
159159
}
160-
var client1 client
161-
err = client1.New(req.URL, data)
160+
var clientVar client
161+
err = clientVar.New(req.URL, data)
162162
if err != nil {
163163
return err
164164
}
165-
req.Header.Set("authorization", client1.String())
165+
req.Header.Set("authorization", clientVar.String())
166166
resp, err := http.DefaultClient.Do(req)
167167
if err != nil {
168168
return err

‎internal/canal/canal.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
)
1414

1515
func main() {
16+
log.SetFlags(log.Ltime)
1617
http.DefaultTransport = &http.Transport{
1718
Proxy: func(req *http.Request) (*url.URL, error) {
1819
urlVar, err := http.ProxyFromEnvironment(req)

‎internal/rakuten/rakuten.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,15 @@ func main() {
1616
log.SetFlags(log.Ltime)
1717
http.DefaultTransport = &http.Transport{
1818
Proxy: func(req *http.Request) (*url.URL, error) {
19+
urlVar, err := http.ProxyFromEnvironment(req)
20+
if err != nil {
21+
return nil, err
22+
}
23+
if urlVar != nil {
24+
log.Println("Proxy", urlVar)
25+
}
1926
log.Println(req.Method, req.URL)
20-
return http.ProxyFromEnvironment(req)
27+
return urlVar, nil
2128
},
2229
}
2330
var set flag_set
@@ -57,16 +64,11 @@ func (f *flag_set) New() error {
5764
f.media = filepath.ToSlash(f.media) + "/media"
5865
f.cdm.ClientId = f.media + "/client_id.bin"
5966
f.cdm.PrivateKey = f.media + "/private_key.pem"
60-
f.filters = net.Filters{
61-
{BitrateStart: 100_000, BitrateEnd: 300_000},
62-
{BitrateStart: 3_000_000, BitrateEnd: 5_000_000},
63-
}
6467
flag.StringVar(&f.cdm.ClientId, "C", f.cdm.ClientId, "client ID")
6568
flag.StringVar(&f.cdm.PrivateKey, "P", f.cdm.PrivateKey, "private key")
6669
flag.StringVar(&f.season, "S", "", "season ID")
6770
flag.StringVar(&f.language, "a", "", "audio language")
6871
flag.StringVar(&f.content, "c", "", "content ID")
69-
flag.Var(&f.filters, "f", net.FilterUsage)
7072
flag.StringVar(&f.movie, "m", "", "movie URL")
7173
flag.StringVar(&f.show, "s", "", "TV show URL")
7274
flag.Parse()

‎paramount/paramount.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ func (a At) playReady(content_id string) (*Session, error) {
3232
return nil, err
3333
}
3434
defer resp.Body.Close()
35-
session1 := &Session{}
36-
err = json.NewDecoder(resp.Body).Decode(session1)
35+
sessionVar := &Session{}
36+
err = json.NewDecoder(resp.Body).Decode(sessionVar)
3737
if err != nil {
3838
return nil, err
3939
}
40-
return session1, nil
40+
return sessionVar, nil
4141
}
4242

4343
func (a At) Session(content_id string) (*Session, error) {
@@ -62,12 +62,12 @@ func (a At) Session(content_id string) (*Session, error) {
6262
return nil, errors.New(b.String())
6363
}
6464
defer resp.Body.Close()
65-
session1 := &Session{}
66-
err = json.NewDecoder(resp.Body).Decode(session1)
65+
sessionVar := &Session{}
66+
err = json.NewDecoder(resp.Body).Decode(sessionVar)
6767
if err != nil {
6868
return nil, err
6969
}
70-
return session1, nil
70+
return sessionVar, nil
7171
}
7272

7373
type Session struct {

‎plex/plex.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ func (m *Metadata) Unmarshal(data Byte[Metadata]) error {
2424
return nil
2525
}
2626

27-
func (u User) Metadata(match1 *Match) (Byte[Metadata], error) {
27+
func (u User) Metadata(matchVar *Match) (Byte[Metadata], error) {
2828
req, _ := http.NewRequest("", "https://vod.provider.plex.tv", nil)
29-
req.URL.Path = "/library/metadata/" + match1.RatingKey
29+
req.URL.Path = "/library/metadata/" + matchVar.RatingKey
3030
req.Header.Set("accept", "application/json")
3131
req.Header.Set("x-plex-token", u.AuthToken)
3232
if ForwardedFor != "" {

‎plex/plex_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ func Test(t *testing.T) {
3131
if err != nil {
3232
t.Fatal(err)
3333
}
34-
var user1 User
35-
err = user1.Unmarshal(data)
34+
var userVar User
35+
err = userVar.Unmarshal(data)
3636
if err != nil {
3737
t.Fatal(err)
3838
}
3939
for _, test1 := range watch_tests {
40-
match, err := user1.Match(Url{test1.path})
40+
match, err := userVar.Match(Url{test1.path})
4141
if err != nil {
4242
t.Fatal(err)
4343
}

‎pluto/pluto.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@ func NewClips(id string) (*Clips, error) {
8080
return nil, err
8181
}
8282
defer resp.Body.Close()
83-
var clips1 []Clips
84-
err = json.NewDecoder(resp.Body).Decode(&clips1)
83+
var clipsVar []Clips
84+
err = json.NewDecoder(resp.Body).Decode(&clipsVar)
8585
if err != nil {
8686
return nil, err
8787
}
88-
return &clips1[0], nil
88+
return &clipsVar[0], nil
8989
}
9090

9191
func NewVod(id string) (*Vod, error) {

‎pluto/pluto_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ var tests = []struct {
2020
}
2121

2222
func Test(t *testing.T) {
23-
for _, test1 := range tests {
24-
video, err := NewVod(test1.id)
23+
for _, testVar := range tests {
24+
video, err := NewVod(testVar.id)
2525
if err != nil {
2626
t.Fatal(err)
2727
}

‎rakuten/rakuten.go

Lines changed: 45 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,51 @@ import (
1111
"strings"
1212
)
1313

14+
// geo block
15+
func (a *Address) streamInfo(
16+
content_id, audio_language, player string, video Quality,
17+
) (*StreamInfo, error) {
18+
data, err := json.Marshal(map[string]string{
19+
"audio_language": audio_language,
20+
"audio_quality": "2.0",
21+
"device_serial": "not implemented",
22+
"subtitle_language": "MIS",
23+
"video_type": "stream",
24+
"device_identifier": device_identifier,
25+
"content_id": content_id,
26+
"device_stream_video_quality": string(video),
27+
"player": device_identifier + player,
28+
"classification_id": strconv.Itoa(a.classification_id()),
29+
"content_type": a.ContentType,
30+
})
31+
if err != nil {
32+
return nil, err
33+
}
34+
resp, err := http.Post(
35+
"https://gizmo.rakuten.tv/v3/avod/streamings",
36+
"application/json", bytes.NewReader(data),
37+
)
38+
if err != nil {
39+
return nil, err
40+
}
41+
defer resp.Body.Close()
42+
var value struct {
43+
Data struct {
44+
StreamInfos []StreamInfo `json:"stream_infos"`
45+
}
46+
Errors []struct {
47+
Message string
48+
}
49+
}
50+
err = json.NewDecoder(resp.Body).Decode(&value)
51+
if err != nil {
52+
return nil, err
53+
}
54+
if len(value.Errors) >= 1 { // you can trigger this with wrong location
55+
return nil, errors.New(value.Errors[0].Message)
56+
}
57+
return &value.Data.StreamInfos[0], nil
58+
}
1459
func (s *StreamInfo) License(data []byte) ([]byte, error) {
1560
resp, err := http.Post(
1661
s.LicenseUrl, "application/x-protobuf", bytes.NewReader(data),
@@ -220,49 +265,3 @@ func (a *Address) Pr(
220265
) (*StreamInfo, error) {
221266
return a.streamInfo(content_id, audio_language, ":DASH-CENC:PR", video)
222267
}
223-
224-
// geo block
225-
func (a *Address) streamInfo(
226-
content_id, audio_language, player string, video Quality,
227-
) (*StreamInfo, error) {
228-
data, err := json.Marshal(map[string]string{
229-
"audio_language": audio_language,
230-
"audio_quality": "2.0",
231-
"classification_id": strconv.Itoa(a.classification_id()),
232-
"content_id": content_id,
233-
"content_type": a.ContentType,
234-
"device_identifier": device_identifier,
235-
"device_serial": "not implemented",
236-
"device_stream_video_quality": string(video),
237-
"player": device_identifier + player,
238-
"subtitle_language": "MIS",
239-
"video_type": "stream",
240-
})
241-
if err != nil {
242-
return nil, err
243-
}
244-
resp, err := http.Post(
245-
"https://gizmo.rakuten.tv/v3/avod/streamings",
246-
"application/json", bytes.NewReader(data),
247-
)
248-
if err != nil {
249-
return nil, err
250-
}
251-
defer resp.Body.Close()
252-
var value struct {
253-
Data struct {
254-
StreamInfos []StreamInfo `json:"stream_infos"`
255-
}
256-
Errors []struct {
257-
Message string
258-
}
259-
}
260-
err = json.NewDecoder(resp.Body).Decode(&value)
261-
if err != nil {
262-
return nil, err
263-
}
264-
if len(value.Errors) >= 1 { // you can trigger this with wrong location
265-
return nil, errors.New(value.Errors[0].Message)
266-
}
267-
return &value.Data.StreamInfos[0], nil
268-
}

0 commit comments

Comments
 (0)