Move all code up a directory and refactor imports.

Kilemonn · Feb 3, 2025 · 545db6a · 545db6a
1 parent 9ae24d8
commit 545db6a
Show file tree

Hide file tree

Showing 36 changed files with 20 additions and 20 deletions.
diff --git a/flow/bidetwriter/bidetwriter.go → bidetwriter/bidetwriter.go b/flow/bidetwriter/bidetwriter.go → bidetwriter/bidetwriter.go
diff --git a/flow/bidetwriter/bidetwriter_test.go → bidetwriter/bidetwriter_test.go b/flow/bidetwriter/bidetwriter_test.go → bidetwriter/bidetwriter_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/Kilemonn/flow/flow/testutil"
+	"github.com/Kilemonn/flow/testutil"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/flow/config/apply.go → config/apply.go b/flow/config/apply.go → config/apply.go
diff --git a/flow/config/apply_test.go → config/apply_test.go b/flow/config/apply_test.go → config/apply_test.go
diff --git a/flow/config/config.go → config/config.go b/flow/config/config.go → config/config.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/Kilemonn/flow/flow/stdio"
+	"github.com/Kilemonn/flow/stdio"
 	"gopkg.in/yaml.v3"
 )
 

diff --git a/flow/config/config_file.go → config/config_file.go b/flow/config/config_file.go → config/config_file.go
@@ -7,8 +7,8 @@ import (
 	"io"
 	"os"
 
-	"github.com/Kilemonn/flow/flow/bidetwriter"
-	"github.com/Kilemonn/flow/flow/file"
+	"github.com/Kilemonn/flow/bidetwriter"
+	"github.com/Kilemonn/flow/file"
 )
 
 type ConfigFile struct {

diff --git a/flow/config/config_file_test.go → config/config_file_test.go b/flow/config/config_file_test.go → config/config_file_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/Kilemonn/flow/flow/testutil"
+	"github.com/Kilemonn/flow/testutil"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/flow/config/config_ipc.go → config/config_ipc.go b/flow/config/config_ipc.go → config/config_ipc.go
@@ -3,7 +3,7 @@ package config
 import (
 	"io"
 
-	"github.com/Kilemonn/flow/flow/ipc"
+	"github.com/Kilemonn/flow/ipc"
 )
 
 type ConfigIPC struct {

diff --git a/flow/config/config_port.go → config/config_port.go b/flow/config/config_port.go → config/config_port.go
@@ -6,7 +6,7 @@ import (
 	"slices"
 	"time"
 
-	"github.com/Kilemonn/flow/flow/serial"
+	"github.com/Kilemonn/flow/serial"
 	goSerial "go.bug.st/serial"
 )
 

diff --git a/flow/config/config_settings.go → config/config_settings.go b/flow/config/config_settings.go → config/config_settings.go
diff --git a/flow/config/config_settings_test.go → config/config_settings_test.go b/flow/config/config_settings_test.go → config/config_settings_test.go
diff --git a/flow/config/config_socket.go → config/config_socket.go b/flow/config/config_socket.go → config/config_socket.go
@@ -3,7 +3,7 @@ package config
 import (
 	"io"
 
-	"github.com/Kilemonn/flow/flow/socket"
+	"github.com/Kilemonn/flow/socket"
 )
 
 type ConfigSocket struct {

diff --git a/flow/config/config_test.go → config/config_test.go b/flow/config/config_test.go → config/config_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Kilemonn/flow/flow/testutil"
+	"github.com/Kilemonn/flow/testutil"
 	"github.com/stretchr/testify/require"
 	goSerial "go.bug.st/serial"
 )

diff --git a/flow/config/connection.yaml → config/connection.yaml b/flow/config/connection.yaml → config/connection.yaml
diff --git a/flow/file/sync_file_read_writer.go → file/sync_file_read_writer.go b/flow/file/sync_file_read_writer.go → file/sync_file_read_writer.go
diff --git a/flow/file/sync_file_read_writer_test.go → file/sync_file_read_writer_test.go b/flow/file/sync_file_read_writer_test.go → file/sync_file_read_writer_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/Kilemonn/flow/flow/testutil"
+	"github.com/Kilemonn/flow/testutil"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/flow.go b/flow.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/Kilemonn/flow/flow/config"
-	"github.com/Kilemonn/flow/flow/serial"
+	"github.com/Kilemonn/flow/config"
+	"github.com/Kilemonn/flow/serial"
 )
 
 const (

diff --git a/flow/ipc/ipc-reader.go → ipc/ipc-reader.go b/flow/ipc/ipc-reader.go → ipc/ipc-reader.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"time"
 
-	"github.com/Kilemonn/flow/flow/queuedreader"
+	"github.com/Kilemonn/flow/queuedreader"
 	ipcClient "github.com/Kilemonn/go-ipc/client"
 	ipcServer "github.com/Kilemonn/go-ipc/server"
 )

diff --git a/flow/ipc/ipc-reader_test.go → ipc/ipc-reader_test.go b/flow/ipc/ipc-reader_test.go → ipc/ipc-reader_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Kilemonn/flow/flow/testutil"
+	"github.com/Kilemonn/flow/testutil"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/flow/ipc/ipc-writer.go → ipc/ipc-writer.go b/flow/ipc/ipc-writer.go → ipc/ipc-writer.go
diff --git a/flow/queuedreader/queuedreader.go → queuedreader/queuedreader.go b/flow/queuedreader/queuedreader.go → queuedreader/queuedreader.go
diff --git a/flow/queuedreader/queuereader_test.go → queuedreader/queuereader_test.go b/flow/queuedreader/queuereader_test.go → queuedreader/queuereader_test.go
diff --git a/flow/serial/custom_port.go → serial/custom_port.go b/flow/serial/custom_port.go → serial/custom_port.go
diff --git a/flow/serial/port.go → serial/port.go b/flow/serial/port.go → serial/port.go
diff --git a/flow/serial/port_test_read_file.txt → serial/port_test_read_file.txt b/flow/serial/port_test_read_file.txt → serial/port_test_read_file.txt
diff --git a/flow/serial/serial.go → serial/serial.go b/flow/serial/serial.go → serial/serial.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Kilemonn/flow/flow/stdio"
+	"github.com/Kilemonn/flow/stdio"
 	goSerial "go.bug.st/serial"
 )
 

diff --git a/flow/socket/socket_reader.go → socket/socket_reader.go b/flow/socket/socket_reader.go → socket/socket_reader.go
diff --git a/flow/socket/socket_reader_test.go → socket/socket_reader_test.go b/flow/socket/socket_reader_test.go → socket/socket_reader_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Kilemonn/flow/flow/testutil"
+	"github.com/Kilemonn/flow/testutil"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/flow/socket/socket_writer.go → socket/socket_writer.go b/flow/socket/socket_writer.go → socket/socket_writer.go
diff --git a/flow/socket/tcp_timeout_reader.go → socket/tcp_timeout_reader.go b/flow/socket/tcp_timeout_reader.go → socket/tcp_timeout_reader.go
@@ -5,7 +5,7 @@ import (
 	"slices"
 	"time"
 
-	"github.com/Kilemonn/flow/flow/queuedreader"
+	"github.com/Kilemonn/flow/queuedreader"
 )
 
 type TCPTimeoutReader struct {

diff --git a/flow/socket/udp_timeout_reader.go → socket/udp_timeout_reader.go b/flow/socket/udp_timeout_reader.go → socket/udp_timeout_reader.go
diff --git a/flow/stdio/stdin_reader.go → stdio/stdin_reader.go b/flow/stdio/stdin_reader.go → stdio/stdin_reader.go
diff --git a/flow/stdio/stdin_reader_test.go → stdio/stdin_reader_test.go b/flow/stdio/stdin_reader_test.go → stdio/stdin_reader_test.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/Kilemonn/flow/flow/testutil"
+	"github.com/Kilemonn/flow/testutil"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/flow/stdio/stdout_writer.go → stdio/stdout_writer.go b/flow/stdio/stdout_writer.go → stdio/stdout_writer.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/Kilemonn/flow/flow/bidetwriter"
+	"github.com/Kilemonn/flow/bidetwriter"
 )
 
 func CreateStdOutWriter() (io.WriteCloser, error) {

diff --git a/flow/stdio/stdout_writer_test.go → stdio/stdout_writer_test.go b/flow/stdio/stdout_writer_test.go → stdio/stdout_writer_test.go
@@ -6,7 +6,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/Kilemonn/flow/flow/testutil"
+	"github.com/Kilemonn/flow/testutil"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/flow/testutil/testutil.go → testutil/testutil.go b/flow/testutil/testutil.go → testutil/testutil.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ( @@
     	"io"
     	"os"
-    	"github.com/Kilemonn/flow/flow/stdio"
+    	"github.com/Kilemonn/flow/stdio"
     	"gopkg.in/yaml.v3"
     )
@@ Expand Down @@