diff --git a/cmd/homeserver_offline_importers/export_dendrite_for_import/main.go b/cmd/homeserver_offline_importers/export_dendrite_for_import/main.go index 621702a6..201df83a 100644 --- a/cmd/homeserver_offline_importers/export_dendrite_for_import/main.go +++ b/cmd/homeserver_offline_importers/export_dendrite_for_import/main.go @@ -6,14 +6,14 @@ import ( "path" "github.com/t2bot/matrix-media-repo/archival/v2archive" - "github.com/t2bot/matrix-media-repo/cmd/homeserver_offline_importers/_common" + "github.com/t2bot/matrix-media-repo/cmd/homeserver_offline_importers/internal" "github.com/t2bot/matrix-media-repo/common/rcontext" "github.com/t2bot/matrix-media-repo/homeserver_interop/dendrite" "github.com/t2bot/matrix-media-repo/util" ) func main() { - cfg := _common.InitExportPsqlFlatFile("Dendrite", "media_api.base_path") + cfg := internal.InitExportPsqlFlatFile("Dendrite", "media_api.base_path") ctx := rcontext.InitialNoConfig() ctx.Log.Debug("Connecting to homeserver database...") @@ -22,7 +22,7 @@ func main() { panic(err) } - _common.PsqlFlatFileArchive[dendrite.LocalMedia](ctx, cfg, hsDb, func(r *dendrite.LocalMedia) (v2archive.MediaInfo, io.ReadCloser, error) { + internal.PsqlFlatFileArchive[dendrite.LocalMedia](ctx, cfg, hsDb, func(r *dendrite.LocalMedia) (v2archive.MediaInfo, io.ReadCloser, error) { // For Base64Hash ABCCDD : // $importPath/A/B/CCDD/file diff --git a/cmd/homeserver_offline_importers/export_synapse_for_import/main.go b/cmd/homeserver_offline_importers/export_synapse_for_import/main.go index 6c8cfb3c..6f7839ec 100644 --- a/cmd/homeserver_offline_importers/export_synapse_for_import/main.go +++ b/cmd/homeserver_offline_importers/export_synapse_for_import/main.go @@ -7,14 +7,14 @@ import ( "strings" "github.com/t2bot/matrix-media-repo/archival/v2archive" - "github.com/t2bot/matrix-media-repo/cmd/homeserver_offline_importers/_common" + "github.com/t2bot/matrix-media-repo/cmd/homeserver_offline_importers/internal" "github.com/t2bot/matrix-media-repo/common/rcontext" "github.com/t2bot/matrix-media-repo/homeserver_interop/synapse" "github.com/t2bot/matrix-media-repo/util" ) func main() { - cfg := _common.InitExportPsqlFlatFile("Synapse", "media_store_path") + cfg := internal.InitExportPsqlFlatFile("Synapse", "media_store_path") ctx := rcontext.InitialNoConfig() ctx.Log.Debug("Connecting to homeserver database...") @@ -23,7 +23,7 @@ func main() { panic(err) } - _common.PsqlFlatFileArchive[synapse.LocalMedia](ctx, cfg, hsDb, func(r *synapse.LocalMedia) (v2archive.MediaInfo, io.ReadCloser, error) { + internal.PsqlFlatFileArchive[synapse.LocalMedia](ctx, cfg, hsDb, func(r *synapse.LocalMedia) (v2archive.MediaInfo, io.ReadCloser, error) { // For MediaID AABBCCDD : // $importPath/local_content/AA/BB/CCDD // diff --git a/cmd/homeserver_offline_importers/_common/archiver.go b/cmd/homeserver_offline_importers/internal/archiver.go similarity index 98% rename from cmd/homeserver_offline_importers/_common/archiver.go rename to cmd/homeserver_offline_importers/internal/archiver.go index 645730a4..6b46e2c3 100644 --- a/cmd/homeserver_offline_importers/_common/archiver.go +++ b/cmd/homeserver_offline_importers/internal/archiver.go @@ -1,4 +1,4 @@ -package _common +package internal import ( "fmt" diff --git a/cmd/homeserver_offline_importers/_common/init_export.go b/cmd/homeserver_offline_importers/internal/init_export.go similarity index 99% rename from cmd/homeserver_offline_importers/_common/init_export.go rename to cmd/homeserver_offline_importers/internal/init_export.go index f9b3e7e8..dd0e6d32 100644 --- a/cmd/homeserver_offline_importers/_common/init_export.go +++ b/cmd/homeserver_offline_importers/internal/init_export.go @@ -1,4 +1,4 @@ -package _common +package internal import ( "flag"