make processor external

rusq · May 4, 2023 · 10ef6d7 · 10ef6d7
1 parent c59aa5a
commit 10ef6d7
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 13 deletions.
diff --git a/cmd/slackdump/internal/dump/dump.go b/cmd/slackdump/internal/dump/dump.go
@@ -22,7 +22,7 @@ import (
 	"github.com/rusq/slackdump/v2/cmd/slackdump/internal/golang/base"
 	"github.com/rusq/slackdump/v2/downloader"
 	"github.com/rusq/slackdump/v2/internal/chunk"
-	"github.com/rusq/slackdump/v2/internal/chunk/processor/dirproc"
+	"github.com/rusq/slackdump/v2/internal/chunk/dirproc"
 	"github.com/rusq/slackdump/v2/internal/chunk/transform"
 	"github.com/rusq/slackdump/v2/internal/chunk/transform/fileproc"
 	"github.com/rusq/slackdump/v2/internal/nametmpl"

diff --git a/internal/chunk/control/control.go b/internal/chunk/control/control.go
@@ -11,10 +11,10 @@ import (
 
 	"github.com/rusq/slackdump/v2"
 	"github.com/rusq/slackdump/v2/internal/chunk"
-	"github.com/rusq/slackdump/v2/internal/chunk/processor"
-	"github.com/rusq/slackdump/v2/internal/chunk/processor/dirproc"
+	"github.com/rusq/slackdump/v2/internal/chunk/dirproc"
 	"github.com/rusq/slackdump/v2/internal/structures"
 	"github.com/rusq/slackdump/v2/logger"
+	"github.com/rusq/slackdump/v2/processor"
 	"github.com/slack-go/slack"
 )
 

diff --git a/internal/chunk/control/interfaces.go b/internal/chunk/control/interfaces.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/rusq/slackdump/v2"
-	"github.com/rusq/slackdump/v2/internal/chunk/processor"
-	"github.com/rusq/slackdump/v2/internal/chunk/processor/dirproc"
+	"github.com/rusq/slackdump/v2/internal/chunk/dirproc"
+	"github.com/rusq/slackdump/v2/processor"
 	"github.com/slack-go/slack"
 )
 

diff --git a/internal/chunk/control/workers.go b/internal/chunk/control/workers.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/rusq/slackdump/v2"
 	"github.com/rusq/slackdump/v2/internal/chunk"
-	"github.com/rusq/slackdump/v2/internal/chunk/processor"
-	"github.com/rusq/slackdump/v2/internal/chunk/processor/dirproc"
+	"github.com/rusq/slackdump/v2/internal/chunk/dirproc"
 	"github.com/rusq/slackdump/v2/internal/chunk/transform"
 	"github.com/rusq/slackdump/v2/logger"
+	"github.com/rusq/slackdump/v2/processor"
 	"github.com/slack-go/slack"
 )
 

diff --git a/internal/chunk/processor/dirproc/base.go → internal/chunk/dirproc/base.go b/internal/chunk/processor/dirproc/base.go → internal/chunk/dirproc/base.go
diff --git a/internal/chunk/processor/dirproc/channels.go → internal/chunk/dirproc/channels.go b/internal/chunk/processor/dirproc/channels.go → internal/chunk/dirproc/channels.go
diff --git a/.../chunk/processor/dirproc/conversations.go → internal/chunk/dirproc/conversations.go b/.../chunk/processor/dirproc/conversations.go → internal/chunk/dirproc/conversations.go
@@ -7,8 +7,8 @@ import (
 	"sync"
 
 	"github.com/rusq/slackdump/v2/internal/chunk"
-	"github.com/rusq/slackdump/v2/internal/chunk/processor"
 	"github.com/rusq/slackdump/v2/logger"
+	"github.com/rusq/slackdump/v2/processor"
 	"github.com/slack-go/slack"
 )
 

diff --git a/internal/chunk/processor/dirproc/expproc.go → internal/chunk/dirproc/expproc.go b/internal/chunk/processor/dirproc/expproc.go → internal/chunk/dirproc/expproc.go
diff --git a/internal/chunk/processor/dirproc/users.go → internal/chunk/dirproc/users.go b/internal/chunk/processor/dirproc/users.go → internal/chunk/dirproc/users.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/rusq/slackdump/v2/internal/chunk"
-	"github.com/rusq/slackdump/v2/internal/chunk/processor"
+	"github.com/rusq/slackdump/v2/processor"
 	"github.com/slack-go/slack"
 )
 

diff --git a/internal/chunk/processor/dirproc/wsp.go → internal/chunk/dirproc/wsp.go b/internal/chunk/processor/dirproc/wsp.go → internal/chunk/dirproc/wsp.go
diff --git a/internal/chunk/transform/fileproc/sp_export.go b/internal/chunk/transform/fileproc/sp_export.go
@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 
 	"github.com/rusq/slackdump/v2/export"
-	"github.com/rusq/slackdump/v2/internal/chunk/processor"
 	"github.com/rusq/slackdump/v2/internal/chunk/transform"
+	"github.com/rusq/slackdump/v2/processor"
 	"github.com/slack-go/slack"
 )
 

diff --git a/internal/mocks/mock_processor/mock_processor.go b/internal/mocks/mock_processor/mock_processor.go
diff --git a/internal/chunk/processor/discarder.go → processor/discarder.go b/internal/chunk/processor/discarder.go → processor/discarder.go
diff --git a/internal/chunk/processor/processor.go → processor/processor.go b/internal/chunk/processor/processor.go → processor/processor.go
@@ -9,7 +9,7 @@ import (
 
 // Conversations is the interface for conversation fetching with files.
 //
-//go:generate mockgen -destination ../../mocks/mock_processor/mock_processor.go github.com/rusq/slackdump/v2/internal/chunk/processor Conversations,Users,Channels
+//go:generate mockgen -destination ../../mocks/mock_processor/mock_processor.go github.com/rusq/slackdump/v2/processor Conversations,Users,Channels
 type Conversations interface {
 	Messenger
 	Filer

diff --git a/stream.go b/stream.go
@@ -11,10 +11,10 @@ import (
 	"github.com/slack-go/slack"
 	"golang.org/x/time/rate"
 
-	"github.com/rusq/slackdump/v2/internal/chunk/processor"
 	"github.com/rusq/slackdump/v2/internal/network"
 	"github.com/rusq/slackdump/v2/internal/structures"
 	"github.com/rusq/slackdump/v2/logger"
+	"github.com/rusq/slackdump/v2/processor"
 )
 
 const (