diff options
| -rw-r--r-- | .run/go run server.go.run.xml | 12 | ||||
| -rw-r--r-- | client/main.go | 3 | ||||
| -rw-r--r-- | hotline/access.go (renamed from access.go) | 0 | ||||
| -rw-r--r-- | hotline/account.go (renamed from account.go) | 0 | ||||
| -rw-r--r-- | hotline/banners/1.txt (renamed from client/banners/1.txt) | 0 | ||||
| -rw-r--r-- | hotline/banners/2.txt (renamed from client/banners/2.txt) | 0 | ||||
| -rw-r--r-- | hotline/banners/3.txt (renamed from client/banners/3.txt) | 0 | ||||
| -rw-r--r-- | hotline/banners/4.txt (renamed from client/banners/4.txt) | 0 | ||||
| -rw-r--r-- | hotline/banners/5.txt (renamed from client/banners/5.txt) | 0 | ||||
| -rw-r--r-- | hotline/banners/6.txt (renamed from client/banners/6.txt) | 0 | ||||
| -rw-r--r-- | hotline/banners/7.txt (renamed from client/banners/7.txt) | 0 | ||||
| -rw-r--r-- | hotline/banners/8.txt (renamed from client/banners/8.txt) | 0 | ||||
| -rw-r--r-- | hotline/banners/9.txt (renamed from client/banners/9.txt) | 0 | ||||
| -rw-r--r-- | hotline/client.go (renamed from client.go) | 2 | ||||
| -rw-r--r-- | hotline/client_conn.go (renamed from client_conn.go) | 0 | ||||
| -rw-r--r-- | hotline/client_conn_test.go (renamed from client_conn_test.go) | 0 | ||||
| -rw-r--r-- | hotline/config.go (renamed from config.go) | 0 | ||||
| -rw-r--r-- | hotline/field.go (renamed from field.go) | 0 | ||||
| -rw-r--r-- | hotline/field_test.go (renamed from field_test.go) | 0 | ||||
| -rw-r--r-- | hotline/file_header.go (renamed from file_header.go) | 0 | ||||
| -rw-r--r-- | hotline/file_header_test.go (renamed from file_header_test.go) | 0 | ||||
| -rw-r--r-- | hotline/file_path.go (renamed from file_path.go) | 0 | ||||
| -rw-r--r-- | hotline/file_transfer.go (renamed from file_transfer.go) | 0 | ||||
| -rw-r--r-- | hotline/files.go (renamed from files.go) | 0 | ||||
| -rw-r--r-- | hotline/files_test.go (renamed from files_test.go) | 0 | ||||
| -rw-r--r-- | hotline/flattened_file_object.go (renamed from flattened_file_object.go) | 0 | ||||
| -rw-r--r-- | hotline/flattened_file_object_test.go (renamed from flattened_file_object_test.go) | 0 | ||||
| -rw-r--r-- | hotline/news.go (renamed from news.go) | 0 | ||||
| -rw-r--r-- | hotline/server.go (renamed from server.go) | 0 | ||||
| -rw-r--r-- | hotline/server_blackbox_test.go (renamed from server_blackbox_test.go) | 0 | ||||
| -rw-r--r-- | hotline/server_test.go (renamed from server_test.go) | 0 | ||||
| -rw-r--r-- | hotline/stats.go (renamed from stats.go) | 0 | ||||
| -rw-r--r-- | hotline/test/config/Agreement.txt (renamed from test/config/Agreement.txt) | 0 | ||||
| -rw-r--r-- | hotline/test/config/Files/test/testfile-1k (renamed from test/config/Files/test/testfile-1k) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | hotline/test/config/Files/test/testfile-5k (renamed from test/config/Files/test/testfile-5k) | bin | 5120 -> 5120 bytes | |||
| -rw-r--r-- | hotline/test/config/Files/testdir/some-nested-file.txt (renamed from test/config/Files/testdir/some-nested-file.txt) | 0 | ||||
| -rw-r--r-- | hotline/test/config/Files/testfile.sit (renamed from test/config/Files/testfile.sit) | 0 | ||||
| -rw-r--r-- | hotline/test/config/Files/testfile.txt (renamed from test/config/Files/testfile.txt) | 0 | ||||
| -rw-r--r-- | hotline/test/config/MessageBoard.txt (renamed from test/config/MessageBoard.txt) | 0 | ||||
| -rw-r--r-- | hotline/test/config/ThreadedNews.yaml (renamed from test/config/ThreadedNews.yaml) | 0 | ||||
| -rw-r--r-- | hotline/test/config/Users/admin.yaml (renamed from test/config/Users/admin.yaml) | 0 | ||||
| -rw-r--r-- | hotline/test/config/Users/guest.yaml (renamed from test/config/Users/guest.yaml) | 0 | ||||
| -rw-r--r-- | hotline/test/config/config.yaml (renamed from test/config/config.yaml) | 0 | ||||
| -rw-r--r-- | hotline/tracker.go (renamed from tracker.go) | 0 | ||||
| -rw-r--r-- | hotline/tracker_test.go (renamed from tracker_test.go) | 0 | ||||
| -rw-r--r-- | hotline/transaction.go (renamed from transaction.go) | 0 | ||||
| -rw-r--r-- | hotline/transaction_handlers.go (renamed from transaction_handlers.go) | 0 | ||||
| -rw-r--r-- | hotline/transaction_handlers_test.go (renamed from transaction_handlers_test.go) | 0 | ||||
| -rw-r--r-- | hotline/transaction_test.go (renamed from transaction_test.go) | 0 | ||||
| -rw-r--r-- | hotline/transfer.go (renamed from transfer.go) | 0 | ||||
| -rw-r--r-- | hotline/transfer_test.go (renamed from transfer_test.go) | 0 | ||||
| -rw-r--r-- | hotline/user.go (renamed from user.go) | 0 | ||||
| -rw-r--r-- | hotline/user_test.go (renamed from user_test.go) | 0 | ||||
| -rw-r--r-- | hotline/version.go (renamed from version.go) | 0 | ||||
| -rw-r--r-- | server/main.go | 2 | ||||
| -rw-r--r-- | test/.DS_Store | bin | 6148 -> 0 bytes | |||
| -rw-r--r-- | test/config/.DS_Store | bin | 6148 -> 0 bytes | |||
| -rw-r--r-- | test/config/Users/.DS_Store | bin | 6148 -> 0 bytes |
58 files changed, 4 insertions, 15 deletions
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 @@ -<component name="ProjectRunConfigurationManager"> - <configuration default="false" name="go run server.go" type="GoApplicationRunConfiguration" factoryName="Go Application"> - <working_directory value="$PROJECT_DIR$/server" /> - <go_parameters value="-race" /> - <parameters value="--bind 5600" /> - <kind value="FILE" /> - <package value="bitbucket.org/jhalter/hotline" /> - <directory value="$PROJECT_DIR$" /> - <filePath value="$PROJECT_DIR$/server/main.go" /> - <method v="2" /> - </configuration> -</component>
\ 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 index 21b438f..21b438f 100644 --- a/access.go +++ b/hotline/access.go diff --git a/account.go b/hotline/account.go index b0e9ee5..b0e9ee5 100644 --- a/account.go +++ b/hotline/account.go diff --git a/client/banners/1.txt b/hotline/banners/1.txt index 608a316..608a316 100644 --- a/client/banners/1.txt +++ b/hotline/banners/1.txt diff --git a/client/banners/2.txt b/hotline/banners/2.txt index 1121e06..1121e06 100644 --- a/client/banners/2.txt +++ b/hotline/banners/2.txt diff --git a/client/banners/3.txt b/hotline/banners/3.txt index 608a316..608a316 100644 --- a/client/banners/3.txt +++ b/hotline/banners/3.txt diff --git a/client/banners/4.txt b/hotline/banners/4.txt index 3b9d720..3b9d720 100644 --- a/client/banners/4.txt +++ b/hotline/banners/4.txt diff --git a/client/banners/5.txt b/hotline/banners/5.txt index b6654e7..b6654e7 100644 --- a/client/banners/5.txt +++ b/hotline/banners/5.txt diff --git a/client/banners/6.txt b/hotline/banners/6.txt index c8ac7a6..c8ac7a6 100644 --- a/client/banners/6.txt +++ b/hotline/banners/6.txt diff --git a/client/banners/7.txt b/hotline/banners/7.txt index c072e25..c072e25 100644 --- a/client/banners/7.txt +++ b/hotline/banners/7.txt diff --git a/client/banners/8.txt b/hotline/banners/8.txt index d75e153..d75e153 100644 --- a/client/banners/8.txt +++ b/hotline/banners/8.txt diff --git a/client/banners/9.txt b/hotline/banners/9.txt index eba9134..eba9134 100644 --- a/client/banners/9.txt +++ b/hotline/banners/9.txt diff --git a/client.go b/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 index 5c25f92..5c25f92 100644 --- a/client_conn.go +++ b/hotline/client_conn.go diff --git a/client_conn_test.go b/hotline/client_conn_test.go index d18f9b6..d18f9b6 100644 --- a/client_conn_test.go +++ b/hotline/client_conn_test.go diff --git a/config.go b/hotline/config.go index e0c20cf..e0c20cf 100644 --- a/config.go +++ b/hotline/config.go diff --git a/field.go b/hotline/field.go index 161a9b2..161a9b2 100644 --- a/field.go +++ b/hotline/field.go diff --git a/field_test.go b/hotline/field_test.go index fb686dc..fb686dc 100644 --- a/field_test.go +++ b/hotline/field_test.go diff --git a/file_header.go b/hotline/file_header.go index 60c652e..60c652e 100644 --- a/file_header.go +++ b/hotline/file_header.go diff --git a/file_header_test.go b/hotline/file_header_test.go index 0194a60..0194a60 100644 --- a/file_header_test.go +++ b/hotline/file_header_test.go diff --git a/file_path.go b/hotline/file_path.go index 71168dc..71168dc 100644 --- a/file_path.go +++ b/hotline/file_path.go diff --git a/file_transfer.go b/hotline/file_transfer.go index 46b0061..46b0061 100644 --- a/file_transfer.go +++ b/hotline/file_transfer.go diff --git a/files.go b/hotline/files.go index 69c22b3..69c22b3 100644 --- a/files.go +++ b/hotline/files.go diff --git a/files_test.go b/hotline/files_test.go index 88c893f..88c893f 100644 --- a/files_test.go +++ b/hotline/files_test.go diff --git a/flattened_file_object.go b/hotline/flattened_file_object.go index dfdd8a8..dfdd8a8 100644 --- a/flattened_file_object.go +++ b/hotline/flattened_file_object.go diff --git a/flattened_file_object_test.go b/hotline/flattened_file_object_test.go index 6a6953f..6a6953f 100644 --- a/flattened_file_object_test.go +++ b/hotline/flattened_file_object_test.go diff --git a/news.go b/hotline/news.go index a9e5d72..a9e5d72 100644 --- a/news.go +++ b/hotline/news.go diff --git a/server.go b/hotline/server.go index e51f673..e51f673 100644 --- a/server.go +++ b/hotline/server.go diff --git a/server_blackbox_test.go b/hotline/server_blackbox_test.go index 3718bd2..3718bd2 100644 --- a/server_blackbox_test.go +++ b/hotline/server_blackbox_test.go diff --git a/server_test.go b/hotline/server_test.go index 2e88202..2e88202 100644 --- a/server_test.go +++ b/hotline/server_test.go diff --git a/stats.go b/hotline/stats.go index dd8ea1d..dd8ea1d 100644 --- a/stats.go +++ b/hotline/stats.go diff --git a/test/config/Agreement.txt b/hotline/test/config/Agreement.txt index 2a3bdb7..2a3bdb7 100644 --- a/test/config/Agreement.txt +++ b/hotline/test/config/Agreement.txt diff --git a/test/config/Files/test/testfile-1k b/hotline/test/config/Files/test/testfile-1k Binary files differindex 31758a0..31758a0 100644 --- a/test/config/Files/test/testfile-1k +++ b/hotline/test/config/Files/test/testfile-1k diff --git a/test/config/Files/test/testfile-5k b/hotline/test/config/Files/test/testfile-5k Binary files differindex c889187..c889187 100644 --- a/test/config/Files/test/testfile-5k +++ b/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 index e69de29..e69de29 100644 --- a/test/config/Files/testdir/some-nested-file.txt +++ b/hotline/test/config/Files/testdir/some-nested-file.txt diff --git a/test/config/Files/testfile.sit b/hotline/test/config/Files/testfile.sit index 8d1d542..8d1d542 100644 --- a/test/config/Files/testfile.sit +++ b/hotline/test/config/Files/testfile.sit diff --git a/test/config/Files/testfile.txt b/hotline/test/config/Files/testfile.txt index f0607d4..f0607d4 100644 --- a/test/config/Files/testfile.txt +++ b/hotline/test/config/Files/testfile.txt diff --git a/test/config/MessageBoard.txt b/hotline/test/config/MessageBoard.txt index 1a2f57a..1a2f57a 100644 --- a/test/config/MessageBoard.txt +++ b/hotline/test/config/MessageBoard.txt diff --git a/test/config/ThreadedNews.yaml b/hotline/test/config/ThreadedNews.yaml index 9f3fd65..9f3fd65 100644 --- a/test/config/ThreadedNews.yaml +++ b/hotline/test/config/ThreadedNews.yaml diff --git a/test/config/Users/admin.yaml b/hotline/test/config/Users/admin.yaml index 1bf656b..1bf656b 100644 --- a/test/config/Users/admin.yaml +++ b/hotline/test/config/Users/admin.yaml diff --git a/test/config/Users/guest.yaml b/hotline/test/config/Users/guest.yaml index 57117bd..57117bd 100644 --- a/test/config/Users/guest.yaml +++ b/hotline/test/config/Users/guest.yaml diff --git a/test/config/config.yaml b/hotline/test/config/config.yaml index cb7f15a..cb7f15a 100644 --- a/test/config/config.yaml +++ b/hotline/test/config/config.yaml diff --git a/tracker.go b/hotline/tracker.go index 97ca108..97ca108 100644 --- a/tracker.go +++ b/hotline/tracker.go diff --git a/tracker_test.go b/hotline/tracker_test.go index b904462..b904462 100644 --- a/tracker_test.go +++ b/hotline/tracker_test.go diff --git a/transaction.go b/hotline/transaction.go index 8fbdf35..8fbdf35 100644 --- a/transaction.go +++ b/hotline/transaction.go diff --git a/transaction_handlers.go b/hotline/transaction_handlers.go index b06297d..b06297d 100644 --- a/transaction_handlers.go +++ b/hotline/transaction_handlers.go diff --git a/transaction_handlers_test.go b/hotline/transaction_handlers_test.go index 3042da2..3042da2 100644 --- a/transaction_handlers_test.go +++ b/hotline/transaction_handlers_test.go diff --git a/transaction_test.go b/hotline/transaction_test.go index 227b9e0..227b9e0 100644 --- a/transaction_test.go +++ b/hotline/transaction_test.go diff --git a/transfer.go b/hotline/transfer.go index ecbe324..ecbe324 100644 --- a/transfer.go +++ b/hotline/transfer.go diff --git a/transfer_test.go b/hotline/transfer_test.go index 52044b0..52044b0 100644 --- a/transfer_test.go +++ b/hotline/transfer_test.go diff --git a/user.go b/hotline/user.go index f80fd72..f80fd72 100644 --- a/user.go +++ b/hotline/user.go diff --git a/user_test.go b/hotline/user_test.go index dae4274..dae4274 100644 --- a/user_test.go +++ b/hotline/user_test.go diff --git a/version.go b/hotline/version.go index d24a4bc..d24a4bc 100644 --- a/version.go +++ b/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 Binary files differdeleted file mode 100644 index db68ea8..0000000 --- a/test/.DS_Store +++ /dev/null diff --git a/test/config/.DS_Store b/test/config/.DS_Store Binary files differdeleted file mode 100644 index b486f59..0000000 --- a/test/config/.DS_Store +++ /dev/null diff --git a/test/config/Users/.DS_Store b/test/config/Users/.DS_Store Binary files differdeleted file mode 100644 index 5008ddf..0000000 --- a/test/config/Users/.DS_Store +++ /dev/null |