feat: encapsulate internal packages

ghoshRitesh12 · ghoshRitesh12 · commit 906701f148b2 · 2024-07-21T19:30:39.000+05:30
diff --git a/internal/helpers/browser_endpoint_context.go b/internal/helpers/browser_endpoint_context.go
diff --git a/internal/helpers/get_album_browse_id.go b/internal/helpers/get_album_browse_id.go
@@ -6,7 +6,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/ghoshRitesh12/brooktube/utils"
+	"github.com/ghoshRitesh12/brooktube/internal/utils"
 )
 
 const RAW_ALBUM_ID_PREFIX string = "OLAK5"
diff --git a/internal/helpers/parse_artist_song_contents.go b/internal/helpers/parse_artist_song_contents.go
@@ -1,8 +1,8 @@
 package helpers
 
 import (
-	"github.com/ghoshRitesh12/brooktube/models/search"
-	"github.com/ghoshRitesh12/brooktube/utils"
+	"github.com/ghoshRitesh12/brooktube/internal/models/search"
+	"github.com/ghoshRitesh12/brooktube/internal/utils"
 )
 
 func ParseArtistSongContents(shelfContents *[]search.APIRespSectionContent) []search.SongOrVideo {
diff --git a/internal/helpers/parse_search_content.go b/internal/helpers/parse_search_content.go
@@ -1,7 +1,7 @@
 package helpers
 
 import (
-	"github.com/ghoshRitesh12/brooktube/models/search"
+	"github.com/ghoshRitesh12/brooktube/internal/models/search"
 )
 
 func ParseSearchContent(category search.SearchCategory, shelfContents []search.APIRespSectionContent) search.ResultContent {
diff --git a/internal/models/album/api_response.go b/internal/models/album/api_response.go
@@ -1,8 +1,8 @@
 package album
 
 import (
-	"github.com/ghoshRitesh12/brooktube/models"
-	"github.com/ghoshRitesh12/brooktube/models/search"
+	"github.com/ghoshRitesh12/brooktube/internal/models"
+	"github.com/ghoshRitesh12/brooktube/internal/models/search"
 )
 
 type APIResp struct {
diff --git a/internal/models/album/response.go b/internal/models/album/response.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ghoshRitesh12/brooktube/models"
-	"github.com/ghoshRitesh12/brooktube/utils"
+	"github.com/ghoshRitesh12/brooktube/internal/models"
+	"github.com/ghoshRitesh12/brooktube/internal/utils"
 )
 
 type ScrapedData struct {
diff --git a/internal/models/artist/api_response.go b/internal/models/artist/api_response.go
@@ -1,8 +1,8 @@
 package artist
 
 import (
-	"github.com/ghoshRitesh12/brooktube/models"
-	"github.com/ghoshRitesh12/brooktube/models/search"
+	"github.com/ghoshRitesh12/brooktube/internal/models"
+	"github.com/ghoshRitesh12/brooktube/internal/models/search"
 )
 
 type APIResp struct {
diff --git a/internal/models/artist/response.go b/internal/models/artist/response.go
@@ -4,9 +4,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ghoshRitesh12/brooktube/helpers"
-	"github.com/ghoshRitesh12/brooktube/models/search"
-	"github.com/ghoshRitesh12/brooktube/utils"
+	"github.com/ghoshRitesh12/brooktube/internal/helpers"
+	"github.com/ghoshRitesh12/brooktube/internal/models/search"
+	"github.com/ghoshRitesh12/brooktube/internal/utils"
 )
 
 type ScrapedData struct {
diff --git a/internal/models/artist/util.go b/internal/models/artist/util.go
diff --git a/internal/models/common.go b/internal/models/common.go
@@ -1,6 +1,6 @@
 package models
 
-import "github.com/ghoshRitesh12/brooktube/utils"
+import "github.com/ghoshRitesh12/brooktube/internal/utils"
 
 type Continuations []struct {
 	NextContinuationData struct {
diff --git a/internal/models/navigation.go b/internal/models/navigation.go
diff --git a/internal/models/playlist/api_response.go b/internal/models/playlist/api_response.go
@@ -1,8 +1,8 @@
 package playlist
 
 import (
-	"github.com/ghoshRitesh12/brooktube/models"
-	"github.com/ghoshRitesh12/brooktube/models/search"
+	"github.com/ghoshRitesh12/brooktube/internal/models"
+	"github.com/ghoshRitesh12/brooktube/internal/models/search"
 )
 
 type APIResp struct {
diff --git a/internal/models/playlist/response.go b/internal/models/playlist/response.go
@@ -4,8 +4,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ghoshRitesh12/brooktube/models"
-	"github.com/ghoshRitesh12/brooktube/utils"
+	"github.com/ghoshRitesh12/brooktube/internal/models"
+	"github.com/ghoshRitesh12/brooktube/internal/utils"
 )
 
 type ScrapedData struct {
diff --git a/internal/models/search/api_response.go b/internal/models/search/api_response.go
@@ -1,6 +1,6 @@
 package search
 
-import "github.com/ghoshRitesh12/brooktube/models"
+import "github.com/ghoshRitesh12/brooktube/internal/models"
 
 type APIResp struct {
 	Contents struct {
diff --git a/internal/models/search/response.go b/internal/models/search/response.go
@@ -3,7 +3,7 @@ package search
 import (
 	"strings"
 
-	"github.com/ghoshRitesh12/brooktube/utils"
+	"github.com/ghoshRitesh12/brooktube/internal/utils"
 )
 
 type ScrapedData struct {
diff --git a/internal/models/search/util.go b/internal/models/search/util.go
diff --git a/internal/requests/album.go b/internal/requests/album.go
@@ -3,9 +3,9 @@ package requests
 import (
 	"net/url"
 
-	"github.com/ghoshRitesh12/brooktube/helpers"
-	"github.com/ghoshRitesh12/brooktube/models/album"
-	"github.com/ghoshRitesh12/brooktube/utils"
+	"github.com/ghoshRitesh12/brooktube/internal/helpers"
+	"github.com/ghoshRitesh12/brooktube/internal/models/album"
+	"github.com/ghoshRitesh12/brooktube/internal/utils"
 )
 
 func FetchAlbum(albumBrowseId string) (*album.APIResp, error) {
diff --git a/internal/requests/artist.go b/internal/requests/artist.go
@@ -3,9 +3,9 @@ package requests
 import (
 	"net/url"
 
-	"github.com/ghoshRitesh12/brooktube/helpers"
-	"github.com/ghoshRitesh12/brooktube/models/artist"
-	"github.com/ghoshRitesh12/brooktube/utils"
+	"github.com/ghoshRitesh12/brooktube/internal/helpers"
+	"github.com/ghoshRitesh12/brooktube/internal/models/artist"
+	"github.com/ghoshRitesh12/brooktube/internal/utils"
 )
 
 func FetchArtist(artistChannelID string) (*artist.APIResp, error) {
diff --git a/internal/requests/main.go b/internal/requests/main.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/ghoshRitesh12/brooktube/utils"
+	"github.com/ghoshRitesh12/brooktube/internal/utils"
 )
 
 var defaultHeaders = map[string]string{
diff --git a/internal/requests/playlist.go b/internal/requests/playlist.go
@@ -3,9 +3,9 @@ package requests
 import (
 	"net/url"
 
-	"github.com/ghoshRitesh12/brooktube/helpers"
-	"github.com/ghoshRitesh12/brooktube/models/playlist"
-	"github.com/ghoshRitesh12/brooktube/utils"
+	"github.com/ghoshRitesh12/brooktube/internal/helpers"
+	"github.com/ghoshRitesh12/brooktube/internal/models/playlist"
+	"github.com/ghoshRitesh12/brooktube/internal/utils"
 )
 
 func FetchPlaylist(playlistId string) (*playlist.APIResp, error) {
diff --git a/internal/requests/search.go b/internal/requests/search.go
@@ -3,8 +3,8 @@ package requests
 import (
 	"net/url"
 
-	"github.com/ghoshRitesh12/brooktube/models/search"
-	"github.com/ghoshRitesh12/brooktube/utils"
+	"github.com/ghoshRitesh12/brooktube/internal/models/search"
+	"github.com/ghoshRitesh12/brooktube/internal/utils"
 )
 
 func FetchSearchResults(query string, category search.SearchCategory, continuationToken string) (*search.APIResp, error) {
diff --git a/internal/utils/constants.go b/internal/utils/constants.go
diff --git a/internal/utils/context.go b/internal/utils/context.go
diff --git a/internal/utils/errors.go b/internal/utils/errors.go
diff --git a/parsers/album.go b/parsers/album.go
@@ -4,10 +4,10 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ghoshRitesh12/brooktube/helpers"
-	"github.com/ghoshRitesh12/brooktube/models/album"
-	"github.com/ghoshRitesh12/brooktube/requests"
-	"github.com/ghoshRitesh12/brooktube/utils"
+	"github.com/ghoshRitesh12/brooktube/internal/helpers"
+	"github.com/ghoshRitesh12/brooktube/internal/models/album"
+	"github.com/ghoshRitesh12/brooktube/internal/requests"
+	"github.com/ghoshRitesh12/brooktube/internal/utils"
 )
 
 const ALBUM_SCRAPE_OPERATIONS int = 2
diff --git a/parsers/artist.go b/parsers/artist.go
@@ -3,8 +3,8 @@ package parsers
 import (
 	"sync"
 
-	"github.com/ghoshRitesh12/brooktube/models/artist"
-	"github.com/ghoshRitesh12/brooktube/requests"
+	"github.com/ghoshRitesh12/brooktube/internal/models/artist"
+	"github.com/ghoshRitesh12/brooktube/internal/requests"
 )
 
 const ARTIST_SCRAPE_OPERATIONS int = 7
diff --git a/parsers/artist_test.go b/parsers/artist_test.go
@@ -7,14 +7,27 @@ import (
 	"github.com/ghoshRitesh12/brooktube"
 )
 
+// go test -run TestGetArtist ./parsers -v -count=1
 func TestGetArtist(t *testing.T) {
-	const EMINEM_CHANNEL_ID = "UCedvOgsKFzcK3hA5taf3KoQ"
-	brooktube := brooktube.New()
-
-	artist, err := brooktube.GetArtist(EMINEM_CHANNEL_ID)
-	if err != nil {
-		t.Error(err)
+	testsTable := []struct {
+		channelName string
+		channelId   string
+	}{
+		{"eminem", "UCedvOgsKFzcK3hA5taf3KoQ"},
+		{"naruto playlist guy", "UClX0RWY5bWVzGrWMTTD8iIQ"},
 	}
 
-	spew.Dump(artist)
+	btube := brooktube.New()
+
+	for _, test := range testsTable {
+		t.Run(test.channelName, func(t *testing.T) {
+
+			artist, err := btube.GetArtist(test.channelId)
+			if err != nil {
+				t.Error(err)
+			}
+
+			spew.Dump(artist)
+		})
+	}
 }
diff --git a/parsers/playlist.go b/parsers/playlist.go
@@ -4,9 +4,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ghoshRitesh12/brooktube/models/playlist"
-	"github.com/ghoshRitesh12/brooktube/requests"
-	"github.com/ghoshRitesh12/brooktube/utils"
+	"github.com/ghoshRitesh12/brooktube/internal/models/playlist"
+	"github.com/ghoshRitesh12/brooktube/internal/requests"
+	"github.com/ghoshRitesh12/brooktube/internal/utils"
 )
 
 const PLAYLIST_ID_PREFIX string = "VL"
diff --git a/parsers/search.go b/parsers/search.go
@@ -1,9 +1,9 @@
 package parsers
 
 import (
-	"github.com/ghoshRitesh12/brooktube/helpers"
-	"github.com/ghoshRitesh12/brooktube/models/search"
-	"github.com/ghoshRitesh12/brooktube/requests"
+	"github.com/ghoshRitesh12/brooktube/internal/helpers"
+	"github.com/ghoshRitesh12/brooktube/internal/models/search"
+	"github.com/ghoshRitesh12/brooktube/internal/requests"
 )
 
 type SearchParserParams struct {
diff --git a/parsers/search_test.go b/parsers/search_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/davecgh/go-spew/spew"
 	"github.com/ghoshRitesh12/brooktube"
-	"github.com/ghoshRitesh12/brooktube/models/search"
+	"github.com/ghoshRitesh12/brooktube/internal/models/search"
 	"github.com/ghoshRitesh12/brooktube/parsers"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"regexp"`
`7`	`7`	`"strings"`
`8`	`8`
`9`		`- "github.com/ghoshRitesh12/brooktube/utils"`
	`9`	`+ "github.com/ghoshRitesh12/brooktube/internal/utils"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`const RAW_ALBUM_ID_PREFIX string = "OLAK5"`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package helpers`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/ghoshRitesh12/brooktube/models/search"`
`5`		`- "github.com/ghoshRitesh12/brooktube/utils"`
	`4`	`+ "github.com/ghoshRitesh12/brooktube/internal/models/search"`
	`5`	`+ "github.com/ghoshRitesh12/brooktube/internal/utils"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`func ParseArtistSongContents(shelfContents *[]search.APIRespSectionContent) []search.SongOrVideo {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package helpers`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/ghoshRitesh12/brooktube/models/search"`
	`4`	`+ "github.com/ghoshRitesh12/brooktube/internal/models/search"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`func ParseSearchContent(category search.SearchCategory, shelfContents []search.APIRespSectionContent) search.ResultContent {`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package album`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/ghoshRitesh12/brooktube/models"`
`5`		`- "github.com/ghoshRitesh12/brooktube/models/search"`
	`4`	`+ "github.com/ghoshRitesh12/brooktube/internal/models"`
	`5`	`+ "github.com/ghoshRitesh12/brooktube/internal/models/search"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`type APIResp struct {`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import (`
`5`	`5`	`"strings"`
`6`	`6`	`"sync"`
`7`	`7`
`8`		`- "github.com/ghoshRitesh12/brooktube/models"`
`9`		`- "github.com/ghoshRitesh12/brooktube/utils"`
	`8`	`+ "github.com/ghoshRitesh12/brooktube/internal/models"`
	`9`	`+ "github.com/ghoshRitesh12/brooktube/internal/utils"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`type ScrapedData struct {`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package artist`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/ghoshRitesh12/brooktube/models"`
`5`		`- "github.com/ghoshRitesh12/brooktube/models/search"`
	`4`	`+ "github.com/ghoshRitesh12/brooktube/internal/models"`
	`5`	`+ "github.com/ghoshRitesh12/brooktube/internal/models/search"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`type APIResp struct {`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package playlist`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/ghoshRitesh12/brooktube/models"`
`5`		`- "github.com/ghoshRitesh12/brooktube/models/search"`
	`4`	`+ "github.com/ghoshRitesh12/brooktube/internal/models"`
	`5`	`+ "github.com/ghoshRitesh12/brooktube/internal/models/search"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`type APIResp struct {`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"strings"`
`5`	`5`	`"sync"`
`6`	`6`
`7`		`- "github.com/ghoshRitesh12/brooktube/models"`
`8`		`- "github.com/ghoshRitesh12/brooktube/utils"`
	`7`	`+ "github.com/ghoshRitesh12/brooktube/internal/models"`
	`8`	`+ "github.com/ghoshRitesh12/brooktube/internal/utils"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`type ScrapedData struct {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package search`
`3`	`3`	`import (`
`4`	`4`	`"strings"`
`5`	`5`
`6`		`- "github.com/ghoshRitesh12/brooktube/utils"`
	`6`	`+ "github.com/ghoshRitesh12/brooktube/internal/utils"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`type ScrapedData struct {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"fmt"`
`7`	`7`	`"net/http"`
`8`	`8`
`9`		`- "github.com/ghoshRitesh12/brooktube/utils"`
	`9`	`+ "github.com/ghoshRitesh12/brooktube/internal/utils"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`var defaultHeaders = map[string]string{`