refactor: renamed backend and web client to gmus-backend and gmus-web

README.md

@@ -1,16 +1,16 @@
-# go-music-player
+# go-music-player (gmus)
 
 ## Backend
 
 This manages the music library database, serves requests and handles client connections.
 
-For more info, see the [readme](music-player/README.md).
+For more info, see the [readme](./gmus-backend/README.md).
 
 ## Frontend clients
 
 Each frontend implements the APIs provided by the backend. Their job is to play music, or control the master client. The following clients are implemented:
 
-- [gmus-web](./gmus/README.md) - web client
+- [gmus-web](./gmus-web/README.md) - web client
 
 ## Architecture
 

music-player/Makefile → gmus-backend/Makefile

@@ -14,7 +14,7 @@ clean:
 	mkdir -p bin && rm -rf ./bin/*
 
 fmt:
-	go fmt github.com/felamaslen/go-music-player/...
+	go fmt github.com/felamaslen/gmus-backend/...
 
 test:
 	GO_ENV=test ginkgo ./...

music-player/README.md → gmus-backend/README.md

@@ -1,4 +1,4 @@
-# go-music-player backend
+# gmus-backend
 
 This is the backend part of the music player, written in Golang.
 

music-player/cmd/migrate/main.go → gmus-backend/cmd/migrate/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/felamaslen/go-music-player/pkg/database"
+	"github.com/felamaslen/gmus-backend/pkg/database"
 )
 
 func main() {

music-player/cmd/scan/main.go → gmus-backend/cmd/scan/main.go

@@ -1,9 +1,9 @@
 package main
 
 import (
-	"github.com/felamaslen/go-music-player/pkg/config"
-	"github.com/felamaslen/go-music-player/pkg/database"
-	"github.com/felamaslen/go-music-player/pkg/services"
+	"github.com/felamaslen/gmus-backend/pkg/config"
+	"github.com/felamaslen/gmus-backend/pkg/database"
+	"github.com/felamaslen/gmus-backend/pkg/services"
 )
 
 func main() {

music-player/cmd/server/main.go → gmus-backend/cmd/server/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/felamaslen/go-music-player/pkg/server"
+	"github.com/felamaslen/gmus-backend/pkg/server"
 )
 
 func main() {

music-player/go.mod → gmus-backend/go.mod

@@ -1,4 +1,4 @@
-module github.com/felamaslen/go-music-player
+module github.com/felamaslen/gmus-backend
 
 go 1.15
 

music-player/pkg/config/config.go → gmus-backend/pkg/config/config.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/joho/godotenv"
 
-	"github.com/felamaslen/go-music-player/pkg/logger"
+	"github.com/felamaslen/gmus-backend/pkg/logger"
 )
 
 var envLoaded = false

music-player/pkg/database/main.go → gmus-backend/pkg/database/main.go

@@ -10,7 +10,7 @@ import (
 	_ "github.com/golang-migrate/migrate/v4/database/postgres"
 	_ "github.com/golang-migrate/migrate/v4/source/file"
 
-	config "github.com/felamaslen/go-music-player/pkg/config"
+	config "github.com/felamaslen/gmus-backend/pkg/config"
 
 	_ "github.com/jackc/pgx/stdlib"
 	"github.com/jmoiron/sqlx"

music-player/pkg/read/audio.go → gmus-backend/pkg/read/audio.go

@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 
 	tag "github.com/dhowden/tag"
-	duration "github.com/felamaslen/go-music-player/pkg/read/duration"
+	duration "github.com/felamaslen/gmus-backend/pkg/read/duration"
 )
 
 func ReadFile(basePath string, scannedFile *File) (song *Song, err error) {

music-player/pkg/read/audio_test.go → gmus-backend/pkg/read/audio_test.go

@@ -7,8 +7,8 @@ import (
 	"os"
 	"path"
 
-	"github.com/felamaslen/go-music-player/pkg/read"
-	_ "github.com/felamaslen/go-music-player/pkg/testing"
+	"github.com/felamaslen/gmus-backend/pkg/read"
+	_ "github.com/felamaslen/gmus-backend/pkg/testing"
 )
 
 var _ = Describe("reading audio files", func() {

music-player/pkg/read/duration/vorbis_test.go → gmus-backend/pkg/read/duration/vorbis_test.go

@@ -6,8 +6,8 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/felamaslen/go-music-player/pkg/read/duration"
-	_ "github.com/felamaslen/go-music-player/pkg/testing"
+	"github.com/felamaslen/gmus-backend/pkg/read/duration"
+	_ "github.com/felamaslen/gmus-backend/pkg/testing"
 )
 
 var _ = Describe("Reading ogg vorbis duration", func() {

music-player/pkg/read/files.go → gmus-backend/pkg/read/files.go

@@ -4,9 +4,9 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
-	config "github.com/felamaslen/go-music-player/pkg/config"
-	"github.com/felamaslen/go-music-player/pkg/database"
-	"github.com/felamaslen/go-music-player/pkg/logger"
+	config "github.com/felamaslen/gmus-backend/pkg/config"
+	"github.com/felamaslen/gmus-backend/pkg/database"
+	"github.com/felamaslen/gmus-backend/pkg/logger"
 	"github.com/jmoiron/sqlx"
 	"github.com/lib/pq"
 )

music-player/pkg/read/files_test.go → gmus-backend/pkg/read/files_test.go

@@ -7,9 +7,9 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/felamaslen/go-music-player/pkg/database"
-	"github.com/felamaslen/go-music-player/pkg/read"
-	setup "github.com/felamaslen/go-music-player/pkg/testing"
+	"github.com/felamaslen/gmus-backend/pkg/database"
+	"github.com/felamaslen/gmus-backend/pkg/read"
+	setup "github.com/felamaslen/gmus-backend/pkg/testing"
 )
 
 var _ = Describe("reading files", func() {

music-player/pkg/repository/songs.go → gmus-backend/pkg/repository/songs.go

@@ -3,7 +3,7 @@ package repository
 import (
 	"errors"
 
-	"github.com/felamaslen/go-music-player/pkg/read"
+	"github.com/felamaslen/gmus-backend/pkg/read"
 	"github.com/jmoiron/sqlx"
 	"github.com/lib/pq"
 )

music-player/pkg/repository/songs_test.go → gmus-backend/pkg/repository/songs_test.go

@@ -4,10 +4,10 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/felamaslen/go-music-player/pkg/database"
-	"github.com/felamaslen/go-music-player/pkg/read"
-	"github.com/felamaslen/go-music-player/pkg/repository"
-	setup "github.com/felamaslen/go-music-player/pkg/testing"
+	"github.com/felamaslen/gmus-backend/pkg/database"
+	"github.com/felamaslen/gmus-backend/pkg/read"
+	"github.com/felamaslen/gmus-backend/pkg/repository"
+	setup "github.com/felamaslen/gmus-backend/pkg/testing"
 )
 
 var _ = Describe("songs repository", func() {

music-player/pkg/server/actions.go → gmus-backend/pkg/server/actions.go

@@ -3,7 +3,7 @@ package server
 import (
 	"encoding/json"
 
-	"github.com/felamaslen/go-music-player/pkg/logger"
+	"github.com/felamaslen/gmus-backend/pkg/logger"
 	"github.com/go-redis/redis/v7"
 )
 

music-player/pkg/server/clients.go → gmus-backend/pkg/server/clients.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/felamaslen/go-music-player/pkg/logger"
+	"github.com/felamaslen/gmus-backend/pkg/logger"
 	"github.com/go-redis/redis/v7"
 )
 

music-player/pkg/server/fetch.go → gmus-backend/pkg/server/fetch.go

@@ -5,10 +5,10 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/felamaslen/go-music-player/pkg/database"
-	"github.com/felamaslen/go-music-player/pkg/logger"
-	"github.com/felamaslen/go-music-player/pkg/read"
-	"github.com/felamaslen/go-music-player/pkg/repository"
+	"github.com/felamaslen/gmus-backend/pkg/database"
+	"github.com/felamaslen/gmus-backend/pkg/logger"
+	"github.com/felamaslen/gmus-backend/pkg/read"
+	"github.com/felamaslen/gmus-backend/pkg/repository"
 	"github.com/go-redis/redis/v7"
 )
 

music-player/pkg/server/handler.go → gmus-backend/pkg/server/handler.go

@@ -3,7 +3,7 @@ package server
 import (
 	"net/http"
 
-	"github.com/felamaslen/go-music-player/pkg/logger"
+	"github.com/felamaslen/gmus-backend/pkg/logger"
 	"github.com/go-redis/redis/v7"
 )
 

music-player/pkg/server/pubsub.go → gmus-backend/pkg/server/pubsub.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/felamaslen/go-music-player/pkg/logger"
+	"github.com/felamaslen/gmus-backend/pkg/logger"
 	"github.com/go-redis/redis/v7"
 	"github.com/gorilla/mux"
 	"github.com/gorilla/websocket"

music-player/pkg/server/server.go → gmus-backend/pkg/server/server.go

@@ -5,8 +5,8 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/felamaslen/go-music-player/pkg/config"
-	"github.com/felamaslen/go-music-player/pkg/logger"
+	"github.com/felamaslen/gmus-backend/pkg/config"
+	"github.com/felamaslen/gmus-backend/pkg/logger"
 	"github.com/go-redis/redis/v7"
 	"github.com/gorilla/mux"
 	"github.com/rs/cors"

music-player/pkg/server/stream.go → gmus-backend/pkg/server/stream.go

@@ -7,9 +7,9 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/felamaslen/go-music-player/pkg/database"
-	"github.com/felamaslen/go-music-player/pkg/logger"
-	"github.com/felamaslen/go-music-player/pkg/repository"
+	"github.com/felamaslen/gmus-backend/pkg/database"
+	"github.com/felamaslen/gmus-backend/pkg/logger"
+	"github.com/felamaslen/gmus-backend/pkg/repository"
 	"github.com/go-redis/redis/v7"
 )
 

music-player/pkg/services/fetch.go → gmus-backend/pkg/services/fetch.go

@@ -1,8 +1,8 @@
 package services
 
 import (
-	"github.com/felamaslen/go-music-player/pkg/database"
-	"github.com/felamaslen/go-music-player/pkg/repository"
+	"github.com/felamaslen/gmus-backend/pkg/database"
+	"github.com/felamaslen/gmus-backend/pkg/repository"
 )
 
 func GetArtists(limit int, page int) (artists *[]string, more bool) {

music-player/pkg/services/fetch_test.go → gmus-backend/pkg/services/fetch_test.go

@@ -7,9 +7,9 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/felamaslen/go-music-player/pkg/database"
-	"github.com/felamaslen/go-music-player/pkg/services"
-	setup "github.com/felamaslen/go-music-player/pkg/testing"
+	"github.com/felamaslen/gmus-backend/pkg/database"
+	"github.com/felamaslen/gmus-backend/pkg/services"
+	setup "github.com/felamaslen/gmus-backend/pkg/testing"
 )
 
 var _ = Describe("Fetching data", func() {

music-player/pkg/services/scanner.go → gmus-backend/pkg/services/scanner.go

@@ -1,11 +1,11 @@
 package services
 
 import (
-	"github.com/felamaslen/go-music-player/pkg/config"
-	"github.com/felamaslen/go-music-player/pkg/database"
-	"github.com/felamaslen/go-music-player/pkg/logger"
-	"github.com/felamaslen/go-music-player/pkg/read"
-	"github.com/felamaslen/go-music-player/pkg/repository"
+	"github.com/felamaslen/gmus-backend/pkg/config"
+	"github.com/felamaslen/gmus-backend/pkg/database"
+	"github.com/felamaslen/gmus-backend/pkg/logger"
+	"github.com/felamaslen/gmus-backend/pkg/read"
+	"github.com/felamaslen/gmus-backend/pkg/repository"
 )
 
 const LOG_EVERY = 100

music-player/pkg/services/scanner_test.go → gmus-backend/pkg/services/scanner_test.go

@@ -4,10 +4,10 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/felamaslen/go-music-player/pkg/database"
-	"github.com/felamaslen/go-music-player/pkg/read"
-	"github.com/felamaslen/go-music-player/pkg/services"
-	setup "github.com/felamaslen/go-music-player/pkg/testing"
+	"github.com/felamaslen/gmus-backend/pkg/database"
+	"github.com/felamaslen/gmus-backend/pkg/read"
+	"github.com/felamaslen/gmus-backend/pkg/services"
+	setup "github.com/felamaslen/gmus-backend/pkg/testing"
 )
 
 var _ = Describe("Music scanner service", func() {

music-player/pkg/testing/testing.go → gmus-backend/pkg/testing/testing.go

@@ -5,7 +5,7 @@ import (
 	"path"
 	"runtime"
 
-	"github.com/felamaslen/go-music-player/pkg/database"
+	"github.com/felamaslen/gmus-backend/pkg/database"
 )
 
 func ChangeToRootDir() {

gmus/README.md → gmus-web/README.md

@@ -1,6 +1,6 @@
-# gmus-web client
+# gmus-web
 
-This is a frontend web app for use with the go-music-player server.
+This is a frontend web app for use with the [gmus backend](../gmus-backend/README.md).
 
 ## Scripts