refactor: remove redundant protobuf "model" suffix

devgianlu · Dec 2, 2023 · 59596a2 · 59596a2
1 parent 055c893
commit 59596a2
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 18 deletions.
diff --git a/cmd/daemon/controls.go b/cmd/daemon/controls.go
@@ -6,7 +6,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	librespot "go-librespot"
 	"go-librespot/player"
-	connectpb "go-librespot/proto/spotify/connectstate/model"
+	connectpb "go-librespot/proto/spotify/connectstate"
 	"go-librespot/tracks"
 	"math"
 	"time"

diff --git a/cmd/daemon/player.go b/cmd/daemon/player.go
@@ -8,7 +8,7 @@ import (
 	"go-librespot/ap"
 	"go-librespot/dealer"
 	"go-librespot/player"
-	connectpb "go-librespot/proto/spotify/connectstate/model"
+	connectpb "go-librespot/proto/spotify/connectstate"
 	"go-librespot/session"
 	"go-librespot/tracks"
 	"google.golang.org/protobuf/proto"

diff --git a/cmd/daemon/state.go b/cmd/daemon/state.go
@@ -5,7 +5,7 @@ import (
 	librespot "go-librespot"
 	"go-librespot/dealer"
 	"go-librespot/player"
-	connectpb "go-librespot/proto/spotify/connectstate/model"
+	connectpb "go-librespot/proto/spotify/connectstate"
 	"go-librespot/tracks"
 	"time"
 )

diff --git a/dealer/recv.go b/dealer/recv.go
@@ -7,7 +7,7 @@ import (
 	"encoding/json"
 	"fmt"
 	log "github.com/sirupsen/logrus"
-	connectpb "go-librespot/proto/spotify/connectstate/model"
+	connectpb "go-librespot/proto/spotify/connectstate"
 	"io"
 	"reflect"
 	"strings"

diff --git a/ids.go b/ids.go
@@ -3,7 +3,7 @@ package go_librespot
 import (
 	"encoding/hex"
 	"fmt"
-	connectpb "go-librespot/proto/spotify/connectstate/model"
+	connectpb "go-librespot/proto/spotify/connectstate"
 	"math/big"
 	"regexp"
 	"strings"

diff --git 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/model";
+option go_package = "go-librespot/proto/spotify/connectstate";
 
 message ClusterUpdate {
   Cluster cluster = 1;

diff --git 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/model";
+option go_package = "go-librespot/proto/spotify/connectstate";
 
 message PlayerState {
   int64 timestamp = 1;

diff --git a/.../spotify/connectstate/model/connect.pb.go → proto/spotify/connectstate/connect.pb.go b/.../spotify/connectstate/model/connect.pb.go → proto/spotify/connectstate/connect.pb.go
diff --git a/...y/connectstate/model/connect_player.pb.go → ...spotify/connectstate/connect_player.pb.go b/...y/connectstate/model/connect_player.pb.go → ...spotify/connectstate/connect_player.pb.go
diff --git a/spclient/context_resolver.go b/spclient/context_resolver.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	log "github.com/sirupsen/logrus"
 	librespot "go-librespot"
-	connectpb "go-librespot/proto/spotify/connectstate/model"
+	connectpb "go-librespot/proto/spotify/connectstate"
 	"io"
 	"strings"
 )

diff --git a/spclient/spclient.go b/spclient/spclient.go
@@ -8,7 +8,7 @@ import (
 	"github.com/cenkalti/backoff/v4"
 	log "github.com/sirupsen/logrus"
 	librespot "go-librespot"
-	connectpb "go-librespot/proto/spotify/connectstate/model"
+	connectpb "go-librespot/proto/spotify/connectstate"
 	storagepb "go-librespot/proto/spotify/download"
 	metadatapb "go-librespot/proto/spotify/metadata"
 	"google.golang.org/protobuf/proto"

diff --git a/tracks/tracks.go b/tracks/tracks.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	log "github.com/sirupsen/logrus"
 	librespot "go-librespot"
-	connectpb "go-librespot/proto/spotify/connectstate/model"
+	connectpb "go-librespot/proto/spotify/connectstate"
 	"go-librespot/spclient"
 	"golang.org/x/exp/rand"
 )

diff --git a/tracks/utils.go b/tracks/utils.go
@@ -2,7 +2,7 @@ package tracks
 
 import (
 	librespot "go-librespot"
-	connectpb "go-librespot/proto/spotify/connectstate/model"
+	connectpb "go-librespot/proto/spotify/connectstate"
 )
 
 func ContextTrackComparator(typ librespot.SpotifyIdType, target *connectpb.ContextTrack) func(*connectpb.ContextTrack) bool {