From 35296001c6316a7aa4598d7a09fdf0e734082f94 Mon Sep 17 00:00:00 2001 From: Jeremy Echols Date: Tue, 26 Nov 2024 09:50:44 -0800 Subject: [PATCH 1/2] Move all internal packages one level up Being in `src/internal` means nothing outside `src`, including test scripts, can use these packages. --- {src/internal => internal}/datasize/convert.go | 0 {src/internal => internal}/datasize/convert_test.go | 0 {src/internal => internal}/datasize/datasize.go | 0 {src/internal => internal}/humanize/duration.go | 0 {src/internal => internal}/humanize/duration_test.go | 0 {src/internal => internal}/issuequeue/issue.go | 0 {src/internal => internal}/issuequeue/issue_test.go | 0 {src/internal => internal}/issuequeue/queue.go | 0 {src/internal => internal}/issuequeue/queue_test.go | 0 {src/internal => internal}/lastmod/lastmod.go | 0 {src/internal => internal}/logger/logger.go | 0 {src/internal => internal}/marc/marc.go | 0 {src/internal => internal}/marc/marc_test.go | 0 .../marc/testdata/2002260445-UnitedAmerican.mrk | 0 .../marc/testdata/oni-2024240297-NorthDouglasHerald.xml | 0 {src/internal => internal}/openoni/api.go | 0 {src/internal => internal}/openoni/api_test.go | 0 {src/internal => internal}/sftpgo/sftpgo.go | 0 {src/internal => internal}/sftpgo/sftpgo_test.go | 0 {src/internal => internal}/sftpgo/user.go | 0 20 files changed, 0 insertions(+), 0 deletions(-) rename {src/internal => internal}/datasize/convert.go (100%) rename {src/internal => internal}/datasize/convert_test.go (100%) rename {src/internal => internal}/datasize/datasize.go (100%) rename {src/internal => internal}/humanize/duration.go (100%) rename {src/internal => internal}/humanize/duration_test.go (100%) rename {src/internal => internal}/issuequeue/issue.go (100%) rename {src/internal => internal}/issuequeue/issue_test.go (100%) rename {src/internal => internal}/issuequeue/queue.go (100%) rename {src/internal => internal}/issuequeue/queue_test.go (100%) rename {src/internal => internal}/lastmod/lastmod.go (100%) rename {src/internal => internal}/logger/logger.go (100%) rename {src/internal => internal}/marc/marc.go (100%) rename {src/internal => internal}/marc/marc_test.go (100%) rename {src/internal => internal}/marc/testdata/2002260445-UnitedAmerican.mrk (100%) rename {src/internal => internal}/marc/testdata/oni-2024240297-NorthDouglasHerald.xml (100%) rename {src/internal => internal}/openoni/api.go (100%) rename {src/internal => internal}/openoni/api_test.go (100%) rename {src/internal => internal}/sftpgo/sftpgo.go (100%) rename {src/internal => internal}/sftpgo/sftpgo_test.go (100%) rename {src/internal => internal}/sftpgo/user.go (100%) diff --git a/src/internal/datasize/convert.go b/internal/datasize/convert.go similarity index 100% rename from src/internal/datasize/convert.go rename to internal/datasize/convert.go diff --git a/src/internal/datasize/convert_test.go b/internal/datasize/convert_test.go similarity index 100% rename from src/internal/datasize/convert_test.go rename to internal/datasize/convert_test.go diff --git a/src/internal/datasize/datasize.go b/internal/datasize/datasize.go similarity index 100% rename from src/internal/datasize/datasize.go rename to internal/datasize/datasize.go diff --git a/src/internal/humanize/duration.go b/internal/humanize/duration.go similarity index 100% rename from src/internal/humanize/duration.go rename to internal/humanize/duration.go diff --git a/src/internal/humanize/duration_test.go b/internal/humanize/duration_test.go similarity index 100% rename from src/internal/humanize/duration_test.go rename to internal/humanize/duration_test.go diff --git a/src/internal/issuequeue/issue.go b/internal/issuequeue/issue.go similarity index 100% rename from src/internal/issuequeue/issue.go rename to internal/issuequeue/issue.go diff --git a/src/internal/issuequeue/issue_test.go b/internal/issuequeue/issue_test.go similarity index 100% rename from src/internal/issuequeue/issue_test.go rename to internal/issuequeue/issue_test.go diff --git a/src/internal/issuequeue/queue.go b/internal/issuequeue/queue.go similarity index 100% rename from src/internal/issuequeue/queue.go rename to internal/issuequeue/queue.go diff --git a/src/internal/issuequeue/queue_test.go b/internal/issuequeue/queue_test.go similarity index 100% rename from src/internal/issuequeue/queue_test.go rename to internal/issuequeue/queue_test.go diff --git a/src/internal/lastmod/lastmod.go b/internal/lastmod/lastmod.go similarity index 100% rename from src/internal/lastmod/lastmod.go rename to internal/lastmod/lastmod.go diff --git a/src/internal/logger/logger.go b/internal/logger/logger.go similarity index 100% rename from src/internal/logger/logger.go rename to internal/logger/logger.go diff --git a/src/internal/marc/marc.go b/internal/marc/marc.go similarity index 100% rename from src/internal/marc/marc.go rename to internal/marc/marc.go diff --git a/src/internal/marc/marc_test.go b/internal/marc/marc_test.go similarity index 100% rename from src/internal/marc/marc_test.go rename to internal/marc/marc_test.go diff --git a/src/internal/marc/testdata/2002260445-UnitedAmerican.mrk b/internal/marc/testdata/2002260445-UnitedAmerican.mrk similarity index 100% rename from src/internal/marc/testdata/2002260445-UnitedAmerican.mrk rename to internal/marc/testdata/2002260445-UnitedAmerican.mrk diff --git a/src/internal/marc/testdata/oni-2024240297-NorthDouglasHerald.xml b/internal/marc/testdata/oni-2024240297-NorthDouglasHerald.xml similarity index 100% rename from src/internal/marc/testdata/oni-2024240297-NorthDouglasHerald.xml rename to internal/marc/testdata/oni-2024240297-NorthDouglasHerald.xml diff --git a/src/internal/openoni/api.go b/internal/openoni/api.go similarity index 100% rename from src/internal/openoni/api.go rename to internal/openoni/api.go diff --git a/src/internal/openoni/api_test.go b/internal/openoni/api_test.go similarity index 100% rename from src/internal/openoni/api_test.go rename to internal/openoni/api_test.go diff --git a/src/internal/sftpgo/sftpgo.go b/internal/sftpgo/sftpgo.go similarity index 100% rename from src/internal/sftpgo/sftpgo.go rename to internal/sftpgo/sftpgo.go diff --git a/src/internal/sftpgo/sftpgo_test.go b/internal/sftpgo/sftpgo_test.go similarity index 100% rename from src/internal/sftpgo/sftpgo_test.go rename to internal/sftpgo/sftpgo_test.go diff --git a/src/internal/sftpgo/user.go b/internal/sftpgo/user.go similarity index 100% rename from src/internal/sftpgo/user.go rename to internal/sftpgo/user.go From c495be932b1c6c7a97d608eb7c36d8b9a6e479ad Mon Sep 17 00:00:00 2001 From: Jeremy Echols Date: Tue, 26 Nov 2024 10:00:35 -0800 Subject: [PATCH 2/2] Rewrite all imports --- src/cli/getconf.go | 2 +- src/cmd/agent-test/main.go | 2 +- src/cmd/bulk-issue-queue/main.go | 2 +- src/cmd/delete-live-done-issues/main.go | 2 +- src/cmd/find-dupes/main.go | 2 +- src/cmd/find-issues/main.go | 2 +- src/cmd/make-cache/integrity.go | 2 +- src/cmd/make-cache/main.go | 2 +- src/cmd/migrate-database/main.go | 2 +- src/cmd/page-review-issue-fixer/main.go | 2 +- src/cmd/queue-batches/batch_queue.go | 4 ++-- src/cmd/queue-batches/main.go | 2 +- src/cmd/remove-dead-issues/main.go | 2 +- src/cmd/run-jobs/issue_pages_ready.go | 4 ++-- src/cmd/run-jobs/main.go | 2 +- src/cmd/run-jobs/page_scanner.go | 2 +- src/cmd/run-jobs/scanner_scanner.go | 2 +- src/cmd/server/internal/audithandler/form.go | 2 +- src/cmd/server/internal/audithandler/handlers.go | 2 +- src/cmd/server/internal/batchhandler/flag_issues_handlers.go | 2 +- src/cmd/server/internal/batchhandler/handlers.go | 2 +- src/cmd/server/internal/batchhandler/responder.go | 2 +- src/cmd/server/internal/batchmakerhandler/handlers.go | 2 +- src/cmd/server/internal/batchmakerhandler/schema.go | 2 +- src/cmd/server/internal/issuefinderhandler/responder.go | 2 +- src/cmd/server/internal/mochandler/handlers.go | 2 +- src/cmd/server/internal/responder/responder.go | 2 +- src/cmd/server/internal/responder/templates.go | 2 +- src/cmd/server/internal/titlehandler/handlers.go | 4 ++-- src/cmd/server/internal/titlehandler/marc.go | 4 ++-- src/cmd/server/internal/titlehandler/schema.go | 2 +- src/cmd/server/internal/uploadedissuehandler/filehandler.go | 2 +- src/cmd/server/internal/uploadedissuehandler/schema.go | 2 +- src/cmd/server/internal/uploadedissuehandler/searcher.go | 2 +- src/cmd/server/internal/userhandler/handlers.go | 2 +- src/cmd/server/internal/workflowhandler/can.go | 2 +- src/cmd/server/internal/workflowhandler/handlers.go | 2 +- src/cmd/server/internal/workflowhandler/json.go | 2 +- src/cmd/server/internal/workflowhandler/middleware.go | 2 +- src/cmd/server/internal/workflowhandler/save_metadata.go | 2 +- src/cmd/server/internal/workflowhandler/schema.go | 2 +- .../internal/workflowhandler/unfixable_error_handlers.go | 2 +- src/cmd/server/main.go | 2 +- src/cmd/server/middleware.go | 2 +- src/cmd/server/migrate_issue_metadata_entry.go | 2 +- src/cmd/server/migrate_sftpgo.go | 2 +- src/config/config.go | 2 +- src/dbi/dbi.go | 2 +- src/derivatives/alto/pdf_to_alto.go | 2 +- src/derivatives/jp2/make_jp2.go | 2 +- src/derivatives/mets/pages.go | 2 +- src/issuefinder/title.go | 2 +- src/issuewatcher/watcher.go | 2 +- src/jobs/api_jobs.go | 2 +- src/jobs/batch_job.go | 2 +- src/jobs/issue_job.go | 2 +- src/jobs/job.go | 2 +- src/jobs/job_job.go | 2 +- src/jobs/jobs.go | 2 +- src/models/user.go | 2 +- src/schema/schema.go | 4 ++-- src/uploads/queue.go | 2 +- 62 files changed, 67 insertions(+), 67 deletions(-) diff --git a/src/cli/getconf.go b/src/cli/getconf.go index 9f55679c..32c7d275 100644 --- a/src/cli/getconf.go +++ b/src/cli/getconf.go @@ -8,8 +8,8 @@ import ( flags "github.com/jessevdk/go-flags" "github.com/uoregon-libraries/gopkg/wordutils" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/config" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/version" ) diff --git a/src/cmd/agent-test/main.go b/src/cmd/agent-test/main.go index e6cd70fa..76e6e5cb 100644 --- a/src/cmd/agent-test/main.go +++ b/src/cmd/agent-test/main.go @@ -8,8 +8,8 @@ import ( "strings" "time" + "github.com/uoregon-libraries/newspaper-curation-app/internal/openoni" "github.com/uoregon-libraries/newspaper-curation-app/src/cli" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/openoni" "github.com/uoregon-libraries/newspaper-curation-app/src/models" ) diff --git a/src/cmd/bulk-issue-queue/main.go b/src/cmd/bulk-issue-queue/main.go index 2c8ac06b..418d0ac6 100644 --- a/src/cmd/bulk-issue-queue/main.go +++ b/src/cmd/bulk-issue-queue/main.go @@ -5,10 +5,10 @@ import ( "os" "strings" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cli" "github.com/uoregon-libraries/newspaper-curation-app/src/config" "github.com/uoregon-libraries/newspaper-curation-app/src/dbi" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/issuewatcher" "github.com/uoregon-libraries/newspaper-curation-app/src/schema" "github.com/uoregon-libraries/newspaper-curation-app/src/uploads" diff --git a/src/cmd/delete-live-done-issues/main.go b/src/cmd/delete-live-done-issues/main.go index b7e5d25a..a6306b79 100644 --- a/src/cmd/delete-live-done-issues/main.go +++ b/src/cmd/delete-live-done-issues/main.go @@ -6,9 +6,9 @@ import ( "os" "time" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cli" "github.com/uoregon-libraries/newspaper-curation-app/src/dbi" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/schema" ) diff --git a/src/cmd/find-dupes/main.go b/src/cmd/find-dupes/main.go index 3411acbc..31c74865 100644 --- a/src/cmd/find-dupes/main.go +++ b/src/cmd/find-dupes/main.go @@ -9,8 +9,8 @@ import ( "sort" "github.com/uoregon-libraries/gopkg/fileutil" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cli" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/issuewatcher" "github.com/uoregon-libraries/newspaper-curation-app/src/schema" ) diff --git a/src/cmd/find-issues/main.go b/src/cmd/find-issues/main.go index 640bac12..8f593127 100644 --- a/src/cmd/find-issues/main.go +++ b/src/cmd/find-issues/main.go @@ -13,10 +13,10 @@ import ( "strings" "github.com/uoregon-libraries/gopkg/fileutil" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cli" "github.com/uoregon-libraries/newspaper-curation-app/src/config" "github.com/uoregon-libraries/newspaper-curation-app/src/dbi" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/issuewatcher" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/schema" diff --git a/src/cmd/make-cache/integrity.go b/src/cmd/make-cache/integrity.go index be5d330b..d9fa3ce1 100644 --- a/src/cmd/make-cache/integrity.go +++ b/src/cmd/make-cache/integrity.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/issuefinder" "github.com/uoregon-libraries/newspaper-curation-app/src/issuewatcher" ) diff --git a/src/cmd/make-cache/main.go b/src/cmd/make-cache/main.go index 1807cd3c..d4500b41 100644 --- a/src/cmd/make-cache/main.go +++ b/src/cmd/make-cache/main.go @@ -9,9 +9,9 @@ import ( flags "github.com/jessevdk/go-flags" "github.com/uoregon-libraries/gopkg/wordutils" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/config" "github.com/uoregon-libraries/newspaper-curation-app/src/dbi" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/issuewatcher" ) diff --git a/src/cmd/migrate-database/main.go b/src/cmd/migrate-database/main.go index c5152cd5..07186e83 100644 --- a/src/cmd/migrate-database/main.go +++ b/src/cmd/migrate-database/main.go @@ -9,10 +9,10 @@ import ( _ "github.com/go-sql-driver/mysql" "github.com/pressly/goose/v3" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cli" "github.com/uoregon-libraries/newspaper-curation-app/src/config" "github.com/uoregon-libraries/newspaper-curation-app/src/dbi" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" // Finally, we have to include the migrations dir/package for its side-effect // of migrations which self-register diff --git a/src/cmd/page-review-issue-fixer/main.go b/src/cmd/page-review-issue-fixer/main.go index acca87df..7c2387c7 100644 --- a/src/cmd/page-review-issue-fixer/main.go +++ b/src/cmd/page-review-issue-fixer/main.go @@ -6,10 +6,10 @@ import ( "regexp" "strings" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cli" "github.com/uoregon-libraries/newspaper-curation-app/src/config" "github.com/uoregon-libraries/newspaper-curation-app/src/dbi" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/jobs" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/schema" diff --git a/src/cmd/queue-batches/batch_queue.go b/src/cmd/queue-batches/batch_queue.go index 5c77bc24..ea3f2217 100644 --- a/src/cmd/queue-batches/batch_queue.go +++ b/src/cmd/queue-batches/batch_queue.go @@ -1,8 +1,8 @@ package main import ( - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/issuequeue" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" + "github.com/uoregon-libraries/newspaper-curation-app/internal/issuequeue" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/schema" ) diff --git a/src/cmd/queue-batches/main.go b/src/cmd/queue-batches/main.go index 2e6767e8..980edd0f 100644 --- a/src/cmd/queue-batches/main.go +++ b/src/cmd/queue-batches/main.go @@ -1,10 +1,10 @@ package main import ( + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cli" "github.com/uoregon-libraries/newspaper-curation-app/src/config" "github.com/uoregon-libraries/newspaper-curation-app/src/dbi" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/jobs" ) diff --git a/src/cmd/remove-dead-issues/main.go b/src/cmd/remove-dead-issues/main.go index 391d3dce..c96f8d4c 100644 --- a/src/cmd/remove-dead-issues/main.go +++ b/src/cmd/remove-dead-issues/main.go @@ -3,9 +3,9 @@ package main import ( "fmt" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cli" "github.com/uoregon-libraries/newspaper-curation-app/src/dbi" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/jobs" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/schema" diff --git a/src/cmd/run-jobs/issue_pages_ready.go b/src/cmd/run-jobs/issue_pages_ready.go index 7f1a58e5..a612dc94 100644 --- a/src/cmd/run-jobs/issue_pages_ready.go +++ b/src/cmd/run-jobs/issue_pages_ready.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/lastmod" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" + "github.com/uoregon-libraries/newspaper-curation-app/internal/lastmod" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" ) var pdfFilenameRegex = regexp.MustCompile(`(?i:^[0-9]+.pdf)`) diff --git a/src/cmd/run-jobs/main.go b/src/cmd/run-jobs/main.go index 17f5bfc7..230faed8 100644 --- a/src/cmd/run-jobs/main.go +++ b/src/cmd/run-jobs/main.go @@ -13,10 +13,10 @@ import ( "github.com/uoregon-libraries/gopkg/interrupts" ltype "github.com/uoregon-libraries/gopkg/logger" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cli" "github.com/uoregon-libraries/newspaper-curation-app/src/config" "github.com/uoregon-libraries/newspaper-curation-app/src/dbi" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/jobs" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/schema" diff --git a/src/cmd/run-jobs/page_scanner.go b/src/cmd/run-jobs/page_scanner.go index de19d13c..77d43676 100644 --- a/src/cmd/run-jobs/page_scanner.go +++ b/src/cmd/run-jobs/page_scanner.go @@ -5,8 +5,8 @@ import ( "path/filepath" "time" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/config" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/jobs" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/schema" diff --git a/src/cmd/run-jobs/scanner_scanner.go b/src/cmd/run-jobs/scanner_scanner.go index f1b2b9d0..20ffb43c 100644 --- a/src/cmd/run-jobs/scanner_scanner.go +++ b/src/cmd/run-jobs/scanner_scanner.go @@ -1,8 +1,8 @@ package main import ( + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/config" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/issuewatcher" "github.com/uoregon-libraries/newspaper-curation-app/src/schema" "github.com/uoregon-libraries/newspaper-curation-app/src/uploads" diff --git a/src/cmd/server/internal/audithandler/form.go b/src/cmd/server/internal/audithandler/form.go index 9f1a5dd7..22c2a613 100644 --- a/src/cmd/server/internal/audithandler/form.go +++ b/src/cmd/server/internal/audithandler/form.go @@ -7,8 +7,8 @@ import ( "strings" "time" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/responder" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" ) diff --git a/src/cmd/server/internal/audithandler/handlers.go b/src/cmd/server/internal/audithandler/handlers.go index e47fc121..ef863f36 100644 --- a/src/cmd/server/internal/audithandler/handlers.go +++ b/src/cmd/server/internal/audithandler/handlers.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/gorilla/mux" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/responder" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/privilege" "github.com/uoregon-libraries/newspaper-curation-app/src/web/tmpl" diff --git a/src/cmd/server/internal/batchhandler/flag_issues_handlers.go b/src/cmd/server/internal/batchhandler/flag_issues_handlers.go index 0221e344..c6d5d667 100644 --- a/src/cmd/server/internal/batchhandler/flag_issues_handlers.go +++ b/src/cmd/server/internal/batchhandler/flag_issues_handlers.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/jobs" "github.com/uoregon-libraries/newspaper-curation-app/src/models" ) diff --git a/src/cmd/server/internal/batchhandler/handlers.go b/src/cmd/server/internal/batchhandler/handlers.go index c697134e..0d866801 100644 --- a/src/cmd/server/internal/batchhandler/handlers.go +++ b/src/cmd/server/internal/batchhandler/handlers.go @@ -6,8 +6,8 @@ import ( "net/http" "time" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/responder" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/jobs" "github.com/uoregon-libraries/newspaper-curation-app/src/models" ) diff --git a/src/cmd/server/internal/batchhandler/responder.go b/src/cmd/server/internal/batchhandler/responder.go index 1da43456..a52cd7c9 100644 --- a/src/cmd/server/internal/batchhandler/responder.go +++ b/src/cmd/server/internal/batchhandler/responder.go @@ -6,8 +6,8 @@ import ( "strconv" "github.com/gorilla/mux" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/responder" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" ) diff --git a/src/cmd/server/internal/batchmakerhandler/handlers.go b/src/cmd/server/internal/batchmakerhandler/handlers.go index 6d0fa541..94a78d9d 100644 --- a/src/cmd/server/internal/batchmakerhandler/handlers.go +++ b/src/cmd/server/internal/batchmakerhandler/handlers.go @@ -8,9 +8,9 @@ import ( "strconv" "github.com/gorilla/mux" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/responder" "github.com/uoregon-libraries/newspaper-curation-app/src/config" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/jobs" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/web/tmpl" diff --git a/src/cmd/server/internal/batchmakerhandler/schema.go b/src/cmd/server/internal/batchmakerhandler/schema.go index 960b3543..895c099a 100644 --- a/src/cmd/server/internal/batchmakerhandler/schema.go +++ b/src/cmd/server/internal/batchmakerhandler/schema.go @@ -3,8 +3,8 @@ package batchmakerhandler import ( "fmt" + "github.com/uoregon-libraries/newspaper-curation-app/internal/issuequeue" "github.com/uoregon-libraries/newspaper-curation-app/src/duration" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/issuequeue" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/schema" ) diff --git a/src/cmd/server/internal/issuefinderhandler/responder.go b/src/cmd/server/internal/issuefinderhandler/responder.go index 16a34a60..df8f7949 100644 --- a/src/cmd/server/internal/issuefinderhandler/responder.go +++ b/src/cmd/server/internal/issuefinderhandler/responder.go @@ -6,8 +6,8 @@ import ( "path" "strconv" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/responder" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/schema" "github.com/uoregon-libraries/newspaper-curation-app/src/web/tmpl" diff --git a/src/cmd/server/internal/mochandler/handlers.go b/src/cmd/server/internal/mochandler/handlers.go index 8d917c66..ff43e9bf 100644 --- a/src/cmd/server/internal/mochandler/handlers.go +++ b/src/cmd/server/internal/mochandler/handlers.go @@ -8,8 +8,8 @@ import ( "strconv" "github.com/gorilla/mux" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/responder" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/web/tmpl" ) diff --git a/src/cmd/server/internal/responder/responder.go b/src/cmd/server/internal/responder/responder.go index 38031bc9..8436ba39 100644 --- a/src/cmd/server/internal/responder/responder.go +++ b/src/cmd/server/internal/responder/responder.go @@ -12,8 +12,8 @@ import ( "os" "time" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/settings" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/version" "github.com/uoregon-libraries/newspaper-curation-app/src/web/tmpl" diff --git a/src/cmd/server/internal/responder/templates.go b/src/cmd/server/internal/responder/templates.go index dc1f7d46..a8a88e02 100644 --- a/src/cmd/server/internal/responder/templates.go +++ b/src/cmd/server/internal/responder/templates.go @@ -9,9 +9,9 @@ import ( "strings" "time" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/apperr" "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/settings" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/privilege" "github.com/uoregon-libraries/newspaper-curation-app/src/schema" diff --git a/src/cmd/server/internal/titlehandler/handlers.go b/src/cmd/server/internal/titlehandler/handlers.go index 70281d41..3263115c 100644 --- a/src/cmd/server/internal/titlehandler/handlers.go +++ b/src/cmd/server/internal/titlehandler/handlers.go @@ -9,12 +9,12 @@ import ( "strconv" "github.com/gorilla/mux" + "github.com/uoregon-libraries/newspaper-curation-app/internal/datasize" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/responder" "github.com/uoregon-libraries/newspaper-curation-app/src/config" "github.com/uoregon-libraries/newspaper-curation-app/src/dbi" "github.com/uoregon-libraries/newspaper-curation-app/src/duration" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/datasize" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/privilege" "github.com/uoregon-libraries/newspaper-curation-app/src/web/tmpl" diff --git a/src/cmd/server/internal/titlehandler/marc.go b/src/cmd/server/internal/titlehandler/marc.go index c9ee4ef6..95981360 100644 --- a/src/cmd/server/internal/titlehandler/marc.go +++ b/src/cmd/server/internal/titlehandler/marc.go @@ -7,8 +7,8 @@ import ( "os" "strings" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/marc" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" + "github.com/uoregon-libraries/newspaper-curation-app/internal/marc" ) // pullMARCForTitle pulls the MARC record from the library of congress and sets the diff --git a/src/cmd/server/internal/titlehandler/schema.go b/src/cmd/server/internal/titlehandler/schema.go index ef089b80..1bf08e25 100644 --- a/src/cmd/server/internal/titlehandler/schema.go +++ b/src/cmd/server/internal/titlehandler/schema.go @@ -5,8 +5,8 @@ import ( "sort" "strings" + "github.com/uoregon-libraries/newspaper-curation-app/internal/datasize" "github.com/uoregon-libraries/newspaper-curation-app/src/duration" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/datasize" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/schema" ) diff --git a/src/cmd/server/internal/uploadedissuehandler/filehandler.go b/src/cmd/server/internal/uploadedissuehandler/filehandler.go index 48504f88..b60ee53d 100644 --- a/src/cmd/server/internal/uploadedissuehandler/filehandler.go +++ b/src/cmd/server/internal/uploadedissuehandler/filehandler.go @@ -11,8 +11,8 @@ import ( "strings" "github.com/uoregon-libraries/gopkg/fileutil" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/responder" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" ) // FileHandler attempts to find and display a file to the browser diff --git a/src/cmd/server/internal/uploadedissuehandler/schema.go b/src/cmd/server/internal/uploadedissuehandler/schema.go index 8b5054f8..acf2f066 100644 --- a/src/cmd/server/internal/uploadedissuehandler/schema.go +++ b/src/cmd/server/internal/uploadedissuehandler/schema.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/schema" "github.com/uoregon-libraries/newspaper-curation-app/src/uploads" diff --git a/src/cmd/server/internal/uploadedissuehandler/searcher.go b/src/cmd/server/internal/uploadedissuehandler/searcher.go index 40adafcc..8ff22cd0 100644 --- a/src/cmd/server/internal/uploadedissuehandler/searcher.go +++ b/src/cmd/server/internal/uploadedissuehandler/searcher.go @@ -7,9 +7,9 @@ import ( "sync" "time" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/apperr" "github.com/uoregon-libraries/newspaper-curation-app/src/config" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/issuewatcher" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/schema" diff --git a/src/cmd/server/internal/userhandler/handlers.go b/src/cmd/server/internal/userhandler/handlers.go index 798acca8..6d9430ab 100644 --- a/src/cmd/server/internal/userhandler/handlers.go +++ b/src/cmd/server/internal/userhandler/handlers.go @@ -8,8 +8,8 @@ import ( "strconv" "github.com/gorilla/mux" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/responder" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/privilege" "github.com/uoregon-libraries/newspaper-curation-app/src/web/tmpl" diff --git a/src/cmd/server/internal/workflowhandler/can.go b/src/cmd/server/internal/workflowhandler/can.go index 2fe855ed..3efbf6ac 100644 --- a/src/cmd/server/internal/workflowhandler/can.go +++ b/src/cmd/server/internal/workflowhandler/can.go @@ -6,8 +6,8 @@ import ( "html/template" "net/http" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/responder" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/privilege" "github.com/uoregon-libraries/newspaper-curation-app/src/schema" diff --git a/src/cmd/server/internal/workflowhandler/handlers.go b/src/cmd/server/internal/workflowhandler/handlers.go index d83150b6..9e09a383 100644 --- a/src/cmd/server/internal/workflowhandler/handlers.go +++ b/src/cmd/server/internal/workflowhandler/handlers.go @@ -6,8 +6,8 @@ import ( "html/template" "net/http" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/responder" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/jobs" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/privilege" diff --git a/src/cmd/server/internal/workflowhandler/json.go b/src/cmd/server/internal/workflowhandler/json.go index 178124cf..758d596e 100644 --- a/src/cmd/server/internal/workflowhandler/json.go +++ b/src/cmd/server/internal/workflowhandler/json.go @@ -3,7 +3,7 @@ package workflowhandler import ( "time" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/humanize" + "github.com/uoregon-libraries/newspaper-curation-app/internal/humanize" "github.com/uoregon-libraries/newspaper-curation-app/src/models" ) diff --git a/src/cmd/server/internal/workflowhandler/middleware.go b/src/cmd/server/internal/workflowhandler/middleware.go index 0a09afd5..71b97dd2 100644 --- a/src/cmd/server/internal/workflowhandler/middleware.go +++ b/src/cmd/server/internal/workflowhandler/middleware.go @@ -5,8 +5,8 @@ import ( "strconv" "github.com/gorilla/mux" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/responder" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/privilege" ) diff --git a/src/cmd/server/internal/workflowhandler/save_metadata.go b/src/cmd/server/internal/workflowhandler/save_metadata.go index 994a8140..976dca3c 100644 --- a/src/cmd/server/internal/workflowhandler/save_metadata.go +++ b/src/cmd/server/internal/workflowhandler/save_metadata.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/responder" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/jobs" "github.com/uoregon-libraries/newspaper-curation-app/src/models" ) diff --git a/src/cmd/server/internal/workflowhandler/schema.go b/src/cmd/server/internal/workflowhandler/schema.go index 91ead622..6aaa0434 100644 --- a/src/cmd/server/internal/workflowhandler/schema.go +++ b/src/cmd/server/internal/workflowhandler/schema.go @@ -6,8 +6,8 @@ import ( "strconv" "time" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/apperr" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/schema" ) diff --git a/src/cmd/server/internal/workflowhandler/unfixable_error_handlers.go b/src/cmd/server/internal/workflowhandler/unfixable_error_handlers.go index 0e449bb4..c2341cc4 100644 --- a/src/cmd/server/internal/workflowhandler/unfixable_error_handlers.go +++ b/src/cmd/server/internal/workflowhandler/unfixable_error_handlers.go @@ -6,8 +6,8 @@ import ( "net/http" "strconv" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/responder" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/jobs" "github.com/uoregon-libraries/newspaper-curation-app/src/models" ) diff --git a/src/cmd/server/main.go b/src/cmd/server/main.go index d1cb3a37..db21ca9c 100644 --- a/src/cmd/server/main.go +++ b/src/cmd/server/main.go @@ -11,6 +11,7 @@ import ( "github.com/gorilla/mux" flags "github.com/jessevdk/go-flags" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/audithandler" "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/batchhandler" "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/batchmakerhandler" @@ -24,7 +25,6 @@ import ( "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/workflowhandler" "github.com/uoregon-libraries/newspaper-curation-app/src/config" "github.com/uoregon-libraries/newspaper-curation-app/src/dbi" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/issuewatcher" "github.com/uoregon-libraries/newspaper-curation-app/src/web/webutil" ) diff --git a/src/cmd/server/middleware.go b/src/cmd/server/middleware.go index 03089d14..abb07b43 100644 --- a/src/cmd/server/middleware.go +++ b/src/cmd/server/middleware.go @@ -3,8 +3,8 @@ package main import ( "net/http" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/cmd/server/internal/responder" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" ) // nocache is a Middleware function to send back no-cache header diff --git a/src/cmd/server/migrate_issue_metadata_entry.go b/src/cmd/server/migrate_issue_metadata_entry.go index 452e498e..02a4e2ce 100644 --- a/src/cmd/server/migrate_issue_metadata_entry.go +++ b/src/cmd/server/migrate_issue_metadata_entry.go @@ -3,7 +3,7 @@ package main import ( "time" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" ) diff --git a/src/cmd/server/migrate_sftpgo.go b/src/cmd/server/migrate_sftpgo.go index 2452f417..e38179b1 100644 --- a/src/cmd/server/migrate_sftpgo.go +++ b/src/cmd/server/migrate_sftpgo.go @@ -3,8 +3,8 @@ package main import ( "os" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/dbi" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" ) diff --git a/src/config/config.go b/src/config/config.go index 74c4dd82..2667b8c0 100644 --- a/src/config/config.go +++ b/src/config/config.go @@ -10,7 +10,7 @@ import ( "time" "github.com/uoregon-libraries/gopkg/bashconf" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/datasize" + "github.com/uoregon-libraries/newspaper-curation-app/internal/datasize" ) // Config holds the configuration needed for this application to work diff --git a/src/dbi/dbi.go b/src/dbi/dbi.go index 3e7b3b00..cd324cbe 100644 --- a/src/dbi/dbi.go +++ b/src/dbi/dbi.go @@ -11,7 +11,7 @@ import ( "time" "github.com/Nerdmaster/magicsql" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/sftpgo" + "github.com/uoregon-libraries/newspaper-curation-app/internal/sftpgo" // We need to pull in mysql for the side-effect it offers us (allowing // "mysql" as a driver name), not the actual code it provides diff --git a/src/derivatives/alto/pdf_to_alto.go b/src/derivatives/alto/pdf_to_alto.go index c2417184..72a89bae 100644 --- a/src/derivatives/alto/pdf_to_alto.go +++ b/src/derivatives/alto/pdf_to_alto.go @@ -9,7 +9,7 @@ import ( "github.com/uoregon-libraries/gopkg/fileutil" ltype "github.com/uoregon-libraries/gopkg/logger" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/shell" ) diff --git a/src/derivatives/jp2/make_jp2.go b/src/derivatives/jp2/make_jp2.go index 7f71dca0..f56f2bf1 100644 --- a/src/derivatives/jp2/make_jp2.go +++ b/src/derivatives/jp2/make_jp2.go @@ -9,7 +9,7 @@ import ( "github.com/uoregon-libraries/gopkg/fileutil" ltype "github.com/uoregon-libraries/gopkg/logger" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" ) // RateFactor is our constant divisor / multiplier for rates. We store diff --git a/src/derivatives/mets/pages.go b/src/derivatives/mets/pages.go index 66731460..a56854ad 100644 --- a/src/derivatives/mets/pages.go +++ b/src/derivatives/mets/pages.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/schema" ) diff --git a/src/issuefinder/title.go b/src/issuefinder/title.go index 59c56cea..553e4b94 100644 --- a/src/issuefinder/title.go +++ b/src/issuefinder/title.go @@ -4,10 +4,10 @@ import ( "fmt" "path/filepath" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/apperr" "github.com/uoregon-libraries/newspaper-curation-app/src/chronam" "github.com/uoregon-libraries/newspaper-curation-app/src/httpcache" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/schema" ) diff --git a/src/issuewatcher/watcher.go b/src/issuewatcher/watcher.go index 4ec3d753..bdf1cba8 100644 --- a/src/issuewatcher/watcher.go +++ b/src/issuewatcher/watcher.go @@ -11,8 +11,8 @@ import ( "sync" "time" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/config" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" ) // A Watcher wraps the Scanner to provide a long-running issue watcher which diff --git a/src/jobs/api_jobs.go b/src/jobs/api_jobs.go index 38177724..079bd449 100644 --- a/src/jobs/api_jobs.go +++ b/src/jobs/api_jobs.go @@ -3,8 +3,8 @@ package jobs import ( "fmt" + "github.com/uoregon-libraries/newspaper-curation-app/internal/openoni" "github.com/uoregon-libraries/newspaper-curation-app/src/config" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/openoni" "github.com/uoregon-libraries/newspaper-curation-app/src/models" ) diff --git a/src/jobs/batch_job.go b/src/jobs/batch_job.go index a7f41424..4270bb66 100644 --- a/src/jobs/batch_job.go +++ b/src/jobs/batch_job.go @@ -3,7 +3,7 @@ package jobs import ( "fmt" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" ) diff --git a/src/jobs/issue_job.go b/src/jobs/issue_job.go index 0ac7a6b1..5844ddcc 100644 --- a/src/jobs/issue_job.go +++ b/src/jobs/issue_job.go @@ -3,7 +3,7 @@ package jobs import ( "fmt" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/schema" ) diff --git a/src/jobs/job.go b/src/jobs/job.go index 6e19745b..07356301 100644 --- a/src/jobs/job.go +++ b/src/jobs/job.go @@ -7,8 +7,8 @@ import ( "time" ltype "github.com/uoregon-libraries/gopkg/logger" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/config" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" ) diff --git a/src/jobs/job_job.go b/src/jobs/job_job.go index b1f3369c..dedff8bb 100644 --- a/src/jobs/job_job.go +++ b/src/jobs/job_job.go @@ -3,7 +3,7 @@ package jobs import ( "fmt" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" ) diff --git a/src/jobs/jobs.go b/src/jobs/jobs.go index 88eb9e79..a3ccdaca 100644 --- a/src/jobs/jobs.go +++ b/src/jobs/jobs.go @@ -1,7 +1,7 @@ package jobs import ( - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/models" ) diff --git a/src/models/user.go b/src/models/user.go index dce162d7..ec279c9e 100644 --- a/src/models/user.go +++ b/src/models/user.go @@ -4,8 +4,8 @@ import ( "errors" "strings" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/dbi" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/privilege" ) diff --git a/src/schema/schema.go b/src/schema/schema.go index b48884a2..3df72287 100644 --- a/src/schema/schema.go +++ b/src/schema/schema.go @@ -14,9 +14,9 @@ import ( "time" "github.com/uoregon-libraries/gopkg/fileutil" + "github.com/uoregon-libraries/newspaper-curation-app/internal/lastmod" + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/apperr" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/lastmod" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" ) // WorkflowStep describes the location within the workflow any issue can exist diff --git a/src/uploads/queue.go b/src/uploads/queue.go index 443271a7..39f05656 100644 --- a/src/uploads/queue.go +++ b/src/uploads/queue.go @@ -1,8 +1,8 @@ package uploads import ( + "github.com/uoregon-libraries/newspaper-curation-app/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/apperr" - "github.com/uoregon-libraries/newspaper-curation-app/src/internal/logger" "github.com/uoregon-libraries/newspaper-curation-app/src/jobs" "github.com/uoregon-libraries/newspaper-curation-app/src/models" "github.com/uoregon-libraries/newspaper-curation-app/src/schema"