refactor : directory adjustment

pojol · Nov 13, 2021 · 7340cff · 7340cff
1 parent b1c6606
commit 7340cff
Show file tree

Hide file tree

Showing 32 changed files with 28 additions and 28 deletions.
diff --git a/driver/Dockerfile → Dockerfile b/driver/Dockerfile → Dockerfile
diff --git a/driver/behavior/behavior.go → behavior/behavior.go b/driver/behavior/behavior.go → behavior/behavior.go
diff --git a/driver/behavior/behavior_test.go → behavior/behavior_test.go b/driver/behavior/behavior_test.go → behavior/behavior_test.go
diff --git a/driver/bot/bot.go → bot/bot.go b/driver/bot/bot.go → bot/bot.go
@@ -10,9 +10,9 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/pojol/gobot/driver/behavior"
-	"github.com/pojol/gobot/driver/script"
-	"github.com/pojol/gobot/driver/utils"
+	"github.com/pojol/gobot/behavior"
+	"github.com/pojol/gobot/script"
+	"github.com/pojol/gobot/utils"
 	lua "github.com/yuin/gopher-lua"
 )
 

diff --git a/driver/bot/bot_test.go → bot/bot_test.go b/driver/bot/bot_test.go → bot/bot_test.go
@@ -5,9 +5,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/pojol/gobot/driver/behavior"
-	"github.com/pojol/gobot/driver/mock"
-	"github.com/pojol/gobot/driver/utils"
+	"github.com/pojol/gobot/behavior"
+	"github.com/pojol/gobot/mock"
+	"github.com/pojol/gobot/utils"
 	"github.com/stretchr/testify/assert"
 	lua "github.com/yuin/gopher-lua"
 )

diff --git a/driver/database/db.go → database/db.go b/driver/database/db.go → database/db.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/pojol/gobot/driver/bot"
+	"github.com/pojol/gobot/bot"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 )

diff --git a/driver/factory/batch.go → factory/batch.go b/driver/factory/batch.go → factory/batch.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/google/uuid"
-	"github.com/pojol/gobot/driver/behavior"
-	"github.com/pojol/gobot/driver/bot"
-	"github.com/pojol/gobot/driver/utils"
+	"github.com/pojol/gobot/behavior"
+	"github.com/pojol/gobot/bot"
+	"github.com/pojol/gobot/utils"
 )
 
 type BatchInfo struct {

diff --git a/driver/factory/factory.go → factory/factory.go b/driver/factory/factory.go → factory/factory.go
@@ -5,10 +5,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/pojol/gobot/driver/behavior"
-	"github.com/pojol/gobot/driver/bot"
-	"github.com/pojol/gobot/driver/database"
-	"github.com/pojol/gobot/driver/utils"
+	"github.com/pojol/gobot/behavior"
+	"github.com/pojol/gobot/bot"
+	"github.com/pojol/gobot/database"
+	"github.com/pojol/gobot/utils"
 )
 
 type urlDetail struct {

diff --git a/driver/factory/factory_opt.go → factory/factory_opt.go b/driver/factory/factory_opt.go → factory/factory_opt.go
diff --git a/driver/factory/factory_test.go → factory/factory_test.go b/driver/factory/factory_test.go → factory/factory_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pojol/gobot/driver/mock"
+	"github.com/pojol/gobot/mock"
 )
 
 var compose = `

diff --git a/driver/main.go → main.go b/driver/main.go → main.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
-	"github.com/pojol/gobot/driver/factory"
-	"github.com/pojol/gobot/driver/mock"
-	"github.com/pojol/gobot/driver/server"
+	"github.com/pojol/gobot/factory"
+	"github.com/pojol/gobot/mock"
+	"github.com/pojol/gobot/server"
 )
 
 var (

diff --git a/driver/mock/server.go → mock/server.go b/driver/mock/server.go → mock/server.go
diff --git a/driver/plugins/json/json.go → plugins/json/json.go b/driver/plugins/json/json.go → plugins/json/json.go
@@ -3,8 +3,8 @@ package main
 import (
 	"encoding/json"
 
-	"github.com/pojol/gobot/driver/plugins"
-	"github.com/pojol/gobot/driver/serialization"
+	"github.com/pojol/gobot/plugins"
+	"github.com/pojol/gobot/serialization"
 )
 
 type jsonp struct {

diff --git a/driver/plugins/plugin.go → plugins/plugin.go b/driver/plugins/plugin.go → plugins/plugin.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"plugin"
 
-	"github.com/pojol/gobot/driver/serialization"
+	"github.com/pojol/gobot/serialization"
 )
 
 type Plugin struct {

diff --git a/driver/script/book/book.pb.go → script/book/book.pb.go b/driver/script/book/book.pb.go → script/book/book.pb.go
diff --git a/driver/script/book/book.proto → script/book/book.proto b/driver/script/book/book.proto → script/book/book.proto
diff --git a/driver/script/book/gen.sh → script/book/gen.sh b/driver/script/book/gen.sh → script/book/gen.sh
diff --git a/driver/script/global.lua → script/global.lua b/driver/script/global.lua → script/global.lua
diff --git a/driver/script/http.go → script/http.go b/driver/script/http.go → script/http.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/pojol/gobot/driver/utils"
+	"github.com/pojol/gobot/utils"
 	lua "github.com/yuin/gopher-lua"
 )
 

diff --git a/driver/script/httptype.go → script/httptype.go b/driver/script/httptype.go → script/httptype.go
diff --git a/driver/script/json.lua → script/json.lua b/driver/script/json.lua → script/json.lua
diff --git a/driver/script/proto.go → script/proto.go b/driver/script/proto.go → script/proto.go
diff --git a/driver/script/script_test.go → script/script_test.go b/driver/script/script_test.go → script/script_test.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/pojol/gobot/driver/script/book"
+	"github.com/pojol/gobot/script/book"
 	lua "github.com/yuin/gopher-lua"
 )
 

diff --git a/driver/script/utils.go → script/utils.go b/driver/script/utils.go → script/utils.go
diff --git a/driver/serialization/serialization.go → serialization/serialization.go b/driver/serialization/serialization.go → serialization/serialization.go
diff --git a/driver/server/server.go → server/server.go b/driver/server/server.go → server/server.go
@@ -7,11 +7,11 @@ import (
 	"net/http"
 
 	"github.com/labstack/echo/v4"
-	"github.com/pojol/gobot/driver/behavior"
-	"github.com/pojol/gobot/driver/bot"
-	"github.com/pojol/gobot/driver/database"
-	"github.com/pojol/gobot/driver/factory"
-	"github.com/pojol/gobot/driver/utils"
+	"github.com/pojol/gobot/behavior"
+	"github.com/pojol/gobot/bot"
+	"github.com/pojol/gobot/database"
+	"github.com/pojol/gobot/factory"
+	"github.com/pojol/gobot/utils"
 )
 
 type Response struct {

diff --git a/driver/utils/color.go → utils/color.go b/driver/utils/color.go → utils/color.go
diff --git a/driver/utils/luatable2map.go → utils/luatable2map.go b/driver/utils/luatable2map.go → utils/luatable2map.go
diff --git a/driver/utils/luatable2map_test.go → utils/luatable2map_test.go b/driver/utils/luatable2map_test.go → utils/luatable2map_test.go
diff --git a/driver/utils/sizewaitgroup.go → utils/sizewaitgroup.go b/driver/utils/sizewaitgroup.go → utils/sizewaitgroup.go
diff --git a/driver/utils/switch.go → utils/switch.go b/driver/utils/switch.go → utils/switch.go
diff --git a/driver/utils/upload_file.go → utils/upload_file.go b/driver/utils/upload_file.go → utils/upload_file.go