From 5b9c63757fe64d349c300ab906eaa5ca81258add Mon Sep 17 00:00:00 2001 From: Su Yang Date: Fri, 5 Jan 2024 22:50:15 +0800 Subject: [PATCH] chore: mv internal/data => config/data --- cmd/cmd.go | 2 +- cmd/flags.go | 2 +- {internal => config}/data/bookmark.go | 2 +- {internal => config}/data/bookmark_test.go | 2 +- {internal => config}/data/config.go | 2 +- {internal => config}/data/config_test.go | 2 +- {internal => config}/data/editor.go | 2 +- {internal => config}/data/editor_test.go | 2 +- {internal => config}/data/fs.go | 2 +- {internal => config}/data/fs_test.go | 2 +- {internal => config}/data/serializer.go | 2 +- {internal => config}/data/serializer_test.go | 2 +- {internal => config}/data/settings.go | 2 +- {internal => config}/data/settings_test.go | 2 +- internal/editor/editor.go | 2 +- internal/pages/home/application.go | 2 +- internal/pages/home/bookmark.go | 2 +- internal/pages/home/home.go | 2 +- internal/redir/redir.go | 2 +- internal/settings/appearance/appearance.go | 2 +- internal/settings/others/others.go | 2 +- internal/settings/search/search.go | 2 +- internal/settings/theme/theme.go | 2 +- internal/settings/weather/weather.go | 2 +- internal/state/theme.go | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) rename {internal => config}/data/bookmark.go (99%) rename {internal => config}/data/bookmark_test.go (97%) rename {internal => config}/data/config.go (99%) rename {internal => config}/data/config_test.go (95%) rename {internal => config}/data/editor.go (99%) rename {internal => config}/data/editor_test.go (99%) rename {internal => config}/data/fs.go (97%) rename {internal => config}/data/fs_test.go (97%) rename {internal => config}/data/serializer.go (98%) rename {internal => config}/data/serializer_test.go (98%) rename {internal => config}/data/settings.go (99%) rename {internal => config}/data/settings_test.go (99%) diff --git a/cmd/cmd.go b/cmd/cmd.go index 3b621e9..fc11c02 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -3,7 +3,7 @@ package cmd import ( "log/slog" - FlareData "github.com/soulteary/flare/internal/data" + FlareData "github.com/soulteary/flare/config/data" FlareLogger "github.com/soulteary/flare/internal/logger" FlareState "github.com/soulteary/flare/internal/state" ) diff --git a/cmd/flags.go b/cmd/flags.go index 25af37e..c6f72c0 100644 --- a/cmd/flags.go +++ b/cmd/flags.go @@ -13,7 +13,7 @@ import ( flags "github.com/spf13/pflag" "gopkg.in/ini.v1" - FlareData "github.com/soulteary/flare/internal/data" + FlareData "github.com/soulteary/flare/config/data" FlareLogger "github.com/soulteary/flare/internal/logger" FlareModel "github.com/soulteary/flare/internal/model" ) diff --git a/internal/data/bookmark.go b/config/data/bookmark.go similarity index 99% rename from internal/data/bookmark.go rename to config/data/bookmark.go index ed8502b..3a5196f 100644 --- a/internal/data/bookmark.go +++ b/config/data/bookmark.go @@ -1,4 +1,4 @@ -package data +package FlareData import ( "fmt" diff --git a/internal/data/bookmark_test.go b/config/data/bookmark_test.go similarity index 97% rename from internal/data/bookmark_test.go rename to config/data/bookmark_test.go index ea738ef..7d0482c 100644 --- a/internal/data/bookmark_test.go +++ b/config/data/bookmark_test.go @@ -1,4 +1,4 @@ -package data +package FlareData import ( "os" diff --git a/internal/data/config.go b/config/data/config.go similarity index 99% rename from internal/data/config.go rename to config/data/config.go index d70fe34..45fc36e 100644 --- a/internal/data/config.go +++ b/config/data/config.go @@ -1,4 +1,4 @@ -package data +package FlareData import ( "fmt" diff --git a/internal/data/config_test.go b/config/data/config_test.go similarity index 95% rename from internal/data/config_test.go rename to config/data/config_test.go index d2acd63..cab0af0 100644 --- a/internal/data/config_test.go +++ b/config/data/config_test.go @@ -1,4 +1,4 @@ -package data +package FlareData import ( "os" diff --git a/internal/data/editor.go b/config/data/editor.go similarity index 99% rename from internal/data/editor.go rename to config/data/editor.go index 04409a5..66e43e9 100644 --- a/internal/data/editor.go +++ b/config/data/editor.go @@ -1,4 +1,4 @@ -package data +package FlareData import ( "log" diff --git a/internal/data/editor_test.go b/config/data/editor_test.go similarity index 99% rename from internal/data/editor_test.go rename to config/data/editor_test.go index d4936f3..bb9cd11 100644 --- a/internal/data/editor_test.go +++ b/config/data/editor_test.go @@ -1,4 +1,4 @@ -package data +package FlareData import ( "testing" diff --git a/internal/data/fs.go b/config/data/fs.go similarity index 97% rename from internal/data/fs.go rename to config/data/fs.go index 424932a..2ad307b 100644 --- a/internal/data/fs.go +++ b/config/data/fs.go @@ -1,4 +1,4 @@ -package data +package FlareData import ( "log" diff --git a/internal/data/fs_test.go b/config/data/fs_test.go similarity index 97% rename from internal/data/fs_test.go rename to config/data/fs_test.go index d3721f0..7cca672 100644 --- a/internal/data/fs_test.go +++ b/config/data/fs_test.go @@ -1,4 +1,4 @@ -package data +package FlareData import ( "bytes" diff --git a/internal/data/serializer.go b/config/data/serializer.go similarity index 98% rename from internal/data/serializer.go rename to config/data/serializer.go index 3a05a54..d4c1ed4 100644 --- a/internal/data/serializer.go +++ b/config/data/serializer.go @@ -1,4 +1,4 @@ -package data +package FlareData import ( "bytes" diff --git a/internal/data/serializer_test.go b/config/data/serializer_test.go similarity index 98% rename from internal/data/serializer_test.go rename to config/data/serializer_test.go index 68b4cb6..0a4c33e 100644 --- a/internal/data/serializer_test.go +++ b/config/data/serializer_test.go @@ -1,4 +1,4 @@ -package data +package FlareData import ( "testing" diff --git a/internal/data/settings.go b/config/data/settings.go similarity index 99% rename from internal/data/settings.go rename to config/data/settings.go index adeb8f3..a7ad87b 100644 --- a/internal/data/settings.go +++ b/config/data/settings.go @@ -1,4 +1,4 @@ -package data +package FlareData import ( FlareModel "github.com/soulteary/flare/internal/model" diff --git a/internal/data/settings_test.go b/config/data/settings_test.go similarity index 99% rename from internal/data/settings_test.go rename to config/data/settings_test.go index 2bf23e6..16fc940 100644 --- a/internal/data/settings_test.go +++ b/config/data/settings_test.go @@ -1,4 +1,4 @@ -package data +package FlareData import ( "os" diff --git a/internal/editor/editor.go b/internal/editor/editor.go index 0ca3cf7..08fa529 100644 --- a/internal/editor/editor.go +++ b/internal/editor/editor.go @@ -9,8 +9,8 @@ import ( "github.com/gin-gonic/gin" "github.com/soulteary/memfs" + FlareData "github.com/soulteary/flare/config/data" FlareAuth "github.com/soulteary/flare/internal/auth" - FlareData "github.com/soulteary/flare/internal/data" FlareState "github.com/soulteary/flare/internal/state" ) diff --git a/internal/pages/home/application.go b/internal/pages/home/application.go index b1da482..5d8ac59 100644 --- a/internal/pages/home/application.go +++ b/internal/pages/home/application.go @@ -4,7 +4,7 @@ import ( "html/template" "strings" - FlareData "github.com/soulteary/flare/internal/data" + FlareData "github.com/soulteary/flare/config/data" FlareModel "github.com/soulteary/flare/internal/model" FlareMDI "github.com/soulteary/flare/internal/resources/mdi" FlareState "github.com/soulteary/flare/internal/state" diff --git a/internal/pages/home/bookmark.go b/internal/pages/home/bookmark.go index 50d53bd..4f8ecac 100644 --- a/internal/pages/home/bookmark.go +++ b/internal/pages/home/bookmark.go @@ -4,7 +4,7 @@ import ( "html/template" "strings" - FlareData "github.com/soulteary/flare/internal/data" + FlareData "github.com/soulteary/flare/config/data" FlareModel "github.com/soulteary/flare/internal/model" FlareMDI "github.com/soulteary/flare/internal/resources/mdi" FlareState "github.com/soulteary/flare/internal/state" diff --git a/internal/pages/home/home.go b/internal/pages/home/home.go index c57789c..eac5f1d 100644 --- a/internal/pages/home/home.go +++ b/internal/pages/home/home.go @@ -10,8 +10,8 @@ import ( "github.com/gin-gonic/gin" + FlareData "github.com/soulteary/flare/config/data" FlareAuth "github.com/soulteary/flare/internal/auth" - FlareData "github.com/soulteary/flare/internal/data" FlareModel "github.com/soulteary/flare/internal/model" FlareWeather "github.com/soulteary/flare/internal/settings/weather" FlareState "github.com/soulteary/flare/internal/state" diff --git a/internal/redir/redir.go b/internal/redir/redir.go index e9da2e0..1d7629d 100644 --- a/internal/redir/redir.go +++ b/internal/redir/redir.go @@ -5,7 +5,7 @@ import ( "github.com/gin-gonic/gin" - FlareData "github.com/soulteary/flare/internal/data" + FlareData "github.com/soulteary/flare/config/data" FlareState "github.com/soulteary/flare/internal/state" ) diff --git a/internal/settings/appearance/appearance.go b/internal/settings/appearance/appearance.go index 204dedf..9915fc9 100644 --- a/internal/settings/appearance/appearance.go +++ b/internal/settings/appearance/appearance.go @@ -7,8 +7,8 @@ import ( "github.com/gin-gonic/gin" + FlareData "github.com/soulteary/flare/config/data" FlareAuth "github.com/soulteary/flare/internal/auth" - FlareData "github.com/soulteary/flare/internal/data" FlareModel "github.com/soulteary/flare/internal/model" FlareState "github.com/soulteary/flare/internal/state" ) diff --git a/internal/settings/others/others.go b/internal/settings/others/others.go index cbf0833..ede26be 100644 --- a/internal/settings/others/others.go +++ b/internal/settings/others/others.go @@ -6,8 +6,8 @@ import ( "github.com/gin-gonic/gin" + FlareData "github.com/soulteary/flare/config/data" FlareAuth "github.com/soulteary/flare/internal/auth" - FlareData "github.com/soulteary/flare/internal/data" FlareState "github.com/soulteary/flare/internal/state" FlareVersion "github.com/soulteary/flare/internal/version" ) diff --git a/internal/settings/search/search.go b/internal/settings/search/search.go index f61dc60..dbf7776 100644 --- a/internal/settings/search/search.go +++ b/internal/settings/search/search.go @@ -5,8 +5,8 @@ import ( "github.com/gin-gonic/gin" + FlareData "github.com/soulteary/flare/config/data" FlareAuth "github.com/soulteary/flare/internal/auth" - FlareData "github.com/soulteary/flare/internal/data" FlareState "github.com/soulteary/flare/internal/state" ) diff --git a/internal/settings/theme/theme.go b/internal/settings/theme/theme.go index 1de0649..1fce0ee 100644 --- a/internal/settings/theme/theme.go +++ b/internal/settings/theme/theme.go @@ -5,8 +5,8 @@ import ( "github.com/gin-gonic/gin" + FlareData "github.com/soulteary/flare/config/data" FlareAuth "github.com/soulteary/flare/internal/auth" - FlareData "github.com/soulteary/flare/internal/data" FlareState "github.com/soulteary/flare/internal/state" ) diff --git a/internal/settings/weather/weather.go b/internal/settings/weather/weather.go index 5be63ca..7f677b6 100644 --- a/internal/settings/weather/weather.go +++ b/internal/settings/weather/weather.go @@ -7,8 +7,8 @@ import ( "github.com/gin-gonic/gin" + FlareData "github.com/soulteary/flare/config/data" FlareAuth "github.com/soulteary/flare/internal/auth" - FlareData "github.com/soulteary/flare/internal/data" FlareModel "github.com/soulteary/flare/internal/model" FlareState "github.com/soulteary/flare/internal/state" weather "github.com/soulteary/funny-china-weather" diff --git a/internal/state/theme.go b/internal/state/theme.go index e083129..be21e31 100644 --- a/internal/state/theme.go +++ b/internal/state/theme.go @@ -5,7 +5,7 @@ package state import ( "html/template" - FlareData "github.com/soulteary/flare/internal/data" + FlareData "github.com/soulteary/flare/config/data" FlareModel "github.com/soulteary/flare/internal/model" )