feat: simple folders move

ccil-kbw · May 4, 2024 · 70ea38e · 70ea38e
1 parent 0dde998
commit 70ea38e
Show file tree

Hide file tree

Showing 28 changed files with 20 additions and 20 deletions.
diff --git a/cmd/cli/main.go b/cmd/cli/main.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	iqamav2 "github.com/ccil-kbw/robot/iqama/v2"
+	iqamav2 "github.com/ccil-kbw/robot/pkg/iqama/v2"
 	"os"
 )
 

diff --git a/cmd/darsrec/main.go b/cmd/darsrec/main.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/ccil-kbw/robot/rec"
+	rec2 "github.com/ccil-kbw/robot/pkg/rec"
 	"os"
 )
 
@@ -23,8 +23,8 @@ func main() {
 			os.Exit(1)
 		}
 	}
-	data := rec.NewRecordConfigDataS()
+	data := rec2.NewRecordConfigDataS()
 
-	rec.StartRecServer(host, password, data)
+	rec2.StartRecServer(host, password, data)
 
 }
diff --git a/cmd/discord_bot/main.go b/cmd/discord_bot/main.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/caarlos0/env/v11"
-	"github.com/ccil-kbw/robot/discord"
+	"github.com/ccil-kbw/robot/pkg/discord"
 	"github.com/joho/godotenv"
 	"go.uber.org/zap"
 	"log"

diff --git a/cmd/iqama_proxy/main.go b/cmd/iqama_proxy/main.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"net/http"
 
-	v1 "github.com/ccil-kbw/robot/iqama/v1"
+	v1 "github.com/ccil-kbw/robot/pkg/iqama/v1"
 )
 
 func main() {

diff --git a/cmd/monolith/main.go b/cmd/monolith/main.go
@@ -2,15 +2,15 @@ package main
 
 import (
 	"fmt"
+	"github.com/ccil-kbw/robot/pkg/discord"
+	rec2 "github.com/ccil-kbw/robot/pkg/rec"
 
-	"github.com/ccil-kbw/robot/discord"
 	"go.uber.org/zap"
 	"os"
 	"os/signal"
 	"strings"
 	"time"
 
-	"github.com/ccil-kbw/robot/rec"
 	"github.com/joho/godotenv"
 )
 
@@ -48,7 +48,7 @@ func main() {
 
 	signal.Notify(stop, os.Interrupt)
 
-	var obs *rec.Recorder
+	var obs *rec2.Recorder
 
 	if config.Features.DiscordBot {
 		go bot()
@@ -57,7 +57,7 @@ func main() {
 	if config.Features.Record {
 		host := os.Getenv("MDROID_OBS_WEBSOCKET_HOST")
 		password := os.Getenv("MDROID_OBS_WEBSOCKET_PASSWORD")
-		data := rec.NewRecordConfigDataS()
+		data := rec2.NewRecordConfigDataS()
 
 		obsClient := startServerWithRetry(host, password, data)
 
@@ -120,9 +120,9 @@ func bot() {
 	discordBot.StartBot()
 }
 
-func startServerWithRetry(host string, password string, data *rec.RecordConfigDataS) *rec.Recorder {
+func startServerWithRetry(host string, password string, data *rec2.RecordConfigDataS) *rec2.Recorder {
 	for {
-		obs, err := rec.StartRecServer(host, password, data)
+		obs, err := rec2.StartRecServer(host, password, data)
 		if err != nil {
 			fmt.Printf("could not reach or authenticate to OBS, retrying in 1 minutes...\n")
 			time.Sleep(1 * time.Minute)

diff --git a/discord/admin.go → pkg/discord/admin.go b/discord/admin.go → pkg/discord/admin.go
@@ -3,7 +3,7 @@ package discord
 import (
 	"fmt"
 	"github.com/bwmarrin/discordgo"
-	"github.com/ccil-kbw/robot/rec"
+	"github.com/ccil-kbw/robot/pkg/rec"
 	"time"
 )
 

diff --git a/discord/discord.go → pkg/discord/discord.go b/discord/discord.go → pkg/discord/discord.go
@@ -4,7 +4,7 @@
 package discord
 
 import (
-	"github.com/ccil-kbw/robot/rec"
+	"github.com/ccil-kbw/robot/pkg/rec"
 	"log"
 	"os"
 	"os/signal"

diff --git a/discord/mappers.go → pkg/discord/mappers.go b/discord/mappers.go → pkg/discord/mappers.go
@@ -2,7 +2,7 @@ package discord
 
 import (
 	"github.com/bwmarrin/discordgo"
-	"github.com/ccil-kbw/robot/iqama/v2"
+	"github.com/ccil-kbw/robot/pkg/iqama/v2"
 	"go.uber.org/zap"
 )
 

diff --git a/discord/public.go → pkg/discord/public.go b/discord/public.go → pkg/discord/public.go
@@ -2,7 +2,7 @@ package discord
 
 import (
 	"github.com/bwmarrin/discordgo"
-	iqamav2 "github.com/ccil-kbw/robot/iqama/v2"
+	iqamav2 "github.com/ccil-kbw/robot/pkg/iqama/v2"
 	"go.uber.org/zap"
 	"os"
 	"strings"

diff --git a/iqama/iqama.go → pkg/iqama/iqama.go b/iqama/iqama.go → pkg/iqama/iqama.go
@@ -2,8 +2,8 @@ package iqama
 
 import (
 	"fmt"
-	v1 "github.com/ccil-kbw/robot/iqama/v1"
-	"github.com/ccil-kbw/robot/rec"
+	v1 "github.com/ccil-kbw/robot/pkg/iqama/v1"
+	"github.com/ccil-kbw/robot/pkg/rec"
 	"sync"
 	"time"
 )

diff --git a/iqama/v1/iqama.go → pkg/iqama/v1/iqama.go b/iqama/v1/iqama.go → pkg/iqama/v1/iqama.go
diff --git a/iqama/v1/model.go → pkg/iqama/v1/model.go b/iqama/v1/model.go → pkg/iqama/v1/model.go
diff --git a/iqama/v1/print.go → pkg/iqama/v1/print.go b/iqama/v1/print.go → pkg/iqama/v1/print.go
diff --git a/iqama/v2/assets/img/fares___blueprint.png → ...iqama/v2/assets/img/fares___blueprint.png b/iqama/v2/assets/img/fares___blueprint.png → ...iqama/v2/assets/img/fares___blueprint.png
diff --git a/...a/Chomedey Laval QC 2/@ccil_kbw/iqama.csv → ...a/Chomedey Laval QC 2/@ccil_kbw/iqama.csv b/...a/Chomedey Laval QC 2/@ccil_kbw/iqama.csv → ...a/Chomedey Laval QC 2/@ccil_kbw/iqama.csv
diff --git a/...Chomedey Laval QC 2/@ccil_kbw_2/iqama.csv → ...Chomedey Laval QC 2/@ccil_kbw_2/iqama.csv b/...Chomedey Laval QC 2/@ccil_kbw_2/iqama.csv → ...Chomedey Laval QC 2/@ccil_kbw_2/iqama.csv
diff --git a/...ata/Chomedey Laval QC/@ccil_kbw/iqama.csv → ...ata/Chomedey Laval QC/@ccil_kbw/iqama.csv b/...ata/Chomedey Laval QC/@ccil_kbw/iqama.csv → ...ata/Chomedey Laval QC/@ccil_kbw/iqama.csv
diff --git a/...a/Chomedey Laval QC/@ccil_kbw_2/iqama.csv → ...a/Chomedey Laval QC/@ccil_kbw_2/iqama.csv b/...a/Chomedey Laval QC/@ccil_kbw_2/iqama.csv → ...a/Chomedey Laval QC/@ccil_kbw_2/iqama.csv
diff --git a/iqama/v2/const.go → pkg/iqama/v2/const.go b/iqama/v2/const.go → pkg/iqama/v2/const.go
diff --git a/iqama/v2/csv.go → pkg/iqama/v2/csv.go b/iqama/v2/csv.go → pkg/iqama/v2/csv.go
diff --git a/iqama/v2/csv_helpers.go → pkg/iqama/v2/csv_helpers.go b/iqama/v2/csv_helpers.go → pkg/iqama/v2/csv_helpers.go
diff --git a/iqama/v2/csv_test.go → pkg/iqama/v2/csv_test.go b/iqama/v2/csv_test.go → pkg/iqama/v2/csv_test.go
diff --git a/iqama/v2/helpers.go → pkg/iqama/v2/helpers.go b/iqama/v2/helpers.go → pkg/iqama/v2/helpers.go
diff --git a/iqama/v2/interface.go → pkg/iqama/v2/interface.go b/iqama/v2/interface.go → pkg/iqama/v2/interface.go
diff --git a/iqama/v2/models.go → pkg/iqama/v2/models.go b/iqama/v2/models.go → pkg/iqama/v2/models.go
diff --git a/rec/rec.go → pkg/rec/rec.go b/rec/rec.go → pkg/rec/rec.go
diff --git a/rec/rec_iqama.go → pkg/rec/rec_iqama.go b/rec/rec_iqama.go → pkg/rec/rec_iqama.go
@@ -2,8 +2,8 @@ package rec
 
 import (
 	"fmt"
-	v1 "github.com/ccil-kbw/robot/iqama/v1"
-	v2 "github.com/ccil-kbw/robot/iqama/v2"
+	v1 "github.com/ccil-kbw/robot/pkg/iqama/v1"
+	v2 "github.com/ccil-kbw/robot/pkg/iqama/v2"
 	"sync"
 	"time"
 )

diff --git a/rec/server.go → pkg/rec/server.go b/rec/server.go → pkg/rec/server.go