apps/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-10-09 10:40:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Backend: Move search package to /internal/entity/search

Browse Source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer
2024-07-02 07:39:39 +02:00
parent 7f60af3e3f
commit 43b2b39b51
119 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/albums.go
View File

@@ -10,10 +10,10 @@ import (
"github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/auth/acl"
"github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/entity"
"github.com/photoprism/photoprism/internal/entity/query" "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/event"
"github.com/photoprism/photoprism/internal/form" "github.com/photoprism/photoprism/internal/form"
"github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/get"
"github.com/photoprism/photoprism/internal/search"
"github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/clean"
"github.com/photoprism/photoprism/pkg/fs" "github.com/photoprism/photoprism/pkg/fs"
"github.com/photoprism/photoprism/pkg/i18n" "github.com/photoprism/photoprism/pkg/i18n"

2
internal/api/albums_search.go
View File

@@ -7,10 +7,10 @@ import (
"github.com/gin-gonic/gin/binding" "github.com/gin-gonic/gin/binding"
"github.com/photoprism/photoprism/internal/auth/acl" "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/event"
"github.com/photoprism/photoprism/internal/form" "github.com/photoprism/photoprism/internal/form"
"github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/get"
"github.com/photoprism/photoprism/internal/search"
"github.com/photoprism/photoprism/pkg/txt" "github.com/photoprism/photoprism/pkg/txt"
) )

2
internal/api/api_event.go
View File

@@ -3,9 +3,9 @@ package api
import ( import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/photoprism/photoprism/internal/entity/search"
"github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/event"
"github.com/photoprism/photoprism/internal/form" "github.com/photoprism/photoprism/internal/form"
"github.com/photoprism/photoprism/internal/search"
) )
// Event represents an api event type. // Event represents an api event type.

2
internal/api/download_album.go
View File

@@ -9,9 +9,9 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/photoprism/photoprism/internal/entity/query" "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/get"
"github.com/photoprism/photoprism/internal/photoprism" "github.com/photoprism/photoprism/internal/photoprism"
"github.com/photoprism/photoprism/internal/search"
"github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/clean"
"github.com/photoprism/photoprism/pkg/fs" "github.com/photoprism/photoprism/pkg/fs"
"github.com/photoprism/photoprism/pkg/i18n" "github.com/photoprism/photoprism/pkg/i18n"

2
internal/api/faces.go
View File

@@ -7,9 +7,9 @@ import (
"github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/auth/acl"
"github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/entity"
"github.com/photoprism/photoprism/internal/entity/search"
"github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/event"
"github.com/photoprism/photoprism/internal/form" "github.com/photoprism/photoprism/internal/form"
"github.com/photoprism/photoprism/internal/search"
"github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/clean"
"github.com/photoprism/photoprism/pkg/i18n" "github.com/photoprism/photoprism/pkg/i18n"
"github.com/photoprism/photoprism/pkg/txt" "github.com/photoprism/photoprism/pkg/txt"

2
internal/api/faces_search.go
View File

@@ -7,8 +7,8 @@ import (
"github.com/gin-gonic/gin/binding" "github.com/gin-gonic/gin/binding"
"github.com/photoprism/photoprism/internal/auth/acl" "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/form"
"github.com/photoprism/photoprism/internal/search"
"github.com/photoprism/photoprism/pkg/txt" "github.com/photoprism/photoprism/pkg/txt"
) )

2
internal/api/labels_search.go
View File

@@ -7,8 +7,8 @@ import (
"github.com/gin-gonic/gin/binding" "github.com/gin-gonic/gin/binding"
"github.com/photoprism/photoprism/internal/auth/acl" "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/form"
"github.com/photoprism/photoprism/internal/search"
"github.com/photoprism/photoprism/pkg/txt" "github.com/photoprism/photoprism/pkg/txt"
) )

2
internal/api/photos_search.go
View File

@@ -8,10 +8,10 @@ import (
"github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/auth/acl"
"github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/entity"
"github.com/photoprism/photoprism/internal/entity/search"
"github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/event"
"github.com/photoprism/photoprism/internal/form" "github.com/photoprism/photoprism/internal/form"
"github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/get"
"github.com/photoprism/photoprism/internal/search"
"github.com/photoprism/photoprism/pkg/i18n" "github.com/photoprism/photoprism/pkg/i18n"
) )

2
internal/api/photos_search_geo.go
View File

@@ -7,10 +7,10 @@ import (
"github.com/gin-gonic/gin/binding" "github.com/gin-gonic/gin/binding"
"github.com/photoprism/photoprism/internal/auth/acl" "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/event"
"github.com/photoprism/photoprism/internal/form" "github.com/photoprism/photoprism/internal/form"
"github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/get"
"github.com/photoprism/photoprism/internal/search"
"github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/clean"
"github.com/photoprism/photoprism/pkg/header" "github.com/photoprism/photoprism/pkg/header"
"github.com/photoprism/photoprism/pkg/txt" "github.com/photoprism/photoprism/pkg/txt"

2
internal/api/services_search.go
View File

@@ -8,9 +8,9 @@ import (
"github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/auth/acl"
"github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/entity"
"github.com/photoprism/photoprism/internal/entity/search"
"github.com/photoprism/photoprism/internal/form" "github.com/photoprism/photoprism/internal/form"
"github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/get"
"github.com/photoprism/photoprism/internal/search"
) )
// SearchServices finds account settings and returns them as JSON. // SearchServices finds account settings and returns them as JSON.

2
internal/api/share_preview.go
View File

@@ -13,11 +13,11 @@ import (
"github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/entity"
"github.com/photoprism/photoprism/internal/entity/query" "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/form"
"github.com/photoprism/photoprism/internal/frame" "github.com/photoprism/photoprism/internal/frame"
"github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/get"
"github.com/photoprism/photoprism/internal/photoprism" "github.com/photoprism/photoprism/internal/photoprism"
"github.com/photoprism/photoprism/internal/search"
"github.com/photoprism/photoprism/internal/thumb" "github.com/photoprism/photoprism/internal/thumb"
"github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/clean"
"github.com/photoprism/photoprism/pkg/fs" "github.com/photoprism/photoprism/pkg/fs"

2
internal/api/subjects_search.go
View File

@@ -7,8 +7,8 @@ import (
"github.com/gin-gonic/gin/binding" "github.com/gin-gonic/gin/binding"
"github.com/photoprism/photoprism/internal/auth/acl" "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/form"
"github.com/photoprism/photoprism/internal/search"
"github.com/photoprism/photoprism/pkg/txt" "github.com/photoprism/photoprism/pkg/txt"
) )

2
internal/api/users_sessions.go
View File

@@ -8,9 +8,9 @@ import (
"github.com/photoprism/photoprism/internal/auth/acl" "github.com/photoprism/photoprism/internal/auth/acl"
"github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/entity"
"github.com/photoprism/photoprism/internal/entity/search"
"github.com/photoprism/photoprism/internal/form" "github.com/photoprism/photoprism/internal/form"
"github.com/photoprism/photoprism/internal/get" "github.com/photoprism/photoprism/internal/get"
"github.com/photoprism/photoprism/internal/search"
"github.com/photoprism/photoprism/pkg/authn" "github.com/photoprism/photoprism/pkg/authn"
"github.com/photoprism/photoprism/pkg/rnd" "github.com/photoprism/photoprism/pkg/rnd"
"github.com/photoprism/photoprism/pkg/sortby" "github.com/photoprism/photoprism/pkg/sortby"

2
internal/commands/find.go
View File

@@ -8,8 +8,8 @@ import (
"github.com/dustin/go-humanize" "github.com/dustin/go-humanize"
"github.com/urfave/cli" "github.com/urfave/cli"
"github.com/photoprism/photoprism/internal/entity/search"
"github.com/photoprism/photoprism/internal/form" "github.com/photoprism/photoprism/internal/form"
"github.com/photoprism/photoprism/internal/search"
"github.com/photoprism/photoprism/pkg/report" "github.com/photoprism/photoprism/pkg/report"
"github.com/photoprism/photoprism/pkg/sortby" "github.com/photoprism/photoprism/pkg/sortby"
) )

2
internal/entity/query/albums.go
View File

@@ -4,9 +4,9 @@ import (
"fmt" "fmt"
"github.com/photoprism/photoprism/internal/entity" "github.com/photoprism/photoprism/internal/entity"
"github.com/photoprism/photoprism/internal/entity/search"
"github.com/photoprism/photoprism/internal/form" "github.com/photoprism/photoprism/internal/form"
"github.com/photoprism/photoprism/internal/mutex" "github.com/photoprism/photoprism/internal/mutex"
"github.com/photoprism/photoprism/internal/search"
"github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/clean"
"github.com/photoprism/photoprism/pkg/media" "github.com/photoprism/photoprism/pkg/media"

0
internal/search/accounts.go → internal/entity/search/accounts.go
View File

0
internal/search/accounts_test.go → internal/entity/search/accounts_test.go
View File

0
internal/search/albums.go → internal/entity/search/albums.go
View File

0
internal/search/albums_photos.go → internal/entity/search/albums_photos.go
View File

0
internal/search/albums_results.go → internal/entity/search/albums_results.go
View File

0
internal/search/albums_test.go → internal/entity/search/albums_test.go
View File

0
internal/search/conditions.go → internal/entity/search/conditions.go
View File

0
internal/search/conditions_test.go → internal/entity/search/conditions_test.go
View File

0
internal/search/errors.go → internal/entity/search/errors.go
View File

0
internal/search/faces.go → internal/entity/search/faces.go
View File

0
internal/search/faces_results.go → internal/entity/search/faces_results.go
View File

0
internal/search/faces_test.go → internal/entity/search/faces_test.go
View File

0
internal/search/labels.go → internal/entity/search/labels.go
View File

0
internal/search/labels_results.go → internal/entity/search/labels_results.go
View File

0
internal/search/labels_test.go → internal/entity/search/labels_test.go
View File

0
internal/search/photos.go → internal/entity/search/photos.go
View File

0
internal/search/photos_filter_album_test.go → internal/entity/search/photos_filter_album_test.go
View File

0
internal/search/photos_filter_albums_test.go → internal/entity/search/photos_filter_albums_test.go
View File

0
internal/search/photos_filter_alt_test.go → internal/entity/search/photos_filter_alt_test.go
View File

0
internal/search/photos_filter_animated_test.go → internal/entity/search/photos_filter_animated_test.go
View File

0
internal/search/photos_filter_archived_test.go → internal/entity/search/photos_filter_archived_test.go
View File

0
internal/search/photos_filter_camera_test.go → internal/entity/search/photos_filter_camera_test.go
View File

0
internal/search/photos_filter_category_test.go → internal/entity/search/photos_filter_category_test.go
View File

0
internal/search/photos_filter_city_test.go → internal/entity/search/photos_filter_city_test.go
View File

0
internal/search/photos_filter_color_test.go → internal/entity/search/photos_filter_color_test.go
View File

0
internal/search/photos_filter_country_test.go → internal/entity/search/photos_filter_country_test.go
View File

0
internal/search/photos_filter_day_test.go → internal/entity/search/photos_filter_day_test.go
View File

0
internal/search/photos_filter_error_test.go → internal/entity/search/photos_filter_error_test.go
View File

0
internal/search/photos_filter_f_number_test.go → internal/entity/search/photos_filter_f_number_test.go
View File

0
internal/search/photos_filter_face_test.go → internal/entity/search/photos_filter_face_test.go
View File

0
internal/search/photos_filter_faces_test.go → internal/entity/search/photos_filter_faces_test.go
View File

0
internal/search/photos_filter_favorite_test.go → internal/entity/search/photos_filter_favorite_test.go
View File

0
internal/search/photos_filter_filename_test.go → internal/entity/search/photos_filter_filename_test.go
View File

0
internal/search/photos_filter_filter_test.go → internal/entity/search/photos_filter_filter_test.go
View File

0
internal/search/photos_filter_focal_length_test.go → internal/entity/search/photos_filter_focal_length_test.go
View File

0
internal/search/photos_filter_folder_test.go → internal/entity/search/photos_filter_folder_test.go
View File

0
internal/search/photos_filter_geo_test.go → internal/entity/search/photos_filter_geo_test.go
View File

0
internal/search/photos_filter_hash_test.go → internal/entity/search/photos_filter_hash_test.go
View File

0
internal/search/photos_filter_hidden_test.go → internal/entity/search/photos_filter_hidden_test.go
View File

0
internal/search/photos_filter_id_test.go → internal/entity/search/photos_filter_id_test.go
View File

0
internal/search/photos_filter_iso_test.go → internal/entity/search/photos_filter_iso_test.go
View File

0
internal/search/photos_filter_keywords_test.go → internal/entity/search/photos_filter_keywords_test.go
View File

0
internal/search/photos_filter_label_test.go → internal/entity/search/photos_filter_label_test.go
View File

0
internal/search/photos_filter_landscape_test.go → internal/entity/search/photos_filter_landscape_test.go
View File

0
internal/search/photos_filter_lens_test.go → internal/entity/search/photos_filter_lens_test.go
View File

0
internal/search/photos_filter_live_test.go → internal/entity/search/photos_filter_live_test.go
View File

0
internal/search/photos_filter_mono_test.go → internal/entity/search/photos_filter_mono_test.go
View File

0
internal/search/photos_filter_month_test.go → internal/entity/search/photos_filter_month_test.go
View File

0
internal/search/photos_filter_name_test.go → internal/entity/search/photos_filter_name_test.go
View File

0
internal/search/photos_filter_panorama_test.go → internal/entity/search/photos_filter_panorama_test.go
View File

0
internal/search/photos_filter_path_test.go → internal/entity/search/photos_filter_path_test.go
View File

0
internal/search/photos_filter_people_test.go → internal/entity/search/photos_filter_people_test.go
View File

0
internal/search/photos_filter_person_test.go → internal/entity/search/photos_filter_person_test.go
View File

0
internal/search/photos_filter_photo_test.go → internal/entity/search/photos_filter_photo_test.go
View File

0
internal/search/photos_filter_portrait_test.go → internal/entity/search/photos_filter_portrait_test.go
View File

0
internal/search/photos_filter_primary_test.go → internal/entity/search/photos_filter_primary_test.go
View File

0
internal/search/photos_filter_private_test.go → internal/entity/search/photos_filter_private_test.go
View File

0
internal/search/photos_filter_public_test.go → internal/entity/search/photos_filter_public_test.go
View File

0
internal/search/photos_filter_raw_test.go → internal/entity/search/photos_filter_raw_test.go
View File

0
internal/search/photos_filter_resolution_test.go → internal/entity/search/photos_filter_resolution_test.go
View File

0
internal/search/photos_filter_review_test.go → internal/entity/search/photos_filter_review_test.go
View File

0
internal/search/photos_filter_scan_test.go → internal/entity/search/photos_filter_scan_test.go
View File

0
internal/search/photos_filter_square_test.go → internal/entity/search/photos_filter_square_test.go
View File

0
internal/search/photos_filter_stack_test.go → internal/entity/search/photos_filter_stack_test.go
View File

0
internal/search/photos_filter_stackable_test.go → internal/entity/search/photos_filter_stackable_test.go
View File

0
internal/search/photos_filter_state_test.go → internal/entity/search/photos_filter_state_test.go
View File

0
internal/search/photos_filter_subject_test.go → internal/entity/search/photos_filter_subject_test.go
View File

0
internal/search/photos_filter_subjects_test.go → internal/entity/search/photos_filter_subjects_test.go
View File

0
internal/search/photos_filter_time_test.go → internal/entity/search/photos_filter_time_test.go
View File

0
internal/search/photos_filter_title_test.go → internal/entity/search/photos_filter_title_test.go
View File

0
internal/search/photos_filter_type_test.go → internal/entity/search/photos_filter_type_test.go
View File

0
internal/search/photos_filter_uid_test.go → internal/entity/search/photos_filter_uid_test.go
View File

0
internal/search/photos_filter_unsorted_test.go → internal/entity/search/photos_filter_unsorted_test.go
View File

0
internal/search/photos_filter_unstacked_test.go → internal/entity/search/photos_filter_unstacked_test.go
View File

0
internal/search/photos_filter_vector_test.go → internal/entity/search/photos_filter_vector_test.go
View File

0
internal/search/photos_filter_video_test.go → internal/entity/search/photos_filter_video_test.go
View File

0
internal/search/photos_filter_year_test.go → internal/entity/search/photos_filter_year_test.go
View File

0
internal/search/photos_geo.go → internal/entity/search/photos_geo.go
View File

0
internal/search/photos_geo_filter_albums_test.go → internal/entity/search/photos_geo_filter_albums_test.go
View File

0
internal/search/photos_geo_filter_favorite_test.go → internal/entity/search/photos_geo_filter_favorite_test.go
View File

0
internal/search/photos_geo_filter_near_test.go → internal/entity/search/photos_geo_filter_near_test.go
View File

0
internal/search/photos_geo_filter_s2_test.go → internal/entity/search/photos_geo_filter_s2_test.go
View File

0
internal/search/photos_geo_filter_time_test.go → internal/entity/search/photos_geo_filter_time_test.go
View File

0
internal/search/photos_geo_test.go → internal/entity/search/photos_geo_test.go
View File

0
internal/search/photos_geojson_result.go → internal/entity/search/photos_geojson_result.go
View File

Some files were not shown because too many files have changed in this diff Show More