diff --git a/internal/api/abort.go b/internal/api/abort.go index 8f5e313e4..4f2143818 100644 --- a/internal/api/abort.go +++ b/internal/api/abort.go @@ -7,7 +7,7 @@ import ( "github.com/gin-gonic/gin" "github.com/photoprism/photoprism/internal/config" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/authn" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/i18n" diff --git a/internal/api/albums.go b/internal/api/albums.go index e04771035..dc6e646b2 100644 --- a/internal/api/albums.go +++ b/internal/api/albums.go @@ -13,7 +13,7 @@ import ( "github.com/photoprism/photoprism/internal/entity/search" "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" "github.com/photoprism/photoprism/pkg/i18n" diff --git a/internal/api/albums_search.go b/internal/api/albums_search.go index 78f6e40b8..3960560ac 100644 --- a/internal/api/albums_search.go +++ b/internal/api/albums_search.go @@ -10,7 +10,7 @@ import ( "github.com/photoprism/photoprism/internal/entity/search" "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/txt" ) diff --git a/internal/api/api_client_config.go b/internal/api/api_client_config.go index b5c07a0dc..c79e93021 100644 --- a/internal/api/api_client_config.go +++ b/internal/api/api_client_config.go @@ -6,7 +6,7 @@ import ( "github.com/gin-gonic/gin" "github.com/photoprism/photoprism/internal/event" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" ) // UpdateClientConfig publishes updated client configuration values over the websocket connections. diff --git a/internal/api/api_response_headers.go b/internal/api/api_response_headers.go index 8c036d1ef..b6c8f6f09 100644 --- a/internal/api/api_response_headers.go +++ b/internal/api/api_response_headers.go @@ -7,7 +7,7 @@ import ( "github.com/gin-gonic/gin" "github.com/photoprism/photoprism/internal/entity" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/header" ) diff --git a/internal/api/api_test.go b/internal/api/api_test.go index a8cd068da..3997986b1 100644 --- a/internal/api/api_test.go +++ b/internal/api/api_test.go @@ -14,7 +14,7 @@ import ( "github.com/photoprism/photoprism/internal/config" "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/internal/server/limiter" "github.com/photoprism/photoprism/pkg/header" ) diff --git a/internal/api/batch.go b/internal/api/batch.go index 2f25fb87f..5e0ef5414 100644 --- a/internal/api/batch.go +++ b/internal/api/batch.go @@ -15,8 +15,8 @@ import ( "github.com/photoprism/photoprism/internal/entity/query" "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/i18n" ) diff --git a/internal/api/cache.go b/internal/api/cache.go index f273325e3..7f1b724f2 100644 --- a/internal/api/cache.go +++ b/internal/api/cache.go @@ -9,7 +9,7 @@ import ( "github.com/photoprism/photoprism/internal/config/ttl" "github.com/photoprism/photoprism/internal/entity/query" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/internal/thumb" "github.com/photoprism/photoprism/pkg/fs" "github.com/photoprism/photoprism/pkg/header" diff --git a/internal/api/config_options.go b/internal/api/config_options.go index d1418f26c..03c2e39c1 100644 --- a/internal/api/config_options.go +++ b/internal/api/config_options.go @@ -10,8 +10,8 @@ import ( "github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/entity" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/mutex" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" ) diff --git a/internal/api/config_settings.go b/internal/api/config_settings.go index 530fac9ce..38eeb66c4 100644 --- a/internal/api/config_settings.go +++ b/internal/api/config_settings.go @@ -8,7 +8,7 @@ import ( "github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/config/customize" "github.com/photoprism/photoprism/internal/entity" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/i18n" ) diff --git a/internal/api/connect.go b/internal/api/connect.go index c69bf45a0..2d48cba8a 100644 --- a/internal/api/connect.go +++ b/internal/api/connect.go @@ -7,8 +7,8 @@ import ( "github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/mutex" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/i18n" ) diff --git a/internal/api/covers.go b/internal/api/covers.go index dd1f51e53..7351e9eb4 100644 --- a/internal/api/covers.go +++ b/internal/api/covers.go @@ -8,8 +8,8 @@ import ( "github.com/gin-gonic/gin" "github.com/photoprism/photoprism/internal/entity/query" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/internal/thumb" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" diff --git a/internal/api/download_album.go b/internal/api/download_album.go index 48520f0b7..ca44d250b 100644 --- a/internal/api/download_album.go +++ b/internal/api/download_album.go @@ -10,8 +10,8 @@ import ( "github.com/photoprism/photoprism/internal/entity/query" "github.com/photoprism/photoprism/internal/entity/search" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" "github.com/photoprism/photoprism/pkg/i18n" diff --git a/internal/api/download_file.go b/internal/api/download_file.go index 3897ed3c2..2d74d9cd7 100644 --- a/internal/api/download_file.go +++ b/internal/api/download_file.go @@ -8,8 +8,8 @@ import ( "github.com/gin-gonic/gin" "github.com/photoprism/photoprism/internal/entity/query" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" diff --git a/internal/api/echo.go b/internal/api/echo.go index 8ffbe7117..43f3f2460 100644 --- a/internal/api/echo.go +++ b/internal/api/echo.go @@ -5,7 +5,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" ) // Echo returns the request and response headers as JSON if debug mode is enabled. diff --git a/internal/api/errors.go b/internal/api/errors.go index 5ee7dfa95..4d9b01eeb 100644 --- a/internal/api/errors.go +++ b/internal/api/errors.go @@ -7,7 +7,7 @@ import ( "github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/entity/query" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/i18n" "github.com/photoprism/photoprism/pkg/txt" ) diff --git a/internal/api/feedback.go b/internal/api/feedback.go index 1555cb8ee..2b8c4ec9b 100644 --- a/internal/api/feedback.go +++ b/internal/api/feedback.go @@ -7,7 +7,7 @@ import ( "github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/i18n" ) diff --git a/internal/api/file_delete.go b/internal/api/file_delete.go index 120ef75b2..4d9c31fc2 100644 --- a/internal/api/file_delete.go +++ b/internal/api/file_delete.go @@ -9,8 +9,8 @@ import ( "github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/entity/query" "github.com/photoprism/photoprism/internal/event" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/i18n" ) diff --git a/internal/api/file_orientation.go b/internal/api/file_orientation.go index d035a88af..d033ddfda 100644 --- a/internal/api/file_orientation.go +++ b/internal/api/file_orientation.go @@ -8,8 +8,8 @@ import ( "github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/entity/query" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/i18n" ) diff --git a/internal/api/folders_cover.go b/internal/api/folders_cover.go index c119171aa..c26eb7331 100644 --- a/internal/api/folders_cover.go +++ b/internal/api/folders_cover.go @@ -8,8 +8,8 @@ import ( "github.com/gin-gonic/gin" "github.com/photoprism/photoprism/internal/entity/query" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/internal/thumb" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" diff --git a/internal/api/folders_search.go b/internal/api/folders_search.go index 0d4971911..d87b86485 100644 --- a/internal/api/folders_search.go +++ b/internal/api/folders_search.go @@ -13,7 +13,7 @@ import ( "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/entity/query" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" ) diff --git a/internal/api/import.go b/internal/api/import.go index 5f68ea16b..4604504ce 100644 --- a/internal/api/import.go +++ b/internal/api/import.go @@ -16,8 +16,8 @@ import ( "github.com/photoprism/photoprism/internal/entity/query" "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/authn" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" diff --git a/internal/api/index.go b/internal/api/index.go index c6c9b60b0..59d25ce49 100644 --- a/internal/api/index.go +++ b/internal/api/index.go @@ -12,8 +12,8 @@ import ( "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/i18n" "github.com/photoprism/photoprism/pkg/txt" diff --git a/internal/api/markers.go b/internal/api/markers.go index 4fa5f46e7..aa4c37cb5 100644 --- a/internal/api/markers.go +++ b/internal/api/markers.go @@ -14,8 +14,8 @@ import ( "github.com/photoprism/photoprism/internal/entity/query" "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/mutex" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/internal/thumb/crop" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/i18n" diff --git a/internal/api/metrics.go b/internal/api/metrics.go index 9f13547a8..6d336dc11 100644 --- a/internal/api/metrics.go +++ b/internal/api/metrics.go @@ -13,7 +13,7 @@ import ( "github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/config" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" ) // GetMetrics provides a prometheus-compatible metrics endpoint for monitoring. diff --git a/internal/api/moments_time.go b/internal/api/moments_time.go index 9c570514c..5603eec02 100644 --- a/internal/api/moments_time.go +++ b/internal/api/moments_time.go @@ -7,7 +7,7 @@ import ( "github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/entity/query" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/txt" ) diff --git a/internal/api/oauth_authorize.go b/internal/api/oauth_authorize.go index 153cd60d9..007a14116 100644 --- a/internal/api/oauth_authorize.go +++ b/internal/api/oauth_authorize.go @@ -6,7 +6,7 @@ import ( "github.com/gin-gonic/gin" "github.com/photoprism/photoprism/internal/event" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/authn" "github.com/photoprism/photoprism/pkg/header" "github.com/photoprism/photoprism/pkg/i18n" diff --git a/internal/api/oauth_revoke.go b/internal/api/oauth_revoke.go index 97e6d65d4..d05d0b1e3 100644 --- a/internal/api/oauth_revoke.go +++ b/internal/api/oauth_revoke.go @@ -10,7 +10,7 @@ import ( "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/authn" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/header" diff --git a/internal/api/oauth_token.go b/internal/api/oauth_token.go index 4c2cd0188..72bd3cee6 100644 --- a/internal/api/oauth_token.go +++ b/internal/api/oauth_token.go @@ -11,7 +11,7 @@ import ( "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/internal/server/limiter" "github.com/photoprism/photoprism/pkg/authn" "github.com/photoprism/photoprism/pkg/clean" diff --git a/internal/api/oauth_userinfo.go b/internal/api/oauth_userinfo.go index c868b7a19..feff11db1 100644 --- a/internal/api/oauth_userinfo.go +++ b/internal/api/oauth_userinfo.go @@ -6,7 +6,7 @@ import ( "github.com/gin-gonic/gin" "github.com/photoprism/photoprism/internal/event" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/authn" "github.com/photoprism/photoprism/pkg/header" "github.com/photoprism/photoprism/pkg/i18n" diff --git a/internal/api/oidc_login.go b/internal/api/oidc_login.go index 0fd1c488f..713a42066 100644 --- a/internal/api/oidc_login.go +++ b/internal/api/oidc_login.go @@ -6,7 +6,7 @@ import ( "github.com/gin-gonic/gin" "github.com/photoprism/photoprism/internal/event" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/internal/server/limiter" "github.com/photoprism/photoprism/pkg/authn" "github.com/photoprism/photoprism/pkg/header" diff --git a/internal/api/oidc_redirect.go b/internal/api/oidc_redirect.go index 453e3a607..c39d2a0cb 100644 --- a/internal/api/oidc_redirect.go +++ b/internal/api/oidc_redirect.go @@ -7,7 +7,7 @@ import ( "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/event" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/internal/server/limiter" "github.com/photoprism/photoprism/pkg/authn" "github.com/photoprism/photoprism/pkg/clean" diff --git a/internal/api/photo_unstack.go b/internal/api/photo_unstack.go index 83cec4ece..c65b973ec 100644 --- a/internal/api/photo_unstack.go +++ b/internal/api/photo_unstack.go @@ -11,8 +11,8 @@ import ( "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/entity/query" "github.com/photoprism/photoprism/internal/event" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/i18n" ) diff --git a/internal/api/photos.go b/internal/api/photos.go index 184ebe618..9527df6a3 100644 --- a/internal/api/photos.go +++ b/internal/api/photos.go @@ -10,8 +10,8 @@ import ( "github.com/photoprism/photoprism/internal/entity/query" "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" "github.com/photoprism/photoprism/pkg/i18n" diff --git a/internal/api/photos_search.go b/internal/api/photos_search.go index df4c71b79..4d9292254 100644 --- a/internal/api/photos_search.go +++ b/internal/api/photos_search.go @@ -11,7 +11,7 @@ import ( "github.com/photoprism/photoprism/internal/entity/search" "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/i18n" ) diff --git a/internal/api/photos_search_geo.go b/internal/api/photos_search_geo.go index e5bd8aa34..5e9f885b5 100644 --- a/internal/api/photos_search_geo.go +++ b/internal/api/photos_search_geo.go @@ -10,7 +10,7 @@ import ( "github.com/photoprism/photoprism/internal/entity/search" "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/header" "github.com/photoprism/photoprism/pkg/txt" diff --git a/internal/api/reactions.go b/internal/api/reactions.go index bf044fb5c..557acaeb0 100644 --- a/internal/api/reactions.go +++ b/internal/api/reactions.go @@ -7,7 +7,7 @@ import ( "github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/entity/query" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/react" ) diff --git a/internal/api/server.go b/internal/api/server.go index 05c489b44..6ddeb9709 100644 --- a/internal/api/server.go +++ b/internal/api/server.go @@ -8,7 +8,7 @@ import ( "github.com/gin-gonic/gin" "github.com/photoprism/photoprism/internal/auth/acl" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" ) // StopServer shuts down the server. diff --git a/internal/api/services.go b/internal/api/services.go index ec00688bc..f4925b756 100644 --- a/internal/api/services.go +++ b/internal/api/services.go @@ -11,7 +11,7 @@ import ( "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/entity/query" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/internal/workers" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" diff --git a/internal/api/services_search.go b/internal/api/services_search.go index 71a2f7950..853c45ea8 100644 --- a/internal/api/services_search.go +++ b/internal/api/services_search.go @@ -10,7 +10,7 @@ import ( "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/entity/search" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" ) // SearchServices finds account settings and returns them as JSON. diff --git a/internal/api/services_upload.go b/internal/api/services_upload.go index 66dfe8e48..8f348b85e 100644 --- a/internal/api/services_upload.go +++ b/internal/api/services_upload.go @@ -11,7 +11,7 @@ import ( "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/entity/query" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/internal/workers" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/i18n" diff --git a/internal/api/session.go b/internal/api/session.go index 1363855e0..6cfad32d5 100644 --- a/internal/api/session.go +++ b/internal/api/session.go @@ -2,7 +2,7 @@ package api import ( "github.com/photoprism/photoprism/internal/entity" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/internal/server/limiter" "github.com/photoprism/photoprism/pkg/rnd" ) diff --git a/internal/api/session_create.go b/internal/api/session_create.go index 8a05fc03f..0cb53d97b 100644 --- a/internal/api/session_create.go +++ b/internal/api/session_create.go @@ -9,7 +9,7 @@ import ( "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/internal/server/limiter" "github.com/photoprism/photoprism/pkg/authn" "github.com/photoprism/photoprism/pkg/header" diff --git a/internal/api/session_delete.go b/internal/api/session_delete.go index 5f75ec6bc..052f53d7b 100644 --- a/internal/api/session_delete.go +++ b/internal/api/session_delete.go @@ -8,7 +8,7 @@ import ( "github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/event" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/internal/session" "github.com/photoprism/photoprism/pkg/authn" "github.com/photoprism/photoprism/pkg/clean" diff --git a/internal/api/session_get.go b/internal/api/session_get.go index 959a9c606..b1374cbb6 100644 --- a/internal/api/session_get.go +++ b/internal/api/session_get.go @@ -6,7 +6,7 @@ import ( "github.com/gin-gonic/gin" "github.com/photoprism/photoprism/internal/auth/acl" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/header" "github.com/photoprism/photoprism/pkg/rnd" diff --git a/internal/api/session_response.go b/internal/api/session_response.go index c61a1d3c6..ef7ac0ad6 100644 --- a/internal/api/session_response.go +++ b/internal/api/session_response.go @@ -5,7 +5,7 @@ import ( "github.com/photoprism/photoprism/internal/config" "github.com/photoprism/photoprism/internal/entity" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" ) // CreateSessionResponse returns the authentication response data for POST requests diff --git a/internal/api/session_test.go b/internal/api/session_test.go index 13ccabab8..06fb7db66 100644 --- a/internal/api/session_test.go +++ b/internal/api/session_test.go @@ -9,7 +9,7 @@ import ( "github.com/photoprism/photoprism/internal/config" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/i18n" "github.com/photoprism/photoprism/pkg/rnd" ) diff --git a/internal/api/share.go b/internal/api/share.go index e3a10f804..565852e31 100644 --- a/internal/api/share.go +++ b/internal/api/share.go @@ -8,7 +8,7 @@ import ( "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/entity/query" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" ) diff --git a/internal/api/share_preview.go b/internal/api/share_preview.go index 32dd7e3ef..73d002a11 100644 --- a/internal/api/share_preview.go +++ b/internal/api/share_preview.go @@ -15,8 +15,8 @@ import ( "github.com/photoprism/photoprism/internal/entity/query" "github.com/photoprism/photoprism/internal/entity/search" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/internal/thumb" "github.com/photoprism/photoprism/internal/thumb/frame" "github.com/photoprism/photoprism/pkg/clean" diff --git a/internal/api/thumbnails.go b/internal/api/thumbnails.go index eec183a89..bf813009e 100644 --- a/internal/api/thumbnails.go +++ b/internal/api/thumbnails.go @@ -8,8 +8,8 @@ import ( "github.com/gin-gonic/gin" "github.com/photoprism/photoprism/internal/entity/query" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/internal/thumb" "github.com/photoprism/photoprism/internal/thumb/crop" "github.com/photoprism/photoprism/pkg/clean" diff --git a/internal/api/users_avatar.go b/internal/api/users_avatar.go index 1665fd221..6d4c262ec 100644 --- a/internal/api/users_avatar.go +++ b/internal/api/users_avatar.go @@ -10,8 +10,8 @@ import ( "github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/event" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" "github.com/photoprism/photoprism/pkg/i18n" diff --git a/internal/api/users_passcode.go b/internal/api/users_passcode.go index 8c931b30c..efbb18848 100644 --- a/internal/api/users_passcode.go +++ b/internal/api/users_passcode.go @@ -10,7 +10,7 @@ import ( "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/internal/server/limiter" "github.com/photoprism/photoprism/pkg/authn" "github.com/photoprism/photoprism/pkg/clean" diff --git a/internal/api/users_password.go b/internal/api/users_password.go index 228cb31e4..e1bc522a3 100644 --- a/internal/api/users_password.go +++ b/internal/api/users_password.go @@ -10,7 +10,7 @@ import ( "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/internal/server/limiter" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/i18n" diff --git a/internal/api/users_sessions.go b/internal/api/users_sessions.go index 6e7ddb74b..fa33477e8 100644 --- a/internal/api/users_sessions.go +++ b/internal/api/users_sessions.go @@ -10,7 +10,7 @@ import ( "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/entity/search" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/authn" "github.com/photoprism/photoprism/pkg/rnd" "github.com/photoprism/photoprism/pkg/sortby" diff --git a/internal/api/users_update.go b/internal/api/users_update.go index 5d11274e3..9b2159300 100644 --- a/internal/api/users_update.go +++ b/internal/api/users_update.go @@ -9,7 +9,7 @@ import ( "github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/event" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/i18n" ) diff --git a/internal/api/users_upload.go b/internal/api/users_upload.go index 388b74b9e..74d7fd02e 100644 --- a/internal/api/users_upload.go +++ b/internal/api/users_upload.go @@ -15,8 +15,8 @@ import ( "github.com/photoprism/photoprism/internal/entity/query" "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" "github.com/photoprism/photoprism/pkg/i18n" diff --git a/internal/api/video.go b/internal/api/video.go index fc40e8dc8..4d8d7e80c 100644 --- a/internal/api/video.go +++ b/internal/api/video.go @@ -10,8 +10,8 @@ import ( "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/entity/query" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" "github.com/photoprism/photoprism/pkg/video" diff --git a/internal/api/websocket_create.go b/internal/api/websocket_create.go index 1eb2a77ab..fc54acc1c 100644 --- a/internal/api/websocket_create.go +++ b/internal/api/websocket_create.go @@ -6,7 +6,7 @@ import ( "github.com/gin-gonic/gin" "github.com/photoprism/photoprism/internal/entity" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/rnd" ) diff --git a/internal/api/zip.go b/internal/api/zip.go index 8d27f7bee..bb3aefb58 100644 --- a/internal/api/zip.go +++ b/internal/api/zip.go @@ -15,8 +15,8 @@ import ( "github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/entity/query" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" "github.com/photoprism/photoprism/pkg/i18n" diff --git a/internal/commands/cleanup.go b/internal/commands/cleanup.go index 21fd8d922..751e6b55d 100644 --- a/internal/commands/cleanup.go +++ b/internal/commands/cleanup.go @@ -7,8 +7,8 @@ import ( "github.com/dustin/go-humanize/english" "github.com/urfave/cli" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" ) // CleanUpCommand configures the command name, flags, and action. diff --git a/internal/commands/commands_test.go b/internal/commands/commands_test.go index 59a73728e..6972dcf65 100644 --- a/internal/commands/commands_test.go +++ b/internal/commands/commands_test.go @@ -10,7 +10,7 @@ import ( "github.com/photoprism/photoprism/internal/config" "github.com/photoprism/photoprism/internal/event" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" ) func TestMain(m *testing.M) { diff --git a/internal/commands/config.go b/internal/commands/config.go index 2c2f79d30..814654dd7 100644 --- a/internal/commands/config.go +++ b/internal/commands/config.go @@ -4,7 +4,7 @@ import ( "github.com/urfave/cli" "github.com/photoprism/photoprism/internal/config" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" ) // InitConfig initializes the command config. diff --git a/internal/commands/convert.go b/internal/commands/convert.go index b187d271b..2b37d45c6 100644 --- a/internal/commands/convert.go +++ b/internal/commands/convert.go @@ -9,7 +9,7 @@ import ( "github.com/urfave/cli" "github.com/photoprism/photoprism/internal/config" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" ) diff --git a/internal/commands/copy.go b/internal/commands/copy.go index be741cfe7..ba2b3cf90 100644 --- a/internal/commands/copy.go +++ b/internal/commands/copy.go @@ -10,8 +10,8 @@ import ( "github.com/urfave/cli" "github.com/photoprism/photoprism/internal/config" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" ) diff --git a/internal/commands/faces.go b/internal/commands/faces.go index 1f20a0b16..123b2fc58 100644 --- a/internal/commands/faces.go +++ b/internal/commands/faces.go @@ -12,8 +12,8 @@ import ( "github.com/photoprism/photoprism/internal/config" "github.com/photoprism/photoprism/internal/entity/query" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" ) diff --git a/internal/commands/import.go b/internal/commands/import.go index 1a60c2de5..cf89ed950 100644 --- a/internal/commands/import.go +++ b/internal/commands/import.go @@ -10,8 +10,8 @@ import ( "github.com/urfave/cli" "github.com/photoprism/photoprism/internal/config" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" ) diff --git a/internal/commands/index.go b/internal/commands/index.go index e504a99a8..e31fa6600 100644 --- a/internal/commands/index.go +++ b/internal/commands/index.go @@ -9,8 +9,8 @@ import ( "github.com/dustin/go-humanize/english" "github.com/urfave/cli" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" ) diff --git a/internal/commands/moments.go b/internal/commands/moments.go index 9c4b4608e..e298b2200 100644 --- a/internal/commands/moments.go +++ b/internal/commands/moments.go @@ -6,7 +6,7 @@ import ( "github.com/urfave/cli" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" ) // MomentsCommand configures the command name, flags, and action. diff --git a/internal/commands/places.go b/internal/commands/places.go index f9a84037f..f96bcc097 100644 --- a/internal/commands/places.go +++ b/internal/commands/places.go @@ -9,7 +9,7 @@ import ( "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/entity/query" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" ) // PlacesCommands configures the command name, flags, and action. diff --git a/internal/commands/purge.go b/internal/commands/purge.go index ccf227736..c5ab89f3d 100644 --- a/internal/commands/purge.go +++ b/internal/commands/purge.go @@ -9,8 +9,8 @@ import ( "github.com/dustin/go-humanize/english" "github.com/urfave/cli" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" ) diff --git a/internal/commands/restore.go b/internal/commands/restore.go index 45986e30e..c2157c84d 100644 --- a/internal/commands/restore.go +++ b/internal/commands/restore.go @@ -7,8 +7,8 @@ import ( "github.com/dustin/go-humanize/english" "github.com/urfave/cli" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism/backup" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" ) diff --git a/internal/commands/show_config.go b/internal/commands/show_config.go index baeaa6d2f..c3126740e 100644 --- a/internal/commands/show_config.go +++ b/internal/commands/show_config.go @@ -8,7 +8,7 @@ import ( "github.com/urfave/cli" "github.com/photoprism/photoprism/internal/config" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/report" ) diff --git a/internal/commands/thumbs.go b/internal/commands/thumbs.go index 267cf1c8e..ddb5226bf 100644 --- a/internal/commands/thumbs.go +++ b/internal/commands/thumbs.go @@ -7,7 +7,7 @@ import ( "github.com/urfave/cli" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" ) diff --git a/internal/photoprism/backup/albums.go b/internal/photoprism/backup/albums.go index 8c8a1a5bc..a72b34999 100644 --- a/internal/photoprism/backup/albums.go +++ b/internal/photoprism/backup/albums.go @@ -7,7 +7,7 @@ import ( "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/entity/query" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" ) diff --git a/internal/photoprism/backup/backup_test.go b/internal/photoprism/backup/backup_test.go index 00316b0b5..a624f0c2c 100644 --- a/internal/photoprism/backup/backup_test.go +++ b/internal/photoprism/backup/backup_test.go @@ -8,8 +8,8 @@ import ( "github.com/photoprism/photoprism/internal/config" "github.com/photoprism/photoprism/internal/event" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" ) func TestMain(m *testing.M) { diff --git a/internal/photoprism/backup/database.go b/internal/photoprism/backup/database.go index 44e1cf91e..f99f55d1c 100644 --- a/internal/photoprism/backup/database.go +++ b/internal/photoprism/backup/database.go @@ -17,7 +17,7 @@ import ( "github.com/photoprism/photoprism/internal/config" "github.com/photoprism/photoprism/internal/entity" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" ) diff --git a/internal/get/classify.go b/internal/photoprism/get/classify.go similarity index 100% rename from internal/get/classify.go rename to internal/photoprism/get/classify.go diff --git a/internal/get/cleanup.go b/internal/photoprism/get/cleanup.go similarity index 100% rename from internal/get/cleanup.go rename to internal/photoprism/get/cleanup.go diff --git a/internal/get/convert.go b/internal/photoprism/get/convert.go similarity index 100% rename from internal/get/convert.go rename to internal/photoprism/get/convert.go diff --git a/internal/get/cover-cache.go b/internal/photoprism/get/cover-cache.go similarity index 100% rename from internal/get/cover-cache.go rename to internal/photoprism/get/cover-cache.go diff --git a/internal/get/face.go b/internal/photoprism/get/face.go similarity index 100% rename from internal/get/face.go rename to internal/photoprism/get/face.go diff --git a/internal/get/faces.go b/internal/photoprism/get/faces.go similarity index 100% rename from internal/get/faces.go rename to internal/photoprism/get/faces.go diff --git a/internal/get/files.go b/internal/photoprism/get/files.go similarity index 100% rename from internal/get/files.go rename to internal/photoprism/get/files.go diff --git a/internal/get/folder-cache.go b/internal/photoprism/get/folder-cache.go similarity index 100% rename from internal/get/folder-cache.go rename to internal/photoprism/get/folder-cache.go diff --git a/internal/get/get.go b/internal/photoprism/get/get.go similarity index 100% rename from internal/get/get.go rename to internal/photoprism/get/get.go diff --git a/internal/get/get_test.go b/internal/photoprism/get/get_test.go similarity index 100% rename from internal/get/get_test.go rename to internal/photoprism/get/get_test.go diff --git a/internal/get/import.go b/internal/photoprism/get/import.go similarity index 100% rename from internal/get/import.go rename to internal/photoprism/get/import.go diff --git a/internal/get/index.go b/internal/photoprism/get/index.go similarity index 100% rename from internal/get/index.go rename to internal/photoprism/get/index.go diff --git a/internal/get/moments.go b/internal/photoprism/get/moments.go similarity index 100% rename from internal/get/moments.go rename to internal/photoprism/get/moments.go diff --git a/internal/get/nsfw.go b/internal/photoprism/get/nsfw.go similarity index 100% rename from internal/get/nsfw.go rename to internal/photoprism/get/nsfw.go diff --git a/internal/get/oidc.go b/internal/photoprism/get/oidc.go similarity index 100% rename from internal/get/oidc.go rename to internal/photoprism/get/oidc.go diff --git a/internal/get/photos.go b/internal/photoprism/get/photos.go similarity index 100% rename from internal/get/photos.go rename to internal/photoprism/get/photos.go diff --git a/internal/get/places.go b/internal/photoprism/get/places.go similarity index 100% rename from internal/get/places.go rename to internal/photoprism/get/places.go diff --git a/internal/get/purge.go b/internal/photoprism/get/purge.go similarity index 100% rename from internal/get/purge.go rename to internal/photoprism/get/purge.go diff --git a/internal/get/query.go b/internal/photoprism/get/query.go similarity index 100% rename from internal/get/query.go rename to internal/photoprism/get/query.go diff --git a/internal/get/services.go b/internal/photoprism/get/services.go similarity index 100% rename from internal/get/services.go rename to internal/photoprism/get/services.go diff --git a/internal/get/services_test.go b/internal/photoprism/get/services_test.go similarity index 100% rename from internal/get/services_test.go rename to internal/photoprism/get/services_test.go diff --git a/internal/get/session.go b/internal/photoprism/get/session.go similarity index 100% rename from internal/get/session.go rename to internal/photoprism/get/session.go diff --git a/internal/get/thumb-cache.go b/internal/photoprism/get/thumb-cache.go similarity index 100% rename from internal/get/thumb-cache.go rename to internal/photoprism/get/thumb-cache.go diff --git a/internal/get/thumbs.go b/internal/photoprism/get/thumbs.go similarity index 100% rename from internal/get/thumbs.go rename to internal/photoprism/get/thumbs.go diff --git a/internal/server/server_test.go b/internal/server/server_test.go index d691fd6e6..0027dd015 100644 --- a/internal/server/server_test.go +++ b/internal/server/server_test.go @@ -8,7 +8,7 @@ import ( "github.com/photoprism/photoprism/internal/config" "github.com/photoprism/photoprism/internal/event" - "github.com/photoprism/photoprism/internal/get" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/internal/server/limiter" ) diff --git a/internal/workers/auto/import.go b/internal/workers/auto/import.go index 398bfc590..9e2f0b237 100644 --- a/internal/workers/auto/import.go +++ b/internal/workers/auto/import.go @@ -8,9 +8,9 @@ import ( "github.com/photoprism/photoprism/internal/api" "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/event" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/mutex" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/i18n" ) diff --git a/internal/workers/auto/index.go b/internal/workers/auto/index.go index 68358c5be..02a3b1124 100644 --- a/internal/workers/auto/index.go +++ b/internal/workers/auto/index.go @@ -6,8 +6,8 @@ import ( "github.com/photoprism/photoprism/internal/api" "github.com/photoprism/photoprism/internal/entity" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/mutex" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/internal/workers" ) diff --git a/internal/workers/index.go b/internal/workers/index.go index 10f133e16..ec7dbaf3b 100644 --- a/internal/workers/index.go +++ b/internal/workers/index.go @@ -9,9 +9,9 @@ import ( "github.com/photoprism/photoprism/internal/config" "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/event" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/mutex" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/pkg/i18n" ) diff --git a/internal/workers/sync_download.go b/internal/workers/sync_download.go index 4fe6716a1..2497e76e1 100644 --- a/internal/workers/sync_download.go +++ b/internal/workers/sync_download.go @@ -9,9 +9,9 @@ import ( "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/entity/query" "github.com/photoprism/photoprism/internal/event" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/mutex" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" "github.com/photoprism/photoprism/internal/service/webdav" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" diff --git a/internal/workers/workers_test.go b/internal/workers/workers_test.go index 6b4a2305d..6232cae24 100644 --- a/internal/workers/workers_test.go +++ b/internal/workers/workers_test.go @@ -8,8 +8,8 @@ import ( "github.com/photoprism/photoprism/internal/config" "github.com/photoprism/photoprism/internal/event" - "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" + "github.com/photoprism/photoprism/internal/photoprism/get" ) func TestMain(m *testing.M) {