From 34f6371d9d1271ad74dcc8afd3fbff78480afd9a Mon Sep 17 00:00:00 2001 From: devgianlu Date: Wed, 7 Aug 2024 01:09:57 +0200 Subject: [PATCH] refactor: rename package to `github.com/devgianlu/go-librespot` --- README.md | 2 +- ap/ap.go | 6 +++--- apresolve/resolve.go | 2 +- audio/chunked_reader.go | 2 +- audio/metadata.go | 2 +- audio/provider.go | 4 ++-- cmd/daemon/api_server.go | 2 +- cmd/daemon/controls.go | 10 +++++----- cmd/daemon/main.go | 12 ++++++------ cmd/daemon/player.go | 16 ++++++++-------- cmd/daemon/state.go | 10 +++++----- dealer/dealer.go | 2 +- dealer/recv.go | 2 +- go.mod | 2 +- ids.go | 2 +- login5/hashcash.go | 4 ++-- login5/login5.go | 6 +++--- output/driver_unix.go | 2 +- output/output.go | 2 +- platform.go | 4 ++-- player.go | 2 +- player/format.go | 2 +- player/player.go | 14 +++++++------- player/restriction.go | 4 ++-- player/source.go | 2 +- player/stream.go | 4 ++-- proto/authentication.proto | 2 +- proto/autoplay_context_request.proto | 2 +- proto/clienttoken.proto | 2 +- proto/connect.proto | 2 +- proto/connect_devices.proto | 2 +- proto/connect_player.proto | 2 +- proto/connectivity.proto | 2 +- proto/google/google_duration.pb.go | 7 ++++--- proto/google_duration.proto | 2 +- proto/keyexchange.proto | 2 +- proto/login5.proto | 2 +- proto/login5_challenges_code.proto | 2 +- proto/login5_challenges_hashcash.proto | 2 +- proto/login5_client_info.proto | 2 +- proto/login5_credentials.proto | 2 +- proto/login5_identifiers.proto | 2 +- proto/login5_user_info.proto | 2 +- proto/metadata.proto | 2 +- proto/spotify/authentication.pb.go | 7 ++++--- .../clienttoken/data/v0/connectivity.pb.go | 10 ++++++---- .../clienttoken/http/v0/clienttoken.pb.go | 12 +++++++----- proto/spotify/connectstate/connect.pb.go | 11 ++++++----- .../spotify/connectstate/connect_player.pb.go | 10 ++++++---- .../connectstate/devices/connect_devices.pb.go | 10 ++++++---- proto/spotify/download/storage_resolve.pb.go | 9 +++++---- proto/spotify/keyexchange.pb.go | 7 ++++--- .../v3/challenges/login5_challenges_code.pb.go | 10 ++++++---- .../login5_challenges_hashcash.pb.go | 11 ++++++----- .../v3/credentials/login5_credentials.pb.go | 11 ++++++----- .../v3/identifiers/login5_identifiers.pb.go | 11 ++++++----- proto/spotify/login5/v3/login5.pb.go | 15 ++++++++------- .../spotify/login5/v3/login5_client_info.pb.go | 9 +++++---- proto/spotify/login5/v3/login5_user_info.pb.go | 10 ++++++---- proto/spotify/metadata/metadata.pb.go | 7 ++++--- .../player/autoplay_context_request.pb.go | 7 ++++--- proto/storage_resolve.proto | 2 +- session/client_token.go | 6 +++--- session/getters.go | 8 ++++---- session/options.go | 4 ++-- session/session.go | 18 +++++++++--------- spclient/context_resolver.go | 4 ++-- spclient/spclient.go | 10 +++++----- tracks/paged_list.go | 2 +- tracks/tracks.go | 6 +++--- tracks/utils.go | 4 ++-- version.go | 2 +- vorbis/decoder.go | 4 ++-- zeroconf/zeroconf.go | 6 +++--- 74 files changed, 215 insertions(+), 191 deletions(-) diff --git a/README.md b/README.md index 7f97190..56498b3 100644 --- a/README.md +++ b/README.md @@ -57,5 +57,5 @@ To crosscompile for different architectures the `GOOS` and `GOARCH` environment To recompile protobuf definitions use: ```shell -protoc --go_out=proto --go_opt module=go-librespot/proto -I proto proto/*.proto +protoc --go_out=proto --go_opt module=github.com/devgianlu/go-librespot/proto -I proto proto/*.proto ``` \ No newline at end of file diff --git a/ap/ap.go b/ap/ap.go index 2d660be..8c22026 100644 --- a/ap/ap.go +++ b/ap/ap.go @@ -11,10 +11,10 @@ import ( "errors" "fmt" "github.com/cenkalti/backoff/v4" + librespot "github.com/devgianlu/go-librespot" + "github.com/devgianlu/go-librespot/dh" + pb "github.com/devgianlu/go-librespot/proto/spotify" log "github.com/sirupsen/logrus" - librespot "go-librespot" - "go-librespot/dh" - pb "go-librespot/proto/spotify" "golang.org/x/crypto/pbkdf2" "golang.org/x/exp/slices" "google.golang.org/protobuf/proto" diff --git a/apresolve/resolve.go b/apresolve/resolve.go index 3d96cf0..b32f01d 100644 --- a/apresolve/resolve.go +++ b/apresolve/resolve.go @@ -3,8 +3,8 @@ package apresolve import ( "encoding/json" "fmt" + librespot "github.com/devgianlu/go-librespot" log "github.com/sirupsen/logrus" - librespot "go-librespot" "golang.org/x/exp/slices" "net/http" "net/url" diff --git a/audio/chunked_reader.go b/audio/chunked_reader.go index 4ed3843..da8d0c2 100644 --- a/audio/chunked_reader.go +++ b/audio/chunked_reader.go @@ -3,8 +3,8 @@ package audio import ( "fmt" "github.com/cenkalti/backoff/v4" + librespot "github.com/devgianlu/go-librespot" log "github.com/sirupsen/logrus" - librespot "go-librespot" "io" "net/http" "net/url" diff --git a/audio/metadata.go b/audio/metadata.go index 89219b4..2380021 100644 --- a/audio/metadata.go +++ b/audio/metadata.go @@ -5,9 +5,9 @@ import ( "encoding/binary" "errors" "fmt" + librespot "github.com/devgianlu/go-librespot" log "github.com/sirupsen/logrus" "github.com/xlab/vorbis-go/vorbis" - librespot "go-librespot" "io" "math" ) diff --git a/audio/provider.go b/audio/provider.go index 96467bd..3790950 100644 --- a/audio/provider.go +++ b/audio/provider.go @@ -5,9 +5,9 @@ import ( "encoding/binary" "encoding/hex" "fmt" + librespot "github.com/devgianlu/go-librespot" + "github.com/devgianlu/go-librespot/ap" log "github.com/sirupsen/logrus" - librespot "go-librespot" - "go-librespot/ap" "sync" ) diff --git a/cmd/daemon/api_server.go b/cmd/daemon/api_server.go index e361765..cb927e2 100644 --- a/cmd/daemon/api_server.go +++ b/cmd/daemon/api_server.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" "fmt" + librespot "github.com/devgianlu/go-librespot" log "github.com/sirupsen/logrus" - librespot "go-librespot" "net" "net/http" "nhooyr.io/websocket" diff --git a/cmd/daemon/controls.go b/cmd/daemon/controls.go index 29ffba4..ae129e3 100644 --- a/cmd/daemon/controls.go +++ b/cmd/daemon/controls.go @@ -3,12 +3,12 @@ package main import ( "errors" "fmt" + librespot "github.com/devgianlu/go-librespot" + "github.com/devgianlu/go-librespot/player" + connectpb "github.com/devgianlu/go-librespot/proto/spotify/connectstate" + playerpb "github.com/devgianlu/go-librespot/proto/spotify/player" + "github.com/devgianlu/go-librespot/tracks" log "github.com/sirupsen/logrus" - librespot "go-librespot" - "go-librespot/player" - connectpb "go-librespot/proto/spotify/connectstate" - playerpb "go-librespot/proto/spotify/player" - "go-librespot/tracks" "google.golang.org/protobuf/proto" "math" "strconv" diff --git a/cmd/daemon/main.go b/cmd/daemon/main.go index f1e3811..5f4f3f9 100644 --- a/cmd/daemon/main.go +++ b/cmd/daemon/main.go @@ -5,13 +5,13 @@ import ( "encoding/json" "flag" "fmt" + "github.com/devgianlu/go-librespot/apresolve" + "github.com/devgianlu/go-librespot/output" + "github.com/devgianlu/go-librespot/player" + devicespb "github.com/devgianlu/go-librespot/proto/spotify/connectstate/devices" + "github.com/devgianlu/go-librespot/session" + "github.com/devgianlu/go-librespot/zeroconf" log "github.com/sirupsen/logrus" - "go-librespot/apresolve" - "go-librespot/output" - "go-librespot/player" - devicespb "go-librespot/proto/spotify/connectstate/devices" - "go-librespot/session" - "go-librespot/zeroconf" "golang.org/x/exp/rand" "gopkg.in/yaml.v3" "math" diff --git a/cmd/daemon/player.go b/cmd/daemon/player.go index 7798d17..8e434b8 100644 --- a/cmd/daemon/player.go +++ b/cmd/daemon/player.go @@ -4,15 +4,15 @@ import ( "bytes" "encoding/xml" "fmt" + librespot "github.com/devgianlu/go-librespot" + "github.com/devgianlu/go-librespot/ap" + "github.com/devgianlu/go-librespot/dealer" + "github.com/devgianlu/go-librespot/output" + "github.com/devgianlu/go-librespot/player" + connectpb "github.com/devgianlu/go-librespot/proto/spotify/connectstate" + "github.com/devgianlu/go-librespot/session" + "github.com/devgianlu/go-librespot/tracks" log "github.com/sirupsen/logrus" - librespot "go-librespot" - "go-librespot/ap" - "go-librespot/dealer" - "go-librespot/output" - "go-librespot/player" - connectpb "go-librespot/proto/spotify/connectstate" - "go-librespot/session" - "go-librespot/tracks" "google.golang.org/protobuf/proto" "math" "strings" diff --git a/cmd/daemon/state.go b/cmd/daemon/state.go index 866d6ad..d72c207 100644 --- a/cmd/daemon/state.go +++ b/cmd/daemon/state.go @@ -1,12 +1,12 @@ package main import ( + librespot "github.com/devgianlu/go-librespot" + "github.com/devgianlu/go-librespot/dealer" + "github.com/devgianlu/go-librespot/player" + connectpb "github.com/devgianlu/go-librespot/proto/spotify/connectstate" + "github.com/devgianlu/go-librespot/tracks" log "github.com/sirupsen/logrus" - librespot "go-librespot" - "go-librespot/dealer" - "go-librespot/player" - connectpb "go-librespot/proto/spotify/connectstate" - "go-librespot/tracks" "time" ) diff --git a/dealer/dealer.go b/dealer/dealer.go index 35dfe64..fd866a5 100644 --- a/dealer/dealer.go +++ b/dealer/dealer.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" "github.com/cenkalti/backoff/v4" + librespot "github.com/devgianlu/go-librespot" log "github.com/sirupsen/logrus" - librespot "go-librespot" "math" "net/http" "nhooyr.io/websocket" diff --git a/dealer/recv.go b/dealer/recv.go index 1c1d626..0f4eb89 100644 --- a/dealer/recv.go +++ b/dealer/recv.go @@ -6,8 +6,8 @@ import ( "encoding/base64" "encoding/json" "fmt" + connectpb "github.com/devgianlu/go-librespot/proto/spotify/connectstate" log "github.com/sirupsen/logrus" - connectpb "go-librespot/proto/spotify/connectstate" "io" "reflect" "strings" diff --git a/go.mod b/go.mod index a307f8a..3b067bd 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module go-librespot +module github.com/devgianlu/go-librespot go 1.22.2 diff --git a/ids.go b/ids.go index 489aa06..23c5564 100644 --- a/ids.go +++ b/ids.go @@ -3,7 +3,7 @@ package go_librespot import ( "encoding/hex" "fmt" - connectpb "go-librespot/proto/spotify/connectstate" + connectpb "github.com/devgianlu/go-librespot/proto/spotify/connectstate" "math/big" "regexp" "strings" diff --git a/login5/hashcash.go b/login5/hashcash.go index 8c48828..f2177f4 100644 --- a/login5/hashcash.go +++ b/login5/hashcash.go @@ -2,8 +2,8 @@ package login5 import ( "crypto/sha1" - "go-librespot/proto/google" - challengespb "go-librespot/proto/spotify/login5/v3/challenges" + "github.com/devgianlu/go-librespot/proto/google" + challengespb "github.com/devgianlu/go-librespot/proto/spotify/login5/v3/challenges" "math/bits" "time" ) diff --git a/login5/login5.go b/login5/login5.go index 9f8843e..6cc56b4 100644 --- a/login5/login5.go +++ b/login5/login5.go @@ -3,10 +3,10 @@ package login5 import ( "bytes" "fmt" + librespot "github.com/devgianlu/go-librespot" + pb "github.com/devgianlu/go-librespot/proto/spotify/login5/v3" + credentialspb "github.com/devgianlu/go-librespot/proto/spotify/login5/v3/credentials" log "github.com/sirupsen/logrus" - librespot "go-librespot" - pb "go-librespot/proto/spotify/login5/v3" - credentialspb "go-librespot/proto/spotify/login5/v3/credentials" "google.golang.org/protobuf/proto" "io" "net/http" diff --git a/output/driver_unix.go b/output/driver_unix.go index 2ec4ba3..532b599 100644 --- a/output/driver_unix.go +++ b/output/driver_unix.go @@ -10,8 +10,8 @@ import "C" import ( "errors" "fmt" + librespot "github.com/devgianlu/go-librespot" log "github.com/sirupsen/logrus" - librespot "go-librespot" "golang.org/x/sys/unix" "io" "sync" diff --git a/output/output.go b/output/output.go index 00eb15b..cf47b57 100644 --- a/output/output.go +++ b/output/output.go @@ -1,7 +1,7 @@ package output import ( - librespot "go-librespot" + librespot "github.com/devgianlu/go-librespot" ) type Output struct { diff --git a/platform.go b/platform.go index 92b7420..50e7a81 100644 --- a/platform.go +++ b/platform.go @@ -1,8 +1,8 @@ package go_librespot import ( - spotifypb "go-librespot/proto/spotify" - clienttokenpb "go-librespot/proto/spotify/clienttoken/data/v0" + spotifypb "github.com/devgianlu/go-librespot/proto/spotify" + clienttokenpb "github.com/devgianlu/go-librespot/proto/spotify/clienttoken/data/v0" "runtime" ) diff --git a/player.go b/player.go index 4e6bd8b..7a27525 100644 --- a/player.go +++ b/player.go @@ -2,7 +2,7 @@ package go_librespot import ( "errors" - metadatapb "go-librespot/proto/spotify/metadata" + metadatapb "github.com/devgianlu/go-librespot/proto/spotify/metadata" ) var ( diff --git a/player/format.go b/player/format.go index a432090..2ba8f15 100644 --- a/player/format.go +++ b/player/format.go @@ -1,7 +1,7 @@ package player import ( - metadatapb "go-librespot/proto/spotify/metadata" + metadatapb "github.com/devgianlu/go-librespot/proto/spotify/metadata" ) func formatBitrate(format metadatapb.AudioFile_Format) int { diff --git a/player/player.go b/player/player.go index 91effff..f8363fd 100644 --- a/player/player.go +++ b/player/player.go @@ -2,14 +2,14 @@ package player import ( "fmt" + librespot "github.com/devgianlu/go-librespot" + "github.com/devgianlu/go-librespot/audio" + "github.com/devgianlu/go-librespot/output" + downloadpb "github.com/devgianlu/go-librespot/proto/spotify/download" + "github.com/devgianlu/go-librespot/proto/spotify/metadata" + "github.com/devgianlu/go-librespot/spclient" + "github.com/devgianlu/go-librespot/vorbis" log "github.com/sirupsen/logrus" - librespot "go-librespot" - "go-librespot/audio" - "go-librespot/output" - downloadpb "go-librespot/proto/spotify/download" - "go-librespot/proto/spotify/metadata" - "go-librespot/spclient" - "go-librespot/vorbis" "time" ) diff --git a/player/restriction.go b/player/restriction.go index 968ff54..81e1c0a 100644 --- a/player/restriction.go +++ b/player/restriction.go @@ -1,8 +1,8 @@ package player import ( - librespot "go-librespot" - metadatapb "go-librespot/proto/spotify/metadata" + librespot "github.com/devgianlu/go-librespot" + metadatapb "github.com/devgianlu/go-librespot/proto/spotify/metadata" "strings" ) diff --git a/player/source.go b/player/source.go index 1399487..024bb21 100644 --- a/player/source.go +++ b/player/source.go @@ -2,7 +2,7 @@ package player import ( "errors" - librespot "go-librespot" + librespot "github.com/devgianlu/go-librespot" "io" "sync" ) diff --git a/player/stream.go b/player/stream.go index 9f0f86f..4ef8a9d 100644 --- a/player/stream.go +++ b/player/stream.go @@ -2,8 +2,8 @@ package player import ( "bytes" - librespot "go-librespot" - metadatapb "go-librespot/proto/spotify/metadata" + librespot "github.com/devgianlu/go-librespot" + metadatapb "github.com/devgianlu/go-librespot/proto/spotify/metadata" ) type Stream struct { diff --git a/proto/authentication.proto b/proto/authentication.proto index 10d40e5..1864c78 100644 --- a/proto/authentication.proto +++ b/proto/authentication.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package spotify; -option go_package = "go-librespot/proto/spotify/"; +option go_package = "github.com/devgianlu/go-librespot/proto/spotify/"; message ClientResponseEncrypted { required LoginCredentials login_credentials = 0xa; diff --git a/proto/autoplay_context_request.proto b/proto/autoplay_context_request.proto index 2fc07d1..283c172 100644 --- a/proto/autoplay_context_request.proto +++ b/proto/autoplay_context_request.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package spotify.player; -option go_package = "go-librespot/proto/spotify/player"; +option go_package = "github.com/devgianlu/go-librespot/proto/spotify/player"; message AutoplayContextRequest { required string context_uri = 1; diff --git a/proto/clienttoken.proto b/proto/clienttoken.proto index a62d837..401df3f 100644 --- a/proto/clienttoken.proto +++ b/proto/clienttoken.proto @@ -4,7 +4,7 @@ package spotify.clienttoken.http.v0; import "connectivity.proto"; -option go_package = "go-librespot/proto/spotify/clienttoken/http/v0"; +option go_package = "github.com/devgianlu/go-librespot/proto/spotify/clienttoken/http/v0"; message ClientTokenRequest { ClientTokenRequestType request_type = 1; diff --git a/proto/connect.proto b/proto/connect.proto index c05d7e4..261a315 100644 --- a/proto/connect.proto +++ b/proto/connect.proto @@ -5,7 +5,7 @@ package spotify.connectstate; import "connect_player.proto"; import "connect_devices.proto"; -option go_package = "go-librespot/proto/spotify/connectstate"; +option go_package = "github.com/devgianlu/go-librespot/proto/spotify/connectstate"; message ClusterUpdate { Cluster cluster = 1; diff --git a/proto/connect_devices.proto b/proto/connect_devices.proto index 26a6f40..47c9722 100644 --- a/proto/connect_devices.proto +++ b/proto/connect_devices.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package spotify.connectstate.devices; -option go_package = "go-librespot/proto/spotify/connectstate/devices"; +option go_package = "github.com/devgianlu/go-librespot/proto/spotify/connectstate/devices"; message DeviceAlias { uint32 id = 1; diff --git a/proto/connect_player.proto b/proto/connect_player.proto index e7a9b11..5f59c52 100644 --- a/proto/connect_player.proto +++ b/proto/connect_player.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package spotify.connectstate; -option go_package = "go-librespot/proto/spotify/connectstate"; +option go_package = "github.com/devgianlu/go-librespot/proto/spotify/connectstate"; message PlayerState { int64 timestamp = 1; diff --git a/proto/connectivity.proto b/proto/connectivity.proto index 8cc92ff..65f4797 100644 --- a/proto/connectivity.proto +++ b/proto/connectivity.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package spotify.clienttoken.data.v0; -option go_package = "go-librespot/proto/spotify/clienttoken/data/v0"; +option go_package = "github.com/devgianlu/go-librespot/proto/spotify/clienttoken/data/v0"; message ConnectivitySdkData { PlatformSpecificData platform_specific_data = 1; diff --git a/proto/google/google_duration.pb.go b/proto/google/google_duration.pb.go index b36c98f..83b900f 100644 --- a/proto/google/google_duration.pb.go +++ b/proto/google/google_duration.pb.go @@ -171,9 +171,10 @@ var file_google_duration_proto_rawDesc = []byte{ 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, - 0x61, 0x6e, 0x6f, 0x73, 0x42, 0x1b, 0x5a, 0x19, 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, - 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, - 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x6e, 0x6f, 0x73, 0x42, 0x30, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x76, 0x67, 0x69, 0x61, 0x6e, 0x6c, 0x75, 0x2f, 0x67, 0x6f, 0x2d, + 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, + 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/google_duration.proto b/proto/google_duration.proto index 695dceb..cd73436 100644 --- a/proto/google_duration.proto +++ b/proto/google_duration.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package google.protobuf; -option go_package = "go-librespot/proto/google"; +option go_package = "github.com/devgianlu/go-librespot/proto/google"; message Duration { int64 seconds = 1; diff --git a/proto/keyexchange.proto b/proto/keyexchange.proto index d43d190..2d60a6e 100644 --- a/proto/keyexchange.proto +++ b/proto/keyexchange.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package spotify; -option go_package = "go-librespot/proto/spotify/"; +option go_package = "github.com/devgianlu/go-librespot/proto/spotify/"; message ClientHello { required BuildInfo build_info = 0xa; diff --git a/proto/login5.proto b/proto/login5.proto index ccc1017..f83e676 100644 --- a/proto/login5.proto +++ b/proto/login5.proto @@ -9,7 +9,7 @@ import "login5_challenges_hashcash.proto"; import "login5_credentials.proto"; import "login5_identifiers.proto"; -option go_package = "go-librespot/proto/spotify/login5/v3"; +option go_package = "github.com/devgianlu/go-librespot/proto/spotify/login5/v3"; message Challenges { repeated Challenge challenges = 1; diff --git a/proto/login5_challenges_code.proto b/proto/login5_challenges_code.proto index 8c2a374..592ce84 100644 --- a/proto/login5_challenges_code.proto +++ b/proto/login5_challenges_code.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package spotify.login5.v3.challenges; -option go_package = "go-librespot/proto/spotify/login5/v3/challenges"; +option go_package = "github.com/devgianlu/go-librespot/proto/spotify/login5/v3/challenges"; message CodeChallenge { Method method = 1; diff --git a/proto/login5_challenges_hashcash.proto b/proto/login5_challenges_hashcash.proto index 8fe96e1..94da229 100644 --- a/proto/login5_challenges_hashcash.proto +++ b/proto/login5_challenges_hashcash.proto @@ -4,7 +4,7 @@ package spotify.login5.v3.challenges; import "google_duration.proto"; -option go_package = "go-librespot/proto/spotify/login5/v3/challenges"; +option go_package = "github.com/devgianlu/go-librespot/proto/spotify/login5/v3/challenges"; message HashcashChallenge { bytes prefix = 1; diff --git a/proto/login5_client_info.proto b/proto/login5_client_info.proto index 3eb3271..532c3e8 100644 --- a/proto/login5_client_info.proto +++ b/proto/login5_client_info.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package spotify.login5.v3; -option go_package = "go-librespot/proto/spotify/login5/v3"; +option go_package = "github.com/devgianlu/go-librespot/proto/spotify/login5/v3"; message ClientInfo { string client_id = 1; diff --git a/proto/login5_credentials.proto b/proto/login5_credentials.proto index 2c51826..5d1cfa3 100644 --- a/proto/login5_credentials.proto +++ b/proto/login5_credentials.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package spotify.login5.v3.credentials; -option go_package = "go-librespot/proto/spotify/login5/v3/credentials"; +option go_package = "github.com/devgianlu/go-librespot/proto/spotify/login5/v3/credentials"; message StoredCredential { string username = 1; diff --git a/proto/login5_identifiers.proto b/proto/login5_identifiers.proto index 534d47c..c5a4019 100644 --- a/proto/login5_identifiers.proto +++ b/proto/login5_identifiers.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package spotify.login5.v3.identifiers; -option go_package = "go-librespot/proto/spotify/login5/v3/identifiers"; +option go_package = "github.com/devgianlu/go-librespot/proto/spotify/login5/v3/identifiers"; message PhoneNumber { string number = 1; diff --git a/proto/login5_user_info.proto b/proto/login5_user_info.proto index 9f1ff37..024fdde 100644 --- a/proto/login5_user_info.proto +++ b/proto/login5_user_info.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package spotify.login5.v3; -option go_package = "go-librespot/proto/spotify/login5/v3"; +option go_package = "github.com/devgianlu/go-librespot/proto/spotify/login5/v3"; message UserInfo { string name = 1; diff --git a/proto/metadata.proto b/proto/metadata.proto index 6ff80f7..f4ce819 100644 --- a/proto/metadata.proto +++ b/proto/metadata.proto @@ -2,7 +2,7 @@ syntax = "proto2"; package spotify.metadata; -option go_package = "go-librespot/proto/spotify/metadata"; +option go_package = "github.com/devgianlu/go-librespot/proto/spotify/metadata"; message Artist { optional bytes gid = 1; diff --git a/proto/spotify/authentication.pb.go b/proto/spotify/authentication.pb.go index c0e89db..e5c234e 100644 --- a/proto/spotify/authentication.pb.go +++ b/proto/spotify/authentication.pb.go @@ -1728,9 +1728,10 @@ var file_authentication_proto_rawDesc = []byte{ 0x0a, 0x0a, 0x06, 0x4f, 0x53, 0x5f, 0x42, 0x43, 0x4f, 0x10, 0x16, 0x2a, 0x28, 0x0a, 0x0b, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x46, 0x61, 0x63, 0x65, 0x62, - 0x6f, 0x6f, 0x6b, 0x10, 0x01, 0x42, 0x1d, 0x5a, 0x1b, 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, - 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, - 0x69, 0x66, 0x79, 0x2f, + 0x6f, 0x6f, 0x6b, 0x10, 0x01, 0x42, 0x32, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x76, 0x67, 0x69, 0x61, 0x6e, 0x6c, 0x75, 0x2f, 0x67, 0x6f, + 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, } var ( diff --git a/proto/spotify/clienttoken/data/v0/connectivity.pb.go b/proto/spotify/clienttoken/data/v0/connectivity.pb.go index 9bc08ea..1d244fb 100644 --- a/proto/spotify/clienttoken/data/v0/connectivity.pb.go +++ b/proto/spotify/clienttoken/data/v0/connectivity.pb.go @@ -830,10 +830,12 @@ var file_connectivity_proto_rawDesc = []byte{ 0x6e, 0x6f, 0x77, 0x6e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x34, 0x12, 0x26, 0x0a, 0x0f, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x35, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x56, 0x61, 0x6c, 0x75, - 0x65, 0x35, 0x42, 0x30, 0x5a, 0x2e, 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, - 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, - 0x2f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2f, 0x64, 0x61, 0x74, - 0x61, 0x2f, 0x76, 0x30, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x35, 0x42, 0x45, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, + 0x2f, 0x64, 0x65, 0x76, 0x67, 0x69, 0x61, 0x6e, 0x6c, 0x75, 0x2f, 0x67, 0x6f, 0x2d, 0x6c, 0x69, + 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, + 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x74, 0x6f, 0x6b, 0x65, + 0x6e, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x76, 0x30, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/proto/spotify/clienttoken/http/v0/clienttoken.pb.go b/proto/spotify/clienttoken/http/v0/clienttoken.pb.go index 3d9ddbe..69d5c5d 100644 --- a/proto/spotify/clienttoken/http/v0/clienttoken.pb.go +++ b/proto/spotify/clienttoken/http/v0/clienttoken.pb.go @@ -7,7 +7,7 @@ package v0 import ( - v0 "go-librespot/proto/spotify/clienttoken/data/v0" + v0 "github.com/devgianlu/go-librespot/proto/spotify/clienttoken/data/v0" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -1395,10 +1395,12 @@ var file_clienttoken_proto_rawDesc = []byte{ 0x12, 0x19, 0x0a, 0x15, 0x43, 0x48, 0x41, 0x4c, 0x4c, 0x45, 0x4e, 0x47, 0x45, 0x5f, 0x45, 0x56, 0x41, 0x4c, 0x55, 0x41, 0x54, 0x45, 0x5f, 0x4a, 0x53, 0x10, 0x02, 0x12, 0x17, 0x0a, 0x13, 0x43, 0x48, 0x41, 0x4c, 0x4c, 0x45, 0x4e, 0x47, 0x45, 0x5f, 0x48, 0x41, 0x53, 0x48, 0x5f, 0x43, 0x41, - 0x53, 0x48, 0x10, 0x03, 0x42, 0x30, 0x5a, 0x2e, 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, - 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, - 0x66, 0x79, 0x2f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2f, 0x68, - 0x74, 0x74, 0x70, 0x2f, 0x76, 0x30, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x53, 0x48, 0x10, 0x03, 0x42, 0x45, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x76, 0x67, 0x69, 0x61, 0x6e, 0x6c, 0x75, 0x2f, 0x67, 0x6f, 0x2d, + 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, + 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x74, 0x6f, + 0x6b, 0x65, 0x6e, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x76, 0x30, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/proto/spotify/connectstate/connect.pb.go b/proto/spotify/connectstate/connect.pb.go index ff4b609..6bb2449 100644 --- a/proto/spotify/connectstate/connect.pb.go +++ b/proto/spotify/connectstate/connect.pb.go @@ -7,7 +7,7 @@ package connectstate import ( - devices "go-librespot/proto/spotify/connectstate/devices" + devices "github.com/devgianlu/go-librespot/proto/spotify/connectstate/devices" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -2541,10 +2541,11 @@ var file_connect_proto_rawDesc = []byte{ 0x12, 0x23, 0x0a, 0x1f, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x5f, 0x44, 0x4f, 0x45, 0x53, 0x5f, 0x4e, 0x4f, 0x54, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x52, 0x41, 0x54, 0x45, 0x5f, 0x4c, 0x49, - 0x4d, 0x49, 0x54, 0x45, 0x44, 0x10, 0x07, 0x42, 0x29, 0x5a, 0x27, 0x67, 0x6f, 0x2d, 0x6c, 0x69, - 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, - 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x73, 0x74, 0x61, - 0x74, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x4d, 0x49, 0x54, 0x45, 0x44, 0x10, 0x07, 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, + 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x76, 0x67, 0x69, 0x61, 0x6e, 0x6c, 0x75, 0x2f, + 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, + 0x63, 0x74, 0x73, 0x74, 0x61, 0x74, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/spotify/connectstate/connect_player.pb.go b/proto/spotify/connectstate/connect_player.pb.go index 2d1ccbe..315a2e2 100644 --- a/proto/spotify/connectstate/connect_player.pb.go +++ b/proto/spotify/connectstate/connect_player.pb.go @@ -2382,10 +2382,12 @@ var file_connect_player_proto_rawDesc = []byte{ 0x45, 0x10, 0x04, 0x12, 0x0e, 0x0a, 0x0a, 0x4c, 0x4f, 0x43, 0x41, 0x4c, 0x5f, 0x46, 0x49, 0x4c, 0x45, 0x10, 0x05, 0x2a, 0x27, 0x0a, 0x0a, 0x48, 0x69, 0x46, 0x69, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x4f, - 0x46, 0x46, 0x10, 0x01, 0x12, 0x06, 0x0a, 0x02, 0x4f, 0x4e, 0x10, 0x02, 0x42, 0x29, 0x5a, 0x27, - 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, - 0x63, 0x74, 0x73, 0x74, 0x61, 0x74, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x46, 0x46, 0x10, 0x01, 0x12, 0x06, 0x0a, 0x02, 0x4f, 0x4e, 0x10, 0x02, 0x42, 0x3e, 0x5a, 0x3c, + 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x76, 0x67, 0x69, + 0x61, 0x6e, 0x6c, 0x75, 0x2f, 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, + 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, + 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x73, 0x74, 0x61, 0x74, 0x65, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/spotify/connectstate/devices/connect_devices.pb.go b/proto/spotify/connectstate/devices/connect_devices.pb.go index e96a4e1..33af879 100644 --- a/proto/spotify/connectstate/devices/connect_devices.pb.go +++ b/proto/spotify/connectstate/devices/connect_devices.pb.go @@ -210,10 +210,12 @@ var file_connect_devices_proto_rawDesc = []byte{ 0x50, 0x4f, 0x54, 0x49, 0x46, 0x59, 0x10, 0x64, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x41, 0x52, 0x5f, 0x54, 0x48, 0x49, 0x4e, 0x47, 0x10, 0x65, 0x12, 0x0c, 0x0a, 0x08, 0x4f, 0x42, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x10, 0x66, 0x12, 0x0e, 0x0a, 0x0a, 0x48, 0x4f, 0x4d, 0x45, 0x5f, 0x54, 0x48, - 0x49, 0x4e, 0x47, 0x10, 0x67, 0x42, 0x31, 0x5a, 0x2f, 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, - 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, - 0x69, 0x66, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x73, 0x74, 0x61, 0x74, 0x65, - 0x2f, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x49, 0x4e, 0x47, 0x10, 0x67, 0x42, 0x46, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x76, 0x67, 0x69, 0x61, 0x6e, 0x6c, 0x75, 0x2f, 0x67, 0x6f, + 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, + 0x73, 0x74, 0x61, 0x74, 0x65, 0x2f, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x73, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/spotify/download/storage_resolve.pb.go b/proto/spotify/download/storage_resolve.pb.go index 3466e4e..7586bc0 100644 --- a/proto/spotify/download/storage_resolve.pb.go +++ b/proto/spotify/download/storage_resolve.pb.go @@ -150,10 +150,11 @@ var file_storage_resolve_proto_rawDesc = []byte{ 0x0c, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x65, 0x69, 0x64, 0x22, 0x2e, 0x0a, 0x06, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x07, 0x0a, 0x03, 0x43, 0x44, 0x4e, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x54, 0x4f, 0x52, 0x41, 0x47, 0x45, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x52, 0x45, 0x53, - 0x54, 0x52, 0x49, 0x43, 0x54, 0x45, 0x44, 0x10, 0x03, 0x42, 0x25, 0x5a, 0x23, 0x67, 0x6f, 0x2d, - 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, - 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x54, 0x52, 0x49, 0x43, 0x54, 0x45, 0x44, 0x10, 0x03, 0x42, 0x3a, 0x5a, 0x38, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x76, 0x67, 0x69, 0x61, 0x6e, 0x6c, + 0x75, 0x2f, 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, 0x64, 0x6f, 0x77, + 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/spotify/keyexchange.pb.go b/proto/spotify/keyexchange.pb.go index 51c0985..abf1db4 100644 --- a/proto/spotify/keyexchange.pb.go +++ b/proto/spotify/keyexchange.pb.go @@ -2409,9 +2409,10 @@ var file_keyexchange_proto_rawDesc = []byte{ 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x10, 0x0f, 0x12, 0x11, 0x0a, 0x0d, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x41, 0x70, 0x70, 0x4b, 0x65, 0x79, 0x10, 0x10, 0x12, 0x15, 0x0a, 0x11, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6e, 0x6e, 0x65, - 0x64, 0x10, 0x11, 0x42, 0x1d, 0x5a, 0x1b, 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, - 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, - 0x79, 0x2f, + 0x64, 0x10, 0x11, 0x42, 0x32, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x64, 0x65, 0x76, 0x67, 0x69, 0x61, 0x6e, 0x6c, 0x75, 0x2f, 0x67, 0x6f, 0x2d, 0x6c, + 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, + 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, } var ( diff --git a/proto/spotify/login5/v3/challenges/login5_challenges_code.pb.go b/proto/spotify/login5/v3/challenges/login5_challenges_code.pb.go index 116864f..031f06d 100644 --- a/proto/spotify/login5/v3/challenges/login5_challenges_code.pb.go +++ b/proto/spotify/login5/v3/challenges/login5_challenges_code.pb.go @@ -208,10 +208,12 @@ var file_login5_challenges_code_proto_rawDesc = []byte{ 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x4d, 0x53, 0x10, 0x01, 0x22, 0x22, 0x0a, 0x0c, 0x43, 0x6f, 0x64, 0x65, 0x53, 0x6f, 0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, - 0x63, 0x6f, 0x64, 0x65, 0x42, 0x31, 0x5a, 0x2f, 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, - 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, - 0x66, 0x79, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x35, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x68, 0x61, - 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x63, 0x6f, 0x64, 0x65, 0x42, 0x46, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x76, 0x67, 0x69, 0x61, 0x6e, 0x6c, 0x75, 0x2f, 0x67, 0x6f, 0x2d, + 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, + 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x35, 0x2f, 0x76, + 0x33, 0x2f, 0x63, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/spotify/login5/v3/challenges/login5_challenges_hashcash.pb.go b/proto/spotify/login5/v3/challenges/login5_challenges_hashcash.pb.go index 0753da6..af69aa3 100644 --- a/proto/spotify/login5/v3/challenges/login5_challenges_hashcash.pb.go +++ b/proto/spotify/login5/v3/challenges/login5_challenges_hashcash.pb.go @@ -7,7 +7,7 @@ package challenges import ( - google "go-librespot/proto/google" + google "github.com/devgianlu/go-librespot/proto/google" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -150,10 +150,11 @@ var file_login5_challenges_hashcash_proto_rawDesc = []byte{ 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, - 0x31, 0x5a, 0x2f, 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, 0x6c, 0x6f, - 0x67, 0x69, 0x6e, 0x35, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, - 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x46, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, + 0x76, 0x67, 0x69, 0x61, 0x6e, 0x6c, 0x75, 0x2f, 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, + 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, + 0x66, 0x79, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x35, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x68, 0x61, + 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/spotify/login5/v3/credentials/login5_credentials.pb.go b/proto/spotify/login5/v3/credentials/login5_credentials.pb.go index 9222826..58ceac6 100644 --- a/proto/spotify/login5/v3/credentials/login5_credentials.pb.go +++ b/proto/spotify/login5/v3/credentials/login5_credentials.pb.go @@ -540,11 +540,12 @@ var file_login5_credentials_proto_rawDesc = []byte{ 0x75, 0x74, 0x68, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x75, 0x74, 0x68, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x75, 0x72, 0x69, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, - 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x55, 0x72, 0x69, 0x42, 0x32, 0x5a, 0x30, 0x67, - 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x35, - 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x55, 0x72, 0x69, 0x42, 0x47, 0x5a, 0x45, 0x67, + 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x76, 0x67, 0x69, 0x61, + 0x6e, 0x6c, 0x75, 0x2f, 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, + 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, 0x6c, + 0x6f, 0x67, 0x69, 0x6e, 0x35, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, + 0x69, 0x61, 0x6c, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/spotify/login5/v3/identifiers/login5_identifiers.pb.go b/proto/spotify/login5/v3/identifiers/login5_identifiers.pb.go index 1ea71ed..769d098 100644 --- a/proto/spotify/login5/v3/identifiers/login5_identifiers.pb.go +++ b/proto/spotify/login5/v3/identifiers/login5_identifiers.pb.go @@ -97,11 +97,12 @@ var file_login5_identifiers_proto_rawDesc = []byte{ 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x30, 0x0a, 0x14, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x5f, 0x63, 0x61, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x72, 0x79, 0x43, 0x61, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x42, 0x32, 0x5a, - 0x30, 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, 0x6c, 0x6f, 0x67, 0x69, - 0x6e, 0x35, 0x2f, 0x76, 0x33, 0x2f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, - 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x79, 0x43, 0x61, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x42, 0x47, 0x5a, + 0x45, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x76, 0x67, + 0x69, 0x61, 0x6e, 0x6c, 0x75, 0x2f, 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, + 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, + 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x35, 0x2f, 0x76, 0x33, 0x2f, 0x69, 0x64, 0x65, 0x6e, 0x74, + 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/spotify/login5/v3/login5.pb.go b/proto/spotify/login5/v3/login5.pb.go index a92f324..124cae2 100644 --- a/proto/spotify/login5/v3/login5.pb.go +++ b/proto/spotify/login5/v3/login5.pb.go @@ -7,9 +7,9 @@ package v3 import ( - challenges "go-librespot/proto/spotify/login5/v3/challenges" - credentials "go-librespot/proto/spotify/login5/v3/credentials" - identifiers "go-librespot/proto/spotify/login5/v3/identifiers" + challenges "github.com/devgianlu/go-librespot/proto/spotify/login5/v3/challenges" + credentials "github.com/devgianlu/go-librespot/proto/spotify/login5/v3/credentials" + identifiers "github.com/devgianlu/go-librespot/proto/spotify/login5/v3/identifiers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -964,10 +964,11 @@ var file_login5_proto_rawDesc = []byte{ 0x5f, 0x41, 0x54, 0x54, 0x45, 0x4d, 0x50, 0x54, 0x53, 0x10, 0x06, 0x12, 0x17, 0x0a, 0x13, 0x49, 0x4e, 0x56, 0x41, 0x4c, 0x49, 0x44, 0x5f, 0x50, 0x48, 0x4f, 0x4e, 0x45, 0x4e, 0x55, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x07, 0x12, 0x13, 0x0a, 0x0f, 0x54, 0x52, 0x59, 0x5f, 0x41, 0x47, 0x41, 0x49, - 0x4e, 0x5f, 0x4c, 0x41, 0x54, 0x45, 0x52, 0x10, 0x08, 0x42, 0x26, 0x5a, 0x24, 0x67, 0x6f, 0x2d, - 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, - 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x35, 0x2f, 0x76, - 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x4e, 0x5f, 0x4c, 0x41, 0x54, 0x45, 0x52, 0x10, 0x08, 0x42, 0x3b, 0x5a, 0x39, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x76, 0x67, 0x69, 0x61, 0x6e, 0x6c, + 0x75, 0x2f, 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, 0x6c, 0x6f, 0x67, + 0x69, 0x6e, 0x35, 0x2f, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/spotify/login5/v3/login5_client_info.pb.go b/proto/spotify/login5/v3/login5_client_info.pb.go index 637eadf..84c4b20 100644 --- a/proto/spotify/login5/v3/login5_client_info.pb.go +++ b/proto/spotify/login5/v3/login5_client_info.pb.go @@ -85,10 +85,11 @@ var file_login5_client_info_proto_rawDesc = []byte{ 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x64, 0x65, 0x76, - 0x69, 0x63, 0x65, 0x49, 0x64, 0x42, 0x26, 0x5a, 0x24, 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, - 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, - 0x69, 0x66, 0x79, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x35, 0x2f, 0x76, 0x33, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x63, 0x65, 0x49, 0x64, 0x42, 0x3b, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x76, 0x67, 0x69, 0x61, 0x6e, 0x6c, 0x75, 0x2f, 0x67, 0x6f, + 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x35, 0x2f, + 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/spotify/login5/v3/login5_user_info.pb.go b/proto/spotify/login5/v3/login5_user_info.pb.go index a178d8f..a61b91e 100644 --- a/proto/spotify/login5/v3/login5_user_info.pb.go +++ b/proto/spotify/login5/v3/login5_user_info.pb.go @@ -204,10 +204,12 @@ var file_login5_user_info_proto_rawDesc = []byte{ 0x65, 0x72, 0x65, 0x64, 0x22, 0x38, 0x0a, 0x06, 0x47, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x4d, 0x41, 0x4c, 0x45, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x45, 0x4d, 0x41, 0x4c, 0x45, 0x10, - 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x4e, 0x45, 0x55, 0x54, 0x52, 0x41, 0x4c, 0x10, 0x03, 0x42, 0x26, - 0x5a, 0x24, 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, 0x6c, 0x6f, 0x67, - 0x69, 0x6e, 0x35, 0x2f, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x4e, 0x45, 0x55, 0x54, 0x52, 0x41, 0x4c, 0x10, 0x03, 0x42, 0x3b, + 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x76, + 0x67, 0x69, 0x61, 0x6e, 0x6c, 0x75, 0x2f, 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, + 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, + 0x79, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x35, 0x2f, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/proto/spotify/metadata/metadata.pb.go b/proto/spotify/metadata/metadata.pb.go index aa21b8c..88d3a7f 100644 --- a/proto/spotify/metadata/metadata.pb.go +++ b/proto/spotify/metadata/metadata.pb.go @@ -3317,9 +3317,10 @@ var file_metadata_proto_rawDesc = []byte{ 0x74, 0x69, 0x6e, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x74, 0x61, 0x67, - 0x42, 0x25, 0x5a, 0x23, 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, - 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, 0x6d, - 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, + 0x42, 0x3a, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, + 0x65, 0x76, 0x67, 0x69, 0x61, 0x6e, 0x6c, 0x75, 0x2f, 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, + 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, + 0x69, 0x66, 0x79, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, } var ( diff --git a/proto/spotify/player/autoplay_context_request.pb.go b/proto/spotify/player/autoplay_context_request.pb.go index 39bf36b..3e542c4 100644 --- a/proto/spotify/player/autoplay_context_request.pb.go +++ b/proto/spotify/player/autoplay_context_request.pb.go @@ -87,9 +87,10 @@ var file_autoplay_context_request_proto_rawDesc = []byte{ 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x55, 0x72, 0x69, 0x12, 0x28, 0x0a, 0x10, 0x72, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x5f, 0x75, 0x72, 0x69, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x72, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, - 0x63, 0x6b, 0x55, 0x72, 0x69, 0x42, 0x23, 0x5a, 0x21, 0x67, 0x6f, 0x2d, 0x6c, 0x69, 0x62, 0x72, - 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x70, 0x6f, 0x74, - 0x69, 0x66, 0x79, 0x2f, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, + 0x63, 0x6b, 0x55, 0x72, 0x69, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x76, 0x67, 0x69, 0x61, 0x6e, 0x6c, 0x75, 0x2f, 0x67, 0x6f, + 0x2d, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x2f, 0x73, 0x70, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2f, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, } var ( diff --git a/proto/storage_resolve.proto b/proto/storage_resolve.proto index 4250d2a..3a5e539 100644 --- a/proto/storage_resolve.proto +++ b/proto/storage_resolve.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package spotify.download.proto; -option go_package = "go-librespot/proto/spotify/download"; +option go_package = "github.com/devgianlu/go-librespot/proto/spotify/download"; message StorageResolveResponse { Result result = 1; diff --git a/session/client_token.go b/session/client_token.go index c70f3dd..b98ca22 100644 --- a/session/client_token.go +++ b/session/client_token.go @@ -3,10 +3,10 @@ package session import ( "bytes" "fmt" + librespot "github.com/devgianlu/go-librespot" + pbdata "github.com/devgianlu/go-librespot/proto/spotify/clienttoken/data/v0" + pbhttp "github.com/devgianlu/go-librespot/proto/spotify/clienttoken/http/v0" log "github.com/sirupsen/logrus" - librespot "go-librespot" - pbdata "go-librespot/proto/spotify/clienttoken/data/v0" - pbhttp "go-librespot/proto/spotify/clienttoken/http/v0" "google.golang.org/protobuf/proto" "io" "net/http" diff --git a/session/getters.go b/session/getters.go index 4d99968..867ce0c 100644 --- a/session/getters.go +++ b/session/getters.go @@ -1,10 +1,10 @@ package session import ( - "go-librespot/ap" - "go-librespot/audio" - "go-librespot/dealer" - "go-librespot/spclient" + "github.com/devgianlu/go-librespot/ap" + "github.com/devgianlu/go-librespot/audio" + "github.com/devgianlu/go-librespot/dealer" + "github.com/devgianlu/go-librespot/spclient" ) func (s *Session) Username() string { diff --git a/session/options.go b/session/options.go index b4be41a..388948a 100644 --- a/session/options.go +++ b/session/options.go @@ -1,8 +1,8 @@ package session import ( - "go-librespot/apresolve" - devicespb "go-librespot/proto/spotify/connectstate/devices" + "github.com/devgianlu/go-librespot/apresolve" + devicespb "github.com/devgianlu/go-librespot/proto/spotify/connectstate/devices" ) type Options struct { diff --git a/session/session.go b/session/session.go index ab830ee..7403e14 100644 --- a/session/session.go +++ b/session/session.go @@ -4,16 +4,16 @@ import ( "context" "encoding/hex" "fmt" + librespot "github.com/devgianlu/go-librespot" + "github.com/devgianlu/go-librespot/ap" + "github.com/devgianlu/go-librespot/apresolve" + "github.com/devgianlu/go-librespot/audio" + "github.com/devgianlu/go-librespot/dealer" + "github.com/devgianlu/go-librespot/login5" + devicespb "github.com/devgianlu/go-librespot/proto/spotify/connectstate/devices" + credentialspb "github.com/devgianlu/go-librespot/proto/spotify/login5/v3/credentials" + "github.com/devgianlu/go-librespot/spclient" log "github.com/sirupsen/logrus" - librespot "go-librespot" - "go-librespot/ap" - "go-librespot/apresolve" - "go-librespot/audio" - "go-librespot/dealer" - "go-librespot/login5" - devicespb "go-librespot/proto/spotify/connectstate/devices" - credentialspb "go-librespot/proto/spotify/login5/v3/credentials" - "go-librespot/spclient" "golang.org/x/oauth2" spotifyoauth2 "golang.org/x/oauth2/spotify" ) diff --git a/spclient/context_resolver.go b/spclient/context_resolver.go index 2b9757d..7d62937 100644 --- a/spclient/context_resolver.go +++ b/spclient/context_resolver.go @@ -3,9 +3,9 @@ package spclient import ( "encoding/json" "fmt" + librespot "github.com/devgianlu/go-librespot" + connectpb "github.com/devgianlu/go-librespot/proto/spotify/connectstate" log "github.com/sirupsen/logrus" - librespot "go-librespot" - connectpb "go-librespot/proto/spotify/connectstate" "io" "strings" ) diff --git a/spclient/spclient.go b/spclient/spclient.go index a688d3f..f104803 100644 --- a/spclient/spclient.go +++ b/spclient/spclient.go @@ -6,12 +6,12 @@ import ( "encoding/json" "fmt" "github.com/cenkalti/backoff/v4" + librespot "github.com/devgianlu/go-librespot" + connectpb "github.com/devgianlu/go-librespot/proto/spotify/connectstate" + storagepb "github.com/devgianlu/go-librespot/proto/spotify/download" + metadatapb "github.com/devgianlu/go-librespot/proto/spotify/metadata" + playerpb "github.com/devgianlu/go-librespot/proto/spotify/player" log "github.com/sirupsen/logrus" - librespot "go-librespot" - connectpb "go-librespot/proto/spotify/connectstate" - storagepb "go-librespot/proto/spotify/download" - metadatapb "go-librespot/proto/spotify/metadata" - playerpb "go-librespot/proto/spotify/player" "google.golang.org/protobuf/proto" "io" "net/http" diff --git a/tracks/paged_list.go b/tracks/paged_list.go index 4cd536c..735e56f 100644 --- a/tracks/paged_list.go +++ b/tracks/paged_list.go @@ -3,8 +3,8 @@ package tracks import ( "errors" "fmt" + librespot "github.com/devgianlu/go-librespot" log "github.com/sirupsen/logrus" - librespot "go-librespot" "golang.org/x/exp/rand" "io" ) diff --git a/tracks/tracks.go b/tracks/tracks.go index 426a56f..fc12616 100644 --- a/tracks/tracks.go +++ b/tracks/tracks.go @@ -2,10 +2,10 @@ package tracks import ( "fmt" + librespot "github.com/devgianlu/go-librespot" + connectpb "github.com/devgianlu/go-librespot/proto/spotify/connectstate" + "github.com/devgianlu/go-librespot/spclient" log "github.com/sirupsen/logrus" - librespot "go-librespot" - connectpb "go-librespot/proto/spotify/connectstate" - "go-librespot/spclient" "golang.org/x/exp/rand" ) diff --git a/tracks/utils.go b/tracks/utils.go index a6b8893..d08596d 100644 --- a/tracks/utils.go +++ b/tracks/utils.go @@ -1,8 +1,8 @@ package tracks import ( - librespot "go-librespot" - connectpb "go-librespot/proto/spotify/connectstate" + librespot "github.com/devgianlu/go-librespot" + connectpb "github.com/devgianlu/go-librespot/proto/spotify/connectstate" ) func ContextTrackComparator(typ librespot.SpotifyIdType, target *connectpb.ContextTrack) func(*connectpb.ContextTrack) bool { diff --git a/version.go b/version.go index 2451d3d..7b8f055 100644 --- a/version.go +++ b/version.go @@ -38,5 +38,5 @@ func SystemInfoString() string { } func UserAgent() string { - return fmt.Sprintf("go-librespot/%s Go/%s", VersionNumberString(), runtime.Version()) + return fmt.Sprintf("github.com/devgianlu/go-librespot/%s Go/%s", VersionNumberString(), runtime.Version()) } diff --git a/vorbis/decoder.go b/vorbis/decoder.go index 333db3f..3e4e396 100644 --- a/vorbis/decoder.go +++ b/vorbis/decoder.go @@ -3,9 +3,9 @@ package vorbis import ( "errors" "fmt" + librespot "github.com/devgianlu/go-librespot" + "github.com/devgianlu/go-librespot/audio" log "github.com/sirupsen/logrus" - librespot "go-librespot" - "go-librespot/audio" "io" "strings" "sync" diff --git a/zeroconf/zeroconf.go b/zeroconf/zeroconf.go index 72e9bd8..0b29cb8 100644 --- a/zeroconf/zeroconf.go +++ b/zeroconf/zeroconf.go @@ -9,11 +9,11 @@ import ( "encoding/base64" "encoding/json" "fmt" + librespot "github.com/devgianlu/go-librespot" + "github.com/devgianlu/go-librespot/dh" + devicespb "github.com/devgianlu/go-librespot/proto/spotify/connectstate/devices" "github.com/grandcat/zeroconf" log "github.com/sirupsen/logrus" - librespot "go-librespot" - "go-librespot/dh" - devicespb "go-librespot/proto/spotify/connectstate/devices" "net" "net/http" "sync"