From: Jeff Halter Date: Thu, 29 Jul 2021 01:21:52 +0000 (-0700) Subject: Move code to hotline dir X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/commitdiff_plain/22c599abc18895f73e96095f35b71cf3357d41b4?ds=inline Move code to hotline dir --- diff --git a/.run/go run server.go.run.xml b/.run/go run server.go.run.xml deleted file mode 100644 index efbc814..0000000 --- a/.run/go run server.go.run.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/client/main.go b/client/main.go index 6008cad..3ce4c7e 100644 --- a/client/main.go +++ b/client/main.go @@ -4,7 +4,7 @@ import ( "context" "flag" "fmt" - hotline "github.com/jhalter/mobius" + "github.com/jhalter/mobius/hotline" "github.com/rivo/tview" "go.uber.org/zap" "go.uber.org/zap/zapcore" @@ -14,6 +14,7 @@ import ( "syscall" ) + func main() { _, cancelRoot := context.WithCancel(context.Background()) diff --git a/access.go b/hotline/access.go similarity index 100% rename from access.go rename to hotline/access.go diff --git a/account.go b/hotline/account.go similarity index 100% rename from account.go rename to hotline/account.go diff --git a/client/banners/1.txt b/hotline/banners/1.txt similarity index 100% rename from client/banners/1.txt rename to hotline/banners/1.txt diff --git a/client/banners/2.txt b/hotline/banners/2.txt similarity index 100% rename from client/banners/2.txt rename to hotline/banners/2.txt diff --git a/client/banners/3.txt b/hotline/banners/3.txt similarity index 100% rename from client/banners/3.txt rename to hotline/banners/3.txt diff --git a/client/banners/4.txt b/hotline/banners/4.txt similarity index 100% rename from client/banners/4.txt rename to hotline/banners/4.txt diff --git a/client/banners/5.txt b/hotline/banners/5.txt similarity index 100% rename from client/banners/5.txt rename to hotline/banners/5.txt diff --git a/client/banners/6.txt b/hotline/banners/6.txt similarity index 100% rename from client/banners/6.txt rename to hotline/banners/6.txt diff --git a/client/banners/7.txt b/hotline/banners/7.txt similarity index 100% rename from client/banners/7.txt rename to hotline/banners/7.txt diff --git a/client/banners/8.txt b/hotline/banners/8.txt similarity index 100% rename from client/banners/8.txt rename to hotline/banners/8.txt diff --git a/client/banners/9.txt b/hotline/banners/9.txt similarity index 100% rename from client/banners/9.txt rename to hotline/banners/9.txt diff --git a/client.go b/hotline/client.go similarity index 99% rename from client.go rename to hotline/client.go index 940e6fe..9bb33e1 100644 --- a/client.go +++ b/hotline/client.go @@ -27,7 +27,7 @@ const ( trackerListPage = "trackerList" ) -//go:embed client/banners/*.txt +//go:embed banners/*.txt var bannerDir embed.FS type Bookmark struct { diff --git a/client_conn.go b/hotline/client_conn.go similarity index 100% rename from client_conn.go rename to hotline/client_conn.go diff --git a/client_conn_test.go b/hotline/client_conn_test.go similarity index 100% rename from client_conn_test.go rename to hotline/client_conn_test.go diff --git a/config.go b/hotline/config.go similarity index 100% rename from config.go rename to hotline/config.go diff --git a/field.go b/hotline/field.go similarity index 100% rename from field.go rename to hotline/field.go diff --git a/field_test.go b/hotline/field_test.go similarity index 100% rename from field_test.go rename to hotline/field_test.go diff --git a/file_header.go b/hotline/file_header.go similarity index 100% rename from file_header.go rename to hotline/file_header.go diff --git a/file_header_test.go b/hotline/file_header_test.go similarity index 100% rename from file_header_test.go rename to hotline/file_header_test.go diff --git a/file_path.go b/hotline/file_path.go similarity index 100% rename from file_path.go rename to hotline/file_path.go diff --git a/file_transfer.go b/hotline/file_transfer.go similarity index 100% rename from file_transfer.go rename to hotline/file_transfer.go diff --git a/files.go b/hotline/files.go similarity index 100% rename from files.go rename to hotline/files.go diff --git a/files_test.go b/hotline/files_test.go similarity index 100% rename from files_test.go rename to hotline/files_test.go diff --git a/flattened_file_object.go b/hotline/flattened_file_object.go similarity index 100% rename from flattened_file_object.go rename to hotline/flattened_file_object.go diff --git a/flattened_file_object_test.go b/hotline/flattened_file_object_test.go similarity index 100% rename from flattened_file_object_test.go rename to hotline/flattened_file_object_test.go diff --git a/news.go b/hotline/news.go similarity index 100% rename from news.go rename to hotline/news.go diff --git a/server.go b/hotline/server.go similarity index 100% rename from server.go rename to hotline/server.go diff --git a/server_blackbox_test.go b/hotline/server_blackbox_test.go similarity index 100% rename from server_blackbox_test.go rename to hotline/server_blackbox_test.go diff --git a/server_test.go b/hotline/server_test.go similarity index 100% rename from server_test.go rename to hotline/server_test.go diff --git a/stats.go b/hotline/stats.go similarity index 100% rename from stats.go rename to hotline/stats.go diff --git a/test/config/Agreement.txt b/hotline/test/config/Agreement.txt similarity index 100% rename from test/config/Agreement.txt rename to hotline/test/config/Agreement.txt diff --git a/test/config/Files/test/testfile-1k b/hotline/test/config/Files/test/testfile-1k similarity index 100% rename from test/config/Files/test/testfile-1k rename to hotline/test/config/Files/test/testfile-1k diff --git a/test/config/Files/test/testfile-5k b/hotline/test/config/Files/test/testfile-5k similarity index 100% rename from test/config/Files/test/testfile-5k rename to hotline/test/config/Files/test/testfile-5k diff --git a/test/config/Files/testdir/some-nested-file.txt b/hotline/test/config/Files/testdir/some-nested-file.txt similarity index 100% rename from test/config/Files/testdir/some-nested-file.txt rename to hotline/test/config/Files/testdir/some-nested-file.txt diff --git a/test/config/Files/testfile.sit b/hotline/test/config/Files/testfile.sit similarity index 100% rename from test/config/Files/testfile.sit rename to hotline/test/config/Files/testfile.sit diff --git a/test/config/Files/testfile.txt b/hotline/test/config/Files/testfile.txt similarity index 100% rename from test/config/Files/testfile.txt rename to hotline/test/config/Files/testfile.txt diff --git a/test/config/MessageBoard.txt b/hotline/test/config/MessageBoard.txt similarity index 100% rename from test/config/MessageBoard.txt rename to hotline/test/config/MessageBoard.txt diff --git a/test/config/ThreadedNews.yaml b/hotline/test/config/ThreadedNews.yaml similarity index 100% rename from test/config/ThreadedNews.yaml rename to hotline/test/config/ThreadedNews.yaml diff --git a/test/config/Users/admin.yaml b/hotline/test/config/Users/admin.yaml similarity index 100% rename from test/config/Users/admin.yaml rename to hotline/test/config/Users/admin.yaml diff --git a/test/config/Users/guest.yaml b/hotline/test/config/Users/guest.yaml similarity index 100% rename from test/config/Users/guest.yaml rename to hotline/test/config/Users/guest.yaml diff --git a/test/config/config.yaml b/hotline/test/config/config.yaml similarity index 100% rename from test/config/config.yaml rename to hotline/test/config/config.yaml diff --git a/tracker.go b/hotline/tracker.go similarity index 100% rename from tracker.go rename to hotline/tracker.go diff --git a/tracker_test.go b/hotline/tracker_test.go similarity index 100% rename from tracker_test.go rename to hotline/tracker_test.go diff --git a/transaction.go b/hotline/transaction.go similarity index 100% rename from transaction.go rename to hotline/transaction.go diff --git a/transaction_handlers.go b/hotline/transaction_handlers.go similarity index 100% rename from transaction_handlers.go rename to hotline/transaction_handlers.go diff --git a/transaction_handlers_test.go b/hotline/transaction_handlers_test.go similarity index 100% rename from transaction_handlers_test.go rename to hotline/transaction_handlers_test.go diff --git a/transaction_test.go b/hotline/transaction_test.go similarity index 100% rename from transaction_test.go rename to hotline/transaction_test.go diff --git a/transfer.go b/hotline/transfer.go similarity index 100% rename from transfer.go rename to hotline/transfer.go diff --git a/transfer_test.go b/hotline/transfer_test.go similarity index 100% rename from transfer_test.go rename to hotline/transfer_test.go diff --git a/user.go b/hotline/user.go similarity index 100% rename from user.go rename to hotline/user.go diff --git a/user_test.go b/hotline/user_test.go similarity index 100% rename from user_test.go rename to hotline/user_test.go diff --git a/version.go b/hotline/version.go similarity index 100% rename from version.go rename to hotline/version.go diff --git a/server/main.go b/server/main.go index 0b9a09c..772625b 100644 --- a/server/main.go +++ b/server/main.go @@ -4,7 +4,7 @@ import ( "context" "flag" "fmt" - "github.com/jhalter/mobius" + "github.com/jhalter/mobius/hotline" "go.uber.org/zap" "go.uber.org/zap/zapcore" "os" diff --git a/test/.DS_Store b/test/.DS_Store deleted file mode 100644 index db68ea8..0000000 Binary files a/test/.DS_Store and /dev/null differ diff --git a/test/config/.DS_Store b/test/config/.DS_Store deleted file mode 100644 index b486f59..0000000 Binary files a/test/config/.DS_Store and /dev/null differ diff --git a/test/config/Users/.DS_Store b/test/config/Users/.DS_Store deleted file mode 100644 index 5008ddf..0000000 Binary files a/test/config/Users/.DS_Store and /dev/null differ