diff --git a/internal/api/albums.go b/internal/api/albums.go index ab1dea8d0..e04771035 100644 --- a/internal/api/albums.go +++ b/internal/api/albums.go @@ -10,10 +10,10 @@ import ( "github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/entity/query" + "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/search" "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 1aed1ac24..78f6e40b8 100644 --- a/internal/api/albums_search.go +++ b/internal/api/albums_search.go @@ -7,10 +7,10 @@ import ( "github.com/gin-gonic/gin/binding" "github.com/photoprism/photoprism/internal/auth/acl" + "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/search" "github.com/photoprism/photoprism/pkg/txt" ) diff --git a/internal/api/api_event.go b/internal/api/api_event.go index 26eac42df..2774dee3e 100644 --- a/internal/api/api_event.go +++ b/internal/api/api_event.go @@ -3,9 +3,9 @@ package api import ( "github.com/gin-gonic/gin" + "github.com/photoprism/photoprism/internal/entity/search" "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/search" ) // Event represents an api event type. diff --git a/internal/api/download_album.go b/internal/api/download_album.go index cdb399b0d..48520f0b7 100644 --- a/internal/api/download_album.go +++ b/internal/api/download_album.go @@ -9,9 +9,9 @@ import ( "github.com/gin-gonic/gin" "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/search" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" "github.com/photoprism/photoprism/pkg/i18n" diff --git a/internal/api/faces.go b/internal/api/faces.go index da0fc6fd8..90b529c1f 100644 --- a/internal/api/faces.go +++ b/internal/api/faces.go @@ -7,9 +7,9 @@ import ( "github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/entity" + "github.com/photoprism/photoprism/internal/entity/search" "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/search" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/i18n" "github.com/photoprism/photoprism/pkg/txt" diff --git a/internal/api/faces_search.go b/internal/api/faces_search.go index 38a8efdb9..3c6b1ddec 100644 --- a/internal/api/faces_search.go +++ b/internal/api/faces_search.go @@ -7,8 +7,8 @@ import ( "github.com/gin-gonic/gin/binding" "github.com/photoprism/photoprism/internal/auth/acl" + "github.com/photoprism/photoprism/internal/entity/search" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/search" "github.com/photoprism/photoprism/pkg/txt" ) diff --git a/internal/api/labels_search.go b/internal/api/labels_search.go index 16cd00ce3..ffd25f407 100644 --- a/internal/api/labels_search.go +++ b/internal/api/labels_search.go @@ -7,8 +7,8 @@ import ( "github.com/gin-gonic/gin/binding" "github.com/photoprism/photoprism/internal/auth/acl" + "github.com/photoprism/photoprism/internal/entity/search" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/search" "github.com/photoprism/photoprism/pkg/txt" ) diff --git a/internal/api/photos_search.go b/internal/api/photos_search.go index f3bca4cfb..df4c71b79 100644 --- a/internal/api/photos_search.go +++ b/internal/api/photos_search.go @@ -8,10 +8,10 @@ import ( "github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/entity" + "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/search" "github.com/photoprism/photoprism/pkg/i18n" ) diff --git a/internal/api/photos_search_geo.go b/internal/api/photos_search_geo.go index c31f01123..e5bd8aa34 100644 --- a/internal/api/photos_search_geo.go +++ b/internal/api/photos_search_geo.go @@ -7,10 +7,10 @@ import ( "github.com/gin-gonic/gin/binding" "github.com/photoprism/photoprism/internal/auth/acl" + "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/search" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/header" "github.com/photoprism/photoprism/pkg/txt" diff --git a/internal/api/services_search.go b/internal/api/services_search.go index 69baebe5c..71a2f7950 100644 --- a/internal/api/services_search.go +++ b/internal/api/services_search.go @@ -8,9 +8,9 @@ import ( "github.com/photoprism/photoprism/internal/auth/acl" "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/search" ) // SearchServices finds account settings and returns them as JSON. diff --git a/internal/api/share_preview.go b/internal/api/share_preview.go index 96937ce28..fdcd3070d 100644 --- a/internal/api/share_preview.go +++ b/internal/api/share_preview.go @@ -13,11 +13,11 @@ import ( "github.com/photoprism/photoprism/internal/entity" "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/frame" "github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/photoprism" - "github.com/photoprism/photoprism/internal/search" "github.com/photoprism/photoprism/internal/thumb" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" diff --git a/internal/api/subjects_search.go b/internal/api/subjects_search.go index 858772fe3..1ae25bc34 100644 --- a/internal/api/subjects_search.go +++ b/internal/api/subjects_search.go @@ -7,8 +7,8 @@ import ( "github.com/gin-gonic/gin/binding" "github.com/photoprism/photoprism/internal/auth/acl" + "github.com/photoprism/photoprism/internal/entity/search" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/search" "github.com/photoprism/photoprism/pkg/txt" ) diff --git a/internal/api/users_sessions.go b/internal/api/users_sessions.go index 154e00ede..6e7ddb74b 100644 --- a/internal/api/users_sessions.go +++ b/internal/api/users_sessions.go @@ -8,9 +8,9 @@ import ( "github.com/photoprism/photoprism/internal/auth/acl" "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/search" "github.com/photoprism/photoprism/pkg/authn" "github.com/photoprism/photoprism/pkg/rnd" "github.com/photoprism/photoprism/pkg/sortby" diff --git a/internal/commands/find.go b/internal/commands/find.go index 6bee1cec3..c8e8b21e5 100644 --- a/internal/commands/find.go +++ b/internal/commands/find.go @@ -8,8 +8,8 @@ import ( "github.com/dustin/go-humanize" "github.com/urfave/cli" + "github.com/photoprism/photoprism/internal/entity/search" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/internal/search" "github.com/photoprism/photoprism/pkg/report" "github.com/photoprism/photoprism/pkg/sortby" ) diff --git a/internal/entity/query/albums.go b/internal/entity/query/albums.go index 89f2d0e86..7213ad3a3 100644 --- a/internal/entity/query/albums.go +++ b/internal/entity/query/albums.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/photoprism/photoprism/internal/entity" + "github.com/photoprism/photoprism/internal/entity/search" "github.com/photoprism/photoprism/internal/form" "github.com/photoprism/photoprism/internal/mutex" - "github.com/photoprism/photoprism/internal/search" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/media" diff --git a/internal/search/accounts.go b/internal/entity/search/accounts.go similarity index 100% rename from internal/search/accounts.go rename to internal/entity/search/accounts.go diff --git a/internal/search/accounts_test.go b/internal/entity/search/accounts_test.go similarity index 100% rename from internal/search/accounts_test.go rename to internal/entity/search/accounts_test.go diff --git a/internal/search/albums.go b/internal/entity/search/albums.go similarity index 100% rename from internal/search/albums.go rename to internal/entity/search/albums.go diff --git a/internal/search/albums_photos.go b/internal/entity/search/albums_photos.go similarity index 100% rename from internal/search/albums_photos.go rename to internal/entity/search/albums_photos.go diff --git a/internal/search/albums_results.go b/internal/entity/search/albums_results.go similarity index 100% rename from internal/search/albums_results.go rename to internal/entity/search/albums_results.go diff --git a/internal/search/albums_test.go b/internal/entity/search/albums_test.go similarity index 100% rename from internal/search/albums_test.go rename to internal/entity/search/albums_test.go diff --git a/internal/search/conditions.go b/internal/entity/search/conditions.go similarity index 100% rename from internal/search/conditions.go rename to internal/entity/search/conditions.go diff --git a/internal/search/conditions_test.go b/internal/entity/search/conditions_test.go similarity index 100% rename from internal/search/conditions_test.go rename to internal/entity/search/conditions_test.go diff --git a/internal/search/errors.go b/internal/entity/search/errors.go similarity index 100% rename from internal/search/errors.go rename to internal/entity/search/errors.go diff --git a/internal/search/faces.go b/internal/entity/search/faces.go similarity index 100% rename from internal/search/faces.go rename to internal/entity/search/faces.go diff --git a/internal/search/faces_results.go b/internal/entity/search/faces_results.go similarity index 100% rename from internal/search/faces_results.go rename to internal/entity/search/faces_results.go diff --git a/internal/search/faces_test.go b/internal/entity/search/faces_test.go similarity index 100% rename from internal/search/faces_test.go rename to internal/entity/search/faces_test.go diff --git a/internal/search/labels.go b/internal/entity/search/labels.go similarity index 100% rename from internal/search/labels.go rename to internal/entity/search/labels.go diff --git a/internal/search/labels_results.go b/internal/entity/search/labels_results.go similarity index 100% rename from internal/search/labels_results.go rename to internal/entity/search/labels_results.go diff --git a/internal/search/labels_test.go b/internal/entity/search/labels_test.go similarity index 100% rename from internal/search/labels_test.go rename to internal/entity/search/labels_test.go diff --git a/internal/search/photos.go b/internal/entity/search/photos.go similarity index 100% rename from internal/search/photos.go rename to internal/entity/search/photos.go diff --git a/internal/search/photos_filter_album_test.go b/internal/entity/search/photos_filter_album_test.go similarity index 100% rename from internal/search/photos_filter_album_test.go rename to internal/entity/search/photos_filter_album_test.go diff --git a/internal/search/photos_filter_albums_test.go b/internal/entity/search/photos_filter_albums_test.go similarity index 100% rename from internal/search/photos_filter_albums_test.go rename to internal/entity/search/photos_filter_albums_test.go diff --git a/internal/search/photos_filter_alt_test.go b/internal/entity/search/photos_filter_alt_test.go similarity index 100% rename from internal/search/photos_filter_alt_test.go rename to internal/entity/search/photos_filter_alt_test.go diff --git a/internal/search/photos_filter_animated_test.go b/internal/entity/search/photos_filter_animated_test.go similarity index 100% rename from internal/search/photos_filter_animated_test.go rename to internal/entity/search/photos_filter_animated_test.go diff --git a/internal/search/photos_filter_archived_test.go b/internal/entity/search/photos_filter_archived_test.go similarity index 100% rename from internal/search/photos_filter_archived_test.go rename to internal/entity/search/photos_filter_archived_test.go diff --git a/internal/search/photos_filter_camera_test.go b/internal/entity/search/photos_filter_camera_test.go similarity index 100% rename from internal/search/photos_filter_camera_test.go rename to internal/entity/search/photos_filter_camera_test.go diff --git a/internal/search/photos_filter_category_test.go b/internal/entity/search/photos_filter_category_test.go similarity index 100% rename from internal/search/photos_filter_category_test.go rename to internal/entity/search/photos_filter_category_test.go diff --git a/internal/search/photos_filter_city_test.go b/internal/entity/search/photos_filter_city_test.go similarity index 100% rename from internal/search/photos_filter_city_test.go rename to internal/entity/search/photos_filter_city_test.go diff --git a/internal/search/photos_filter_color_test.go b/internal/entity/search/photos_filter_color_test.go similarity index 100% rename from internal/search/photos_filter_color_test.go rename to internal/entity/search/photos_filter_color_test.go diff --git a/internal/search/photos_filter_country_test.go b/internal/entity/search/photos_filter_country_test.go similarity index 100% rename from internal/search/photos_filter_country_test.go rename to internal/entity/search/photos_filter_country_test.go diff --git a/internal/search/photos_filter_day_test.go b/internal/entity/search/photos_filter_day_test.go similarity index 100% rename from internal/search/photos_filter_day_test.go rename to internal/entity/search/photos_filter_day_test.go diff --git a/internal/search/photos_filter_error_test.go b/internal/entity/search/photos_filter_error_test.go similarity index 100% rename from internal/search/photos_filter_error_test.go rename to internal/entity/search/photos_filter_error_test.go diff --git a/internal/search/photos_filter_f_number_test.go b/internal/entity/search/photos_filter_f_number_test.go similarity index 100% rename from internal/search/photos_filter_f_number_test.go rename to internal/entity/search/photos_filter_f_number_test.go diff --git a/internal/search/photos_filter_face_test.go b/internal/entity/search/photos_filter_face_test.go similarity index 100% rename from internal/search/photos_filter_face_test.go rename to internal/entity/search/photos_filter_face_test.go diff --git a/internal/search/photos_filter_faces_test.go b/internal/entity/search/photos_filter_faces_test.go similarity index 100% rename from internal/search/photos_filter_faces_test.go rename to internal/entity/search/photos_filter_faces_test.go diff --git a/internal/search/photos_filter_favorite_test.go b/internal/entity/search/photos_filter_favorite_test.go similarity index 100% rename from internal/search/photos_filter_favorite_test.go rename to internal/entity/search/photos_filter_favorite_test.go diff --git a/internal/search/photos_filter_filename_test.go b/internal/entity/search/photos_filter_filename_test.go similarity index 100% rename from internal/search/photos_filter_filename_test.go rename to internal/entity/search/photos_filter_filename_test.go diff --git a/internal/search/photos_filter_filter_test.go b/internal/entity/search/photos_filter_filter_test.go similarity index 100% rename from internal/search/photos_filter_filter_test.go rename to internal/entity/search/photos_filter_filter_test.go diff --git a/internal/search/photos_filter_focal_length_test.go b/internal/entity/search/photos_filter_focal_length_test.go similarity index 100% rename from internal/search/photos_filter_focal_length_test.go rename to internal/entity/search/photos_filter_focal_length_test.go diff --git a/internal/search/photos_filter_folder_test.go b/internal/entity/search/photos_filter_folder_test.go similarity index 100% rename from internal/search/photos_filter_folder_test.go rename to internal/entity/search/photos_filter_folder_test.go diff --git a/internal/search/photos_filter_geo_test.go b/internal/entity/search/photos_filter_geo_test.go similarity index 100% rename from internal/search/photos_filter_geo_test.go rename to internal/entity/search/photos_filter_geo_test.go diff --git a/internal/search/photos_filter_hash_test.go b/internal/entity/search/photos_filter_hash_test.go similarity index 100% rename from internal/search/photos_filter_hash_test.go rename to internal/entity/search/photos_filter_hash_test.go diff --git a/internal/search/photos_filter_hidden_test.go b/internal/entity/search/photos_filter_hidden_test.go similarity index 100% rename from internal/search/photos_filter_hidden_test.go rename to internal/entity/search/photos_filter_hidden_test.go diff --git a/internal/search/photos_filter_id_test.go b/internal/entity/search/photos_filter_id_test.go similarity index 100% rename from internal/search/photos_filter_id_test.go rename to internal/entity/search/photos_filter_id_test.go diff --git a/internal/search/photos_filter_iso_test.go b/internal/entity/search/photos_filter_iso_test.go similarity index 100% rename from internal/search/photos_filter_iso_test.go rename to internal/entity/search/photos_filter_iso_test.go diff --git a/internal/search/photos_filter_keywords_test.go b/internal/entity/search/photos_filter_keywords_test.go similarity index 100% rename from internal/search/photos_filter_keywords_test.go rename to internal/entity/search/photos_filter_keywords_test.go diff --git a/internal/search/photos_filter_label_test.go b/internal/entity/search/photos_filter_label_test.go similarity index 100% rename from internal/search/photos_filter_label_test.go rename to internal/entity/search/photos_filter_label_test.go diff --git a/internal/search/photos_filter_landscape_test.go b/internal/entity/search/photos_filter_landscape_test.go similarity index 100% rename from internal/search/photos_filter_landscape_test.go rename to internal/entity/search/photos_filter_landscape_test.go diff --git a/internal/search/photos_filter_lens_test.go b/internal/entity/search/photos_filter_lens_test.go similarity index 100% rename from internal/search/photos_filter_lens_test.go rename to internal/entity/search/photos_filter_lens_test.go diff --git a/internal/search/photos_filter_live_test.go b/internal/entity/search/photos_filter_live_test.go similarity index 100% rename from internal/search/photos_filter_live_test.go rename to internal/entity/search/photos_filter_live_test.go diff --git a/internal/search/photos_filter_mono_test.go b/internal/entity/search/photos_filter_mono_test.go similarity index 100% rename from internal/search/photos_filter_mono_test.go rename to internal/entity/search/photos_filter_mono_test.go diff --git a/internal/search/photos_filter_month_test.go b/internal/entity/search/photos_filter_month_test.go similarity index 100% rename from internal/search/photos_filter_month_test.go rename to internal/entity/search/photos_filter_month_test.go diff --git a/internal/search/photos_filter_name_test.go b/internal/entity/search/photos_filter_name_test.go similarity index 100% rename from internal/search/photos_filter_name_test.go rename to internal/entity/search/photos_filter_name_test.go diff --git a/internal/search/photos_filter_panorama_test.go b/internal/entity/search/photos_filter_panorama_test.go similarity index 100% rename from internal/search/photos_filter_panorama_test.go rename to internal/entity/search/photos_filter_panorama_test.go diff --git a/internal/search/photos_filter_path_test.go b/internal/entity/search/photos_filter_path_test.go similarity index 100% rename from internal/search/photos_filter_path_test.go rename to internal/entity/search/photos_filter_path_test.go diff --git a/internal/search/photos_filter_people_test.go b/internal/entity/search/photos_filter_people_test.go similarity index 100% rename from internal/search/photos_filter_people_test.go rename to internal/entity/search/photos_filter_people_test.go diff --git a/internal/search/photos_filter_person_test.go b/internal/entity/search/photos_filter_person_test.go similarity index 100% rename from internal/search/photos_filter_person_test.go rename to internal/entity/search/photos_filter_person_test.go diff --git a/internal/search/photos_filter_photo_test.go b/internal/entity/search/photos_filter_photo_test.go similarity index 100% rename from internal/search/photos_filter_photo_test.go rename to internal/entity/search/photos_filter_photo_test.go diff --git a/internal/search/photos_filter_portrait_test.go b/internal/entity/search/photos_filter_portrait_test.go similarity index 100% rename from internal/search/photos_filter_portrait_test.go rename to internal/entity/search/photos_filter_portrait_test.go diff --git a/internal/search/photos_filter_primary_test.go b/internal/entity/search/photos_filter_primary_test.go similarity index 100% rename from internal/search/photos_filter_primary_test.go rename to internal/entity/search/photos_filter_primary_test.go diff --git a/internal/search/photos_filter_private_test.go b/internal/entity/search/photos_filter_private_test.go similarity index 100% rename from internal/search/photos_filter_private_test.go rename to internal/entity/search/photos_filter_private_test.go diff --git a/internal/search/photos_filter_public_test.go b/internal/entity/search/photos_filter_public_test.go similarity index 100% rename from internal/search/photos_filter_public_test.go rename to internal/entity/search/photos_filter_public_test.go diff --git a/internal/search/photos_filter_raw_test.go b/internal/entity/search/photos_filter_raw_test.go similarity index 100% rename from internal/search/photos_filter_raw_test.go rename to internal/entity/search/photos_filter_raw_test.go diff --git a/internal/search/photos_filter_resolution_test.go b/internal/entity/search/photos_filter_resolution_test.go similarity index 100% rename from internal/search/photos_filter_resolution_test.go rename to internal/entity/search/photos_filter_resolution_test.go diff --git a/internal/search/photos_filter_review_test.go b/internal/entity/search/photos_filter_review_test.go similarity index 100% rename from internal/search/photos_filter_review_test.go rename to internal/entity/search/photos_filter_review_test.go diff --git a/internal/search/photos_filter_scan_test.go b/internal/entity/search/photos_filter_scan_test.go similarity index 100% rename from internal/search/photos_filter_scan_test.go rename to internal/entity/search/photos_filter_scan_test.go diff --git a/internal/search/photos_filter_square_test.go b/internal/entity/search/photos_filter_square_test.go similarity index 100% rename from internal/search/photos_filter_square_test.go rename to internal/entity/search/photos_filter_square_test.go diff --git a/internal/search/photos_filter_stack_test.go b/internal/entity/search/photos_filter_stack_test.go similarity index 100% rename from internal/search/photos_filter_stack_test.go rename to internal/entity/search/photos_filter_stack_test.go diff --git a/internal/search/photos_filter_stackable_test.go b/internal/entity/search/photos_filter_stackable_test.go similarity index 100% rename from internal/search/photos_filter_stackable_test.go rename to internal/entity/search/photos_filter_stackable_test.go diff --git a/internal/search/photos_filter_state_test.go b/internal/entity/search/photos_filter_state_test.go similarity index 100% rename from internal/search/photos_filter_state_test.go rename to internal/entity/search/photos_filter_state_test.go diff --git a/internal/search/photos_filter_subject_test.go b/internal/entity/search/photos_filter_subject_test.go similarity index 100% rename from internal/search/photos_filter_subject_test.go rename to internal/entity/search/photos_filter_subject_test.go diff --git a/internal/search/photos_filter_subjects_test.go b/internal/entity/search/photos_filter_subjects_test.go similarity index 100% rename from internal/search/photos_filter_subjects_test.go rename to internal/entity/search/photos_filter_subjects_test.go diff --git a/internal/search/photos_filter_time_test.go b/internal/entity/search/photos_filter_time_test.go similarity index 100% rename from internal/search/photos_filter_time_test.go rename to internal/entity/search/photos_filter_time_test.go diff --git a/internal/search/photos_filter_title_test.go b/internal/entity/search/photos_filter_title_test.go similarity index 100% rename from internal/search/photos_filter_title_test.go rename to internal/entity/search/photos_filter_title_test.go diff --git a/internal/search/photos_filter_type_test.go b/internal/entity/search/photos_filter_type_test.go similarity index 100% rename from internal/search/photos_filter_type_test.go rename to internal/entity/search/photos_filter_type_test.go diff --git a/internal/search/photos_filter_uid_test.go b/internal/entity/search/photos_filter_uid_test.go similarity index 100% rename from internal/search/photos_filter_uid_test.go rename to internal/entity/search/photos_filter_uid_test.go diff --git a/internal/search/photos_filter_unsorted_test.go b/internal/entity/search/photos_filter_unsorted_test.go similarity index 100% rename from internal/search/photos_filter_unsorted_test.go rename to internal/entity/search/photos_filter_unsorted_test.go diff --git a/internal/search/photos_filter_unstacked_test.go b/internal/entity/search/photos_filter_unstacked_test.go similarity index 100% rename from internal/search/photos_filter_unstacked_test.go rename to internal/entity/search/photos_filter_unstacked_test.go diff --git a/internal/search/photos_filter_vector_test.go b/internal/entity/search/photos_filter_vector_test.go similarity index 100% rename from internal/search/photos_filter_vector_test.go rename to internal/entity/search/photos_filter_vector_test.go diff --git a/internal/search/photos_filter_video_test.go b/internal/entity/search/photos_filter_video_test.go similarity index 100% rename from internal/search/photos_filter_video_test.go rename to internal/entity/search/photos_filter_video_test.go diff --git a/internal/search/photos_filter_year_test.go b/internal/entity/search/photos_filter_year_test.go similarity index 100% rename from internal/search/photos_filter_year_test.go rename to internal/entity/search/photos_filter_year_test.go diff --git a/internal/search/photos_geo.go b/internal/entity/search/photos_geo.go similarity index 100% rename from internal/search/photos_geo.go rename to internal/entity/search/photos_geo.go diff --git a/internal/search/photos_geo_filter_albums_test.go b/internal/entity/search/photos_geo_filter_albums_test.go similarity index 100% rename from internal/search/photos_geo_filter_albums_test.go rename to internal/entity/search/photos_geo_filter_albums_test.go diff --git a/internal/search/photos_geo_filter_favorite_test.go b/internal/entity/search/photos_geo_filter_favorite_test.go similarity index 100% rename from internal/search/photos_geo_filter_favorite_test.go rename to internal/entity/search/photos_geo_filter_favorite_test.go diff --git a/internal/search/photos_geo_filter_near_test.go b/internal/entity/search/photos_geo_filter_near_test.go similarity index 100% rename from internal/search/photos_geo_filter_near_test.go rename to internal/entity/search/photos_geo_filter_near_test.go diff --git a/internal/search/photos_geo_filter_s2_test.go b/internal/entity/search/photos_geo_filter_s2_test.go similarity index 100% rename from internal/search/photos_geo_filter_s2_test.go rename to internal/entity/search/photos_geo_filter_s2_test.go diff --git a/internal/search/photos_geo_filter_time_test.go b/internal/entity/search/photos_geo_filter_time_test.go similarity index 100% rename from internal/search/photos_geo_filter_time_test.go rename to internal/entity/search/photos_geo_filter_time_test.go diff --git a/internal/search/photos_geo_test.go b/internal/entity/search/photos_geo_test.go similarity index 100% rename from internal/search/photos_geo_test.go rename to internal/entity/search/photos_geo_test.go diff --git a/internal/search/photos_geojson_result.go b/internal/entity/search/photos_geojson_result.go similarity index 100% rename from internal/search/photos_geojson_result.go rename to internal/entity/search/photos_geojson_result.go diff --git a/internal/search/photos_geojson_result_test.go b/internal/entity/search/photos_geojson_result_test.go similarity index 100% rename from internal/search/photos_geojson_result_test.go rename to internal/entity/search/photos_geojson_result_test.go diff --git a/internal/search/photos_results.go b/internal/entity/search/photos_results.go similarity index 100% rename from internal/search/photos_results.go rename to internal/entity/search/photos_results.go diff --git a/internal/search/photos_results_test.go b/internal/entity/search/photos_results_test.go similarity index 100% rename from internal/search/photos_results_test.go rename to internal/entity/search/photos_results_test.go diff --git a/internal/search/photos_test.go b/internal/entity/search/photos_test.go similarity index 100% rename from internal/search/photos_test.go rename to internal/entity/search/photos_test.go diff --git a/internal/search/photos_viewer.go b/internal/entity/search/photos_viewer.go similarity index 100% rename from internal/search/photos_viewer.go rename to internal/entity/search/photos_viewer.go diff --git a/internal/search/photos_viewer_test.go b/internal/entity/search/photos_viewer_test.go similarity index 100% rename from internal/search/photos_viewer_test.go rename to internal/entity/search/photos_viewer_test.go diff --git a/internal/search/search.go b/internal/entity/search/search.go similarity index 100% rename from internal/search/search.go rename to internal/entity/search/search.go diff --git a/internal/search/search_test.go b/internal/entity/search/search_test.go similarity index 100% rename from internal/search/search_test.go rename to internal/entity/search/search_test.go diff --git a/internal/search/select.go b/internal/entity/search/select.go similarity index 100% rename from internal/search/select.go rename to internal/entity/search/select.go diff --git a/internal/search/select_test.go b/internal/entity/search/select_test.go similarity index 100% rename from internal/search/select_test.go rename to internal/entity/search/select_test.go diff --git a/internal/search/sessions.go b/internal/entity/search/sessions.go similarity index 100% rename from internal/search/sessions.go rename to internal/entity/search/sessions.go diff --git a/internal/search/sessions_test.go b/internal/entity/search/sessions_test.go similarity index 100% rename from internal/search/sessions_test.go rename to internal/entity/search/sessions_test.go diff --git a/internal/search/subjects.go b/internal/entity/search/subjects.go similarity index 100% rename from internal/search/subjects.go rename to internal/entity/search/subjects.go diff --git a/internal/search/subjects_results.go b/internal/entity/search/subjects_results.go similarity index 100% rename from internal/search/subjects_results.go rename to internal/entity/search/subjects_results.go diff --git a/internal/search/subjects_test.go b/internal/entity/search/subjects_test.go similarity index 100% rename from internal/search/subjects_test.go rename to internal/entity/search/subjects_test.go diff --git a/internal/search/users.go b/internal/entity/search/users.go similarity index 100% rename from internal/search/users.go rename to internal/entity/search/users.go diff --git a/internal/search/users_test.go b/internal/entity/search/users_test.go similarity index 100% rename from internal/search/users_test.go rename to internal/entity/search/users_test.go diff --git a/internal/workers/share.go b/internal/workers/share.go index e3a171505..c2ccb83aa 100644 --- a/internal/workers/share.go +++ b/internal/workers/share.go @@ -8,12 +8,12 @@ import ( "github.com/photoprism/photoprism/internal/config" "github.com/photoprism/photoprism/internal/entity" "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/mutex" "github.com/photoprism/photoprism/internal/photoprism" "github.com/photoprism/photoprism/internal/remote" "github.com/photoprism/photoprism/internal/remote/webdav" - "github.com/photoprism/photoprism/internal/search" "github.com/photoprism/photoprism/internal/thumb" "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/fs" diff --git a/internal/workers/sync.go b/internal/workers/sync.go index b90ddfe47..fc7cd0ae6 100644 --- a/internal/workers/sync.go +++ b/internal/workers/sync.go @@ -7,11 +7,11 @@ import ( "github.com/photoprism/photoprism/internal/config" "github.com/photoprism/photoprism/internal/entity" + "github.com/photoprism/photoprism/internal/entity/search" "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" "github.com/photoprism/photoprism/internal/mutex" "github.com/photoprism/photoprism/internal/remote" - "github.com/photoprism/photoprism/internal/search" ) // Sync represents a sync worker.