From 323d495840da7aedc908c6929b4d7ea6f9dac7a7 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Fri, 30 Sep 2022 00:42:19 +0200 Subject: [PATCH] Auth: Apply user rights and permissions in the search API #98 #782 Signed-off-by: Michael Mayer --- Makefile | 3 + frontend/src/app/routes.js | 6 + frontend/src/common/config.js | 29 +- frontend/src/common/session.js | 25 +- frontend/src/common/util.js | 4 + frontend/src/component/album/toolbar.vue | 2 +- frontend/src/component/label/clipboard.vue | 30 +- frontend/src/component/navigation.vue | 39 +- frontend/src/component/subject/clipboard.vue | 18 +- frontend/src/css/results.css | 4 + frontend/src/dialog/upload.vue | 11 +- frontend/src/locales/translations.pot | 283 ++++++----- frontend/src/model/user.js | 11 +- frontend/src/pages/album/photos.vue | 13 +- frontend/src/pages/albums.vue | 6 +- frontend/src/pages/auth/login.vue | 1 + frontend/src/pages/labels.vue | 43 +- frontend/src/pages/photos.vue | 3 +- frontend/src/pages/places.vue | 18 +- frontend/src/share/photos.vue | 14 +- frontend/src/share/places.vue | 456 ++++++++++++++++++ frontend/src/share/routes.js | 7 + internal/acl/grant.go | 2 +- internal/api/api_test.go | 2 +- internal/api/auth.go | 24 +- internal/api/auth_session_get.go | 8 +- internal/api/event.go | 19 +- internal/api/import.go | 91 ++-- internal/api/photos_search.go | 63 +-- internal/api/photos_search_geojson.go | 56 +-- internal/api/upload.go | 18 +- internal/auto/import.go | 4 +- internal/commands/commands.go | 5 +- internal/commands/convert.go | 2 +- internal/commands/copy.go | 22 +- internal/commands/faces.go | 2 +- internal/commands/import.go | 22 +- internal/commands/index.go | 2 +- internal/commands/migrations.go | 4 +- internal/commands/passwd.go | 3 +- internal/commands/purge.go | 1 - internal/commands/restore.go | 2 +- internal/commands/show_test.go | 1 + internal/commands/users.go | 24 +- internal/config/client_config.go | 22 +- internal/config/client_config_test.go | 2 +- internal/config/config_filepaths.go | 5 + internal/config/config_report.go | 1 + internal/config/options.go | 1 + internal/config/options_cli.go | 6 + internal/customize/acl.go | 28 +- internal/customize/acl_test.go | 2 +- internal/entity/account.go | 4 +- internal/entity/album.go | 4 +- internal/entity/album_cache.go | 2 +- internal/entity/auth_session.go | 79 ++- internal/entity/auth_session_data.go | 4 + internal/entity/auth_user.go | 40 +- internal/entity/auth_user_cli.go | 27 +- internal/entity/auth_user_settings.go | 8 +- internal/entity/auth_user_test.go | 6 + internal/entity/cell.go | 2 +- internal/entity/face.go | 2 +- internal/entity/file.go | 10 +- internal/entity/folder.go | 2 +- internal/entity/label.go | 10 +- internal/entity/link.go | 10 +- internal/entity/photo.go | 4 +- internal/form/search_photos.go | 10 +- internal/form/search_photos_geo.go | 13 +- internal/form/serialize.go | 8 +- internal/form/user.go | 12 +- internal/i18n/messages.go | 2 +- internal/photoprism/config.go | 4 +- internal/photoprism/import.go | 10 +- internal/photoprism/import_options.go | 12 +- internal/photoprism/import_options_test.go | 48 +- internal/photoprism/import_test.go | 28 +- internal/photoprism/import_worker.go | 27 +- internal/photoprism/import_worker_test.go | 6 +- internal/photoprism/index.go | 4 +- internal/photoprism/index_options.go | 2 +- internal/photoprism/index_test.go | 2 +- internal/photoprism/thumbs_test.go | 2 +- internal/search/errors.go | 15 + internal/search/photos.go | 120 ++++- internal/search/photos_filter_album_test.go | 200 -------- internal/search/photos_filter_albums_test.go | 340 ------------- .../search/photos_filter_animated_test.go | 115 ----- .../search/photos_filter_archived_test.go | 110 ----- internal/search/photos_filter_camera_test.go | 200 -------- .../search/photos_filter_category_test.go | 180 ------- internal/search/photos_filter_city_test.go | 240 --------- internal/search/photos_filter_color_test.go | 180 ------- internal/search/photos_filter_country_test.go | 230 --------- internal/search/photos_filter_day_test.go | 220 --------- internal/search/photos_filter_error_test.go | 110 ----- internal/search/photos_filter_face_test.go | 190 -------- internal/search/photos_filter_faces_test.go | 225 --------- .../search/photos_filter_favorite_test.go | 115 ----- .../search/photos_filter_filename_test.go | 355 -------------- internal/search/photos_filter_filter_test.go | 185 ------- internal/search/photos_filter_folder_test.go | 330 ------------- internal/search/photos_filter_geo_test.go | 100 ---- internal/search/photos_filter_hash_test.go | 250 ---------- internal/search/photos_filter_hidden_test.go | 110 ----- .../search/photos_filter_keywords_test.go | 370 -------------- internal/search/photos_filter_label_test.go | 280 ----------- .../search/photos_filter_landscape_test.go | 115 ----- internal/search/photos_filter_lens_test.go | 210 -------- internal/search/photos_filter_live_test.go | 110 ----- internal/search/photos_filter_mono_test.go | 110 ----- internal/search/photos_filter_month_test.go | 220 --------- internal/search/photos_filter_name_test.go | 355 -------------- .../search/photos_filter_panorama_test.go | 110 ----- internal/search/photos_filter_path_test.go | 320 ------------ internal/search/photos_filter_people_test.go | 260 ---------- internal/search/photos_filter_person_test.go | 260 ---------- internal/search/photos_filter_photo_test.go | 110 ----- .../search/photos_filter_portrait_test.go | 125 ----- internal/search/photos_filter_primary_test.go | 110 ----- internal/search/photos_filter_private_test.go | 110 ----- internal/search/photos_filter_public_test.go | 110 ----- internal/search/photos_filter_raw_test.go | 115 ----- internal/search/photos_filter_review_test.go | 110 ----- internal/search/photos_filter_scan_test.go | 110 ----- internal/search/photos_filter_square_test.go | 115 ----- internal/search/photos_filter_stack_test.go | 110 ----- .../search/photos_filter_stackable_test.go | 110 ----- internal/search/photos_filter_state_test.go | 240 --------- internal/search/photos_filter_subject_test.go | 260 ---------- .../search/photos_filter_subjects_test.go | 260 ---------- internal/search/photos_filter_title_test.go | 300 ------------ internal/search/photos_filter_type_test.go | 250 ---------- internal/search/photos_filter_uid_test.go | 376 +++------------ .../search/photos_filter_unsorted_test.go | 110 ----- .../search/photos_filter_unstacked_test.go | 115 ----- internal/search/photos_filter_vector_test.go | 120 ----- internal/search/photos_filter_video_test.go | 110 ----- internal/search/photos_filter_year_test.go | 230 --------- internal/search/photos_geo.go | 139 +++++- .../search/photos_geo_filter_albums_test.go | 340 ------------- .../search/photos_geo_filter_favorite_test.go | 100 ---- .../search/photos_geo_filter_near_test.go | 195 -------- internal/search/photos_geo_filter_s2_test.go | 205 -------- internal/search/photos_geo_test.go | 155 ------ internal/search/photos_test.go | 345 ------------- internal/search/photos_viewer.go | 9 +- internal/service/session.go | 3 +- internal/session/session.go | 2 + internal/session/session_delete_test.go | 3 +- internal/session/session_get_test.go | 5 +- internal/session/session_public.go | 5 +- internal/session/session_public_test.go | 5 +- internal/session/session_save_test.go | 5 +- internal/workers/sync_download.go | 2 +- internal/workers/workers_test.go | 8 +- pkg/clean/name.go | 26 +- pkg/clean/name_test.go | 30 +- pkg/clean/path.go | 16 + pkg/clean/path_test.go | 42 ++ pkg/rnd/contains.go | 55 +++ pkg/rnd/contains_test.go | 80 +++ pkg/rnd/hash.go | 62 +++ pkg/rnd/hash_test.go | 35 ++ pkg/rnd/type.go | 135 ++++++ pkg/rnd/type_test.go | 25 + pkg/rnd/uid.go | 5 + pkg/rnd/uid_test.go | 7 - pkg/rnd/validation.go | 15 - pkg/s2/s2.go | 4 +- pkg/txt/countries.go | 2 + 172 files changed, 2149 insertions(+), 12236 deletions(-) create mode 100644 frontend/src/share/places.vue create mode 100644 internal/search/errors.go create mode 100644 pkg/rnd/contains.go create mode 100644 pkg/rnd/contains_test.go create mode 100644 pkg/rnd/hash.go create mode 100644 pkg/rnd/hash_test.go create mode 100644 pkg/rnd/type.go create mode 100644 pkg/rnd/type_test.go diff --git a/Makefile b/Makefile index 960be935b..1c88ea6c6 100644 --- a/Makefile +++ b/Makefile @@ -507,6 +507,9 @@ fmt-go: goimports -w pkg internal cmd tidy: go mod tidy -go=1.16 && go mod tidy -go=1.17 +users: + ./photoprism users add -p photoprism -r admin -s -a test:true -n "Alice Austen" superadmin + ./photoprism users ls # Declare all targets as "PHONY", see https://www.gnu.org/software/make/manual/html_node/Phony-Targets.html. MAKEFLAGS += --always-make diff --git a/frontend/src/app/routes.js b/frontend/src/app/routes.js index f8e72c5d1..4e1102c5f 100644 --- a/frontend/src/app/routes.js +++ b/frontend/src/app/routes.js @@ -233,6 +233,12 @@ export default [ component: Places, meta: { title: $gettext("Places"), auth: true }, }, + { + name: "album_place", + path: "/places/:album/:q", + component: Places, + meta: { title: $gettext("Places"), auth: true }, + }, { name: "states", path: "/states", diff --git a/frontend/src/common/config.js b/frontend/src/common/config.js index 8eb9da589..db408d8d6 100644 --- a/frontend/src/common/config.js +++ b/frontend/src/common/config.js @@ -355,18 +355,45 @@ export default class Config { return result; } + // allow checks whether the current user is granted permission for the specified resource. allow(resource, perm) { if (this.values["acl"] && this.values["acl"][resource]) { - return !!this.values["acl"][resource][perm] || !!this.values["acl"][resource]["full_access"]; + if (this.values["acl"][resource]["full_access"]) { + return true; + } else if (this.values["acl"][resource][perm]) { + return true; + } } return false; } + // allowAny checks whether the current user is granted any of the permissions for the specified resource. + allowAny(resource, perms) { + if (this.values["acl"] && this.values["acl"][resource]) { + if (this.values["acl"][resource]["full_access"]) { + return true; + } + for (const perm of perms) { + if (this.values["acl"][resource][perm]) { + return true; + } + } + } + + return false; + } + + // deny checks whether the current user must be denied access to the specified resource. deny(resource, perm) { return !this.allow(resource, perm); } + // denyAll checks whether the current user is granted none of the permissions for the specified resource. + denyAll(resource, perm) { + return !this.allowAny(resource, perm); + } + settings() { return this.values.settings; } diff --git a/frontend/src/common/session.js b/frontend/src/common/session.js index 8b5dcbb58..4e20a7bb5 100644 --- a/frontend/src/common/session.js +++ b/frontend/src/common/session.js @@ -77,7 +77,9 @@ export default class Session { }); // Say hello. - this.sendClientInfo(); + this.refresh().then(() => { + this.sendClientInfo(); + }); } useSessionStorage() { @@ -253,6 +255,27 @@ export default class Session { }); } + refresh() { + if (this.hasId()) { + return Api.get("session/" + this.getId()) + .then((resp) => { + if (resp.data && resp.data.config) { + this.setConfig(resp.data.config); + this.setUser(resp.data.user); + this.setData(resp.data.data); + } + return Promise.resolve(); + }) + .catch(() => { + this.deleteId(); + window.location.reload(); + return Promise.reject(); + }); + } else { + return Promise.resolve(); + } + } + redeemToken(token) { return Api.post("session", { token }).then((resp) => { this.setConfig(resp.data.config); diff --git a/frontend/src/common/util.js b/frontend/src/common/util.js index 860053fac..b7acf9551 100644 --- a/frontend/src/common/util.js +++ b/frontend/src/common/util.js @@ -153,6 +153,10 @@ export default class Util { return s.replace(/\w\S*/g, (w) => w.replace(/^\w/, (c) => c.toUpperCase())); } + static generateToken() { + return (Math.random() + 1).toString(36).substring(6); + } + static fileType(value) { if (!value || typeof value !== "string") { return ""; diff --git a/frontend/src/component/album/toolbar.vue b/frontend/src/component/album/toolbar.vue index 3f6a31c48..a7be7e01d 100644 --- a/frontend/src/component/album/toolbar.vue +++ b/frontend/src/component/album/toolbar.vue @@ -111,7 +111,7 @@ export default { }].concat(this.$config.get('countries')); const features = this.$config.settings().features; return { - canUpload: this.$config.allow("albums", "upload") && features.upload, + canUpload: this.$config.allow("files", "upload") && features.upload, canDownload: this.$config.allow("albums", "download") && features.download, canShare: this.$config.allow("albums", "share") && features.share, canManage: this.$config.allow("albums", "manage"), diff --git a/frontend/src/component/label/clipboard.vue b/frontend/src/component/label/clipboard.vue index f06ca5b78..206113519 100644 --- a/frontend/src/component/label/clipboard.vue +++ b/frontend/src/component/label/clipboard.vue @@ -36,11 +36,10 @@ cloud_download @@ -50,7 +49,7 @@ fab dark small color="remove" :title="$gettext('Delete')" - :disabled="selection.length === 0" + :disabled="!canManage || selection.length === 0" class="action-delete" @click.stop="dialog.delete = true" > @@ -85,11 +84,20 @@ export default { type: Array, default: () => [], }, - refresh: Function, - clearSelection: Function, + refresh: { + type: Function, + default: () => {}, + }, + clearSelection: { + type: Function, + default: () => {}, + }, }, data() { return { + canManage: this.$config.allow("labels", "manage"), + canDownload: this.$config.allow("labels", "download"), + canAddAlbums: this.$config.allow("albums", "create") && this.$config.feature("albums"), expanded: false, dialog: { delete: false, @@ -105,6 +113,10 @@ export default { this.expanded = false; }, addToAlbum(ppid) { + if (!this.canAddAlbums) { + return; + } + this.dialog.album = false; Api.post(`albums/${ppid}/photos`, {"labels": this.selection}).then(() => this.onAdded()); @@ -113,6 +125,10 @@ export default { this.clearClipboard(); }, batchDelete() { + if (!this.canManage) { + return; + } + this.dialog.delete = false; Api.post("batch/labels/delete", {"labels": this.selection}).then(this.onDeleted.bind(this)); @@ -122,6 +138,10 @@ export default { this.clearClipboard(); }, download() { + if (!this.canDownload) { + return; + } + if (this.selection.length !== 1) { Notify.error(this.$gettext("You can only download one label")); return; diff --git a/frontend/src/component/navigation.vue b/frontend/src/component/navigation.vue index c943c27a5..eb222fed8 100644 --- a/frontend/src/component/navigation.vue +++ b/frontend/src/component/navigation.vue @@ -70,7 +70,7 @@ - + chevron_right chevron_left @@ -165,7 +165,7 @@ - + bookmark @@ -177,8 +177,7 @@ - + + {{ label.Name }} + {}, + }, }, data() { const query = this.$route.query; @@ -168,7 +174,12 @@ export default { const q = query['q'] ? query['q'] : ''; const all = query['all'] ? query['all'] : ''; + const canManage = this.$config.allow("labels", "manage"); + const canAddAlbums = this.$config.allow("albums", "create") && this.$config.feature("albums"); + return { + canManage: canManage, + canSelect: canManage || canAddAlbums, view: 'all', config: this.$config.values, subscriptions: [], @@ -231,6 +242,10 @@ export default { window.localStorage.setItem("labels_offset", offset); }, toggleLike(ev, index) { + if (!this.canManage) { + return; + } + const inputType = this.input.eval(ev, index); if (inputType !== ClickShort) { @@ -246,7 +261,9 @@ export default { label.toggleLike(); }, selectRange(rangeEnd, models) { - if (!models || !models[rangeEnd] || !(models[rangeEnd] instanceof RestModel)) { + if (!this.canSelect) { + return; + } else if (!models || !models[rangeEnd] || !(models[rangeEnd] instanceof RestModel)) { console.warn("selectRange() - invalid arguments:", rangeEnd, models); return; } @@ -271,6 +288,10 @@ export default { return (rangeEnd - rangeStart) + 1; }, onSelect(ev, index) { + if (!this.canSelect) { + return; + } + const inputType = this.input.eval(ev, index); if (inputType !== ClickShort) { @@ -302,6 +323,10 @@ export default { } }, onContextMenu(ev, index) { + if (!this.canSelect) { + return; + } + if (this.$isMobile) { ev.preventDefault(); ev.stopPropagation(); @@ -312,6 +337,10 @@ export default { } }, onSave(label) { + if (!this.canManage) { + return; + } + label.update(); }, showAll() { @@ -336,6 +365,10 @@ export default { } }, toggleSelection(uid) { + if (!this.canSelect) { + return; + } + const pos = this.selection.indexOf(uid); if (pos !== -1) { diff --git a/frontend/src/pages/photos.vue b/frontend/src/pages/photos.vue index 304f32ec4..4e38418d1 100644 --- a/frontend/src/pages/photos.vue +++ b/frontend/src/pages/photos.vue @@ -103,6 +103,7 @@ export default { isShared: this.$config.deny("photos", "manage"), canEdit: this.$config.allow("photos", "update") && features.edit, hasPlaces: this.$config.allow("places", "view") && features.places, + canSearchPlaces: this.$config.allow("places", "search") && features.places, subscriptions: [], listen: false, dirty: false, @@ -233,7 +234,7 @@ export default { return "newest"; }, openLocation(index) { - if (!this.hasPlaces) { + if (!this.canSearchPlaces) { return; } diff --git a/frontend/src/pages/places.vue b/frontend/src/pages/places.vue index 14c327bcc..9076436f5 100644 --- a/frontend/src/pages/places.vue +++ b/frontend/src/pages/places.vue @@ -1,7 +1,7 @@ + + + diff --git a/frontend/src/share/routes.js b/frontend/src/share/routes.js index 4ba1fb241..ada7290ac 100644 --- a/frontend/src/share/routes.js +++ b/frontend/src/share/routes.js @@ -1,5 +1,6 @@ import Albums from "share/albums.vue"; import AlbumPhotos from "share/photos.vue"; +import Places from "pages/places.vue"; const c = window.__CONFIG__; const siteTitle = c.siteAuthor ? c.siteAuthor : c.name; @@ -24,6 +25,12 @@ export default [ component: AlbumPhotos, meta: { title: shareTitle, auth: true, hideNav: true }, }, + { + name: "album_place", + path: "/places/:album/:q", + component: Places, + meta: { title: shareTitle, auth: true, hideNav: true }, + }, { path: "*", redirect: { name: "albums" }, diff --git a/internal/acl/grant.go b/internal/acl/grant.go index 1d81b2df3..c0b1c54ec 100644 --- a/internal/acl/grant.go +++ b/internal/acl/grant.go @@ -2,7 +2,7 @@ package acl // Predefined grants to simplify configuration. var ( - GrantFullAccess = Grant{FullAccess: true, AccessAll: true, ActionCreate: true, ActionUpdate: true, ActionDelete: true, ActionDownload: true, ActionShare: true, ActionRate: true, ActionReact: true, ActionManage: true, ActionSubscribe: true} + GrantFullAccess = Grant{FullAccess: true, AccessAll: true, AccessLibrary: true, ActionCreate: true, ActionUpdate: true, ActionDelete: true, ActionDownload: true, ActionShare: true, ActionRate: true, ActionReact: true, ActionManage: true, ActionSubscribe: true} GrantSubscribeAll = Grant{AccessAll: true, ActionSubscribe: true} GrantSubscribeOwn = Grant{AccessOwn: true, ActionSubscribe: true} ) diff --git a/internal/api/api_test.go b/internal/api/api_test.go index 3864afd17..7e3f655f8 100644 --- a/internal/api/api_test.go +++ b/internal/api/api_test.go @@ -20,7 +20,7 @@ func TestMain(m *testing.M) { log.SetLevel(logrus.TraceLevel) event.AuditLog = log - c := config.NewTestConfig("api") + c := config.TestConfig() service.SetConfig(c) code := m.Run() diff --git a/internal/api/auth.go b/internal/api/auth.go index 563c8bfae..344a0c1ba 100644 --- a/internal/api/auth.go +++ b/internal/api/auth.go @@ -13,22 +13,28 @@ func Auth(c *gin.Context, resource acl.Resource, grant acl.Permission) *entity.S } // AuthAny checks if at least one permission allows access and returns the session in this case. -func AuthAny(c *gin.Context, resource acl.Resource, grants acl.Permissions) *entity.Session { - // Get session ID, if any. +func AuthAny(c *gin.Context, resource acl.Resource, grants acl.Permissions) (s *entity.Session) { + // Get client IP address and session ID, if any. + ip := ClientIP(c) sessId := SessionID(c) - // Find and return the client session after all checks have passed. - if s := Session(sessId); s == nil { - event.AuditWarn([]string{ClientIP(c), "unauthenticated", "%s %s as unknown user", "denied"}, grants.String(), string(resource)) + // Find client session. + if s = Session(sessId); s == nil { + event.AuditWarn([]string{ip, "unauthenticated", "%s %s as unknown user", "denied"}, grants.String(), string(resource)) return entity.SessionStatusUnauthorized() - } else if s.User() == nil { - event.AuditWarn([]string{ClientIP(c), "session %s", "%s %s as unknown user", "denied"}, s.RefID, grants.String(), string(resource)) + } else { + s.SetClientIP(ip) + } + + // Check authorization. + if s.User() == nil { + event.AuditWarn([]string{ip, "session %s", "%s %s as unknown user", "denied"}, s.RefID, grants.String(), string(resource)) return entity.SessionStatusUnauthorized() } else if acl.Resources.DenyAll(resource, s.User().AclRole(), grants) { - event.AuditErr([]string{ClientIP(c), "session %s", "%s %s as %s", "denied"}, s.RefID, grants.String(), string(resource), s.User().AclRole().String()) + event.AuditErr([]string{ip, "session %s", "%s %s as %s", "denied"}, s.RefID, grants.String(), string(resource), s.User().AclRole().String()) return entity.SessionStatusForbidden() } else { - event.AuditInfo([]string{ClientIP(c), "session %s", "%s %s as %s", "granted"}, s.RefID, grants.String(), string(resource), s.User().AclRole().String()) + event.AuditInfo([]string{ip, "session %s", "%s %s as %s", "granted"}, s.RefID, grants.String(), string(resource), s.User().AclRole().String()) return s } } diff --git a/internal/api/auth_session_get.go b/internal/api/auth_session_get.go index 4646a5491..f544daa62 100644 --- a/internal/api/auth_session_get.go +++ b/internal/api/auth_session_get.go @@ -3,12 +3,10 @@ package api import ( "net/http" - "github.com/photoprism/photoprism/internal/config" - - "github.com/photoprism/photoprism/internal/service" - "github.com/gin-gonic/gin" + "github.com/photoprism/photoprism/internal/config" + "github.com/photoprism/photoprism/internal/service" "github.com/photoprism/photoprism/pkg/clean" ) @@ -50,7 +48,7 @@ func GetSession(router *gin.RouterGroup) { var clientConfig config.ClientConfig if conf := service.Config(); conf == nil { - log.Errorf("session: config is nil - possible bug") + log.Errorf("session: config is not set - possible bug") AbortUnexpected(c) return } else if sess.User().IsVisitor() { diff --git a/internal/api/event.go b/internal/api/event.go index 1366a083e..893283069 100644 --- a/internal/api/event.go +++ b/internal/api/event.go @@ -18,23 +18,12 @@ const ( ) func PublishPhotoEvent(e EntityEvent, uid string, c *gin.Context) { - f := form.SearchPhotos{UID: uid, Merged: true} - - if err := f.ParseQueryString(); err != nil { - log.Errorf("publish: %s", err) - AbortBadRequest(c) - return - } - - result, _, err := search.Photos(f) - - if err != nil { - log.Error(err) + if result, _, err := search.Photos(form.SearchPhotos{UID: uid, Merged: true}); err != nil { + log.Warnf("search: %s", err) AbortUnexpected(c) - return + } else { + event.PublishEntities("photos", string(e), result) } - - event.PublishEntities("photos", string(e), result) } func PublishAlbumEvent(e EntityEvent, uid string, c *gin.Context) { diff --git a/internal/api/import.go b/internal/api/import.go index 0c4fc91d0..51326841f 100644 --- a/internal/api/import.go +++ b/internal/api/import.go @@ -3,10 +3,12 @@ package api import ( "net/http" "os" + "path" "path/filepath" "strings" "time" + "github.com/dustin/go-humanize/english" "github.com/gin-gonic/gin" "github.com/photoprism/photoprism/internal/acl" @@ -21,12 +23,16 @@ import ( "github.com/photoprism/photoprism/pkg/fs" ) +const ( + UploadPath = "/upload" +) + // StartImport imports media files from a directory and converts/indexes them as needed. // // POST /api/v1/import* func StartImport(router *gin.RouterGroup) { router.POST("/import/*path", func(c *gin.Context) { - s := Auth(c, acl.ResourceFiles, acl.ActionManage) + s := AuthAny(c, acl.ResourceFiles, acl.Permissions{acl.ActionManage, acl.ActionUpload}) if s.Abort(c) { return @@ -48,66 +54,93 @@ func StartImport(router *gin.RouterGroup) { return } - subPath := "" - path := conf.ImportPath() + srcFolder := "" + importPath := conf.ImportPath() - if subPath = clean.Path(c.Param("path")); subPath != "" && subPath != "/" { - subPath = strings.Replace(subPath, ".", "", -1) - path = filepath.Join(path, subPath) + // Import from sub-folder? + if srcFolder = clean.Path(c.Param("path")); srcFolder != "" && srcFolder != "/" { + srcFolder = strings.Replace(srcFolder, ".", "", -1) } else if f.Path != "" { - subPath = strings.Replace(f.Path, ".", "", -1) - path = filepath.Join(path, subPath) + srcFolder = strings.Replace(f.Path, ".", "", -1) } - path = filepath.Clean(path) + // To avoid conflicts, uploads are imported from "import_path/upload/session_ref/timestamp". + if token := path.Base(srcFolder); token != "" && path.Dir(srcFolder) == UploadPath { + srcFolder = path.Join(UploadPath, s.RefID+token) + event.AuditInfo([]string{ClientIP(c), "session %s", "import uploads from %s as %s", "granted"}, s.RefID, clean.Log(srcFolder), s.User().AclRole().String()) + } else if acl.Resources.Deny(acl.ResourceFiles, s.User().AclRole(), acl.ActionManage) { + event.AuditErr([]string{ClientIP(c), "session %s", "import files from %s as %s", "denied"}, s.RefID, clean.Log(srcFolder), s.User().AclRole().String()) + AbortForbidden(c) + return + } + + importPath = path.Join(importPath, srcFolder) imp := service.Import() RemoveFromFolderCache(entity.RootImport) - var opt photoprism.ImportOptions - - if f.Move { - event.InfoMsg(i18n.MsgMovingFilesFrom, clean.Log(filepath.Base(path))) - opt = photoprism.ImportOptionsMove(path) - } else { - event.InfoMsg(i18n.MsgCopyingFilesFrom, clean.Log(filepath.Base(path))) - opt = photoprism.ImportOptionsCopy(path) + var destFolder string + if destFolder = s.User().UploadPath; destFolder == "" { + destFolder = conf.ImportDest() } - if len(f.Albums) > 0 { + var opt photoprism.ImportOptions + + // Copy or move files to the destination folder? + if f.Move { + event.InfoMsg(i18n.MsgMovingFilesFrom, clean.Log(filepath.Base(importPath))) + opt = photoprism.ImportOptionsMove(importPath, destFolder) + } else { + event.InfoMsg(i18n.MsgCopyingFilesFrom, clean.Log(filepath.Base(importPath))) + opt = photoprism.ImportOptionsCopy(importPath, destFolder) + } + + // Add imported files to albums if allowed. + if len(f.Albums) > 0 && + acl.Resources.AllowAny(acl.ResourceAlbums, s.User().AclRole(), acl.Permissions{acl.ActionCreate, acl.ActionUpload}) { log.Debugf("import: adding files to album %s", clean.Log(strings.Join(f.Albums, " and "))) opt.Albums = f.Albums } - imp.Start(opt) + // Start import. + imported := imp.Start(opt) - if subPath != "" && path != conf.ImportPath() && fs.DirIsEmpty(path) { - if err := os.Remove(path); err != nil { - log.Errorf("import: failed deleting empty folder %s: %s", clean.Log(path), err) + // Delete empty import directory. + if srcFolder != "" && importPath != conf.ImportPath() && fs.DirIsEmpty(importPath) { + if err := os.Remove(importPath); err != nil { + log.Errorf("import: failed deleting empty folder %s: %s", clean.Log(importPath), err) } else { - log.Infof("import: deleted empty folder %s", clean.Log(path)) + log.Infof("import: deleted empty folder %s", clean.Log(importPath)) } } - moments := service.Moments() - - if err := moments.Start(); err != nil { - log.Warnf("moments: %s", err) + // Update moments if files have been imported. + if n := len(imported); n == 0 { + log.Infof("import: no new files found to import", clean.Log(importPath)) + } else { + log.Infof("import: imported %s", english.Plural(n, "file", "files")) + if moments := service.Moments(); moments == nil { + log.Warnf("import: moments service not set - possible bug") + } else if err := moments.Start(); err != nil { + log.Warnf("moments: %s", err) + } } elapsed := int(time.Since(start).Seconds()) + // Show success message. msg := i18n.Msg(i18n.MsgImportCompletedIn, elapsed) event.Success(msg) - event.Publish("import.completed", event.Data{"path": path, "seconds": elapsed}) - event.Publish("index.completed", event.Data{"path": path, "seconds": elapsed}) + event.Publish("import.completed", event.Data{"path": importPath, "seconds": elapsed}) + event.Publish("index.completed", event.Data{"path": importPath, "seconds": elapsed}) for _, uid := range f.Albums { PublishAlbumEvent(EntityUpdated, uid, c) } + // Update the user interface. UpdateClientConfig() // Update album, label, and subject cover thumbs. diff --git a/internal/api/photos_search.go b/internal/api/photos_search.go index 5d9251606..62c3bab8d 100644 --- a/internal/api/photos_search.go +++ b/internal/api/photos_search.go @@ -16,10 +16,9 @@ import ( ) // SearchPhotos searches the pictures index and returns the result as JSON. +// See form.SearchPhotos for supported search params and data types. // // GET /api/v1/photos -// -// See form.SearchPhotos for supported search params and data types. func SearchPhotos(router *gin.RouterGroup) { // searchPhotos checking authorization and parses the search request. searchForm := func(c *gin.Context) (f form.SearchPhotos, s *entity.Session, err error) { @@ -32,59 +31,13 @@ func SearchPhotos(router *gin.RouterGroup) { // Abort if request params are invalid. if err = c.MustBindWith(&f, binding.Form); err != nil { - event.AuditWarn([]string{ClientIP(c), "session %s", "photos", "form invalid", "%s"}, s.RefID, err) + event.AuditWarn([]string{ClientIP(c), "session %s", string(acl.ResourcePhotos), "form invalid", "%s"}, s.RefID, err) AbortBadRequest(c) return f, s, err } - // Limit results to a specific album? - if f.Album == "" { - if acl.Resources.Deny(acl.ResourcePhotos, s.User().AclRole(), acl.ActionSearch) { - event.AuditErr([]string{ClientIP(c), "session %s", "%s %s as %s", "denied"}, s.RefID, acl.ActionSearch.String(), string(acl.ResourcePhotos), s.User().AclRole().String()) - c.AbortWithStatusJSON(http.StatusForbidden, i18n.NewResponse(http.StatusForbidden, i18n.ErrForbidden)) - return f, s, i18n.Error(i18n.ErrForbidden) - } - } else if a, err := entity.CachedAlbumByUID(f.Album); err != nil { - event.AuditWarn([]string{ClientIP(c), "session %s", "photos", "album", f.Album, "not found"}, s.RefID) - AbortAlbumNotFound(c) - return f, s, i18n.Error(i18n.ErrAlbumNotFound) - } else { - f.Filter = a.AlbumFilter - } - - // Parse query string and filter. - if err = f.ParseQueryString(); err != nil { - log.Debugf("search: %s", err) - AbortBadRequest(c) - return f, s, err - } - - conf := service.Config() - - // Enforce ACL. - if acl.Resources.Deny(acl.ResourcePhotos, s.User().AclRole(), acl.AccessPrivate) { - f.Public = true - f.Private = false - } - if acl.Resources.Deny(acl.ResourcePhotos, s.User().AclRole(), acl.ActionDelete) { - f.Archived = false - f.Review = false - } - if acl.Resources.Deny(acl.ResourceFiles, s.User().AclRole(), acl.ActionManage) { - f.Hidden = false - } - - // Sharing link visitors may only see public content in shared albums. - if s.IsVisitor() { - if f.Album == "" || !s.HasShare(f.Album) { - event.AuditErr([]string{ClientIP(c), "session %s", "photos", "shared album", f.Album, "not shared"}, s.RefID) - AbortForbidden(c) - return f, s, i18n.Error(i18n.ErrUnauthorized) - } - - f.UID = "" - f.Albums = "" - } else if !conf.Settings().Features.Private { + // Ignore private flag if feature is disabled. + if !service.Config().Settings().Features.Private { f.Public = false } @@ -100,10 +53,10 @@ func SearchPhotos(router *gin.RouterGroup) { return } - result, count, err := search.Photos(f) + result, count, err := search.UserPhotos(f, s) if err != nil { - event.AuditWarn([]string{ClientIP(c), "session %s", "photos", "search", "%s"}, s.RefID, err) + event.AuditWarn([]string{ClientIP(c), "session %s", string(acl.ResourcePhotos), "search", "%s"}, s.RefID, err) AbortBadRequest(c) return } @@ -129,10 +82,10 @@ func SearchPhotos(router *gin.RouterGroup) { conf := service.Config() - result, count, err := search.PhotosViewerResults(f, conf.ContentUri(), conf.ApiUri(), conf.PreviewToken(), conf.DownloadToken()) + result, count, err := search.UserPhotosViewerResults(f, s, conf.ContentUri(), conf.ApiUri(), conf.PreviewToken(), conf.DownloadToken()) if err != nil { - event.AuditWarn([]string{ClientIP(c), "session %s", "photos", "view", "%s"}, s.RefID, err) + event.AuditWarn([]string{ClientIP(c), "session %s", string(acl.ResourcePhotos), "view", "%s"}, s.RefID, err) AbortBadRequest(c) return } diff --git a/internal/api/photos_search_geojson.go b/internal/api/photos_search_geojson.go index 8d85ab47e..f73ae6b0a 100644 --- a/internal/api/photos_search_geojson.go +++ b/internal/api/photos_search_geojson.go @@ -7,7 +7,7 @@ import ( "github.com/gin-gonic/gin/binding" "github.com/photoprism/photoprism/internal/acl" - "github.com/photoprism/photoprism/internal/entity" + "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" "github.com/photoprism/photoprism/internal/search" "github.com/photoprism/photoprism/internal/service" @@ -16,71 +16,48 @@ import ( ) // SearchGeo finds photos and returns results as JSON, so they can be displayed on a map or in a viewer. +// See form.SearchPhotosGeo for supported search params and data types. // // GET /api/v1/geo -// -// See form.SearchPhotosGeo for supported search params and data types. func SearchGeo(router *gin.RouterGroup) { handler := func(c *gin.Context) { - s := Auth(c, acl.ResourcePhotos, acl.ActionSearch) + s := AuthAny(c, acl.ResourcePlaces, acl.Permissions{acl.ActionSearch, acl.ActionView, acl.AccessShared}) + // Abort if permission was not granted. if s.Abort(c) { return } var f form.SearchPhotosGeo + var err error - err := c.MustBindWith(&f, binding.Form) - - if err != nil { - AbortBadRequest(c) - return - } - - // Limit results to a specific album? - if f.Album == "" { - // Do nothing. - } else if a, err := entity.CachedAlbumByUID(f.Album); err != nil { - AbortAlbumNotFound(c) - return - } else { - f.Filter = a.AlbumFilter - } - - // Parse query string and filter. - if err = f.ParseQueryString(); err != nil { - log.Debugf("search: %s", err) + // Abort if request params are invalid. + if err = c.MustBindWith(&f, binding.Form); err != nil { + event.AuditWarn([]string{ClientIP(c), "session %s", string(acl.ResourcePlaces), "form invalid", "%s"}, s.RefID, err) AbortBadRequest(c) return } conf := service.Config() - // Sharing link visitors may only see public content. - if s.IsVisitor() { - if f.Album == "" || !s.HasShare(f.Album) { - AbortForbidden(c) - return - } - - f.Public = true - f.Private = false - f.Archived = false - f.Review = false - } else { - f.Public = conf.Settings().Features.Private + // Ignore private flag if feature is disabled. + if !conf.Settings().Features.Private { + f.Public = false } // Find matching pictures. - photos, err := search.PhotosGeo(f) + photos, err := search.UserPhotosGeo(f, s) if err != nil { - log.Warnf("search: %s", err) + event.AuditWarn([]string{ClientIP(c), "session %s", string(acl.ResourcePlaces), "search", "%s"}, s.RefID, err) AbortBadRequest(c) return } // Add response headers. + AddCountHeader(c, len(photos)) + AddLimitHeader(c, f.Count) + AddOffsetHeader(c, f.Offset) AddTokenHeaders(c) var resp []byte @@ -88,7 +65,6 @@ func SearchGeo(router *gin.RouterGroup) { // Render JSON response. switch clean.Token(c.Param("format")) { case "view": - conf := service.Config() resp, err = photos.ViewerJSON(conf.ContentUri(), conf.ApiUri(), conf.PreviewToken(), conf.DownloadToken()) default: resp, err = photos.GeoJSON() diff --git a/internal/api/upload.go b/internal/api/upload.go index 90bc7af86..2cb64a1ee 100644 --- a/internal/api/upload.go +++ b/internal/api/upload.go @@ -15,23 +15,26 @@ import ( "github.com/photoprism/photoprism/pkg/clean" ) +// Upload adds files to the import folder, from where supported file types are moved to the originals folders. +// // POST /api/v1/upload/:path func Upload(router *gin.RouterGroup) { - router.POST("/upload/:path", func(c *gin.Context) { + router.POST("/upload/:token", func(c *gin.Context) { conf := service.Config() + if conf.ReadOnly() || !conf.Settings().Features.Upload { Abort(c, http.StatusForbidden, i18n.ErrReadOnly) return } - s := Auth(c, acl.ResourcePhotos, acl.ActionUpload) + s := AuthAny(c, acl.ResourceFiles, acl.Permissions{acl.ActionManage, acl.ActionUpload}) if s.Abort(c) { return } start := time.Now() - subPath := clean.Path(c.Param("path")) + token := clean.Token(c.Param("token")) f, err := c.MultipartForm() @@ -45,18 +48,19 @@ func Upload(router *gin.RouterGroup) { files := f.File["files"] uploaded := len(files) + var uploads []string - p := path.Join(conf.ImportPath(), "upload", subPath) + uploadDir := path.Join(conf.ImportPath(), "upload", s.RefID+token) - if err := os.MkdirAll(p, os.ModePerm); err != nil { - log.Errorf("upload: failed creating folder %s", clean.Log(subPath)) + if err = os.MkdirAll(uploadDir, os.ModePerm); err != nil { + log.Errorf("upload: failed creating folder %s", clean.Log(filepath.Base(uploadDir))) AbortBadRequest(c) return } for _, file := range files { - filename := path.Join(p, filepath.Base(file.Filename)) + filename := path.Join(uploadDir, filepath.Base(file.Filename)) log.Debugf("upload: saving file %s", clean.Log(file.Filename)) diff --git a/internal/auto/import.go b/internal/auto/import.go index 200617642..4ed72ca9c 100644 --- a/internal/auto/import.go +++ b/internal/auto/import.go @@ -71,9 +71,9 @@ func Import() error { var opt photoprism.ImportOptions if conf.Settings().Import.Move { - opt = photoprism.ImportOptionsMove(path) + opt = photoprism.ImportOptionsMove(path, conf.ImportDest()) } else { - opt = photoprism.ImportOptionsCopy(path) + opt = photoprism.ImportOptionsCopy(path, conf.ImportDest()) } imported := imp.Start(opt) diff --git a/internal/commands/commands.go b/internal/commands/commands.go index dc88d90df..f2248642b 100644 --- a/internal/commands/commands.go +++ b/internal/commands/commands.go @@ -1,5 +1,5 @@ /* -Package commands provides photoprism CLI (sub-)commands. +Package commands provides the CLI commands of PhotoPrism. Copyright (c) 2018 - 2022 PhotoPrism UG. All rights reserved. @@ -29,13 +29,12 @@ import ( "os" "syscall" - "github.com/photoprism/photoprism/internal/service" - "github.com/sevlyar/go-daemon" "github.com/urfave/cli" "github.com/photoprism/photoprism/internal/config" "github.com/photoprism/photoprism/internal/event" + "github.com/photoprism/photoprism/internal/service" "github.com/photoprism/photoprism/pkg/fs" ) diff --git a/internal/commands/convert.go b/internal/commands/convert.go index a4e7173be..212fcf7b7 100644 --- a/internal/commands/convert.go +++ b/internal/commands/convert.go @@ -17,7 +17,7 @@ import ( var ConvertCommand = cli.Command{ Name: "convert", Usage: "Converts files in other formats to JPEG and AVC as needed", - ArgsUsage: "[originals folder]", + ArgsUsage: "[SUB-FOLDER]", Flags: []cli.Flag{ cli.BoolFlag{ Name: "force, f", diff --git a/internal/commands/copy.go b/internal/commands/copy.go index d2b2c3535..f2ebbc463 100644 --- a/internal/commands/copy.go +++ b/internal/commands/copy.go @@ -12,6 +12,7 @@ import ( "github.com/photoprism/photoprism/internal/config" "github.com/photoprism/photoprism/internal/photoprism" "github.com/photoprism/photoprism/internal/service" + "github.com/photoprism/photoprism/pkg/clean" ) // CopyCommand registers the copy cli command. @@ -19,8 +20,14 @@ var CopyCommand = cli.Command{ Name: "cp", Aliases: []string{"copy"}, Usage: "Copies media files to originals", - ArgsUsage: "[path]", - Action: copyAction, + ArgsUsage: "[IMPORT PATH]", + Flags: []cli.Flag{ + cli.BoolFlag{ + Name: "dest, d", + Usage: "relative originals `PATH` to which the files should be imported", + }, + }, + Action: copyAction, } // copyAction copies photos to originals path. Default import path is used if no path argument provided @@ -64,10 +71,17 @@ func copyAction(ctx *cli.Context) error { return errors.New("import path is identical with originals") } - log.Infof("copying media files from %s to %s", sourcePath, conf.OriginalsPath()) + var destFolder string + if ctx.IsSet("dest") { + destFolder = clean.UserPath(ctx.String("dest")) + } else { + destFolder = conf.ImportDest() + } + + log.Infof("copying media files from %s to %s", sourcePath, filepath.Join(conf.OriginalsPath(), destFolder)) w := service.Import() - opt := photoprism.ImportOptionsCopy(sourcePath) + opt := photoprism.ImportOptionsCopy(sourcePath, destFolder) w.Start(opt) diff --git a/internal/commands/faces.go b/internal/commands/faces.go index 1e0884fd3..a04030f3d 100644 --- a/internal/commands/faces.go +++ b/internal/commands/faces.go @@ -53,7 +53,7 @@ var FacesCommand = cli.Command{ { Name: "index", Usage: "Searches originals for faces", - ArgsUsage: "[originals folder]", + ArgsUsage: "[SUB-FOLDER]", Action: facesIndexAction, }, { diff --git a/internal/commands/import.go b/internal/commands/import.go index 9995ee3f9..c60d8e9e6 100644 --- a/internal/commands/import.go +++ b/internal/commands/import.go @@ -12,6 +12,7 @@ import ( "github.com/photoprism/photoprism/internal/config" "github.com/photoprism/photoprism/internal/photoprism" "github.com/photoprism/photoprism/internal/service" + "github.com/photoprism/photoprism/pkg/clean" ) // ImportCommand registers the import cli command. @@ -19,8 +20,14 @@ var ImportCommand = cli.Command{ Name: "mv", Aliases: []string{"import"}, Usage: "Moves media files to originals", - ArgsUsage: "[path]", - Action: importAction, + ArgsUsage: "[SOURCE PATH]", + Flags: []cli.Flag{ + cli.BoolFlag{ + Name: "dest, d", + Usage: "relative originals `PATH` to which the files should be imported", + }, + }, + Action: importAction, } // importAction moves photos to originals path. Default import path is used if no path argument provided @@ -64,10 +71,17 @@ func importAction(ctx *cli.Context) error { return errors.New("import path is identical with originals") } - log.Infof("moving media files from %s to %s", sourcePath, conf.OriginalsPath()) + var destFolder string + if ctx.IsSet("dest") { + destFolder = clean.UserPath(ctx.String("dest")) + } else { + destFolder = conf.ImportDest() + } + + log.Infof("moving media files from %s to %s", sourcePath, filepath.Join(conf.OriginalsPath(), destFolder)) w := service.Import() - opt := photoprism.ImportOptionsMove(sourcePath) + opt := photoprism.ImportOptionsMove(sourcePath, destFolder) w.Start(opt) diff --git a/internal/commands/index.go b/internal/commands/index.go index 4238357ad..a602b7a29 100644 --- a/internal/commands/index.go +++ b/internal/commands/index.go @@ -20,7 +20,7 @@ import ( var IndexCommand = cli.Command{ Name: "index", Usage: "Indexes original media files", - ArgsUsage: "[originals folder]", + ArgsUsage: "[SUB-FOLDER]", Flags: indexFlags, Action: indexAction, } diff --git a/internal/commands/migrations.go b/internal/commands/migrations.go index 498e7c08e..e291fcada 100644 --- a/internal/commands/migrations.go +++ b/internal/commands/migrations.go @@ -18,7 +18,7 @@ var MigrationsStatusCommand = cli.Command{ Name: "ls", Aliases: []string{"status", "show"}, Usage: "Lists the status of schema migrations", - ArgsUsage: "[migrations...]", + ArgsUsage: "[MIGRATIONS...]", Flags: report.CliFlags, Action: migrationsStatusAction, } @@ -27,7 +27,7 @@ var MigrationsRunCommand = cli.Command{ Name: "run", Aliases: []string{"execute", "migrate"}, Usage: "Executes database schema migrations", - ArgsUsage: "[migrations...]", + ArgsUsage: "[MIGRATIONS...]", Flags: []cli.Flag{ cli.BoolFlag{ Name: "failed, f", diff --git a/internal/commands/passwd.go b/internal/commands/passwd.go index 9a36a0447..f422ea052 100644 --- a/internal/commands/passwd.go +++ b/internal/commands/passwd.go @@ -10,12 +10,11 @@ import ( "strings" "syscall" - "github.com/photoprism/photoprism/internal/service" - "github.com/urfave/cli" "github.com/photoprism/photoprism/internal/config" "github.com/photoprism/photoprism/internal/entity" + "github.com/photoprism/photoprism/internal/service" "github.com/photoprism/photoprism/pkg/clean" ) diff --git a/internal/commands/purge.go b/internal/commands/purge.go index 57f8b8bd2..e7a28bed7 100644 --- a/internal/commands/purge.go +++ b/internal/commands/purge.go @@ -7,7 +7,6 @@ import ( "time" "github.com/dustin/go-humanize/english" - "github.com/urfave/cli" "github.com/photoprism/photoprism/internal/config" diff --git a/internal/commands/restore.go b/internal/commands/restore.go index f25ba9fe5..fa24aae60 100644 --- a/internal/commands/restore.go +++ b/internal/commands/restore.go @@ -31,7 +31,7 @@ var RestoreCommand = cli.Command{ Name: "restore", Description: restoreDescription, Usage: "Restores the index from an SQL dump and optionally albums from YAML files", - ArgsUsage: "[filename.sql]", + ArgsUsage: "filename.sql", Flags: restoreFlags, Action: restoreAction, } diff --git a/internal/commands/show_test.go b/internal/commands/show_test.go index 09a1e9549..71773c879 100644 --- a/internal/commands/show_test.go +++ b/internal/commands/show_test.go @@ -26,6 +26,7 @@ func TestShowConfigCommand(t *testing.T) { assert.Contains(t, output, "config-path") assert.Contains(t, output, "originals-path") assert.Contains(t, output, "import-path") + assert.Contains(t, output, "import-dest") assert.Contains(t, output, "cache-path") assert.Contains(t, output, "assets-path") assert.Contains(t, output, "darktable-cli") diff --git a/internal/commands/users.go b/internal/commands/users.go index 2f7bb8ab1..679a5d04b 100644 --- a/internal/commands/users.go +++ b/internal/commands/users.go @@ -8,14 +8,14 @@ import ( // Usage hints for the user management subcommands. const ( - UserDisplayNameUsage = "full `NAME` for display in the interface" - UserEmailUsage = "unique `EMAIL` address of the user" - UserPasswordUsage = "`PASSWORD` for authentication" - UserRoleUsage = "user account `ROLE`" - UserAttrUsage = "custom user account `ATTRIBUTES`" - UserAdminUsage = "make user super admin with full access" - UserDisableLoginUsage = "disable login and use of the web interface" - UserCanSyncUsage = "allow to sync files via WebDAV" + UserNameUsage = "full `NAME` for display in the interface" + UserEmailUsage = "unique `EMAIL` address of the user" + UserPasswordUsage = "`PASSWORD` for authentication" + UserRoleUsage = "user account `ROLE`" + UserAttrUsage = "custom user account `ATTRIBUTES`" + UserAdminUsage = "make user super admin with full access" + UserNoLoginUsage = "disable login on the web interface" + UserCanSyncUsage = "allow to sync files via WebDAV" ) // UsersCommand registers the user management subcommands. @@ -34,8 +34,8 @@ var UsersCommand = cli.Command{ // UserFlags specifies the add and modify user command flags. var UserFlags = []cli.Flag{ cli.StringFlag{ - Name: "displayname, n", - Usage: UserDisplayNameUsage, + Name: "name, n", + Usage: UserNameUsage, }, cli.StringFlag{ Name: "email, m", @@ -59,8 +59,8 @@ var UserFlags = []cli.Flag{ Usage: UserAdminUsage, }, cli.BoolFlag{ - Name: "disable-login, d", - Usage: UserDisableLoginUsage, + Name: "no-login, l", + Usage: UserNoLoginUsage, }, cli.BoolFlag{ Name: "can-sync, w", diff --git a/internal/config/client_config.go b/internal/config/client_config.go index 0c43a5097..ea94e4623 100644 --- a/internal/config/client_config.go +++ b/internal/config/client_config.go @@ -82,6 +82,17 @@ type ClientConfig struct { Ext Values `json:"ext"` } +// ApplyACL updates the client config values based on the ACL and Role provided. +func (c ClientConfig) ApplyACL(a acl.ACL, r acl.Role) ClientConfig { + if c.Settings != nil { + c.Settings = c.Settings.ApplyACL(a, r) + } + + c.ACL = a.Grants(r) + + return c +} + // Years represents a list of years. type Years []int @@ -189,7 +200,7 @@ func (c *Config) Flags() (flags []string) { // ClientPublic returns config values for use by the JavaScript UI and other clients. func (c *Config) ClientPublic() ClientConfig { if c.Public() { - return c.ClientUser(true) + return c.ClientUser(true).ApplyACL(acl.Resources, acl.RoleAdmin) } a := c.ClientAssets() @@ -548,18 +559,13 @@ func (c *Config) ClientUser(withSettings bool) ClientConfig { // ClientRole provides the client config values for the specified user role. func (c *Config) ClientRole(role acl.Role) ClientConfig { - result := c.ClientUser(true) - result.Settings = result.Settings.ApplyACL(acl.Resources, role) - result.ACL = acl.Resources.Grants(role) - - return result + return c.ClientUser(true).ApplyACL(acl.Resources, role) } // ClientSession provides the client config values for the specified session. func (c *Config) ClientSession(sess *entity.Session) ClientConfig { - result := c.ClientUser(false) + result := c.ClientUser(false).ApplyACL(acl.Resources, sess.User().AclRole()) result.Settings = c.SessionSettings(sess) - result.ACL = acl.Resources.Grants(sess.User().AclRole()) return result } diff --git a/internal/config/client_config_test.go b/internal/config/client_config_test.go index 3b9124d4c..cf7125fd1 100644 --- a/internal/config/client_config_test.go +++ b/internal/config/client_config_test.go @@ -148,7 +148,7 @@ func TestConfig_ClientRoleConfig(t *testing.T) { Logs: false, Moments: false, People: false, - Places: false, + Places: true, Private: false, Ratings: false, Reactions: false, diff --git a/internal/config/config_filepaths.go b/internal/config/config_filepaths.go index 454da33c5..7f88af76f 100644 --- a/internal/config/config_filepaths.go +++ b/internal/config/config_filepaths.go @@ -256,6 +256,11 @@ func (c *Config) ImportPath() string { return fs.Abs(c.options.ImportPath) } +// ImportDest returns the relative originals path to which the files should be imported by default. +func (c *Config) ImportDest() string { + return clean.UserPath(c.options.ImportDest) +} + // SidecarPath returns the storage path for generated sidecar files (relative or absolute). func (c *Config) SidecarPath() string { if c.options.SidecarPath == "" { diff --git a/internal/config/config_report.go b/internal/config/config_report.go index 849c30dbc..f15cf9c2c 100644 --- a/internal/config/config_report.go +++ b/internal/config/config_report.go @@ -51,6 +51,7 @@ func (c *Config) Report() (rows [][]string, cols []string) { {"cmd-cache-path", c.CmdCachePath()}, {"thumb-cache-path", c.ThumbCachePath()}, {"import-path", c.ImportPath()}, + {"import-dest", c.ImportDest()}, {"assets-path", c.AssetsPath()}, {"static-path", c.StaticPath()}, {"build-path", c.BuildPath()}, diff --git a/internal/config/options.go b/internal/config/options.go index 008faeff9..99cf6a47c 100644 --- a/internal/config/options.go +++ b/internal/config/options.go @@ -48,6 +48,7 @@ type Options struct { BackupPath string `yaml:"BackupPath" json:"-" flag:"backup-path"` CachePath string `yaml:"CachePath" json:"-" flag:"cache-path"` ImportPath string `yaml:"ImportPath" json:"-" flag:"import-path"` + ImportDest string `yaml:"ImportDest" json:"-" flag:"import-dest"` AssetsPath string `yaml:"AssetsPath" json:"-" flag:"assets-path"` CustomAssetsPath string `yaml:"-" json:"-" flag:"custom-assets-path"` TempPath string `yaml:"TempPath" json:"-" flag:"temp-path"` diff --git a/internal/config/options_cli.go b/internal/config/options_cli.go index b99dbf2b6..f3538c7fa 100644 --- a/internal/config/options_cli.go +++ b/internal/config/options_cli.go @@ -164,6 +164,12 @@ var Flags = CliFlags{ Usage: "base `PATH` from which files can be imported to originals *optional*", EnvVar: "PHOTOPRISM_IMPORT_PATH", }}, + CliFlag{ + Flag: cli.StringFlag{ + Name: "import-dest", + Usage: "relative originals `PATH` to which the files should be imported by default *optional*", + EnvVar: "PHOTOPRISM_IMPORT_DEST", + }}, CliFlag{ Flag: cli.StringFlag{ Name: "assets-path, as", diff --git a/internal/customize/acl.go b/internal/customize/acl.go index 6420e9396..1a69801ca 100644 --- a/internal/customize/acl.go +++ b/internal/customize/acl.go @@ -9,41 +9,41 @@ func (s *Settings) ApplyACL(list acl.ACL, role acl.Role) *Settings { m := *s // Features. - m.Features.Search = s.Features.Search && list.AllowAny(acl.ResourcePhotos, role, acl.Permissions{acl.ActionSearch}) - m.Features.Ratings = s.Features.Ratings && list.AllowAny(acl.ResourcePhotos, role, acl.Permissions{acl.ActionRate}) - m.Features.Reactions = s.Features.Reactions && list.AllowAny(acl.ResourcePhotos, role, acl.Permissions{acl.ActionReact}) - m.Features.Videos = s.Features.Videos && list.AllowAny(acl.ResourceVideos, role, acl.Permissions{acl.ActionSearch}) m.Features.Albums = s.Features.Albums && list.AllowAny(acl.ResourceAlbums, role, acl.Permissions{acl.ActionView}) m.Features.Favorites = s.Features.Favorites && list.AllowAny(acl.ResourceFavorites, role, acl.Permissions{acl.ActionSearch}) + m.Features.Folders = s.Features.Folders && list.AllowAny(acl.ResourceFolders, role, acl.Permissions{acl.ActionSearch}) + m.Features.Labels = s.Features.Labels && list.AllowAny(acl.ResourceLabels, role, acl.Permissions{acl.ActionSearch}) m.Features.Moments = s.Features.Moments && list.AllowAny(acl.ResourceMoments, role, acl.Permissions{acl.ActionSearch}) m.Features.People = s.Features.People && list.AllowAny(acl.ResourcePeople, role, acl.Permissions{acl.ActionSearch}) - m.Features.Labels = s.Features.Labels && list.AllowAny(acl.ResourceLabels, role, acl.Permissions{acl.ActionSearch}) - m.Features.Places = s.Features.Places && list.AllowAny(acl.ResourcePlaces, role, acl.Permissions{acl.ActionSearch}) - m.Features.Folders = s.Features.Folders && list.AllowAny(acl.ResourceFolders, role, acl.Permissions{acl.ActionSearch}) + m.Features.Places = s.Features.Places && list.AllowAny(acl.ResourcePlaces, role, acl.Permissions{acl.ActionSearch, acl.ActionView}) m.Features.Private = s.Features.Private && list.AllowAny(acl.ResourcePhotos, role, acl.Permissions{acl.AccessPrivate}) + m.Features.Ratings = s.Features.Ratings && list.AllowAny(acl.ResourcePhotos, role, acl.Permissions{acl.ActionRate}) + m.Features.Reactions = s.Features.Reactions && list.AllowAny(acl.ResourcePhotos, role, acl.Permissions{acl.ActionReact}) + m.Features.Search = s.Features.Search && list.AllowAny(acl.ResourcePhotos, role, acl.Permissions{acl.ActionSearch}) + m.Features.Videos = s.Features.Videos && list.AllowAny(acl.ResourceVideos, role, acl.Permissions{acl.ActionSearch}) // Permissions. - m.Features.Edit = s.Features.Edit && list.AllowAny(acl.ResourcePhotos, role, acl.Permissions{acl.ActionUpdate}) - m.Features.Review = s.Features.Review && list.Allow(acl.ResourcePhotos, role, acl.ActionManage) m.Features.Archive = s.Features.Archive && list.AllowAny(acl.ResourcePhotos, role, acl.Permissions{acl.ActionDelete}) m.Features.Delete = s.Features.Delete && list.AllowAny(acl.ResourcePhotos, role, acl.Permissions{acl.ActionDelete}) + m.Features.Edit = s.Features.Edit && list.AllowAny(acl.ResourcePhotos, role, acl.Permissions{acl.ActionUpdate}) + m.Features.Review = s.Features.Review && list.Allow(acl.ResourcePhotos, role, acl.ActionManage) m.Features.Share = s.Features.Share && list.AllowAny(acl.ResourceShares, role, acl.Permissions{acl.ActionManage}) // Browse, upload and download files. + m.Features.Download = s.Features.Download && !s.Download.Disabled && list.Allow(acl.ResourcePhotos, role, acl.ActionDownload) m.Features.Files = s.Features.Files && list.AllowAny(acl.ResourceFiles, role, acl.Permissions{acl.ActionSearch}) m.Features.Upload = s.Features.Upload && list.Allow(acl.ResourcePhotos, role, acl.ActionUpload) - m.Features.Download = s.Features.Download && !s.Download.Disabled && list.Allow(acl.ResourcePhotos, role, acl.ActionDownload) // Library. + m.Features.Import = s.Features.Import && list.AllowAny(acl.ResourceFiles, role, acl.Permissions{acl.ActionManage, acl.ActionUpload}) m.Features.Library = s.Features.Library && list.Allow(acl.ResourceFiles, role, acl.ActionManage) - m.Features.Import = s.Features.Import && list.Allow(acl.ResourceFiles, role, acl.ActionManage) && list.Allow(acl.ResourcePhotos, role, acl.ActionCreate) m.Features.Logs = s.Features.Logs && list.Allow(acl.ResourceLogs, role, acl.ActionView) // Settings. - m.Features.Settings = s.Features.Settings && list.Allow(acl.ResourceSettings, role, acl.ActionUpdate) - m.Features.Advanced = s.Features.Advanced && list.Allow(acl.ResourceConfig, role, acl.ActionManage) - m.Features.Sync = s.Features.Sync && list.Allow(acl.ResourceAccounts, role, acl.ActionManage) m.Features.Account = s.Features.Account && list.Allow(acl.ResourcePassword, role, acl.ActionUpdate) + m.Features.Advanced = s.Features.Advanced && list.Allow(acl.ResourceConfig, role, acl.ActionManage) + m.Features.Settings = s.Features.Settings && list.Allow(acl.ResourceSettings, role, acl.ActionUpdate) + m.Features.Sync = s.Features.Sync && list.Allow(acl.ResourceAccounts, role, acl.ActionManage) return &m } diff --git a/internal/customize/acl_test.go b/internal/customize/acl_test.go index ed8e60809..ebb73f47c 100644 --- a/internal/customize/acl_test.go +++ b/internal/customize/acl_test.go @@ -73,7 +73,7 @@ func TestSettings_ApplyACL(t *testing.T) { Logs: false, Moments: false, People: false, - Places: false, + Places: true, Private: false, Ratings: false, Reactions: false, diff --git a/internal/entity/account.go b/internal/entity/account.go index aabdf920a..a8485576b 100644 --- a/internal/entity/account.go +++ b/internal/entity/account.go @@ -47,10 +47,10 @@ type Account struct { AccShare bool AccSync bool RetryLimit int - SharePath string `gorm:"type:VARBINARY(500);"` + SharePath string `gorm:"type:VARBINARY(1024);"` ShareSize string `gorm:"type:VARBINARY(16);"` ShareExpires int - SyncPath string `gorm:"type:VARBINARY(500);"` + SyncPath string `gorm:"type:VARBINARY(1024);"` SyncStatus string `gorm:"type:VARBINARY(16);"` SyncInterval int SyncDate sql.NullTime `deepcopier:"skip"` diff --git a/internal/entity/album.go b/internal/entity/album.go index 95c55ce4a..030744a1f 100644 --- a/internal/entity/album.go +++ b/internal/entity/album.go @@ -19,12 +19,12 @@ import ( ) const ( + AlbumUID = byte('a') AlbumDefault = "album" AlbumFolder = "folder" AlbumMoment = "moment" AlbumMonth = "month" AlbumState = "state" - AlbumUID = 'a' ) type Albums []Album @@ -35,7 +35,7 @@ type Album struct { AlbumUID string `gorm:"type:VARBINARY(64);unique_index;" json:"UID" yaml:"UID"` ParentUID string `gorm:"type:VARBINARY(64);default:'';" json:"ParentUID,omitempty" yaml:"ParentUID,omitempty"` AlbumSlug string `gorm:"type:VARBINARY(160);index;" json:"Slug" yaml:"Slug"` - AlbumPath string `gorm:"type:VARBINARY(500);index;" json:"Path,omitempty" yaml:"Path,omitempty"` + AlbumPath string `gorm:"type:VARBINARY(1024);index;" json:"Path,omitempty" yaml:"Path,omitempty"` AlbumType string `gorm:"type:VARBINARY(8);default:'album';" json:"Type" yaml:"Type,omitempty"` AlbumTitle string `gorm:"type:VARCHAR(160);index;" json:"Title" yaml:"Title"` AlbumLocation string `gorm:"type:VARCHAR(160);" json:"Location" yaml:"Location,omitempty"` diff --git a/internal/entity/album_cache.go b/internal/entity/album_cache.go index 00c709c16..b984dc907 100644 --- a/internal/entity/album_cache.go +++ b/internal/entity/album_cache.go @@ -20,7 +20,7 @@ func FlushAlbumCache() { // CachedAlbumByUID returns an existing album or nil if not found. func CachedAlbumByUID(uid string) (m Album, err error) { // Valid album UID? - if uid == "" || !rnd.IsUID(uid, 'a') { + if uid == "" || rnd.InvalidUID(uid, AlbumUID) { return m, fmt.Errorf("invalid album uid %s", clean.LogQuote(uid)) } diff --git a/internal/entity/auth_session.go b/internal/entity/auth_session.go index 95b08768b..c8da8ebc4 100644 --- a/internal/entity/auth_session.go +++ b/internal/entity/auth_session.go @@ -6,6 +6,9 @@ import ( "net/http" "time" + "github.com/photoprism/photoprism/internal/event" + "github.com/photoprism/photoprism/pkg/clean" + "github.com/gin-gonic/gin" "github.com/jinzhu/gorm" @@ -238,22 +241,27 @@ func (m *Session) SetContext(c *gin.Context) *Session { return m } - if ip := txt.Clip(c.ClientIP(), 48); ip != "" { - m.ClientIP = net.ParseIP(ip).String() - - if m.LoginIP == "" { - m.LoginIP = net.ParseIP(ip).String() - m.LoginAt = TimeStamp() - } - } - - if ua := txt.Clip(c.GetHeader("User-Agent"), 512); ua != "" { - m.UserAgent = ua - } + m.SetClientIP(c.ClientIP()) + m.SetUserAgent(c.GetHeader("User-Agent")) return m } +// IsVisitor checks if the session belongs to a sharing link visitor. +func (m *Session) IsVisitor() bool { + return m.User().IsVisitor() +} + +// IsRegistered checks if the session belongs to a registered user account. +func (m *Session) IsRegistered() bool { + return m.User().IsRegistered() +} + +// Unregistered checks if the session belongs to a unregistered user. +func (m *Session) Unregistered() bool { + return !m.User().IsRegistered() +} + // NoShares checks if the session has no shares yet. func (m *Session) NoShares() bool { return m.Data().NoShares() @@ -269,11 +277,6 @@ func (m *Session) HasShare(uid string) bool { return m.Data().HasShare(uid) } -// IsVisitor checks if the session belongs to a sharing link visitor. -func (m *Session) IsVisitor() bool { - return m.User().IsVisitor() -} - // Expired checks if the session has expired. func (m *Session) Expired() bool { if m.ExpiresAt.IsZero() { @@ -320,3 +323,45 @@ func (m *Session) SharedUIDs() UIDs { return data.SharedUIDs() } + +// SetUserAgent sets the client user agent. +func (m *Session) SetUserAgent(ua string) { + if ua == "" { + return + } else if ua = txt.Clip(ua, 512); ua == "" { + return + } else if m.UserAgent != "" && m.UserAgent != ua { + event.AuditWarn([]string{m.IP(), "session %s", "user agent has changed from %s to %s"}, m.RefID, clean.LogQuote(m.UserAgent), clean.LogQuote(ua)) + } + + m.UserAgent = ua +} + +// SetClientIP sets the client IP address. +func (m *Session) SetClientIP(ip string) { + if ip == "" { + return + } else if parsed := net.ParseIP(ip); parsed == nil { + return + } else if ip = parsed.String(); ip == "" { + return + } else if m.ClientIP != "" && m.ClientIP != ip { + event.AuditWarn([]string{ip, "session %s", "client address has changed from %s to %s"}, m.RefID, clean.LogQuote(m.ClientIP), clean.LogQuote(ip)) + } + + m.ClientIP = ip + + if m.LoginIP == "" { + m.LoginIP = ip + m.LoginAt = TimeStamp() + } +} + +// IP returns the client IP address, or "unknown" if it is unknown. +func (m *Session) IP() string { + if m.ClientIP != "" { + return m.ClientIP + } else { + return "unknown" + } +} diff --git a/internal/entity/auth_session_data.go b/internal/entity/auth_session_data.go index 0a9a2b33d..47cd18296 100644 --- a/internal/entity/auth_session_data.go +++ b/internal/entity/auth_session_data.go @@ -82,6 +82,10 @@ func (data SessionData) HasShares() bool { // HasShare if the session includes the specified share func (data SessionData) HasShare(uid string) bool { + if uid == "" || data.NoShares() { + return false + } + for _, share := range data.Shares { if share == uid { return true diff --git a/internal/entity/auth_user.go b/internal/entity/auth_user.go index 109bc73d8..e53a9ccd5 100644 --- a/internal/entity/auth_user.go +++ b/internal/entity/auth_user.go @@ -4,6 +4,7 @@ import ( "errors" "fmt" "net/mail" + "path" "strings" "time" @@ -18,8 +19,8 @@ import ( // User identifier prefixes. const ( + UserUID = byte('u') UserPrefix = "user" - UserUID = 'u' ) // LenNameMin specifies the minimum length of the username in characters. @@ -47,6 +48,8 @@ type User struct { SuperAdmin bool `json:"SuperAdmin,omitempty" yaml:"SuperAdmin,omitempty"` CanLogin bool `json:"CanLogin,omitempty" yaml:"CanLogin,omitempty"` LoginAt *time.Time `json:"LoginAt,omitempty" yaml:"LoginAt,omitempty"` + BasePath string `gorm:"type:VARBINARY(1024);" json:"BasePath,omitempty" yaml:"BasePath,omitempty"` + UploadPath string `gorm:"type:VARBINARY(1024);" json:"UploadPath,omitempty" yaml:"UploadPath,omitempty"` CanSync bool `json:"CanSync,omitempty" yaml:"CanSync,omitempty"` CanInvite bool `json:"CanInvite,omitempty" yaml:"CanInvite,omitempty"` InviteToken string `gorm:"type:VARBINARY(64);index;" json:"-" yaml:"-"` @@ -277,7 +280,7 @@ func (m *User) Disabled() bool { return m.Deleted() || m.Expired() } -// LoginAllowed checks if logging in with the user account is possible. +// LoginAllowed checks if the user is allowed to log in and use the web UI. func (m *User) LoginAllowed() bool { if role := m.AclRole(); m.Disabled() || !m.CanLogin || m.UserName == "" || role == acl.RoleUnauthorized { return false @@ -287,7 +290,7 @@ func (m *User) LoginAllowed() bool { } -// SyncAllowed checks if file sync with the user account is possible. +// SyncAllowed checks whether the user is allowed to use WebDAV to synchronize files. func (m *User) SyncAllowed() bool { if role := m.AclRole(); m.Disabled() || !m.CanSync || m.UserName == "" || role == acl.RoleUnauthorized { return false @@ -296,6 +299,33 @@ func (m *User) SyncAllowed() bool { } } +// UploadAllowed checks if the user is allowed to upload files. +func (m *User) UploadAllowed() bool { + if role := m.AclRole(); m.Disabled() || role == acl.RoleUnauthorized { + return false + } else { + return acl.Resources.Allow(acl.ResourcePhotos, role, acl.ActionUpload) + } +} + +// SetBasePath changes the user's base folder. +func (m *User) SetBasePath(dir string) *User { + m.BasePath = clean.UserPath(dir) + + return m +} + +// SetUploadPath changes the user's upload folder. +func (m *User) SetUploadPath(dir string) *User { + if m.BasePath == "" { + m.UploadPath = clean.UserPath(dir) + } else { + m.UploadPath = path.Join(m.BasePath, clean.UserPath(dir)) + } + + return m +} + // String returns an identifier that can be used in logs. func (m *User) String() string { if n := m.Name(); n != "" { @@ -326,7 +356,7 @@ func (m *User) SetName(login string) (err error) { // Update display name. if m.DisplayName == "" || m.DisplayName == AdminDisplayName { - m.DisplayName = clean.Name(login) + m.DisplayName = clean.NameCapitalized(login) } return nil @@ -568,6 +598,8 @@ func (m *User) SetFormValues(frm form.User) *User { m.CanSync = frm.CanSync m.UserRole = frm.Role() m.UserAttr = frm.Attr() + m.SetBasePath(frm.BasePath) + m.SetUploadPath(frm.UploadPath) return m } diff --git a/internal/entity/auth_user_cli.go b/internal/entity/auth_user_cli.go index 5df220083..f78497457 100644 --- a/internal/entity/auth_user_cli.go +++ b/internal/entity/auth_user_cli.go @@ -1,6 +1,7 @@ package entity import ( + "github.com/photoprism/photoprism/pkg/clean" "github.com/urfave/cli" "github.com/photoprism/photoprism/internal/form" @@ -16,8 +17,8 @@ func (m *User) SetValuesFromCli(ctx *cli.Context) error { } // Display name. - if ctx.IsSet("displayname") { - m.DisplayName = frm.DisplayName + if ctx.IsSet("name") { + m.DisplayName = clean.Name(frm.DisplayName) } // User role. @@ -25,18 +26,13 @@ func (m *User) SetValuesFromCli(ctx *cli.Context) error { m.UserRole = frm.Role() } - // Custom attributes. - if ctx.IsSet("attr") { - m.UserAttr = frm.Attr() - } - // Super-admin status. if ctx.IsSet("superadmin") { m.SuperAdmin = frm.SuperAdmin } // Disable Web UI? - if ctx.IsSet("disable-login") { + if ctx.IsSet("no-login") { m.CanLogin = frm.CanLogin } @@ -45,5 +41,20 @@ func (m *User) SetValuesFromCli(ctx *cli.Context) error { m.CanSync = frm.CanSync } + // Custom attributes. + if ctx.IsSet("attr") { + m.UserAttr = frm.Attr() + } + + // Originals base folder. + if ctx.IsSet("base-path") { + m.SetBasePath(frm.BasePath) + } + + // Sub-folder for uploads. + if ctx.IsSet("upload-path") { + m.SetUploadPath(frm.UploadPath) + } + return m.Validate() } diff --git a/internal/entity/auth_user_settings.go b/internal/entity/auth_user_settings.go index 16f59661d..1162e9b0f 100644 --- a/internal/entity/auth_user_settings.go +++ b/internal/entity/auth_user_settings.go @@ -11,17 +11,17 @@ import ( // UserSettings represents user preferences. type UserSettings struct { UserUID string `gorm:"type:VARBINARY(64);primary_key;auto_increment:false;" json:"-" yaml:"UserUID"` - UIHome string `gorm:"type:VARBINARY(32);column:ui_home;" json:"UIHome,omitempty" yaml:"UIHome,omitempty"` UITheme string `gorm:"type:VARBINARY(32);column:ui_theme;" json:"UITheme,omitempty" yaml:"UITheme,omitempty"` UILanguage string `gorm:"type:VARBINARY(32);column:ui_language;" json:"UILanguage,omitempty" yaml:"UILanguage,omitempty"` UITimeZone string `gorm:"type:VARBINARY(64);column:ui_time_zone;" json:"UITimeZone,omitempty" yaml:"UITimeZone,omitempty"` MapsStyle string `gorm:"type:VARBINARY(32);" json:"MapsStyle,omitempty" yaml:"MapsStyle,omitempty"` MapsAnimate int `json:"MapsAnimate,omitempty" yaml:"MapsAnimate,omitempty"` - IndexPath string `gorm:"type:VARBINARY(500);" json:"IndexPath,omitempty" yaml:"IndexPath,omitempty"` + IndexPath string `gorm:"type:VARBINARY(1024);" json:"IndexPath,omitempty" yaml:"IndexPath,omitempty"` IndexRescan int `json:"IndexRescan,omitempty" yaml:"IndexRescan,omitempty"` - ImportPath string `gorm:"type:VARBINARY(500);" json:"ImportPath,omitempty" yaml:"ImportPath,omitempty"` + ImportPath string `gorm:"type:VARBINARY(1024);" json:"ImportPath,omitempty" yaml:"ImportPath,omitempty"` ImportMove int `json:"ImportMove,omitempty" yaml:"ImportMove,omitempty"` - UploadPath string `gorm:"type:VARBINARY(500);" json:"UploadPath,omitempty" yaml:"UploadPath,omitempty"` + UploadPath string `gorm:"type:VARBINARY(1024);" json:"UploadPath,omitempty" yaml:"UploadPath,omitempty"` + DefaultPage string `gorm:"type:VARBINARY(128);" json:"DefaultPage,omitempty" yaml:"DefaultPage,omitempty"` CreatedAt time.Time `json:"CreatedAt" yaml:"-"` UpdatedAt time.Time `json:"UpdatedAt" yaml:"-"` } diff --git a/internal/entity/auth_user_test.go b/internal/entity/auth_user_test.go index 98c3d3966..c22e357c9 100644 --- a/internal/entity/auth_user_test.go +++ b/internal/entity/auth_user_test.go @@ -665,3 +665,9 @@ func TestUser_SyncAllowed(t *testing.T) { assert.False(t, UserFixtures.Pointer("deleted").SyncAllowed()) assert.False(t, UserFixtures.Pointer("friend").SyncAllowed()) } + +func TestUser_UploadAllowed(t *testing.T) { + assert.True(t, UserFixtures.Pointer("alice").UploadAllowed()) + assert.False(t, UserFixtures.Pointer("deleted").UploadAllowed()) + assert.True(t, UserFixtures.Pointer("friend").UploadAllowed()) +} diff --git a/internal/entity/cell.go b/internal/entity/cell.go index 5db7b25b4..72c6d0453 100644 --- a/internal/entity/cell.go +++ b/internal/entity/cell.go @@ -250,7 +250,7 @@ func FirstOrCreateCell(m *Cell) *Cell { // Keywords returns search keywords for a location. func (m *Cell) Keywords() (result []string) { if m.Place == nil { - log.Errorf("cell: info for %s is nil - possible bug", m.ID) + log.Errorf("cell: place for %s is missing - possible bug", m.ID) return result } diff --git a/internal/entity/face.go b/internal/entity/face.go index fbe6db0f2..91ba431a3 100644 --- a/internal/entity/face.go +++ b/internal/entity/face.go @@ -411,7 +411,7 @@ func FindFace(id string) *Face { // ValidFaceCount counts the number of valid face markers for a file uid. func ValidFaceCount(fileUID string) (c int) { - if !rnd.IsUID(fileUID, 'f') { + if !rnd.IsUID(fileUID, FileUID) { return } diff --git a/internal/entity/file.go b/internal/entity/file.go index f8b9185ea..0573ea9a6 100644 --- a/internal/entity/file.go +++ b/internal/entity/file.go @@ -25,6 +25,10 @@ import ( "github.com/photoprism/photoprism/pkg/txt" ) +const ( + FileUID = byte('f') +) + // Files represents a file result set. type Files []File @@ -44,7 +48,7 @@ type File struct { MediaUTC int64 `gorm:"column:media_utc;index;" json:"MediaUTC" yaml:"MediaUTC,omitempty"` InstanceID string `gorm:"type:VARBINARY(64);index;" json:"InstanceID,omitempty" yaml:"InstanceID,omitempty"` FileUID string `gorm:"type:VARBINARY(64);unique_index;" json:"UID" yaml:"UID"` - FileName string `gorm:"type:VARBINARY(755);unique_index:idx_files_name_root;" json:"Name" yaml:"Name"` + FileName string `gorm:"type:VARBINARY(1024);unique_index:idx_files_name_root;" json:"Name" yaml:"Name"` FileRoot string `gorm:"type:VARBINARY(16);default:'/';unique_index:idx_files_name_root;" json:"Root" yaml:"Root,omitempty"` OriginalName string `gorm:"type:VARBINARY(755);" json:"OriginalName" yaml:"OriginalName,omitempty"` FileHash string `gorm:"type:VARBINARY(128);index" json:"Hash" yaml:"Hash,omitempty"` @@ -193,11 +197,11 @@ func (m *File) BeforeCreate(scope *gorm.Scope) error { } // Return if uid exists. - if rnd.IsUnique(m.FileUID, 'f') { + if rnd.IsUnique(m.FileUID, FileUID) { return nil } - return scope.SetColumn("FileUID", rnd.GenerateUID('f')) + return scope.SetColumn("FileUID", rnd.GenerateUID(FileUID)) } // DownloadName returns the download file name. diff --git a/internal/entity/folder.go b/internal/entity/folder.go index 196254390..3a1ce4b89 100644 --- a/internal/entity/folder.go +++ b/internal/entity/folder.go @@ -22,7 +22,7 @@ type Folders []Folder // Folder represents a file system directory. type Folder struct { - Path string `gorm:"type:VARBINARY(500);unique_index:idx_folders_path_root;" json:"Path" yaml:"Path"` + Path string `gorm:"type:VARBINARY(1024);unique_index:idx_folders_path_root;" json:"Path" yaml:"Path"` Root string `gorm:"type:VARBINARY(16);default:'';unique_index:idx_folders_path_root;" json:"Root" yaml:"Root,omitempty"` FolderUID string `gorm:"type:VARBINARY(64);primary_key;" json:"UID,omitempty" yaml:"UID,omitempty"` FolderType string `gorm:"type:VARBINARY(16);" json:"Type" yaml:"Type,omitempty"` diff --git a/internal/entity/label.go b/internal/entity/label.go index 4ce77ea9d..5d0db4c49 100644 --- a/internal/entity/label.go +++ b/internal/entity/label.go @@ -14,6 +14,10 @@ import ( "github.com/photoprism/photoprism/pkg/txt" ) +const ( + LabelUID = byte('l') +) + var labelMutex = sync.Mutex{} var labelCategoriesMutex = sync.Mutex{} @@ -47,11 +51,11 @@ func (Label) TableName() string { // BeforeCreate creates a random UID if needed before inserting a new row to the database. func (m *Label) BeforeCreate(scope *gorm.Scope) error { - if rnd.IsUnique(m.LabelUID, 'l') { + if rnd.IsUnique(m.LabelUID, LabelUID) { return nil } - return scope.SetColumn("LabelUID", rnd.GenerateUID('l')) + return scope.SetColumn("LabelUID", rnd.GenerateUID(LabelUID)) } // NewLabel returns a new label. @@ -168,7 +172,7 @@ func (m *Label) AfterCreate(scope *gorm.Scope) error { // SetName changes the label name. func (m *Label) SetName(name string) { - name = clean.Name(name) + name = clean.NameCapitalized(name) if name == "" { return diff --git a/internal/entity/link.go b/internal/entity/link.go index 1924d4deb..4bce0b90e 100644 --- a/internal/entity/link.go +++ b/internal/entity/link.go @@ -11,6 +11,10 @@ import ( "github.com/photoprism/photoprism/pkg/txt" ) +const ( + LinkUID = byte('s') +) + type Links []Link // Link represents a sharing link. @@ -36,11 +40,11 @@ func (Link) TableName() string { // BeforeCreate creates a random UID if needed before inserting a new row to the database. func (m *Link) BeforeCreate(scope *gorm.Scope) error { - if rnd.IsUnique(m.LinkUID, 's') { + if rnd.IsUnique(m.LinkUID, LinkUID) { return nil } - return scope.SetColumn("LinkUID", rnd.GenerateUID('s')) + return scope.SetColumn("LinkUID", rnd.GenerateUID(LinkUID)) } // NewLink creates a sharing link. @@ -48,7 +52,7 @@ func NewLink(shareUID string, canComment, canEdit bool) Link { now := TimeStamp() result := Link{ - LinkUID: rnd.GenerateUID('s'), + LinkUID: rnd.GenerateUID(LinkUID), ShareUID: shareUID, LinkToken: rnd.GenerateToken(10), CanComment: canComment, diff --git a/internal/entity/photo.go b/internal/entity/photo.go index 98983fb2b..f5c699bed 100644 --- a/internal/entity/photo.go +++ b/internal/entity/photo.go @@ -23,7 +23,7 @@ import ( ) const ( - PhotoUID = 'p' + PhotoUID = byte('p') ) var MetadataUpdateInterval = 24 * 3 * time.Hour // 3 Days @@ -63,7 +63,7 @@ type Photo struct { TitleSrc string `gorm:"type:VARBINARY(8);" json:"TitleSrc" yaml:"TitleSrc,omitempty"` PhotoDescription string `gorm:"type:VARCHAR(4096);" json:"Description" yaml:"Description,omitempty"` DescriptionSrc string `gorm:"type:VARBINARY(8);" json:"DescriptionSrc" yaml:"DescriptionSrc,omitempty"` - PhotoPath string `gorm:"type:VARBINARY(500);index:idx_photos_path_name;" json:"Path" yaml:"-"` + PhotoPath string `gorm:"type:VARBINARY(1024);index:idx_photos_path_name;" json:"Path" yaml:"-"` PhotoName string `gorm:"type:VARBINARY(255);index:idx_photos_path_name;" json:"Name" yaml:"-"` OriginalName string `gorm:"type:VARBINARY(755);" json:"OriginalName" yaml:"OriginalName,omitempty"` PhotoStack int8 `json:"Stack" yaml:"Stack,omitempty"` diff --git a/internal/form/search_photos.go b/internal/form/search_photos.go index 5e811860c..0e258778e 100644 --- a/internal/form/search_photos.go +++ b/internal/form/search_photos.go @@ -9,8 +9,9 @@ import ( // SearchPhotos represents search form fields for "/api/v1/photos". type SearchPhotos struct { Query string `form:"q"` - Filter string `form:"filter" notes:"-" serialize:"-"` - UID string `form:"uid" example:"uid:pqbcf5j446s0futy" notes:"Internal Unique ID, only exact matches"` + In string `form:"in" serialize:"-" example:"in:ariqwb43p5dh9h13" notes:"Limits results to the album UID specified"` + Filter string `form:"filter" serialize:"-" notes:"-"` + UID string `form:"uid" example:"uid:pqbcf5j446s0futy" notes:"Search for specific files or photos, only exact matches"` Type string `form:"type" example:"type:raw" notes:"Media Type (image, video, raw, live, animated); OR search with |"` Path string `form:"path" example:"path:2020/Holiday" notes:"Path Name, OR search with |, supports * wildcards"` Folder string `form:"folder" example:"folder:\"*/2020\"" notes:"Path Name, OR search with |, supports * wildcards"` // Alias for Path @@ -138,6 +139,11 @@ func (f *SearchPhotos) SerializeAll() string { return Serialize(f, true) } +// FindUidOnly checks if search filters other than UID may be skipped to improve performance. +func (f *SearchPhotos) FindUidOnly() bool { + return f.UID != "" && f.Query == "" && f.In == "" && f.Filter == "" && f.Album == "" && f.Albums == "" +} + func NewPhotoSearch(query string) SearchPhotos { return SearchPhotos{Query: query} } diff --git a/internal/form/search_photos_geo.go b/internal/form/search_photos_geo.go index bf7cb0237..8a12820d2 100644 --- a/internal/form/search_photos_geo.go +++ b/internal/form/search_photos_geo.go @@ -9,7 +9,9 @@ import ( // SearchPhotosGeo represents search form fields for "/api/v1/geo". type SearchPhotosGeo struct { Query string `form:"q"` - Filter string `form:"filter"` + In string `form:"in" serialize:"-" example:"in:ariqwb43p5dh9h13" notes:"Limits results to the album UID specified"` + Filter string `form:"filter" serialize:"-" notes:"-"` + UID string `form:"uid" example:"uid:pqbcf5j446s0futy" notes:"Search for specific files or photos, only exact matches"` Near string `form:"near"` Type string `form:"type"` Path string `form:"path"` @@ -48,8 +50,8 @@ type SearchPhotosGeo struct { Subjects string `form:"subjects"` // Text People string `form:"people"` // Alias for Subjects Keywords string `form:"keywords"` - Album string `form:"album"` - Albums string `form:"albums"` + Album string `form:"album" example:"album:berlin" notes:"Album UID or Name, supports * wildcards"` + Albums string `form:"albums" example:"albums:\"South Africa & Birds\"" notes:"Album Names, can be combined with & and |"` Country string `form:"country"` State string `form:"state"` // Moments City string `form:"city"` @@ -122,6 +124,11 @@ func (f *SearchPhotosGeo) SerializeAll() string { return Serialize(f, true) } +// FindByIdOnly checks if search filters other than UID may be skipped to improve performance. +func (f *SearchPhotosGeo) FindByIdOnly() bool { + return f.UID != "" && f.Query == "" && f.In == "" && f.Filter == "" && f.Album == "" && f.Albums == "" +} + func NewGeoSearch(query string) SearchPhotosGeo { return SearchPhotosGeo{Query: query} } diff --git a/internal/form/serialize.go b/internal/form/serialize.go index 34d9ac3f5..d0e3fc59c 100644 --- a/internal/form/serialize.go +++ b/internal/form/serialize.go @@ -8,9 +8,9 @@ import ( "time" "unicode" - "github.com/photoprism/photoprism/pkg/clean" - "github.com/araddon/dateparse" + + "github.com/photoprism/photoprism/pkg/clean" "github.com/photoprism/photoprism/pkg/txt" ) @@ -35,7 +35,7 @@ func Serialize(f interface{}, all bool) string { fieldInfo := v.Type().Field(i).Tag.Get("serialize") // Serialize field values as string. - if fieldName != "" && (fieldInfo != "-" || all) { + if fieldName != "" && fieldName != "-" && (fieldInfo != "-" || all) { switch t := fieldValue.Interface().(type) { case time.Time: if val := fieldValue.Interface().(time.Time); !val.IsZero() { @@ -123,7 +123,7 @@ func Unserialize(f SearchForm, q string) (result error) { stringValue := string(value) - if fieldName != "" && field.CanSet() { + if fieldName != "" && fieldName != "-" && field.CanSet() { switch field.Interface().(type) { case time.Time: if timeValue, err := dateparse.ParseAny(stringValue); err != nil { diff --git a/internal/form/user.go b/internal/form/user.go index 03731a156..e34ad6e6f 100644 --- a/internal/form/user.go +++ b/internal/form/user.go @@ -12,10 +12,12 @@ type User struct { UserEmail string `json:"Email,omitempty" yaml:"Email,omitempty"` DisplayName string `json:"DisplayName,omitempty" yaml:"DisplayName,omitempty"` UserRole string `json:"Role,omitempty" yaml:"Role,omitempty"` - UserAttr string `json:"Attr,omitempty" yaml:"Attr,omitempty"` SuperAdmin bool `json:"SuperAdmin,omitempty" yaml:"SuperAdmin,omitempty"` CanLogin bool `json:"CanLogin,omitempty" yaml:"CanLogin,omitempty"` CanSync bool `json:"CanSync,omitempty" yaml:"CanSync,omitempty"` + UserAttr string `json:"Attr,omitempty" yaml:"Attr,omitempty"` + BasePath string `json:"BasePath,omitempty" yaml:"BasePath,omitempty"` + UploadPath string `json:"UploadPath,omitempty" yaml:"UploadPath,omitempty"` Password string `json:"Password,omitempty" yaml:"Password,omitempty"` } @@ -24,12 +26,14 @@ func NewUserFromCli(ctx *cli.Context) User { return User{ UserName: clean.Username(ctx.Args().First()), UserEmail: clean.Email(ctx.String("email")), - DisplayName: clean.Name(ctx.String("displayname")), + DisplayName: clean.Name(ctx.String("name")), UserRole: clean.Role(ctx.String("role")), - UserAttr: clean.Attr(ctx.String("attr")), SuperAdmin: ctx.Bool("superadmin"), - CanLogin: !ctx.Bool("disable-login"), + CanLogin: !ctx.Bool("no-login"), CanSync: ctx.Bool("can-sync"), + UserAttr: clean.Attr(ctx.String("attr")), + BasePath: clean.Path(ctx.String("base-path")), + UploadPath: clean.Path(ctx.String("upload-path")), Password: clean.Password(ctx.String("password")), } } diff --git a/internal/i18n/messages.go b/internal/i18n/messages.go index 559940ba1..42feaed8b 100644 --- a/internal/i18n/messages.go +++ b/internal/i18n/messages.go @@ -105,7 +105,7 @@ var Messages = MessageMap{ ErrPublic: gettext("Not available in public mode"), ErrReadOnly: gettext("Not available in read-only mode"), ErrUnauthorized: gettext("Please log in to your account"), - ErrForbidden: gettext("Access denied"), + ErrForbidden: gettext("Permission denied"), ErrOffensiveUpload: gettext("Upload might be offensive"), ErrNoItemsSelected: gettext("No items selected"), ErrCreateFile: gettext("Failed creating file, please check permissions"), diff --git a/internal/photoprism/config.go b/internal/photoprism/config.go index 4ad1d0b8b..2ce9b1682 100644 --- a/internal/photoprism/config.go +++ b/internal/photoprism/config.go @@ -8,7 +8,7 @@ var conf *config.Config func SetConfig(c *config.Config) { if c == nil { - panic("config is nil") + panic("config is missing") } conf = c @@ -16,7 +16,7 @@ func SetConfig(c *config.Config) { func Config() *config.Config { if conf == nil { - panic("config is nil") + panic("config is missing") } return conf diff --git a/internal/photoprism/import.go b/internal/photoprism/import.go index 69c0894c9..a49958a55 100644 --- a/internal/photoprism/import.go +++ b/internal/photoprism/import.go @@ -61,7 +61,7 @@ func (imp *Import) Start(opt ImportOptions) fs.Done { done := make(fs.Done) if imp.conf == nil { - log.Errorf("import: config is nil") + log.Errorf("import: config is not set") return done } @@ -273,7 +273,7 @@ func (imp *Import) Cancel() { } // DestinationFilename returns the destination filename of a MediaFile to be imported. -func (imp *Import) DestinationFilename(mainFile *MediaFile, mediaFile *MediaFile) (string, error) { +func (imp *Import) DestinationFilename(mainFile *MediaFile, mediaFile *MediaFile, folder string) (string, error) { fileName := mainFile.CanonicalName() fileExtension := mediaFile.Extension() dateCreated := mainFile.DateCreated() @@ -289,11 +289,9 @@ func (imp *Import) DestinationFilename(mainFile *MediaFile, mediaFile *MediaFile } } - // Mon Jan 2 15:04:05 -0700 MST 2006 - pathName := filepath.Join(imp.originalsPath(), dateCreated.Format("2006/01")) - + // Find and return available filename. iteration := 0 - + pathName := filepath.Join(imp.originalsPath(), folder, dateCreated.Format("2006/01")) result := filepath.Join(pathName, fileName+fileExtension) for fs.FileExists(result) { diff --git a/internal/photoprism/import_options.go b/internal/photoprism/import_options.go index 90951777a..d147f8574 100644 --- a/internal/photoprism/import_options.go +++ b/internal/photoprism/import_options.go @@ -1,19 +1,22 @@ package photoprism +// ImportOptions represents file import options. type ImportOptions struct { Albums []string Path string Move bool + DestFolder string RemoveDotFiles bool RemoveExistingFiles bool RemoveEmptyDirectories bool } // ImportOptionsCopy returns import options for copying files to originals (read-only). -func ImportOptionsCopy(path string) ImportOptions { +func ImportOptionsCopy(importPath, destFolder string) ImportOptions { result := ImportOptions{ - Path: path, + Path: importPath, Move: false, + DestFolder: destFolder, RemoveDotFiles: false, RemoveExistingFiles: false, RemoveEmptyDirectories: false, @@ -23,10 +26,11 @@ func ImportOptionsCopy(path string) ImportOptions { } // ImportOptionsMove returns import options for moving files to originals (modifies import directory). -func ImportOptionsMove(path string) ImportOptions { +func ImportOptionsMove(importPath, destFolder string) ImportOptions { result := ImportOptions{ - Path: path, + Path: importPath, Move: true, + DestFolder: destFolder, RemoveDotFiles: true, RemoveExistingFiles: true, RemoveEmptyDirectories: true, diff --git a/internal/photoprism/import_options_test.go b/internal/photoprism/import_options_test.go index e32012d83..819a4bedb 100644 --- a/internal/photoprism/import_options_test.go +++ b/internal/photoprism/import_options_test.go @@ -7,19 +7,43 @@ import ( ) func TestImportOptionsCopy(t *testing.T) { - result := ImportOptionsCopy("xxx") - assert.Equal(t, "xxx", result.Path) - assert.Equal(t, false, result.Move) - assert.Equal(t, false, result.RemoveDotFiles) - assert.Equal(t, false, result.RemoveExistingFiles) - assert.Equal(t, false, result.RemoveEmptyDirectories) + t.Run("Default", func(t *testing.T) { + result := ImportOptionsCopy("xxx", "") + assert.Equal(t, "xxx", result.Path) + assert.Equal(t, "", result.DestFolder) + assert.Equal(t, false, result.Move) + assert.Equal(t, false, result.RemoveDotFiles) + assert.Equal(t, false, result.RemoveExistingFiles) + assert.Equal(t, false, result.RemoveEmptyDirectories) + }) + t.Run("WithDestPath", func(t *testing.T) { + result := ImportOptionsCopy("xxx", "foo/bar") + assert.Equal(t, "xxx", result.Path) + assert.Equal(t, "foo/bar", result.DestFolder) + assert.Equal(t, false, result.Move) + assert.Equal(t, false, result.RemoveDotFiles) + assert.Equal(t, false, result.RemoveExistingFiles) + assert.Equal(t, false, result.RemoveEmptyDirectories) + }) } func TestImportOptionsMove(t *testing.T) { - result := ImportOptionsMove("xxx") - assert.Equal(t, "xxx", result.Path) - assert.Equal(t, true, result.Move) - assert.Equal(t, true, result.RemoveDotFiles) - assert.Equal(t, true, result.RemoveExistingFiles) - assert.Equal(t, true, result.RemoveEmptyDirectories) + t.Run("Default", func(t *testing.T) { + result := ImportOptionsMove("xxx", "") + assert.Equal(t, "xxx", result.Path) + assert.Equal(t, "", result.DestFolder) + assert.Equal(t, true, result.Move) + assert.Equal(t, true, result.RemoveDotFiles) + assert.Equal(t, true, result.RemoveExistingFiles) + assert.Equal(t, true, result.RemoveEmptyDirectories) + }) + t.Run("WithDestPath", func(t *testing.T) { + result := ImportOptionsMove("xxx", "foo/bar") + assert.Equal(t, "xxx", result.Path) + assert.Equal(t, "foo/bar", result.DestFolder) + assert.Equal(t, true, result.Move) + assert.Equal(t, true, result.RemoveDotFiles) + assert.Equal(t, true, result.RemoveExistingFiles) + assert.Equal(t, true, result.RemoveEmptyDirectories) + }) } diff --git a/internal/photoprism/import_test.go b/internal/photoprism/import_test.go index faf12c0a9..b1343015d 100644 --- a/internal/photoprism/import_test.go +++ b/internal/photoprism/import_test.go @@ -27,7 +27,9 @@ func TestNewImport(t *testing.T) { func TestImport_DestinationFilename(t *testing.T) { conf := config.TestConfig() - conf.InitializeTestData() + if err := conf.InitializeTestData(); err != nil { + t.Fatal(err) + } tf := classify.New(conf.AssetsPath(), conf.DisableTensorFlow()) nd := nsfw.New(conf.NSFWModelPath()) @@ -44,13 +46,25 @@ func TestImport_DestinationFilename(t *testing.T) { t.Fatal(err) } - fileName, err := imp.DestinationFilename(rawFile, rawFile) + t.Run("NoBasePath", func(t *testing.T) { + fileName, err := imp.DestinationFilename(rawFile, rawFile, "") - if err != nil { - t.Fatal(err) - } + if err != nil { + t.Fatal(err) + } - assert.Equal(t, conf.OriginalsPath()+"/2019/07/20190705_153230_C167C6FD.cr2", fileName) + assert.Equal(t, conf.OriginalsPath()+"/2019/07/20190705_153230_C167C6FD.cr2", fileName) + }) + + t.Run("WithBasePath", func(t *testing.T) { + fileName, err := imp.DestinationFilename(rawFile, rawFile, "users/guest") + + if err != nil { + t.Fatal(err) + } + + assert.Equal(t, conf.OriginalsPath()+"/users/guest/2019/07/20190705_153230_C167C6FD.cr2", fileName) + }) } func TestImport_Start(t *testing.T) { @@ -71,7 +85,7 @@ func TestImport_Start(t *testing.T) { imp := NewImport(conf, ind, convert) - opt := ImportOptionsMove(conf.ImportPath()) + opt := ImportOptionsMove(conf.ImportPath(), "") imp.Start(opt) } diff --git a/internal/photoprism/import_worker.go b/internal/photoprism/import_worker.go index efd3647f6..e9e449f6b 100644 --- a/internal/photoprism/import_worker.go +++ b/internal/photoprism/import_worker.go @@ -25,16 +25,18 @@ func ImportWorker(jobs <-chan ImportJob) { var destMainFileName string o := job.IndexOpt + imp := job.Imp - impOpt := job.ImportOpt - impPath := job.ImportOpt.Path + opt := job.ImportOpt + src := job.ImportOpt.Path + related := job.Related // relatedOriginalNames contains the original filenames of related files. relatedOriginalNames := make(map[string]string, len(related.Files)) if related.Main == nil { - log.Warnf("import: %s belongs to no supported media file", clean.Log(fs.RelName(job.FileName, impPath))) + log.Warnf("import: %s belongs to no supported media file", clean.Log(fs.RelName(job.FileName, src))) continue } @@ -50,17 +52,18 @@ func ImportWorker(jobs <-chan ImportJob) { } } - originalName := related.Main.RelName(impPath) + originalName := related.Main.RelName(src) event.Publish("import.file", event.Data{ - "fileName": originalName, - "baseName": filepath.Base(related.Main.FileName()), + "fileName": originalName, + "baseName": filepath.Base(related.Main.FileName()), + "subFolder": opt.DestFolder, }) for _, f := range related.Files { - relFileName := f.RelName(impPath) + relFileName := f.RelName(src) - if destFileName, err := imp.DestinationFilename(related.Main, f); err == nil { + if destFileName, err := imp.DestinationFilename(related.Main, f, opt.DestFolder); err == nil { destDir := filepath.Dir(destFileName) // Remember the original filenames of related files, so they can later be indexed and searched. @@ -87,7 +90,7 @@ func ImportWorker(jobs <-chan ImportJob) { log.Infof("import: moving related %s file %s to %s", f.FileType(), clean.Log(relFileName), clean.Log(fs.RelName(destFileName, imp.originalsPath()))) } - if impOpt.Move { + if opt.Move { if err := f.Move(destFileName); err != nil { logRelName := clean.Log(fs.RelName(destMainFileName, imp.originalsPath())) log.Debugf("import: %s", err.Error()) @@ -108,12 +111,12 @@ func ImportWorker(jobs <-chan ImportJob) { // Do nothing. } else if file, err := entity.FirstFileByHash(fileHash); err != nil { // Do nothing. - } else if err := entity.AddPhotoToAlbums(file.PhotoUID, impOpt.Albums); err != nil { + } else if err := entity.AddPhotoToAlbums(file.PhotoUID, opt.Albums); err != nil { log.Warn(err) } // Remove duplicates to save storage. - if impOpt.RemoveExistingFiles { + if opt.RemoveExistingFiles { if err := f.Remove(); err != nil { log.Errorf("import: failed deleting %s (%s)", clean.Log(f.BaseName()), err.Error()) } else { @@ -201,7 +204,7 @@ func ImportWorker(jobs <-chan ImportJob) { photoUID = res.PhotoUID // Add photo to album if a list of albums was provided when importing. - if err := entity.AddPhotoToAlbums(photoUID, impOpt.Albums); err != nil { + if err := entity.AddPhotoToAlbums(photoUID, opt.Albums); err != nil { log.Warn(err) } } diff --git a/internal/photoprism/import_worker_test.go b/internal/photoprism/import_worker_test.go index 8d411622b..9d680ce04 100644 --- a/internal/photoprism/import_worker_test.go +++ b/internal/photoprism/import_worker_test.go @@ -14,7 +14,9 @@ import ( func TestImportWorker_OriginalFileNames(t *testing.T) { conf := config.TestConfig() - conf.InitializeTestData() + if err := conf.InitializeTestData(); err != nil { + t.Fatal(err) + } tf := classify.New(conf.AssetsPath(), conf.DisableTensorFlow()) nd := nsfw.New(conf.NSFWModelPath()) @@ -55,7 +57,7 @@ func TestImportWorker_OriginalFileNames(t *testing.T) { FileName: mediaFile.FileName(), Related: relatedFiles, IndexOpt: IndexOptionsAll(), - ImportOpt: ImportOptionsCopy(conf.ImportPath()), + ImportOpt: ImportOptionsCopy(conf.ImportPath(), conf.ImportDest()), Imp: imp, } diff --git a/internal/photoprism/index.go b/internal/photoprism/index.go index f70a490fd..feb51998d 100644 --- a/internal/photoprism/index.go +++ b/internal/photoprism/index.go @@ -39,7 +39,7 @@ type Index struct { // NewIndex returns a new indexer and expects its dependencies as arguments. func NewIndex(conf *config.Config, tensorFlow *classify.TensorFlow, nsfwDetector *nsfw.Detector, faceNet *face.Net, convert *Convert, files *Files, photos *Photos) *Index { if conf == nil { - log.Errorf("index: config is nil") + log.Errorf("index: config is not set") return nil } @@ -82,7 +82,7 @@ func (ind *Index) Start(o IndexOptions) fs.Done { done := make(fs.Done) if ind.conf == nil { - log.Errorf("index: config is nil") + log.Errorf("index: config is not set") return done } diff --git a/internal/photoprism/index_options.go b/internal/photoprism/index_options.go index 27fc3ad0a..d0b9bcc0c 100644 --- a/internal/photoprism/index_options.go +++ b/internal/photoprism/index_options.go @@ -1,6 +1,6 @@ package photoprism -// IndexOptions represents media file indexing options. +// IndexOptions represents file indexing options. type IndexOptions struct { Path string Rescan bool diff --git a/internal/photoprism/index_test.go b/internal/photoprism/index_test.go index b983ec6d7..fc4923fac 100644 --- a/internal/photoprism/index_test.go +++ b/internal/photoprism/index_test.go @@ -28,7 +28,7 @@ func TestIndex_Start(t *testing.T) { ind := NewIndex(conf, tf, nd, fn, convert, NewFiles(), NewPhotos()) imp := NewImport(conf, ind, convert) - opt := ImportOptionsMove(conf.ImportPath()) + opt := ImportOptionsMove(conf.ImportPath(), "") imp.Start(opt) diff --git a/internal/photoprism/thumbs_test.go b/internal/photoprism/thumbs_test.go index c6a0d3cd0..90d94ad36 100644 --- a/internal/photoprism/thumbs_test.go +++ b/internal/photoprism/thumbs_test.go @@ -38,7 +38,7 @@ func TestResample_Start(t *testing.T) { ind := NewIndex(conf, tf, nd, fn, convert, NewFiles(), NewPhotos()) imp := NewImport(conf, ind, convert) - opt := ImportOptionsMove(conf.ImportPath()) + opt := ImportOptionsMove(conf.ImportPath(), "") imp.Start(opt) diff --git a/internal/search/errors.go b/internal/search/errors.go new file mode 100644 index 000000000..025e30ab7 --- /dev/null +++ b/internal/search/errors.go @@ -0,0 +1,15 @@ +package search + +import ( + "fmt" + + "github.com/photoprism/photoprism/internal/i18n" +) + +var ( + ErrForbidden = i18n.Error(i18n.ErrForbidden) + ErrBadRequest = i18n.Error(i18n.ErrBadRequest) + ErrBadSortOrder = fmt.Errorf("iinvalid sort order") + ErrBadFilter = fmt.Errorf("search filter is invalid") + ErrInvalidId = fmt.Errorf("invalid ID specified") +) diff --git a/internal/search/photos.go b/internal/search/photos.go index ef0a93204..8820515da 100644 --- a/internal/search/photos.go +++ b/internal/search/photos.go @@ -9,9 +9,10 @@ import ( "github.com/dustin/go-humanize/english" "github.com/jinzhu/gorm" + "github.com/photoprism/photoprism/internal/acl" "github.com/photoprism/photoprism/internal/entity" + "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/pkg/fs" "github.com/photoprism/photoprism/pkg/rnd" "github.com/photoprism/photoprism/pkg/txt" @@ -28,38 +29,46 @@ var FileTypes = []string{fs.ImageJPEG.String(), fs.ImagePNG.String(), fs.ImageGI // Photos finds photos based on the search form provided and returns them as PhotoResults. func Photos(f form.SearchPhotos) (results PhotoResults, count int, err error) { - return searchPhotos(f, PhotosColsAll) + return searchPhotos(f, nil, PhotosColsAll) +} + +// UserPhotos finds photos based on the search form and user session then returns them as PhotoResults. +func UserPhotos(f form.SearchPhotos, sess *entity.Session) (results PhotoResults, count int, err error) { + return searchPhotos(f, sess, PhotosColsAll) } // PhotoIds finds photo and file ids based on the search form provided and returns them as PhotoResults. func PhotoIds(f form.SearchPhotos) (files PhotoResults, count int, err error) { f.Merged = false f.Primary = true - return searchPhotos(f, "photos.id, photos.photo_uid, files.file_uid") + return searchPhotos(f, nil, "photos.id, photos.photo_uid, files.file_uid") } -// photos searches for photos based on a Form and returns PhotoResults ([]Photo). -func searchPhotos(f form.SearchPhotos, resultCols string) (results PhotoResults, count int, err error) { +// searchPhotos finds photos based on the search form and user session then returns them as PhotoResults. +func searchPhotos(f form.SearchPhotos, sess *entity.Session, resultCols string) (results PhotoResults, count int, err error) { start := time.Now() - s := UnscopedDb() - // s = s.LogMode(true) + // Parse query string and filter. + if err = f.ParseQueryString(); err != nil { + log.Debugf("search: %s", err) + return PhotoResults{}, 0, ErrBadRequest + } - // Database tables. - s = s.Table("files").Select(resultCols). + // Specify table names and joins. + s := UnscopedDb().Table(entity.File{}.TableName()).Select(resultCols). Joins("JOIN photos ON files.photo_id = photos.id AND files.media_id IS NOT NULL"). Joins("LEFT JOIN cameras ON photos.camera_id = cameras.id"). Joins("LEFT JOIN lenses ON photos.lens_id = lenses.id"). Joins("LEFT JOIN places ON photos.place_id = places.id") - // Offset and count. + // Limit offset and count. if f.Count > 0 && f.Count <= MaxResults { s = s.Limit(f.Count).Offset(f.Offset) } else { s = s.Limit(MaxResults).Offset(f.Offset) } - // Sort order. + // Set sort order. switch f.Order { case entity.SortOrderEdited: s = s.Where("photos.edited_at IS NOT NULL").Order("photos.edited_at DESC, files.media_id") @@ -81,7 +90,61 @@ func searchPhotos(f form.SearchPhotos, resultCols string) (results PhotoResults, case entity.SortOrderDefault, entity.SortOrderImported, entity.SortOrderAdded: s = s.Order("files.media_id") default: - return PhotoResults{}, 0, fmt.Errorf("invalid sort order") + return PhotoResults{}, 0, ErrBadSortOrder + } + + // Limit search results to a specific UID scope, e.g. when sharing. + if txt.NotEmpty(f.In) { + f.In = strings.ToLower(f.In) + if idType, idPrefix := rnd.IdType(f.In); idType != rnd.TypeUID || idPrefix != entity.AlbumUID { + return PhotoResults{}, 0, ErrInvalidId + } else if a, err := entity.CachedAlbumByUID(f.In); err != nil || a.AlbumUID == "" { + return PhotoResults{}, 0, ErrInvalidId + } else if a.AlbumFilter == "" { + s = s.Joins("JOIN photos_albums ON photos_albums.photo_uid = files.photo_uid"). + Where("photos_albums.hidden = 0 AND photos_albums.album_uid = ?", a.AlbumUID) + } else if err = form.Unserialize(&f, a.AlbumFilter); err != nil { + return PhotoResults{}, 0, ErrBadFilter + } else { + f.Filter = a.AlbumFilter + s = s.Where("files.photo_uid NOT IN (SELECT photo_uid FROM photos_albums pa WHERE pa.hidden = 1 AND pa.album_uid = ?)", a.AlbumUID) + } + } else { + f.In = "" + } + + // Check session permissions and apply as needed. + if sess != nil { + aclRole := sess.User().AclRole() + + // Visitors and other restricted users can only access shared content. + if !sess.HasShare(f.In) && (sess.IsVisitor() || sess.Unregistered()) || + f.In == "" && acl.Resources.Deny(acl.ResourcePhotos, aclRole, acl.ActionSearch) { + event.AuditErr([]string{sess.IP(), "session %s", "%s %s as %s", "denied"}, sess.RefID, acl.ActionSearch.String(), string(acl.ResourcePhotos), aclRole) + return PhotoResults{}, 0, ErrForbidden + } + + // Exclude private content? + if acl.Resources.Deny(acl.ResourcePhotos, aclRole, acl.AccessPrivate) { + f.Public = true + f.Private = false + } + + // Exclude archived content? + if acl.Resources.Deny(acl.ResourcePhotos, aclRole, acl.ActionDelete) { + f.Archived = false + f.Review = false + } + + // Exclude hidden files? + if acl.Resources.Deny(acl.ResourceFiles, aclRole, acl.AccessAll) { + f.Hidden = false + } + + // Restrict the search to a sub-folder, if specified. + if dir := sess.User().BasePath; f.In == "" && dir != "" { + s = s.Where("photos.photo_path LIKE ?", dir+"%") + } } // Limit the result file types if hidden images/videos should not be found. @@ -102,10 +165,27 @@ func searchPhotos(f form.SearchPhotos, resultCols string) (results PhotoResults, // Find only certain unique IDs? if txt.NotEmpty(f.UID) { - s = s.Where("photos.photo_uid IN (?)", SplitOr(strings.ToLower(f.UID))) + ids := SplitOr(strings.ToLower(f.UID)) - // Take shortcut? - if f.Album == "" && f.Query == "" { + if idType, prefix := rnd.ContainsType(ids); idType == rnd.TypeUID { + switch prefix { + case entity.PhotoUID: + s = s.Where("photos.photo_uid IN (?)", ids) + case entity.FileUID: + s = s.Where("files.file_uid IN (?)", ids) + default: + log.Debugf("(1) idType: %s, prefix: %s", idType, prefix) + return PhotoResults{}, 0, fmt.Errorf("invalid %s specified", idType) + } + } else if idType.SHA() { + s = s.Where("files.file_hash IN (?)", ids) + } else { + log.Debugf("(2) idType: %s, prefix: %s", idType, prefix) + return PhotoResults{}, 0, ErrInvalidId + } + + // Find UIDs only to improve performance? + if sess == nil && f.FindUidOnly() { s = s.Order("files.media_id") if result := s.Scan(&results); result.Error != nil { @@ -120,13 +200,14 @@ func searchPhotos(f form.SearchPhotos, resultCols string) (results PhotoResults, return results, len(results), nil } + } else { + f.UID = "" } // Filter by label, label category and keywords. var categories []entity.Category var labels []entity.Label var labelIds []uint - if txt.NotEmpty(f.Label) { if err := Db().Where(AnySlug("label_slug", f.Label, txt.Or)).Or(AnySlug("custom_slug", f.Label, txt.Or)).Find(&labels).Error; len(labels) == 0 || err != nil { log.Debugf("search: label %s not found", txt.LogParamLower(f.Label)) @@ -550,15 +631,20 @@ func searchPhotos(f form.SearchPhotos, resultCols string) (results PhotoResults, } } - if err := s.Scan(&results).Error; err != nil { + // Query database. + if err = s.Scan(&results).Error; err != nil { return results, 0, err } + // Log number of results. log.Debugf("photos: found %s for %s [%s]", english.Plural(len(results), "result", "results"), f.SerializeAll(), time.Since(start)) + // Merge files that belong to the same photo? if f.Merged { + // Return merged files. return results.Merge() } + // Return unmerged files. return results, len(results), nil } diff --git a/internal/search/photos_filter_album_test.go b/internal/search/photos_filter_album_test.go index 3fbac2c4d..e69723693 100644 --- a/internal/search/photos_filter_album_test.go +++ b/internal/search/photos_filter_album_test.go @@ -14,11 +14,6 @@ func TestPhotosFilterAlbum(t *testing.T) { f.Album = "Berlin*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -32,11 +27,6 @@ func TestPhotosFilterAlbum(t *testing.T) { f.Album = "Pet*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -50,11 +40,6 @@ func TestPhotosFilterAlbum(t *testing.T) { f.Album = "%gold" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -69,11 +54,6 @@ func TestPhotosFilterAlbum(t *testing.T) { f.Album = "I love % dog" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -89,11 +69,6 @@ func TestPhotosFilterAlbum(t *testing.T) { f.Album = "sale%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -108,11 +83,6 @@ func TestPhotosFilterAlbum(t *testing.T) { f.Album = "&IlikeFood" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -127,11 +97,6 @@ func TestPhotosFilterAlbum(t *testing.T) { f.Album = "Pets & Dogs" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -145,11 +110,6 @@ func TestPhotosFilterAlbum(t *testing.T) { f.Album = "Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -163,11 +123,6 @@ func TestPhotosFilterAlbum(t *testing.T) { f.Album = "'Family" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -181,11 +136,6 @@ func TestPhotosFilterAlbum(t *testing.T) { f.Album = "Father's Day" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -199,11 +149,6 @@ func TestPhotosFilterAlbum(t *testing.T) { f.Album = "Ice Cream'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -217,11 +162,6 @@ func TestPhotosFilterAlbum(t *testing.T) { f.Album = "*Forrest" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -235,11 +175,6 @@ func TestPhotosFilterAlbum(t *testing.T) { f.Album = "My*Kids" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -253,11 +188,6 @@ func TestPhotosFilterAlbum(t *testing.T) { f.Album = "Yoga***" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -271,11 +201,6 @@ func TestPhotosFilterAlbum(t *testing.T) { f.Album = "|Banana" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -290,11 +215,6 @@ func TestPhotosFilterAlbum(t *testing.T) { f.Album = "Red|Green" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -309,11 +229,6 @@ func TestPhotosFilterAlbum(t *testing.T) { f.Album = "Blue|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -327,11 +242,6 @@ func TestPhotosFilterAlbum(t *testing.T) { f.Album = "345 Shirt" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -345,11 +255,6 @@ func TestPhotosFilterAlbum(t *testing.T) { f.Album = "Color555 Blue" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -363,11 +268,6 @@ func TestPhotosFilterAlbum(t *testing.T) { f.Album = "Route 66" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -384,11 +284,6 @@ func TestPhotosQueryAlbum(t *testing.T) { f.Query = "album:\"Berlin*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -402,11 +297,6 @@ func TestPhotosQueryAlbum(t *testing.T) { f.Query = "album:\"Pet*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -420,11 +310,6 @@ func TestPhotosQueryAlbum(t *testing.T) { f.Query = "album:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -438,11 +323,6 @@ func TestPhotosQueryAlbum(t *testing.T) { f.Query = "album:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -456,11 +336,6 @@ func TestPhotosQueryAlbum(t *testing.T) { f.Query = "album:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -474,11 +349,6 @@ func TestPhotosQueryAlbum(t *testing.T) { f.Query = "album:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -493,11 +363,6 @@ func TestPhotosQueryAlbum(t *testing.T) { f.Query = "album:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -511,11 +376,6 @@ func TestPhotosQueryAlbum(t *testing.T) { f.Query = "album:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -529,11 +389,6 @@ func TestPhotosQueryAlbum(t *testing.T) { f.Query = "album:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -547,11 +402,6 @@ func TestPhotosQueryAlbum(t *testing.T) { f.Query = "album:\"Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -565,11 +415,6 @@ func TestPhotosQueryAlbum(t *testing.T) { f.Query = "album:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -584,11 +429,6 @@ func TestPhotosQueryAlbum(t *testing.T) { f.Query = "album:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -603,11 +443,6 @@ func TestPhotosQueryAlbum(t *testing.T) { f.Query = "album:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -622,11 +457,6 @@ func TestPhotosQueryAlbum(t *testing.T) { f.Query = "album:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -641,11 +471,6 @@ func TestPhotosQueryAlbum(t *testing.T) { f.Query = "album:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -660,11 +485,6 @@ func TestPhotosQueryAlbum(t *testing.T) { f.Query = "album:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -679,11 +499,6 @@ func TestPhotosQueryAlbum(t *testing.T) { f.Query = "album:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -698,11 +513,6 @@ func TestPhotosQueryAlbum(t *testing.T) { f.Query = "album:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -717,11 +527,6 @@ func TestPhotosQueryAlbum(t *testing.T) { f.Query = "album:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -736,11 +541,6 @@ func TestPhotosQueryAlbum(t *testing.T) { f.Query = "album:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_albums_test.go b/internal/search/photos_filter_albums_test.go index eed6f1721..71c2257b3 100644 --- a/internal/search/photos_filter_albums_test.go +++ b/internal/search/photos_filter_albums_test.go @@ -15,11 +15,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Berlin 2019" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -33,11 +28,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Pet*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -51,11 +41,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Pet*|Berlin 2019" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -69,11 +54,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Pet* | Berlin 2019" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -87,11 +67,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Pet* or Berlin 2019" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -105,11 +80,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Pet* OR Berlin 2019" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -123,11 +93,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Pet*&Berlin 2019" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -141,11 +106,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Pet* & Berlin 2019" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -159,11 +119,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Pet* and Berlin 2019" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -177,11 +132,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Pet* AND Berlin 2019" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -195,11 +145,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "%gold" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -213,11 +158,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "I love % dog" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -231,11 +171,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "sale%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +184,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "&IlikeFood" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -267,11 +197,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Pets & Dogs" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -285,11 +210,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -303,11 +223,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "'Family" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -321,11 +236,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Father's Day" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -340,11 +250,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Ice Cream'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -358,11 +263,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "*Forrest" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -376,11 +276,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "My*Kids" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -394,11 +289,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Yoga***" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -412,11 +302,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "|Banana" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -430,11 +315,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Red|Green" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, count, err := Photos(f) if err != nil { @@ -454,11 +334,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Blue|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -473,11 +348,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "345 Shirt" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -491,11 +361,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Color555 Blue" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -509,11 +374,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Route 66" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -527,11 +387,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Route 66 & Father's Day" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -545,11 +400,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Route 66 | Father's Day" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -563,11 +413,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Red|Green & Father's Day" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -581,11 +426,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Red|Green | Father's Day" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -599,11 +439,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Light& & Red|Green" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -617,11 +452,6 @@ func TestPhotosFilterAlbums(t *testing.T) { f.Albums = "Red|Green | Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -638,11 +468,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Berlin 2019\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -656,11 +481,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Pet*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -674,11 +494,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Pet*|Berlin 2019\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -692,11 +507,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Pet* | Berlin 2019\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -710,11 +520,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Pet* or Berlin 2019\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -728,11 +533,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Pet* OR Berlin 2019\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -746,11 +546,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Pet*&Berlin 2019\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -764,11 +559,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Pet* & Berlin 2019\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -782,11 +572,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Pet* and Berlin 2019\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -800,11 +585,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Pet* AND Berlin 2019\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -818,11 +598,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -836,11 +611,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -854,11 +624,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -872,11 +637,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -890,11 +650,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -908,11 +663,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -926,11 +676,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -944,11 +689,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -963,11 +703,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -981,11 +716,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -999,11 +729,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1017,11 +742,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1035,11 +755,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1053,11 +768,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, count, err := Photos(f) if err != nil { @@ -1077,11 +787,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1095,11 +800,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1113,11 +813,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1131,11 +826,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1149,11 +839,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1167,11 +852,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Route 66 | Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1185,11 +865,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Red|Green & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1203,11 +878,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Red|Green | Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1221,11 +891,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Light& & Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1239,11 +904,6 @@ func TestPhotosQueryAlbums(t *testing.T) { f.Query = "albums:\"Red|Green | Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_animated_test.go b/internal/search/photos_filter_animated_test.go index 152388996..7a4cc8b97 100644 --- a/internal/search/photos_filter_animated_test.go +++ b/internal/search/photos_filter_animated_test.go @@ -31,11 +31,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -49,11 +44,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -63,11 +53,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -81,11 +66,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -117,11 +92,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -135,11 +105,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -154,11 +119,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -172,11 +132,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -191,11 +146,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -209,11 +159,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -228,11 +173,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -247,11 +187,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -266,11 +201,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -285,11 +215,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -304,11 +229,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -323,11 +243,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -342,11 +257,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -361,11 +271,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -380,11 +285,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -399,11 +299,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -418,11 +313,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -437,11 +327,6 @@ func TestPhotosQueryAnimated(t *testing.T) { f.Query = "animated:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_archived_test.go b/internal/search/photos_filter_archived_test.go index d16ba68c1..07769c25b 100644 --- a/internal/search/photos_filter_archived_test.go +++ b/internal/search/photos_filter_archived_test.go @@ -31,11 +31,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -45,11 +40,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -63,11 +53,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -81,11 +66,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -117,11 +92,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -136,11 +106,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -154,11 +119,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -173,11 +133,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -192,11 +147,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -211,11 +161,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -230,11 +175,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +189,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -268,11 +203,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -287,11 +217,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -306,11 +231,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -325,11 +245,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -344,11 +259,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -363,11 +273,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -382,11 +287,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -401,11 +301,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -420,11 +315,6 @@ func TestPhotosQueryArchived(t *testing.T) { f.Query = "archived:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_camera_test.go b/internal/search/photos_filter_camera_test.go index 889d62eb4..2f6f371c4 100644 --- a/internal/search/photos_filter_camera_test.go +++ b/internal/search/photos_filter_camera_test.go @@ -15,11 +15,6 @@ func TestPhotosFilterCamera(t *testing.T) { f.Camera = "Apple iPhone SE" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -33,11 +28,6 @@ func TestPhotosFilterCamera(t *testing.T) { f.Camera = "Apple" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -51,11 +41,6 @@ func TestPhotosFilterCamera(t *testing.T) { f.Camera = "%gold" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -69,11 +54,6 @@ func TestPhotosFilterCamera(t *testing.T) { f.Camera = "I love % dog" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -87,11 +67,6 @@ func TestPhotosFilterCamera(t *testing.T) { f.Camera = "sale%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -105,11 +80,6 @@ func TestPhotosFilterCamera(t *testing.T) { f.Camera = "&IlikeFood" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -123,11 +93,6 @@ func TestPhotosFilterCamera(t *testing.T) { f.Camera = "Pets & Dogs" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -141,11 +106,6 @@ func TestPhotosFilterCamera(t *testing.T) { f.Camera = "Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -159,11 +119,6 @@ func TestPhotosFilterCamera(t *testing.T) { f.Camera = "'Family" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -177,11 +132,6 @@ func TestPhotosFilterCamera(t *testing.T) { f.Camera = "Father's camera" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -196,11 +146,6 @@ func TestPhotosFilterCamera(t *testing.T) { f.Camera = "Ice Cream'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -214,11 +159,6 @@ func TestPhotosFilterCamera(t *testing.T) { f.Camera = "*Forrest" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -232,11 +172,6 @@ func TestPhotosFilterCamera(t *testing.T) { f.Camera = "My*Kids" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -250,11 +185,6 @@ func TestPhotosFilterCamera(t *testing.T) { f.Camera = "Yoga***" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -268,11 +198,6 @@ func TestPhotosFilterCamera(t *testing.T) { f.Camera = "|Banana" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -286,11 +211,6 @@ func TestPhotosFilterCamera(t *testing.T) { f.Camera = "Red|Green" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -305,11 +225,6 @@ func TestPhotosFilterCamera(t *testing.T) { f.Camera = "Blue|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -324,11 +239,6 @@ func TestPhotosFilterCamera(t *testing.T) { f.Camera = "345 Shirt" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -342,11 +252,6 @@ func TestPhotosFilterCamera(t *testing.T) { f.Camera = "camera555 Blue" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -360,11 +265,6 @@ func TestPhotosFilterCamera(t *testing.T) { f.Camera = "Route 66" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -381,11 +281,6 @@ func TestPhotosQueryCamera(t *testing.T) { f.Query = "camera:\"Apple iPhone SE\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -399,11 +294,6 @@ func TestPhotosQueryCamera(t *testing.T) { f.Query = "camera:\"Apple\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -417,11 +307,6 @@ func TestPhotosQueryCamera(t *testing.T) { f.Query = "camera:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -435,11 +320,6 @@ func TestPhotosQueryCamera(t *testing.T) { f.Query = "camera:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -453,11 +333,6 @@ func TestPhotosQueryCamera(t *testing.T) { f.Query = "camera:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -471,11 +346,6 @@ func TestPhotosQueryCamera(t *testing.T) { f.Query = "camera:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -489,11 +359,6 @@ func TestPhotosQueryCamera(t *testing.T) { f.Query = "camera:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -507,11 +372,6 @@ func TestPhotosQueryCamera(t *testing.T) { f.Query = "camera:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -525,11 +385,6 @@ func TestPhotosQueryCamera(t *testing.T) { f.Query = "camera:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -543,11 +398,6 @@ func TestPhotosQueryCamera(t *testing.T) { f.Query = "camera:\"Father's camera\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -562,11 +412,6 @@ func TestPhotosQueryCamera(t *testing.T) { f.Query = "camera:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -580,11 +425,6 @@ func TestPhotosQueryCamera(t *testing.T) { f.Query = "camera:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -598,11 +438,6 @@ func TestPhotosQueryCamera(t *testing.T) { f.Query = "camera:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -616,11 +451,6 @@ func TestPhotosQueryCamera(t *testing.T) { f.Query = "camera:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -634,11 +464,6 @@ func TestPhotosQueryCamera(t *testing.T) { f.Query = "camera:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -652,11 +477,6 @@ func TestPhotosQueryCamera(t *testing.T) { f.Query = "camera:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -671,11 +491,6 @@ func TestPhotosQueryCamera(t *testing.T) { f.Query = "camera:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -689,11 +504,6 @@ func TestPhotosQueryCamera(t *testing.T) { f.Query = "camera:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -707,11 +517,6 @@ func TestPhotosQueryCamera(t *testing.T) { f.Query = "camera:\"camera555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -725,11 +530,6 @@ func TestPhotosQueryCamera(t *testing.T) { f.Query = "camera:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_category_test.go b/internal/search/photos_filter_category_test.go index 022ea19a6..bb690ac19 100644 --- a/internal/search/photos_filter_category_test.go +++ b/internal/search/photos_filter_category_test.go @@ -15,11 +15,6 @@ func TestPhotosFilterCategory(t *testing.T) { f.Category = "%gold" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -33,11 +28,6 @@ func TestPhotosFilterCategory(t *testing.T) { f.Category = "I love % dog" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -51,11 +41,6 @@ func TestPhotosFilterCategory(t *testing.T) { f.Category = "sale%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -69,11 +54,6 @@ func TestPhotosFilterCategory(t *testing.T) { f.Category = "&IlikeFood" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -87,11 +67,6 @@ func TestPhotosFilterCategory(t *testing.T) { f.Category = "Pets & Dogs" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -105,11 +80,6 @@ func TestPhotosFilterCategory(t *testing.T) { f.Category = "Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -123,11 +93,6 @@ func TestPhotosFilterCategory(t *testing.T) { f.Category = "'Family" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -141,11 +106,6 @@ func TestPhotosFilterCategory(t *testing.T) { f.Category = "Father's category" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -160,11 +120,6 @@ func TestPhotosFilterCategory(t *testing.T) { f.Category = "Ice Cream'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -178,11 +133,6 @@ func TestPhotosFilterCategory(t *testing.T) { f.Category = "*Forrest" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -196,11 +146,6 @@ func TestPhotosFilterCategory(t *testing.T) { f.Category = "My*Camping" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -214,11 +159,6 @@ func TestPhotosFilterCategory(t *testing.T) { f.Category = "Camping***" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -232,11 +172,6 @@ func TestPhotosFilterCategory(t *testing.T) { f.Category = "|Camping" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -250,11 +185,6 @@ func TestPhotosFilterCategory(t *testing.T) { f.Category = "Camping|botanical garden" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -271,11 +201,6 @@ func TestPhotosFilterCategory(t *testing.T) { f.Category = "Camping|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -289,11 +214,6 @@ func TestPhotosFilterCategory(t *testing.T) { f.Category = "345 Shirt" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -307,11 +227,6 @@ func TestPhotosFilterCategory(t *testing.T) { f.Category = "category555 Blue" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -325,11 +240,6 @@ func TestPhotosFilterCategory(t *testing.T) { f.Category = "Route 66" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -346,11 +256,6 @@ func TestPhotosQueryCategory(t *testing.T) { f.Query = "category:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -364,11 +269,6 @@ func TestPhotosQueryCategory(t *testing.T) { f.Query = "category:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -382,11 +282,6 @@ func TestPhotosQueryCategory(t *testing.T) { f.Query = "category:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -400,11 +295,6 @@ func TestPhotosQueryCategory(t *testing.T) { f.Query = "category:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -418,11 +308,6 @@ func TestPhotosQueryCategory(t *testing.T) { f.Query = "category:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -436,11 +321,6 @@ func TestPhotosQueryCategory(t *testing.T) { f.Query = "category:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -454,11 +334,6 @@ func TestPhotosQueryCategory(t *testing.T) { f.Query = "category:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -472,11 +347,6 @@ func TestPhotosQueryCategory(t *testing.T) { f.Query = "category:\"Father's category\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -491,11 +361,6 @@ func TestPhotosQueryCategory(t *testing.T) { f.Query = "category:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -509,11 +374,6 @@ func TestPhotosQueryCategory(t *testing.T) { f.Query = "category:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -527,11 +387,6 @@ func TestPhotosQueryCategory(t *testing.T) { f.Query = "category:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -545,11 +400,6 @@ func TestPhotosQueryCategory(t *testing.T) { f.Query = "category:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -563,11 +413,6 @@ func TestPhotosQueryCategory(t *testing.T) { f.Query = "category:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -581,11 +426,6 @@ func TestPhotosQueryCategory(t *testing.T) { f.Query = "category:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -600,11 +440,6 @@ func TestPhotosQueryCategory(t *testing.T) { f.Query = "category:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -618,11 +453,6 @@ func TestPhotosQueryCategory(t *testing.T) { f.Query = "category:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -636,11 +466,6 @@ func TestPhotosQueryCategory(t *testing.T) { f.Query = "category:\"category555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -654,11 +479,6 @@ func TestPhotosQueryCategory(t *testing.T) { f.Query = "category:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_city_test.go b/internal/search/photos_filter_city_test.go index 493cbefde..7d13590e7 100644 --- a/internal/search/photos_filter_city_test.go +++ b/internal/search/photos_filter_city_test.go @@ -15,11 +15,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "Teotihuacán" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -33,11 +28,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "Neustadt*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -52,11 +42,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "Teotihuacán|Neustadt an der Weinstraße" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -70,11 +55,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "Teotihuacán | Neustadt an der Weinstraße" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -88,11 +68,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "Teotihuacán or Neustadt an der Weinstraße" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -106,11 +81,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "Teotihuacán OR Neustadt an der Weinstraße" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -124,11 +94,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "%gold" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -142,11 +107,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "I love % dog" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -160,11 +120,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "sale%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -178,11 +133,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "&IlikeFood" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -196,11 +146,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "Pets & Dogs" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -214,11 +159,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -232,11 +172,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "'Family" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -250,11 +185,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "Father's state" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -269,11 +199,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "Ice Cream'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -287,11 +212,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "*Forrest" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -305,11 +225,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "My*Kids" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -323,11 +238,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "Yoga***" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -341,11 +251,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "|New york" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -360,11 +265,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "Red|Green" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -379,11 +279,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "Neustadt an der Weinstraße|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -397,11 +292,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "345 Shirt" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -415,11 +305,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "state555 Blue" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -433,11 +318,6 @@ func TestPhotosFilterCity(t *testing.T) { f.City = "Route 66" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -454,11 +334,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"Teotihuacán\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -472,11 +347,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"Neustadt*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -490,11 +360,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"Teotihuacán|Neustadt an der Weinstraße\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -508,11 +373,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"Teotihuacán | Neustadt an der Weinstraße\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -526,11 +386,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"Teotihuacán or Neustadt an der Weinstraße\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -544,11 +399,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"Teotihuacán OR Neustadt an der Weinstraße\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -562,11 +412,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -580,11 +425,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -598,11 +438,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -616,11 +451,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -634,11 +464,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -652,11 +477,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -670,11 +490,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -688,11 +503,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"Father's state\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -707,11 +517,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -725,11 +530,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -743,11 +543,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -761,11 +556,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -779,11 +569,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -797,11 +582,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -816,11 +596,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"Neustadt an der Weinstraße|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -834,11 +609,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -852,11 +622,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"state555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -870,11 +635,6 @@ func TestPhotosQueryCity(t *testing.T) { f.Query = "city:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_color_test.go b/internal/search/photos_filter_color_test.go index 6c533ccc7..890585411 100644 --- a/internal/search/photos_filter_color_test.go +++ b/internal/search/photos_filter_color_test.go @@ -29,11 +29,6 @@ func TestPhotosFilterColor(t *testing.T) { f.Color = "%gold" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -47,11 +42,6 @@ func TestPhotosFilterColor(t *testing.T) { f.Color = "I love % dog" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -65,11 +55,6 @@ func TestPhotosFilterColor(t *testing.T) { f.Color = "sale%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -83,11 +68,6 @@ func TestPhotosFilterColor(t *testing.T) { f.Color = "&IlikeFood" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -101,11 +81,6 @@ func TestPhotosFilterColor(t *testing.T) { f.Color = "Pets & Dogs" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -119,11 +94,6 @@ func TestPhotosFilterColor(t *testing.T) { f.Color = "Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -137,11 +107,6 @@ func TestPhotosFilterColor(t *testing.T) { f.Color = "'Family" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -155,11 +120,6 @@ func TestPhotosFilterColor(t *testing.T) { f.Color = "Father's Day" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -174,11 +134,6 @@ func TestPhotosFilterColor(t *testing.T) { f.Color = "Ice Cream'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -192,11 +147,6 @@ func TestPhotosFilterColor(t *testing.T) { f.Color = "*Forrest" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -210,11 +160,6 @@ func TestPhotosFilterColor(t *testing.T) { f.Color = "My*Kids" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -228,11 +173,6 @@ func TestPhotosFilterColor(t *testing.T) { f.Color = "Yoga***" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -246,11 +186,6 @@ func TestPhotosFilterColor(t *testing.T) { f.Color = "|Banana" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -264,11 +199,6 @@ func TestPhotosFilterColor(t *testing.T) { f.Color = "Red|Green" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -283,11 +213,6 @@ func TestPhotosFilterColor(t *testing.T) { f.Color = "Blue|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -302,11 +227,6 @@ func TestPhotosFilterColor(t *testing.T) { f.Color = "345 Shirt" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -320,11 +240,6 @@ func TestPhotosFilterColor(t *testing.T) { f.Color = "Color555 Blue" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -338,11 +253,6 @@ func TestPhotosFilterColor(t *testing.T) { f.Color = "Route 66" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -373,11 +283,6 @@ func TestPhotosQueryColor(t *testing.T) { f.Query = "color:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -391,11 +296,6 @@ func TestPhotosQueryColor(t *testing.T) { f.Query = "color:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -409,11 +309,6 @@ func TestPhotosQueryColor(t *testing.T) { f.Query = "color:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -427,11 +322,6 @@ func TestPhotosQueryColor(t *testing.T) { f.Query = "color:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -445,11 +335,6 @@ func TestPhotosQueryColor(t *testing.T) { f.Query = "color:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -463,11 +348,6 @@ func TestPhotosQueryColor(t *testing.T) { f.Query = "color:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -481,11 +361,6 @@ func TestPhotosQueryColor(t *testing.T) { f.Query = "color:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -499,11 +374,6 @@ func TestPhotosQueryColor(t *testing.T) { f.Query = "color:\"Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -518,11 +388,6 @@ func TestPhotosQueryColor(t *testing.T) { f.Query = "color:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -536,11 +401,6 @@ func TestPhotosQueryColor(t *testing.T) { f.Query = "color:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -554,11 +414,6 @@ func TestPhotosQueryColor(t *testing.T) { f.Query = "color:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -572,11 +427,6 @@ func TestPhotosQueryColor(t *testing.T) { f.Query = "color:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -590,11 +440,6 @@ func TestPhotosQueryColor(t *testing.T) { f.Query = "color:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -608,11 +453,6 @@ func TestPhotosQueryColor(t *testing.T) { f.Query = "color:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -627,11 +467,6 @@ func TestPhotosQueryColor(t *testing.T) { f.Query = "color:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -645,11 +480,6 @@ func TestPhotosQueryColor(t *testing.T) { f.Query = "color:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -663,11 +493,6 @@ func TestPhotosQueryColor(t *testing.T) { f.Query = "color:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -681,11 +506,6 @@ func TestPhotosQueryColor(t *testing.T) { f.Query = "color:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_country_test.go b/internal/search/photos_filter_country_test.go index 8e6f74883..7c5f9ea02 100644 --- a/internal/search/photos_filter_country_test.go +++ b/internal/search/photos_filter_country_test.go @@ -15,11 +15,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "de" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -33,11 +28,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "mx" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -51,11 +41,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "mx|de" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -69,11 +54,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "mx | de" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -87,11 +67,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "%gold" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -105,11 +80,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "I love % dog" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -123,11 +93,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "sale%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -141,11 +106,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "&IlikeFood" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -159,11 +119,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "Pets & Dogs" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -177,11 +132,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -195,11 +145,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "'Family" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -213,11 +158,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "Father's country" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -232,11 +172,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "Ice Cream'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -250,11 +185,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "*Forrest" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -268,11 +198,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "My*Kids" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -286,11 +211,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "Yoga***" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -304,11 +224,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "|Banana" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -322,11 +237,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "Red|Green" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -341,11 +251,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "Blue|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -360,11 +265,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "345 Shirt" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -378,11 +278,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "country555 Blue" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -396,11 +291,6 @@ func TestPhotosFilterCountry(t *testing.T) { f.Country = "Route 66" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -417,11 +307,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"de\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -435,11 +320,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"mx\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -453,11 +333,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"mx|de\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -471,11 +346,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"mx | de\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -490,11 +360,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"mx or de\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -508,11 +373,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"mx OR de\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -526,11 +386,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -544,11 +399,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -562,11 +412,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -580,11 +425,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -598,11 +438,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -616,11 +451,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -634,11 +464,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -652,11 +477,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"Father's country\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -671,11 +491,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -689,11 +504,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -707,11 +517,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -725,11 +530,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -743,11 +543,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -761,11 +556,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -780,11 +570,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -798,11 +583,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -816,11 +596,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"country555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -834,11 +609,6 @@ func TestPhotosQueryCountry(t *testing.T) { f.Query = "country:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_day_test.go b/internal/search/photos_filter_day_test.go index 36b99f25b..b1da4044e 100644 --- a/internal/search/photos_filter_day_test.go +++ b/internal/search/photos_filter_day_test.go @@ -15,11 +15,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "1" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -33,11 +28,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "17" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -51,11 +41,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "1|17" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -69,11 +54,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "1 | 17" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -92,11 +72,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "%gold" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -110,11 +85,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "I love % dog" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -128,11 +98,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "sale%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -146,11 +111,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "&IlikeFood" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -164,11 +124,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "Pets & Dogs" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -182,11 +137,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -200,11 +150,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "'Family" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -218,11 +163,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "Father's Day" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -237,11 +177,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "Ice Cream'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -255,11 +190,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "*Forrest" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -273,11 +203,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "My*Kids" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -291,11 +216,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "Yoga***" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -309,11 +229,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "|Banana" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -327,11 +242,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "Red|Green" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -346,11 +256,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "Blue|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -365,11 +270,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "345 Shirt" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -383,11 +283,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "day555 Blue" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -401,11 +296,6 @@ func TestPhotosFilterDay(t *testing.T) { f.Day = "Route 66" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -422,11 +312,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"1\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -440,11 +325,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"17\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -458,11 +338,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"1|17\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -476,11 +351,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"1 | 17\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -501,11 +371,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -519,11 +384,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -537,11 +397,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -555,11 +410,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -573,11 +423,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -591,11 +436,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -609,11 +449,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -627,11 +462,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -646,11 +476,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -664,11 +489,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -682,11 +502,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -700,11 +515,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -718,11 +528,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -736,11 +541,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -755,11 +555,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -773,11 +568,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -791,11 +581,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"day555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -809,11 +594,6 @@ func TestPhotosQueryDay(t *testing.T) { f.Query = "day:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_error_test.go b/internal/search/photos_filter_error_test.go index ada09423a..82deb111b 100644 --- a/internal/search/photos_filter_error_test.go +++ b/internal/search/photos_filter_error_test.go @@ -31,11 +31,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -45,11 +40,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -63,11 +53,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -81,11 +66,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -117,11 +92,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -136,11 +106,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -154,11 +119,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -173,11 +133,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -192,11 +147,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -211,11 +161,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -230,11 +175,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +189,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -268,11 +203,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -287,11 +217,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -306,11 +231,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -325,11 +245,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -344,11 +259,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -363,11 +273,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -382,11 +287,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -401,11 +301,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -420,11 +315,6 @@ func TestPhotosQueryError(t *testing.T) { f.Query = "error:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_face_test.go b/internal/search/photos_filter_face_test.go index bdb2e8a57..692cc0c84 100644 --- a/internal/search/photos_filter_face_test.go +++ b/internal/search/photos_filter_face_test.go @@ -20,11 +20,6 @@ func TestPhotosFilterFace(t *testing.T) { f.Face = "PN6QO5INYTUSAATOFL43LL2ABAV5ACZK" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -38,11 +33,6 @@ func TestPhotosFilterFace(t *testing.T) { f.Face = "%gold" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -57,11 +47,6 @@ func TestPhotosFilterFace(t *testing.T) { f.Face = "I love % dog" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -76,11 +61,6 @@ func TestPhotosFilterFace(t *testing.T) { f.Face = "sale%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -94,11 +74,6 @@ func TestPhotosFilterFace(t *testing.T) { f.Face = "&IlikeFood" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -113,11 +88,6 @@ func TestPhotosFilterFace(t *testing.T) { f.Face = "Pets & Dogs" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -131,11 +101,6 @@ func TestPhotosFilterFace(t *testing.T) { f.Face = "Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -149,11 +114,6 @@ func TestPhotosFilterFace(t *testing.T) { f.Face = "'Family" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -168,11 +128,6 @@ func TestPhotosFilterFace(t *testing.T) { f.Face = "Father's face" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -188,11 +143,6 @@ func TestPhotosFilterFace(t *testing.T) { f.Face = "Ice Cream'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -206,11 +156,6 @@ func TestPhotosFilterFace(t *testing.T) { f.Face = "*Forrest" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -224,11 +169,6 @@ func TestPhotosFilterFace(t *testing.T) { f.Face = "My*Kids" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -243,11 +183,6 @@ func TestPhotosFilterFace(t *testing.T) { f.Face = "Yoga***" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -261,11 +196,6 @@ func TestPhotosFilterFace(t *testing.T) { f.Face = "|Banana" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -279,11 +209,6 @@ func TestPhotosFilterFace(t *testing.T) { f.Face = "Red|Green" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -298,11 +223,6 @@ func TestPhotosFilterFace(t *testing.T) { f.Face = "Blue|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -317,11 +237,6 @@ func TestPhotosFilterFace(t *testing.T) { f.Face = "345 Shirt" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -336,11 +251,6 @@ func TestPhotosFilterFace(t *testing.T) { f.Face = "face555 Blue" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -354,11 +264,6 @@ func TestPhotosFilterFace(t *testing.T) { f.Face = "Route 66" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -381,11 +286,6 @@ func TestPhotosQueryFace(t *testing.T) { f.Query = "face:PN6QO5INYTUSAATOFL43LL2ABAV5ACZK" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -399,11 +299,6 @@ func TestPhotosQueryFace(t *testing.T) { f.Query = "face:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -417,11 +312,6 @@ func TestPhotosQueryFace(t *testing.T) { f.Query = "face:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -436,11 +326,6 @@ func TestPhotosQueryFace(t *testing.T) { f.Query = "face:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -455,11 +340,6 @@ func TestPhotosQueryFace(t *testing.T) { f.Query = "face:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -473,11 +353,6 @@ func TestPhotosQueryFace(t *testing.T) { f.Query = "face:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -492,11 +367,6 @@ func TestPhotosQueryFace(t *testing.T) { f.Query = "face:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -510,11 +380,6 @@ func TestPhotosQueryFace(t *testing.T) { f.Query = "face:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -528,11 +393,6 @@ func TestPhotosQueryFace(t *testing.T) { f.Query = "face:\"Father's face\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -548,11 +408,6 @@ func TestPhotosQueryFace(t *testing.T) { f.Query = "face:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -568,11 +423,6 @@ func TestPhotosQueryFace(t *testing.T) { f.Query = "face:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -586,11 +436,6 @@ func TestPhotosQueryFace(t *testing.T) { f.Query = "face:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -604,11 +449,6 @@ func TestPhotosQueryFace(t *testing.T) { f.Query = "face:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -624,11 +464,6 @@ func TestPhotosQueryFace(t *testing.T) { f.Query = "face:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -642,11 +477,6 @@ func TestPhotosQueryFace(t *testing.T) { f.Query = "face:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -661,11 +491,6 @@ func TestPhotosQueryFace(t *testing.T) { f.Query = "face:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -679,11 +504,6 @@ func TestPhotosQueryFace(t *testing.T) { f.Query = "face:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -697,11 +517,6 @@ func TestPhotosQueryFace(t *testing.T) { f.Query = "face:\"face555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -717,11 +532,6 @@ func TestPhotosQueryFace(t *testing.T) { f.Query = "face:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_faces_test.go b/internal/search/photos_filter_faces_test.go index 1eaf28987..9bee6aa14 100644 --- a/internal/search/photos_filter_faces_test.go +++ b/internal/search/photos_filter_faces_test.go @@ -19,11 +19,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "yes" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -37,11 +32,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "1" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -55,11 +45,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "2" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -73,11 +58,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "4" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -91,11 +71,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "%gold" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -110,11 +85,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "I love % dog" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -129,11 +99,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "sale%" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -147,11 +112,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "&IlikeFood" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -166,16 +126,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "Pets & Dogs" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -189,11 +139,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "Light&" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -207,11 +152,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "'Family" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -226,11 +166,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "Father's faces" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -246,11 +181,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "Ice Cream'" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -264,11 +194,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "*Forrest" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -282,11 +207,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "My*Kids" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -301,11 +221,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "Yoga***" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -319,11 +234,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "|Banana" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -337,11 +247,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "Red|Green" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -356,11 +261,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "Blue|" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -375,11 +275,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "345 Shirt" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -394,11 +289,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "faces555 Blue" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -412,11 +302,6 @@ func TestPhotosFilterFaces(t *testing.T) { f.Faces = "Route 66" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -439,11 +324,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:yes" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -457,11 +337,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:1" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -475,11 +350,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:2" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -493,11 +363,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:5" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -511,11 +376,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:\"%gold\"" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -530,11 +390,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:\"I love % dog\"" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -549,11 +404,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:\"sale%\"" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -567,11 +417,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:\"&IlikeFood\"" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -586,11 +431,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:\"Pets & Dogs\"" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -604,11 +444,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:\"Light&\"" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -622,11 +457,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:\"'Family\"" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -641,11 +471,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:\"Father's faces\"" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -661,11 +486,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:\"Ice Cream'\"" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -679,11 +499,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:\"*Forrest\"" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -697,11 +512,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:\"My*Kids\"" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -716,11 +526,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:\"Yoga***\"" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -734,11 +539,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:\"|Banana\"" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -752,11 +552,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:\"Red|Green\"" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -771,11 +566,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:\"Blue|\"" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -789,11 +579,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:\"345 Shirt\"" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -808,11 +593,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:\"faces555 Blue\"" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -826,11 +606,6 @@ func TestPhotosQueryFaces(t *testing.T) { f.Query = "faces:\"Route 66\"" f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_favorite_test.go b/internal/search/photos_filter_favorite_test.go index ac768f1ea..7992c46f9 100644 --- a/internal/search/photos_filter_favorite_test.go +++ b/internal/search/photos_filter_favorite_test.go @@ -31,11 +31,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -45,11 +40,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -63,11 +53,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -81,11 +66,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -117,11 +92,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -136,11 +106,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -154,16 +119,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -178,11 +133,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -197,11 +147,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -216,11 +161,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -235,11 +175,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -254,11 +189,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -273,11 +203,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -292,11 +217,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -311,11 +231,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -330,11 +245,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -349,11 +259,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -368,11 +273,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -387,11 +287,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -406,11 +301,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -425,11 +315,6 @@ func TestPhotosQueryFavorite(t *testing.T) { f.Query = "favorite:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_filename_test.go b/internal/search/photos_filter_filename_test.go index 2494b5357..6c18966b5 100644 --- a/internal/search/photos_filter_filename_test.go +++ b/internal/search/photos_filter_filename_test.go @@ -14,11 +14,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "2790/07/27900704_070228_D6D51B6C.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -32,11 +27,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "1990*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -50,11 +40,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "1990*|2790/07/27900704_070228_D6D51B6C.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -68,11 +53,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "1990* | 2790/07/27900704_070228_D6D51B6C.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -86,11 +66,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "1990* or 2790/07/27900704_070228_D6D51B6C.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -104,11 +79,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "*photo29%.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -122,11 +92,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "*photo%30.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -140,11 +105,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "*photo29%.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -159,11 +119,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "*&photo31.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -178,11 +133,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "*photo&32.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -197,11 +147,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "*photo33&.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -216,11 +161,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "'2020/'vacation/'photo34.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -235,11 +175,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "20'20/vacat'ion/photo'35.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -254,11 +189,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "2020'/vacation'/photo36'.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -273,11 +203,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "*2020/*vacation/*photo37.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -292,11 +217,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "202*3/vac*ation/photo*38.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -311,11 +231,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "2023*/vacatio*/photo39*.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -330,11 +245,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "*photo40*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -349,11 +259,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "*photo*41*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, count, err := Photos(f) if err != nil { @@ -373,11 +278,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "*photo42*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -392,11 +292,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "|202/|vacation/|photo40.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -411,11 +306,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "20|22/vacat|ion/photo|41.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -430,11 +320,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "2022|/vacation|/photo42|.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -449,11 +334,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "2000/holiday/43photo.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -467,11 +347,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "2000/02/pho44to.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -486,11 +361,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "2000/02/photo45.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -505,11 +375,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "\"2000/\"02/\"photo46.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -524,11 +389,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "20\"00/0\"2/photo\"47.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -543,11 +403,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "2000\"/02\"/photo48\".jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -562,11 +417,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = " 2000/ 02/ photo49.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -580,11 +430,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "20 00/ 0 2/photo 50.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -599,11 +444,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "2000 /02 /photo51 .jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -618,11 +458,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "*%photo28.jpg | *photo'35.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -636,11 +471,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "*photo*38.jpg | *photo'35.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -654,11 +484,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "*photo|41.jpg | *&photo31.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -672,11 +497,6 @@ func TestPhotosFilterFilename(t *testing.T) { f.Filename = "London/bridge1.jpg | 1990/04/bridge2.jpg" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -693,11 +513,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"2790/07/27900704_070228_D6D51B6C.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -711,11 +526,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"1990*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -729,11 +539,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"1990*|2790/07/27900704_070228_D6D51B6C.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -747,11 +552,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"1990* | 2790/07/27900704_070228_D6D51B6C.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -765,11 +565,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"*photo29%.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -783,11 +578,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"*photo%30.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -801,11 +591,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"*photo29%.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -820,11 +605,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"*&photo31.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -839,11 +619,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"*photo&32.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -858,11 +633,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"*photo33&.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -877,11 +647,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"'2020/'vacation/'photo34.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -896,11 +661,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"20'20/vacat'ion/photo'35.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -915,11 +675,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"2020'/vacation'/photo36'.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -934,11 +689,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"*2020/*vacation/*photo37.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -953,11 +703,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"202*3/vac*ation/photo*38.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -972,11 +717,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"2023*/vacatio*/photo39*.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -991,11 +731,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"*photo40*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1010,11 +745,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"*photo*41*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, count, err := Photos(f) if err != nil { @@ -1034,11 +764,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"*photo42*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1053,11 +778,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"|202/|vacation/|photo40.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1072,11 +792,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"20|22/vacat|ion/photo|41.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1091,11 +806,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"2022|/vacation|/photo42|.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1110,11 +820,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"2000/holiday/43photo.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1128,11 +833,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"2000/02/pho44to.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1147,11 +847,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"2000/02/photo45.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1166,11 +861,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"\"2000/\"02/\"photo46.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1186,11 +876,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"20\"00/0\"2/photo\"47.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1206,11 +891,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"2000\"/02\"/photo48\".jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1226,11 +906,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\" 2000/ 02/ photo49.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1244,11 +919,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"20 00/ 0 2/photo 50.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1263,11 +933,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"2000 /02 /photo51 .jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1282,11 +947,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"*%photo28.jpg | *photo'35.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1300,11 +960,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"*photo*38.jpg | *photo'35.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1318,11 +973,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"*photo|41.jpg | *&photo31.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1338,11 +988,6 @@ func TestPhotosQueryFilename(t *testing.T) { f.Query = "filename:\"London/bridge1.jpg | 1990/04/bridge2.jpg\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_filter_test.go b/internal/search/photos_filter_filter_test.go index 81d733259..5c7b2c141 100644 --- a/internal/search/photos_filter_filter_test.go +++ b/internal/search/photos_filter_filter_test.go @@ -15,11 +15,6 @@ func TestPhotosFilterFilter(t *testing.T) { f.Filter = "path:\"1990/04\" public:true" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -33,11 +28,6 @@ func TestPhotosFilterFilter(t *testing.T) { f.Filter = "%gold" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -51,11 +41,6 @@ func TestPhotosFilterFilter(t *testing.T) { f.Filter = "I love % dog" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -69,11 +54,6 @@ func TestPhotosFilterFilter(t *testing.T) { f.Filter = "sale%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -87,11 +67,6 @@ func TestPhotosFilterFilter(t *testing.T) { f.Filter = "&IlikeFood" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -105,11 +80,6 @@ func TestPhotosFilterFilter(t *testing.T) { f.Filter = "Pets & Dogs" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -123,11 +93,6 @@ func TestPhotosFilterFilter(t *testing.T) { f.Filter = "Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -141,11 +106,6 @@ func TestPhotosFilterFilter(t *testing.T) { f.Filter = "'Family" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -159,11 +119,6 @@ func TestPhotosFilterFilter(t *testing.T) { f.Filter = "Father's type" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -178,11 +133,6 @@ func TestPhotosFilterFilter(t *testing.T) { f.Filter = "Ice Cream'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -196,11 +146,6 @@ func TestPhotosFilterFilter(t *testing.T) { f.Filter = "*Forrest" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -214,11 +159,6 @@ func TestPhotosFilterFilter(t *testing.T) { f.Filter = "My*Kids" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -232,11 +172,6 @@ func TestPhotosFilterFilter(t *testing.T) { f.Filter = "Yoga***" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -250,11 +185,6 @@ func TestPhotosFilterFilter(t *testing.T) { f.Filter = "|Banana" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -268,11 +198,6 @@ func TestPhotosFilterFilter(t *testing.T) { f.Filter = "Red|Green" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -287,11 +212,6 @@ func TestPhotosFilterFilter(t *testing.T) { f.Filter = "Blue|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -306,11 +226,6 @@ func TestPhotosFilterFilter(t *testing.T) { f.Filter = "345 Shirt" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -324,11 +239,6 @@ func TestPhotosFilterFilter(t *testing.T) { f.Filter = "type555 Blue" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -342,11 +252,6 @@ func TestPhotosFilterFilter(t *testing.T) { f.Filter = "Route 66" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -363,11 +268,6 @@ func TestPhotosQueryFilter(t *testing.T) { f.Filter = "\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -381,11 +281,6 @@ func TestPhotosQueryFilter(t *testing.T) { f.Filter = "\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -399,11 +294,6 @@ func TestPhotosQueryFilter(t *testing.T) { f.Filter = "\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -417,11 +307,6 @@ func TestPhotosQueryFilter(t *testing.T) { f.Filter = "\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -435,11 +320,6 @@ func TestPhotosQueryFilter(t *testing.T) { f.Filter = "\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -453,11 +333,6 @@ func TestPhotosQueryFilter(t *testing.T) { f.Filter = "\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -471,11 +346,6 @@ func TestPhotosQueryFilter(t *testing.T) { f.Filter = "\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -489,11 +359,6 @@ func TestPhotosQueryFilter(t *testing.T) { f.Filter = "\"Father's type\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -508,11 +373,6 @@ func TestPhotosQueryFilter(t *testing.T) { f.Filter = "\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -526,11 +386,6 @@ func TestPhotosQueryFilter(t *testing.T) { f.Filter = "\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -544,11 +399,6 @@ func TestPhotosQueryFilter(t *testing.T) { f.Filter = "\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -562,11 +412,6 @@ func TestPhotosQueryFilter(t *testing.T) { f.Filter = "\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -580,11 +425,6 @@ func TestPhotosQueryFilter(t *testing.T) { f.Filter = "\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -598,11 +438,6 @@ func TestPhotosQueryFilter(t *testing.T) { f.Filter = "\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -617,11 +452,6 @@ func TestPhotosQueryFilter(t *testing.T) { f.Filter = "\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -635,11 +465,6 @@ func TestPhotosQueryFilter(t *testing.T) { f.Filter = "\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -653,11 +478,6 @@ func TestPhotosQueryFilter(t *testing.T) { f.Filter = "\"type555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -671,11 +491,6 @@ func TestPhotosQueryFilter(t *testing.T) { f.Filter = "\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_folder_test.go b/internal/search/photos_filter_folder_test.go index 95bdc2521..f189ebb03 100644 --- a/internal/search/photos_filter_folder_test.go +++ b/internal/search/photos_filter_folder_test.go @@ -14,11 +14,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "2790/07" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -32,11 +27,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "2790*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -50,11 +40,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "London" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -68,11 +53,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "London | 2790/07" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -86,11 +66,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "London|2790/07" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -104,11 +79,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "%abc/%folderx" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -122,11 +92,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "ab%c/fol%de" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -140,11 +105,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "abc%/folde%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -159,11 +119,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "&abc/&folde" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -178,11 +133,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "tes&r/lo&c" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -197,11 +147,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "2020&/vacation&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -216,11 +161,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "'2020/'vacation" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -235,11 +175,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "20'20/vacat'ion" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -254,11 +189,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "2020'/vacation'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -273,11 +203,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "*2020/*vacation" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -292,11 +217,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "202*3/vac*ation" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -311,11 +231,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "2023*/vacatio*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -330,11 +245,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "|202/|vacation" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -349,11 +259,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "20|22/vacat|ion" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -368,11 +273,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "2022|/vacation|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -387,11 +287,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "2000/holiday" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -405,11 +300,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "2000/02" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -424,11 +314,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "2000/02" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -443,11 +328,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "\"2000/\"02" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -462,11 +342,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "20\"00/0\"2" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -481,11 +356,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "2000\"/02\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -500,11 +370,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = " 2000/ 02" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -518,11 +383,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "20 00/ 0 2" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -537,11 +397,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "2000 /02 " f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -556,11 +411,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "%abc/%folderx | 20'20/vacat'ion" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -574,11 +424,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "202*3/vac*ation | 20'20/vacat'ion" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -592,11 +437,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "20|22/vacat|ion | &abc/&folde" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -610,11 +450,6 @@ func TestPhotosFilterFolder(t *testing.T) { f.Folder = "London | 1990/04" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -631,11 +466,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"2790/07\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -649,11 +479,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"2790*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -667,11 +492,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"London\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -685,11 +505,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"London | 2790/07\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -703,11 +518,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"London|2790/07\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -721,11 +531,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"%abc/%folderx\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -739,11 +544,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"ab%c/fol%de\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -757,11 +557,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"abc%/folde%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -776,11 +571,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"&abc/&folde\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -795,11 +585,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"tes&r/lo&c\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -814,11 +599,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"2020&/vacation&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -833,11 +613,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"'2020/'vacation\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -852,11 +627,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"20'20/vacat'ion\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -871,11 +641,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"2020'/vacation'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -890,11 +655,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"*2020/*vacation\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -909,11 +669,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"202*3/vac*ation\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -928,11 +683,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"2023*/vacatio*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -947,11 +697,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"|202/|vacation\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -966,11 +711,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"20|22/vacat|ion\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -985,11 +725,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"2022|/vacation|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1004,11 +739,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"2000/holiday\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1022,11 +752,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"2000/02\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1041,11 +766,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"2000/02\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1060,11 +780,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"\"2000/\"02\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1079,11 +794,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"20\"00/0\"2\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1100,11 +810,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"2000\"/02\"\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1119,11 +824,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\" 2000/ 02\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1137,11 +837,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"20 00/ 0 2\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1156,11 +851,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"2000 /02 \"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1175,11 +865,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"%abc/%folderx | 20'20/vacat'ion\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1193,11 +878,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"202*3/vac*ation | 20'20/vacat'ion\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1211,11 +891,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"20|22/vacat|ion | &abc/&folde\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1229,11 +904,6 @@ func TestPhotosQueryFolder(t *testing.T) { f.Query = "folder:\"London | 1990/04\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_geo_test.go b/internal/search/photos_filter_geo_test.go index 9a8f52e28..7fb219e26 100644 --- a/internal/search/photos_filter_geo_test.go +++ b/internal/search/photos_filter_geo_test.go @@ -31,11 +31,6 @@ func TestPhotosQueryGeo(t *testing.T) { f.Query = "geo:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -49,11 +44,6 @@ func TestPhotosQueryGeo(t *testing.T) { f.Query = "geo:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -67,11 +57,6 @@ func TestPhotosQueryGeo(t *testing.T) { f.Query = "geo:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -85,11 +70,6 @@ func TestPhotosQueryGeo(t *testing.T) { f.Query = "geo:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -104,11 +84,6 @@ func TestPhotosQueryGeo(t *testing.T) { f.Query = "geo:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -122,11 +97,6 @@ func TestPhotosQueryGeo(t *testing.T) { f.Query = "geo:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -141,11 +111,6 @@ func TestPhotosQueryGeo(t *testing.T) { f.Query = "geo:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -160,11 +125,6 @@ func TestPhotosQueryGeo(t *testing.T) { f.Query = "geo:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -179,11 +139,6 @@ func TestPhotosQueryGeo(t *testing.T) { f.Query = "geo:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -198,11 +153,6 @@ func TestPhotosQueryGeo(t *testing.T) { f.Query = "geo:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -217,11 +167,6 @@ func TestPhotosQueryGeo(t *testing.T) { f.Query = "geo:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -236,11 +181,6 @@ func TestPhotosQueryGeo(t *testing.T) { f.Query = "geo:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -255,11 +195,6 @@ func TestPhotosQueryGeo(t *testing.T) { f.Query = "geo:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -274,11 +209,6 @@ func TestPhotosQueryGeo(t *testing.T) { f.Query = "geo:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -293,11 +223,6 @@ func TestPhotosQueryGeo(t *testing.T) { f.Query = "geo:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -312,11 +237,6 @@ func TestPhotosQueryGeo(t *testing.T) { f.Query = "geo:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -331,11 +251,6 @@ func TestPhotosQueryGeo(t *testing.T) { f.Query = "geo:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -350,11 +265,6 @@ func TestPhotosQueryGeo(t *testing.T) { f.Query = "geo:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -369,11 +279,6 @@ func TestPhotosQueryGeo(t *testing.T) { f.Query = "geo:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -388,11 +293,6 @@ func TestPhotosQueryGeo(t *testing.T) { f.Query = "geo:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_hash_test.go b/internal/search/photos_filter_hash_test.go index 23898b83f..9655450dd 100644 --- a/internal/search/photos_filter_hash_test.go +++ b/internal/search/photos_filter_hash_test.go @@ -15,11 +15,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "2cad9168fa6acc5c5c2965ddf6ec465ca42fd818" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -33,11 +28,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "pcad9168fa6acc5c5c2965adf6ec465ca42fd340" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -51,11 +41,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "pcad9168fa6acc5c5c2965adf6ec465ca42fd340|2cad9168fa6acc5c5c2965ddf6ec465ca42fd818" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -69,11 +54,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "pcad9168fa6acc5c5c2965adf6ec465ca42fd340 | 2cad9168fa6acc5c5c2965ddf6ec465ca42fd818" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -87,11 +67,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "pcad9168fa6acc5c5c2965adf6ec465ca42fd340 or 2cad9168fa6acc5c5c2965ddf6ec465ca42fd818" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -105,11 +80,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "pcad9168fa6acc5c5c2965adf6ec465ca42fd340 OR 2cad9168fa6acc5c5c2965ddf6ec465ca42fd818" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -123,11 +93,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "pcad9168fa6acc5c5c2965adf6ec465ca42fd34*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -141,11 +106,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "%gold" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -159,11 +119,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "I love % dog" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -177,11 +132,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "sale%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -195,11 +145,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "&IlikeFood" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -213,11 +158,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "Pets & Dogs" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -231,11 +171,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +184,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "'Family" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -267,11 +197,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "Father's hash" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -286,11 +211,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "Ice Cream'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -304,11 +224,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "*Forrest" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -322,11 +237,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "My*Kids" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -340,11 +250,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "Yoga***" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -358,11 +263,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "|Banana" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -376,11 +276,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "Red|Green" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -395,11 +290,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "Blue|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -414,11 +304,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "345 Shirt" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -432,11 +317,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "hash555 Blue" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -450,11 +330,6 @@ func TestPhotosFilterHash(t *testing.T) { f.Hash = "Route 66" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -471,11 +346,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"2cad9168fa6acc5c5c2965ddf6ec465ca42fd818\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -489,11 +359,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"pcad9168fa6acc5c5c2965adf6ec465ca42fd340\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -507,11 +372,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"pcad9168fa6acc5c5c2965adf6ec465ca42fd340|2cad9168fa6acc5c5c2965ddf6ec465ca42fd818\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -525,11 +385,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"pcad9168fa6acc5c5c2965adf6ec465ca42fd340 | 2cad9168fa6acc5c5c2965ddf6ec465ca42fd818\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -543,11 +398,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"pcad9168fa6acc5c5c2965adf6ec465ca42fd340 or 2cad9168fa6acc5c5c2965ddf6ec465ca42fd818\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -561,11 +411,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"pcad9168fa6acc5c5c2965adf6ec465ca42fd340 OR 2cad9168fa6acc5c5c2965ddf6ec465ca42fd818\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -579,11 +424,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"pcad9168fa6acc5c5c2965adf6ec465ca42fd34*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -597,11 +437,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -615,11 +450,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -633,11 +463,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -651,11 +476,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -669,11 +489,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -687,11 +502,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -705,11 +515,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -723,11 +528,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"Father's hash\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -742,11 +542,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -760,11 +555,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -778,11 +568,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -796,11 +581,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -814,11 +594,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -832,11 +607,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -851,11 +621,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -869,11 +634,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -887,11 +647,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"hash555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -905,11 +660,6 @@ func TestPhotosQueryHash(t *testing.T) { f.Query = "hash:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_hidden_test.go b/internal/search/photos_filter_hidden_test.go index 21c9a98cc..804280d15 100644 --- a/internal/search/photos_filter_hidden_test.go +++ b/internal/search/photos_filter_hidden_test.go @@ -31,11 +31,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -45,11 +40,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -63,11 +53,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -81,11 +66,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -117,11 +92,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -136,11 +106,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -154,11 +119,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -173,11 +133,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -192,11 +147,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -211,11 +161,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -230,11 +175,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +189,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -268,11 +203,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -287,11 +217,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -306,11 +231,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -325,11 +245,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -344,11 +259,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -363,11 +273,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -382,11 +287,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -401,11 +301,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -420,11 +315,6 @@ func TestPhotosQueryHidden(t *testing.T) { f.Query = "hidden:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_keywords_test.go b/internal/search/photos_filter_keywords_test.go index bc06fa3f5..cebeacc30 100644 --- a/internal/search/photos_filter_keywords_test.go +++ b/internal/search/photos_filter_keywords_test.go @@ -14,11 +14,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "kuh" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -32,11 +27,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "b*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -50,11 +40,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "b*|kuh" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -68,11 +53,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "b* | kuh" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -86,11 +66,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "b* or kuh" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -104,11 +79,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "b* OR kuh" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -122,11 +92,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "b*&kuh" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -140,11 +105,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "b* & kuh" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -158,11 +118,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "b* and kuh" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -176,11 +131,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "b* AND kuh" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -194,11 +144,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "%toss" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -212,11 +157,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "ca%t" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -230,11 +170,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "magic%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +184,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "&hogwarts" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -268,11 +198,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "love&trust" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -287,11 +212,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "countryside&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -306,11 +226,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "'grandfather" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -325,11 +240,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "grandma's" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -344,11 +254,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "cheescake'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -363,11 +268,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "*rating" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -382,11 +282,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "three*four" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -401,11 +296,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "tree*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -420,11 +310,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "|mystery" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -439,11 +324,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "run|stay" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -458,11 +338,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "pillow|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -477,11 +352,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "1dish" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -495,11 +365,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "nothing4you" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -514,11 +379,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "joyx2" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -534,11 +394,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "\"electronics" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -553,11 +408,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "sal\"mon" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -572,11 +422,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "fish\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -591,11 +436,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "nothing4you | magic%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -609,11 +449,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "nothing4you | run|stay" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -627,11 +462,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "three*four | grandma's" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -645,11 +475,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "nothing4you & magic%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -663,11 +488,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "nothing4you & run|stay" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -681,11 +501,6 @@ func TestPhotosFilterKeywords(t *testing.T) { f.Keywords = "three*four & grandma's" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -702,11 +517,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"kuh\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -720,11 +530,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"b*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -738,11 +543,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"b*|kuh\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -756,11 +556,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"b* | kuh\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -774,11 +569,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"b* or kuh\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -792,11 +582,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"b* OR kuh\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -810,11 +595,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"b*&kuh\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -828,11 +608,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"b* & kuh\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -846,11 +621,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"b* and kuh\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -864,11 +634,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"b* AND kuh\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -882,11 +647,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"%toss\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -900,11 +660,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"ca%t\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -918,11 +673,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"magic%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -937,11 +687,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"&hogwarts\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -956,11 +701,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"love&trust\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -975,11 +715,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"countryside&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -994,11 +729,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"'grandfather\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1013,11 +743,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"grandma's\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1032,11 +757,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"cheescake'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1051,11 +771,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"*rating\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1070,11 +785,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"three*four\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1089,11 +799,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"tree*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1108,11 +813,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"|mystery\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1127,11 +827,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"run|stay\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1146,11 +841,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"pillow|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1165,11 +855,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"1dish\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1183,11 +868,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"nothing4you\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1202,11 +882,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"joyx2\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1222,11 +897,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"\"electronics\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1241,11 +911,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"sal\"mon\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1260,11 +925,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"fish\"\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1279,11 +939,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"nothing4you | magic%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1297,11 +952,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"nothing4you | run|stay\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1315,11 +965,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"three*four | grandma's\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1333,11 +978,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"nothing4you & magic%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1351,11 +991,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"nothing4you & run|stay\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1369,11 +1004,6 @@ func TestPhotosQueryKeywords(t *testing.T) { f.Query = "keywords:\"three*four & grandma's\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_label_test.go b/internal/search/photos_filter_label_test.go index 9a6186838..63dc53ccc 100644 --- a/internal/search/photos_filter_label_test.go +++ b/internal/search/photos_filter_label_test.go @@ -14,11 +14,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "flower" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -32,11 +27,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "cake" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -50,11 +40,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "cake|flower" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -68,16 +53,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "cake | flower" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -91,16 +66,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "%tennis" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -114,16 +79,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "chem%stry" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -137,16 +92,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "cell%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -161,11 +106,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "&friendship" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -180,11 +120,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "construction&failure" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -199,11 +134,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "goal&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -218,11 +148,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "'activity" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -237,11 +162,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "funera'l" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -256,11 +176,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "technology'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -275,11 +190,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "*tea" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -294,11 +204,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "soup*menu" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -313,11 +218,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "proposal*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -332,11 +232,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "|college" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -351,11 +246,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "potato|couch" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -370,11 +260,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "mall|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -389,11 +274,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "2020-world" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -407,11 +287,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "sport-2021-event" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -426,11 +301,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "oven-3000" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -445,11 +315,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "\"king" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -464,11 +329,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "sal\"mon" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -483,11 +343,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "ladder\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -502,11 +357,6 @@ func TestPhotosFilterLabel(t *testing.T) { f.Label = "oven-3000 | sport-2021-event" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -523,11 +373,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"flower\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -541,11 +386,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"cake\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -559,11 +399,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"cake|flower\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -577,11 +412,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"cake | flower\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -595,11 +425,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"%tennis\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -613,11 +438,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"chem%stry\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -631,11 +451,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"cell%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -650,11 +465,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"&friendship\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -669,11 +479,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"construction&failure\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -688,11 +493,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"goal&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -707,11 +507,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"'activity\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -726,11 +521,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"funera'l\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -745,11 +535,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"technology'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -764,11 +549,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"*tea\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -783,11 +563,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"soup*menu\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -802,11 +577,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"proposal*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -821,11 +591,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"|college\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -840,11 +605,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"potato|couch\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -859,11 +619,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"mall|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -878,11 +633,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"2020-world\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -896,11 +646,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"sport-2021-event\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -915,11 +660,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"oven-3000\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -934,11 +674,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"\"king\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -953,11 +688,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"sal\"mon\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -972,11 +702,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"ladder\"\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -991,11 +716,6 @@ func TestPhotosQueryLabel(t *testing.T) { f.Query = "label:\"oven-3000 | sport-2021-event\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_landscape_test.go b/internal/search/photos_filter_landscape_test.go index 66f06de8c..9dfc60b64 100644 --- a/internal/search/photos_filter_landscape_test.go +++ b/internal/search/photos_filter_landscape_test.go @@ -32,11 +32,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -50,11 +45,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -64,11 +54,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -82,11 +67,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -100,11 +80,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -118,11 +93,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -136,11 +106,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -155,11 +120,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -173,11 +133,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -192,11 +147,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -210,11 +160,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -229,11 +174,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -248,11 +188,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -267,11 +202,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -286,11 +216,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -305,11 +230,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -324,11 +244,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -343,11 +258,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -362,11 +272,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -381,11 +286,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -400,11 +300,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -419,11 +314,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -438,11 +328,6 @@ func TestPhotosQueryLandscape(t *testing.T) { f.Query = "landscape:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_lens_test.go b/internal/search/photos_filter_lens_test.go index f5e8e6ebd..91bff0f08 100644 --- a/internal/search/photos_filter_lens_test.go +++ b/internal/search/photos_filter_lens_test.go @@ -15,11 +15,6 @@ func TestPhotosFilterLens(t *testing.T) { f.Lens = "Apple" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -33,11 +28,6 @@ func TestPhotosFilterLens(t *testing.T) { f.Lens = "Apple iPhone SE back camera 4.15mm f/2.2" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -52,11 +42,6 @@ func TestPhotosFilterLens(t *testing.T) { f.Lens = "*4.15mm f/2.2" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -70,11 +55,6 @@ func TestPhotosFilterLens(t *testing.T) { f.Lens = "%gold" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -88,11 +68,6 @@ func TestPhotosFilterLens(t *testing.T) { f.Lens = "I love % dog" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -106,11 +81,6 @@ func TestPhotosFilterLens(t *testing.T) { f.Lens = "sale%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -124,11 +94,6 @@ func TestPhotosFilterLens(t *testing.T) { f.Lens = "&IlikeFood" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -142,11 +107,6 @@ func TestPhotosFilterLens(t *testing.T) { f.Lens = "Pets & Dogs" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -160,11 +120,6 @@ func TestPhotosFilterLens(t *testing.T) { f.Lens = "Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -178,11 +133,6 @@ func TestPhotosFilterLens(t *testing.T) { f.Lens = "'Family" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -196,11 +146,6 @@ func TestPhotosFilterLens(t *testing.T) { f.Lens = "Father's lens" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -215,11 +160,6 @@ func TestPhotosFilterLens(t *testing.T) { f.Lens = "Ice Cream'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -233,11 +173,6 @@ func TestPhotosFilterLens(t *testing.T) { f.Lens = "*Forrest" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -251,11 +186,6 @@ func TestPhotosFilterLens(t *testing.T) { f.Lens = "My*Kids" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -269,11 +199,6 @@ func TestPhotosFilterLens(t *testing.T) { f.Lens = "Yoga***" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -287,11 +212,6 @@ func TestPhotosFilterLens(t *testing.T) { f.Lens = "|Banana" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -305,11 +225,6 @@ func TestPhotosFilterLens(t *testing.T) { f.Lens = "Red|Green" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -324,11 +239,6 @@ func TestPhotosFilterLens(t *testing.T) { f.Lens = "Blue|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -343,11 +253,6 @@ func TestPhotosFilterLens(t *testing.T) { f.Lens = "345 Shirt" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -361,11 +266,6 @@ func TestPhotosFilterLens(t *testing.T) { f.Lens = "lens555 Blue" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -379,11 +279,6 @@ func TestPhotosFilterLens(t *testing.T) { f.Lens = "Route 66" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -400,11 +295,6 @@ func TestPhotosQueryLens(t *testing.T) { f.Query = "lens:\"Apple\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -418,11 +308,6 @@ func TestPhotosQueryLens(t *testing.T) { f.Query = "lens:\"Apple iPhone SE back camera 4.15mm f/2.2\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -437,11 +322,6 @@ func TestPhotosQueryLens(t *testing.T) { f.Query = "lens:\"*4.15mm f/2.2\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -455,11 +335,6 @@ func TestPhotosQueryLens(t *testing.T) { f.Query = "lens:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -473,11 +348,6 @@ func TestPhotosQueryLens(t *testing.T) { f.Query = "lens:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -491,11 +361,6 @@ func TestPhotosQueryLens(t *testing.T) { f.Query = "lens:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -509,11 +374,6 @@ func TestPhotosQueryLens(t *testing.T) { f.Query = "lens:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -527,11 +387,6 @@ func TestPhotosQueryLens(t *testing.T) { f.Query = "lens:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -545,11 +400,6 @@ func TestPhotosQueryLens(t *testing.T) { f.Query = "lens:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -563,11 +413,6 @@ func TestPhotosQueryLens(t *testing.T) { f.Query = "lens:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -581,11 +426,6 @@ func TestPhotosQueryLens(t *testing.T) { f.Query = "lens:\"Father's lens\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -600,11 +440,6 @@ func TestPhotosQueryLens(t *testing.T) { f.Query = "lens:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -618,11 +453,6 @@ func TestPhotosQueryLens(t *testing.T) { f.Query = "lens:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -636,11 +466,6 @@ func TestPhotosQueryLens(t *testing.T) { f.Query = "lens:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -654,11 +479,6 @@ func TestPhotosQueryLens(t *testing.T) { f.Query = "lens:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -672,11 +492,6 @@ func TestPhotosQueryLens(t *testing.T) { f.Query = "lens:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -690,11 +505,6 @@ func TestPhotosQueryLens(t *testing.T) { f.Query = "lens:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -709,11 +519,6 @@ func TestPhotosQueryLens(t *testing.T) { f.Query = "lens:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -727,11 +532,6 @@ func TestPhotosQueryLens(t *testing.T) { f.Query = "lens:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -745,11 +545,6 @@ func TestPhotosQueryLens(t *testing.T) { f.Query = "lens:\"lens555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -763,11 +558,6 @@ func TestPhotosQueryLens(t *testing.T) { f.Query = "lens:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_live_test.go b/internal/search/photos_filter_live_test.go index 1b0d90f3e..66fb30b61 100644 --- a/internal/search/photos_filter_live_test.go +++ b/internal/search/photos_filter_live_test.go @@ -31,11 +31,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -45,11 +40,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -63,11 +53,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -81,11 +66,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -117,11 +92,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -136,11 +106,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -154,11 +119,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -173,11 +133,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -192,11 +147,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -211,11 +161,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -230,11 +175,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +189,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -268,11 +203,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -287,11 +217,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -306,11 +231,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -325,11 +245,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -344,11 +259,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -363,11 +273,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -382,11 +287,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -401,11 +301,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -420,11 +315,6 @@ func TestPhotosQueryLive(t *testing.T) { f.Query = "live:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_mono_test.go b/internal/search/photos_filter_mono_test.go index e106e5e06..c2b504741 100644 --- a/internal/search/photos_filter_mono_test.go +++ b/internal/search/photos_filter_mono_test.go @@ -31,11 +31,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -45,11 +40,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -63,11 +53,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -81,11 +66,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -117,11 +92,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -136,11 +106,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -154,11 +119,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -173,11 +133,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -192,11 +147,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -211,11 +161,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -230,11 +175,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +189,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -268,11 +203,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -287,11 +217,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -306,11 +231,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -325,11 +245,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -344,11 +259,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -363,11 +273,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -382,11 +287,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -401,11 +301,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -420,11 +315,6 @@ func TestPhotosQueryMono(t *testing.T) { f.Query = "mono:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_month_test.go b/internal/search/photos_filter_month_test.go index 56191136d..d93dd1b24 100644 --- a/internal/search/photos_filter_month_test.go +++ b/internal/search/photos_filter_month_test.go @@ -15,11 +15,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "12" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -33,11 +28,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "1" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -51,11 +41,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "12|1" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -69,11 +54,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "12 | 1" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -92,11 +72,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "%gold" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -110,11 +85,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "I love % dog" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -128,11 +98,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "sale%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -146,11 +111,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "&IlikeFood" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -164,11 +124,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "Pets & Dogs" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -182,11 +137,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -200,11 +150,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "'Family" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -218,11 +163,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "Father's month" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -237,11 +177,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "Ice Cream'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -255,11 +190,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "*Forrest" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -273,11 +203,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "My*Kids" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -291,11 +216,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "Yoga***" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -309,11 +229,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "|Banana" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -327,11 +242,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "Red|Green" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -346,11 +256,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "Blue|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -365,11 +270,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "345 Shirt" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -383,11 +283,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "month555 Blue" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -401,11 +296,6 @@ func TestPhotosFilterMonth(t *testing.T) { f.Month = "Route 66" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -422,11 +312,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"12\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -440,11 +325,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"1\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -458,11 +338,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"12|1\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -476,11 +351,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"12 | 1\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -500,11 +370,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -518,11 +383,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -536,11 +396,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -554,11 +409,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -572,11 +422,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -590,11 +435,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -608,11 +448,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -626,11 +461,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"Father's month\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -645,11 +475,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -663,11 +488,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -681,11 +501,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -699,11 +514,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -717,11 +527,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -735,11 +540,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -754,11 +554,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -772,11 +567,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -790,11 +580,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"month555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -808,11 +593,6 @@ func TestPhotosQueryMonth(t *testing.T) { f.Query = "month:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_name_test.go b/internal/search/photos_filter_name_test.go index 870ce5aff..7f8e87fa6 100644 --- a/internal/search/photos_filter_name_test.go +++ b/internal/search/photos_filter_name_test.go @@ -14,11 +14,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "27900704_070228_D6D51B6C" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -32,11 +27,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "*hoto1*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -50,11 +40,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "*hoto1*|27900704_070228_D6D51B6C" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -68,11 +53,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "*hoto1* | 27900704_070228_D6D51B6C" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -86,11 +66,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "*hoto1* or 27900704_070228_D6D51B6C" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -104,11 +79,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "photo29%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -122,11 +92,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "photo%30" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -140,11 +105,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "photo29%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -159,11 +119,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "&photo31" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -178,11 +133,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "photo&32" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -197,11 +147,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "photo33&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -216,11 +161,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "'photo34" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -235,11 +175,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "photo'35" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -254,11 +189,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "photo36'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -273,11 +203,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "*photo37" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -292,11 +217,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "photo*38" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -311,11 +231,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "photo39*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -330,11 +245,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "|*photo40" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -349,11 +259,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "photo|*41" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, count, err := Photos(f) if err != nil { @@ -373,11 +278,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "photo42*|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -392,11 +292,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "|photo40" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -411,11 +306,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "photo|41" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -430,11 +320,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "photo42|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -449,11 +334,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "43photo" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -467,11 +347,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "pho44to" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -486,11 +361,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "photo45" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -505,11 +375,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "\"photo46" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -524,11 +389,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "photo\"47" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -543,11 +403,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "photo48\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -562,11 +417,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = " photo49" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -580,11 +430,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "photo 50" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -599,11 +444,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "photo51 " f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -618,11 +458,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "%photo28 | photo'35" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -636,11 +471,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "photo*38 | photo'35" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -654,11 +484,6 @@ func TestPhotosFilterName(t *testing.T) { f.Name = "photo|41 | &photo31" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -675,11 +500,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"27900704_070228_D6D51B6C\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -693,11 +513,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"*hoto1*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -711,11 +526,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"*hoto1*|27900704_070228_D6D51B6C\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -729,11 +539,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"*hoto1* | 27900704_070228_D6D51B6C\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -747,11 +552,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"*hoto1* or 27900704_070228_D6D51B6C\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -765,11 +565,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"%photo28\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -783,11 +578,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"photo%30\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -801,11 +591,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"photo29%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -819,11 +604,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"&photo31\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -837,11 +617,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"photo&32\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -855,11 +630,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"photo33&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -873,11 +643,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"'photo34\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -891,11 +656,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"photo'35\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -910,11 +670,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"photo36'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -928,11 +683,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"*photo37\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -946,11 +696,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"photo*38\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -964,11 +709,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"photo39*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -982,11 +722,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"|*photo40\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1001,11 +736,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"photo|*41\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, count, err := Photos(f) if err != nil { @@ -1025,11 +755,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"photo42*|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1044,11 +769,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"|photo40\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1063,11 +783,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"photo|41\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1082,11 +797,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"photo42|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1101,11 +811,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"43photo\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1119,11 +824,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"pho44to\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1137,11 +837,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"photo45\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1155,11 +850,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"\"photo46\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1174,11 +864,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"photo\"47\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1193,11 +878,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"photo48\"\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1212,11 +892,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\" photo49\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1230,11 +905,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"photo 50\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1249,11 +919,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"photo51 \"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1268,11 +933,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"%photo28 | photo'35\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1286,11 +946,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"photo*38 | photo'35\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1304,11 +959,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"photo|41 | &photo31\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1322,11 +972,6 @@ func TestPhotosQueryName(t *testing.T) { f.Query = "name:\"bridge1 | bridge2\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_panorama_test.go b/internal/search/photos_filter_panorama_test.go index 52ca524c7..729e84acf 100644 --- a/internal/search/photos_filter_panorama_test.go +++ b/internal/search/photos_filter_panorama_test.go @@ -31,11 +31,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -45,11 +40,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -63,11 +53,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -81,11 +66,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -117,11 +92,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -136,11 +106,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -154,11 +119,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -173,11 +133,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -192,11 +147,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -211,11 +161,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -230,11 +175,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +189,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -268,11 +203,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -287,11 +217,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -306,11 +231,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -325,11 +245,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -344,11 +259,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -363,11 +273,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -382,11 +287,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -401,11 +301,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -420,11 +315,6 @@ func TestPhotosQueryPanorama(t *testing.T) { f.Query = "panorama:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_path_test.go b/internal/search/photos_filter_path_test.go index 4b6161b96..59a27f815 100644 --- a/internal/search/photos_filter_path_test.go +++ b/internal/search/photos_filter_path_test.go @@ -14,11 +14,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "2790/07" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -32,11 +27,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "2790*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -50,11 +40,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "London" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -68,11 +53,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "London|2790/07" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -86,11 +66,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "%abc/%folderx" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -104,11 +79,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "ab%c/fol%de" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -122,11 +92,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "abc%/folde%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -141,11 +106,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "&abc/&folde" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -160,11 +120,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "tes&r/lo&c" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -179,11 +134,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "2020&/vacation&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -198,11 +148,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "'2020/'vacation" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -217,11 +162,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "20'20/vacat'ion" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -236,11 +176,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "2020'/vacation'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -255,11 +190,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "*2020/*vacation" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -274,11 +204,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "202*3/vac*ation" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -293,11 +218,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "2023*/vacatio*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -312,11 +232,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "|202/|vacation" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -331,11 +246,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "20|22/vacat|ion" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -350,11 +260,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "2022|/vacation|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -369,11 +274,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "2000/holiday" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -387,11 +287,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "2000/02" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -406,11 +301,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "2000/02" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -425,11 +315,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "\"2000/\"02" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -444,11 +329,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "20\"00/0\"2" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -463,11 +343,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "2000\"/02\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -482,11 +357,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = " 2000/ 02" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -500,11 +370,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "20 00/ 0 2" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -519,11 +384,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "2000 /02 " f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -538,11 +398,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "%abc/%folderx|20'20/vacat'ion" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -556,11 +411,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "202*3/vac*ation|20'20/vacat'ion" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -574,11 +424,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "20'20/vacat'ion|&abc/&folde" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -592,11 +437,6 @@ func TestPhotosFilterPath(t *testing.T) { f.Path = "London|1990/04" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -613,11 +453,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"2790/07\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -631,11 +466,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"2790*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -649,11 +479,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"London\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -667,11 +492,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"London|2790/07\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -685,11 +505,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"%abc/%folderx\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -703,11 +518,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"ab%c/fol%de\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -721,11 +531,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"abc%/folde%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -740,11 +545,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"&abc/&folde\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -759,11 +559,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"tes&r/lo&c\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -778,11 +573,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"2020&/vacation&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -797,11 +587,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"'2020/'vacation\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -816,11 +601,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"20'20/vacat'ion\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -835,11 +615,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"2020'/vacation'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -854,11 +629,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"*2020/*vacation\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -873,11 +643,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"202*3/vac*ation\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -892,11 +657,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"2023*/vacatio*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -911,11 +671,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"|202/|vacation\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -930,11 +685,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"20|22/vacat|ion\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -949,11 +699,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"2022|/vacation|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -968,11 +713,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"2000/holiday\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -986,11 +726,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"2000/02\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1005,11 +740,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"2000/02\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1024,11 +754,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"\"2000/\"02\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1043,11 +768,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"20\"00/0\"2\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1064,11 +784,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"2000\"/02\"\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1083,11 +798,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\" 2000/ 02\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1101,11 +811,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"20 00/ 0 2\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1120,11 +825,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"2000 /02 \"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1139,11 +839,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"%abc/%folderx|20'20/vacat'ion\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1157,11 +852,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"202*3/vac*ation|20'20/vacat'ion\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1175,11 +865,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"20'20/vacat'ion|&abc/&folde\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1193,11 +878,6 @@ func TestPhotosQueryPath(t *testing.T) { f.Query = "path:\"London|1990/04\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_people_test.go b/internal/search/photos_filter_people_test.go index ca2a422ad..21eafef7e 100644 --- a/internal/search/photos_filter_people_test.go +++ b/internal/search/photos_filter_people_test.go @@ -15,11 +15,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "Ac*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -33,11 +28,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "Actress" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -51,11 +41,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "Actress A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -69,11 +54,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "Actor A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -87,11 +67,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "Actor A|Actress A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -105,11 +80,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "Actor A | Actress A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -123,11 +93,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "Actor A&Actress A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -141,11 +106,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "Actor A & Actress A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -159,11 +119,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "%gold" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -177,11 +132,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "I love % dog" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -195,11 +145,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "sale%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -213,11 +158,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "&IlikeFood" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -231,11 +171,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "Pets & Dogs" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +184,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -267,11 +197,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "'Family" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -285,11 +210,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "Father's type" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -304,11 +224,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "Ice Cream'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -322,11 +237,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "*Forrest" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -340,11 +250,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "My*Kids" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -358,11 +263,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "Yoga***" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -376,11 +276,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "|Banana" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -394,11 +289,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "Red|Green" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -413,11 +303,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "Blue|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -432,11 +317,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "345 Shirt" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -450,11 +330,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "type555 Blue" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -468,11 +343,6 @@ func TestPhotosFilterPeople(t *testing.T) { f.People = "Route 66" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -489,11 +359,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"Ac*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -507,11 +372,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"Actress\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -525,11 +385,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"Actress A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -543,11 +398,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"Actor A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -561,11 +411,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"Actor A|Actress A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -579,11 +424,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"Actor A | Actress A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -597,11 +437,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"Actor A&Actress A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -615,11 +450,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"Actor A & Actress A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -633,11 +463,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -651,11 +476,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -669,11 +489,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -687,11 +502,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -705,11 +515,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -723,11 +528,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -741,11 +541,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -759,11 +554,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"Father's type\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -778,11 +568,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -796,11 +581,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -814,11 +594,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -832,11 +607,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -850,11 +620,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -868,11 +633,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -887,11 +647,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -905,11 +660,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -923,11 +673,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"type555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -941,11 +686,6 @@ func TestPhotosQueryPeople(t *testing.T) { f.Query = "people:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_person_test.go b/internal/search/photos_filter_person_test.go index f5361b381..a50cb9513 100644 --- a/internal/search/photos_filter_person_test.go +++ b/internal/search/photos_filter_person_test.go @@ -15,11 +15,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "Ac*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -33,11 +28,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "Actress" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -51,11 +41,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "Actress A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -69,11 +54,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "Actor A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -87,11 +67,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "Actor A|Actress A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -105,11 +80,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "Actor A | Actress A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -123,11 +93,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "Actor A&Actress A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -141,11 +106,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "Actor A & Actress A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -159,11 +119,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "%gold" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -177,11 +132,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "I love % dog" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -195,11 +145,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "sale%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -214,11 +159,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "&IlikeFood" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -232,11 +172,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "Pets & Dogs" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -251,11 +186,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -269,11 +199,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "'Family" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -287,11 +212,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "Father's type" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -306,11 +226,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "Ice Cream'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -324,11 +239,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "*Forrest" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -342,11 +252,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "My*Kids" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -360,11 +265,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "Yoga***" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -378,11 +278,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "|Banana" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -396,11 +291,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "Red|Green" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -415,11 +305,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "Blue|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -434,11 +319,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "345 Shirt" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -452,11 +332,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "type555 Blue" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -470,11 +345,6 @@ func TestPhotosFilterPerson(t *testing.T) { f.Person = "Route 66" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -491,11 +361,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"Ac*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -509,11 +374,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"Actress\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -527,11 +387,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"Actress A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -545,11 +400,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"Actor A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -563,11 +413,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"Actor A|Actress A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -581,11 +426,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"Actor A | Actress A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -599,11 +439,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"Actor A&Actress A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -617,11 +452,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"Actor A & Actress A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -635,11 +465,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -653,11 +478,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -671,11 +491,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -690,11 +505,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -708,11 +518,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -727,11 +532,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -745,11 +545,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -763,11 +558,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"Father's type\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -782,11 +572,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -800,11 +585,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -818,11 +598,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -836,11 +611,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -854,11 +624,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -872,11 +637,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -891,11 +651,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -909,11 +664,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -927,11 +677,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"type555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -945,11 +690,6 @@ func TestPhotosQueryPerson(t *testing.T) { f.Query = "person:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_photo_test.go b/internal/search/photos_filter_photo_test.go index b281151d8..b57aecada 100644 --- a/internal/search/photos_filter_photo_test.go +++ b/internal/search/photos_filter_photo_test.go @@ -31,11 +31,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -45,11 +40,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -63,11 +53,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -81,11 +66,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -117,11 +92,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -136,11 +106,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -154,11 +119,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -173,11 +133,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -192,11 +147,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -211,11 +161,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -230,11 +175,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +189,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -268,11 +203,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -287,11 +217,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -306,11 +231,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -325,11 +245,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -344,11 +259,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -363,11 +273,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -382,11 +287,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -401,11 +301,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -420,11 +315,6 @@ func TestPhotosQueryPhoto(t *testing.T) { f.Query = "photo:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_portrait_test.go b/internal/search/photos_filter_portrait_test.go index 896502c4e..072c4b643 100644 --- a/internal/search/photos_filter_portrait_test.go +++ b/internal/search/photos_filter_portrait_test.go @@ -32,11 +32,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -46,11 +41,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -64,11 +54,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -82,11 +67,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -100,11 +80,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -118,11 +93,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -137,16 +107,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -160,11 +120,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -179,11 +134,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -198,11 +148,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -217,11 +162,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -236,11 +176,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -255,11 +190,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -274,11 +204,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -293,11 +218,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -312,11 +232,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -331,11 +246,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -350,11 +260,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -369,11 +274,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -388,11 +288,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -407,11 +302,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -426,11 +316,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "portrait:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -445,11 +330,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "landscape:true" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -464,11 +344,6 @@ func TestPhotosQueryPortrait(t *testing.T) { f.Query = "square:true" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_primary_test.go b/internal/search/photos_filter_primary_test.go index a54d00a23..41c683ab4 100644 --- a/internal/search/photos_filter_primary_test.go +++ b/internal/search/photos_filter_primary_test.go @@ -30,11 +30,6 @@ func TestPhotosQueryPrimary(t *testing.T) { f.Query = "primary:yes" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -43,11 +38,6 @@ func TestPhotosQueryPrimary(t *testing.T) { assert.Greater(t, len(photos), len(photos0)) f.Query = "primary:false" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -61,11 +51,6 @@ func TestPhotosQueryPrimary(t *testing.T) { f.Query = "primary:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -79,11 +64,6 @@ func TestPhotosQueryPrimary(t *testing.T) { f.Query = "primary:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -97,11 +77,6 @@ func TestPhotosQueryPrimary(t *testing.T) { f.Query = "primary:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -115,11 +90,6 @@ func TestPhotosQueryPrimary(t *testing.T) { f.Query = "primary:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -134,11 +104,6 @@ func TestPhotosQueryPrimary(t *testing.T) { f.Query = "primary:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -152,11 +117,6 @@ func TestPhotosQueryPrimary(t *testing.T) { f.Query = "primary:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -171,11 +131,6 @@ func TestPhotosQueryPrimary(t *testing.T) { f.Query = "primary:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -190,11 +145,6 @@ func TestPhotosQueryPrimary(t *testing.T) { f.Query = "primary:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -209,11 +159,6 @@ func TestPhotosQueryPrimary(t *testing.T) { f.Query = "primary:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -228,11 +173,6 @@ func TestPhotosQueryPrimary(t *testing.T) { f.Query = "primary:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -247,11 +187,6 @@ func TestPhotosQueryPrimary(t *testing.T) { f.Query = "primary:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -266,11 +201,6 @@ func TestPhotosQueryPrimary(t *testing.T) { f.Query = "primary:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -285,11 +215,6 @@ func TestPhotosQueryPrimary(t *testing.T) { f.Query = "primary:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -304,11 +229,6 @@ func TestPhotosQueryPrimary(t *testing.T) { f.Query = "primary:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -323,11 +243,6 @@ func TestPhotosQueryPrimary(t *testing.T) { f.Query = "primary:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -342,11 +257,6 @@ func TestPhotosQueryPrimary(t *testing.T) { f.Query = "primary:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -361,11 +271,6 @@ func TestPhotosQueryPrimary(t *testing.T) { f.Query = "primary:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -380,11 +285,6 @@ func TestPhotosQueryPrimary(t *testing.T) { f.Query = "primary:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -399,11 +299,6 @@ func TestPhotosQueryPrimary(t *testing.T) { f.Query = "primary:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -418,11 +313,6 @@ func TestPhotosQueryPrimary(t *testing.T) { f.Query = "primary:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_private_test.go b/internal/search/photos_filter_private_test.go index 69a68b78f..813d789c4 100644 --- a/internal/search/photos_filter_private_test.go +++ b/internal/search/photos_filter_private_test.go @@ -31,11 +31,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -45,11 +40,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -63,11 +53,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -81,11 +66,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -117,11 +92,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -136,11 +106,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -154,11 +119,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -173,11 +133,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -192,11 +147,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -211,11 +161,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -230,11 +175,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +189,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -268,11 +203,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -287,11 +217,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -306,11 +231,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -325,11 +245,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -344,11 +259,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -363,11 +273,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -382,11 +287,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -401,11 +301,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -420,11 +315,6 @@ func TestPhotosQueryPrivate(t *testing.T) { f.Query = "private:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_public_test.go b/internal/search/photos_filter_public_test.go index bfae6e9ae..91012639b 100644 --- a/internal/search/photos_filter_public_test.go +++ b/internal/search/photos_filter_public_test.go @@ -31,11 +31,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -45,11 +40,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -63,11 +53,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -81,11 +66,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -117,11 +92,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -136,11 +106,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -154,11 +119,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -173,11 +133,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -192,11 +147,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -211,11 +161,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -230,11 +175,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +189,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -268,11 +203,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -287,11 +217,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -306,11 +231,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -325,11 +245,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -344,11 +259,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -363,11 +273,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -382,11 +287,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -401,11 +301,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -420,11 +315,6 @@ func TestPhotosQueryPublic(t *testing.T) { f.Query = "public:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_raw_test.go b/internal/search/photos_filter_raw_test.go index d58550727..03f360873 100644 --- a/internal/search/photos_filter_raw_test.go +++ b/internal/search/photos_filter_raw_test.go @@ -31,11 +31,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -45,11 +40,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -63,11 +53,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -81,11 +66,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -117,11 +92,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -136,11 +106,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -154,11 +119,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -173,16 +133,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -197,11 +147,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -216,11 +161,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -235,11 +175,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -254,11 +189,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -273,11 +203,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -292,11 +217,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -311,11 +231,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -330,11 +245,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -349,11 +259,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -368,11 +273,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -387,11 +287,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -406,11 +301,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -425,11 +315,6 @@ func TestPhotosQueryRaw(t *testing.T) { f.Query = "raw:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_review_test.go b/internal/search/photos_filter_review_test.go index 69ee605cc..9a9d41953 100644 --- a/internal/search/photos_filter_review_test.go +++ b/internal/search/photos_filter_review_test.go @@ -31,11 +31,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -45,11 +40,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -63,11 +53,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -81,11 +66,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -117,11 +92,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -136,11 +106,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -154,11 +119,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -173,11 +133,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -192,11 +147,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -211,11 +161,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -230,11 +175,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +189,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -268,11 +203,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -287,11 +217,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -306,11 +231,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -325,11 +245,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -344,11 +259,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -363,11 +273,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -382,11 +287,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -401,11 +301,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -420,11 +315,6 @@ func TestPhotosQueryReview(t *testing.T) { f.Query = "review:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_scan_test.go b/internal/search/photos_filter_scan_test.go index 61b86fd06..ba3458e97 100644 --- a/internal/search/photos_filter_scan_test.go +++ b/internal/search/photos_filter_scan_test.go @@ -31,11 +31,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -45,11 +40,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -63,11 +53,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -81,11 +66,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -117,11 +92,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -136,11 +106,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -154,11 +119,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -173,11 +133,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -192,11 +147,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -211,11 +161,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -230,11 +175,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +189,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -268,11 +203,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -287,11 +217,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -306,11 +231,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -325,11 +245,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -344,11 +259,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -363,11 +273,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -382,11 +287,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -401,11 +301,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -420,11 +315,6 @@ func TestPhotosQueryScan(t *testing.T) { f.Query = "scan:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_square_test.go b/internal/search/photos_filter_square_test.go index c5930c447..441ff821a 100644 --- a/internal/search/photos_filter_square_test.go +++ b/internal/search/photos_filter_square_test.go @@ -31,11 +31,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -49,11 +44,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -63,11 +53,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -81,11 +66,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -117,11 +92,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -135,11 +105,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -154,11 +119,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -172,11 +132,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -191,11 +146,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -209,11 +159,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -228,11 +173,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -247,11 +187,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -266,11 +201,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -285,11 +215,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -304,11 +229,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -323,11 +243,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -342,11 +257,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -361,11 +271,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -380,11 +285,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -399,11 +299,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -418,11 +313,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -437,11 +327,6 @@ func TestPhotosQuerySquare(t *testing.T) { f.Query = "square:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_stack_test.go b/internal/search/photos_filter_stack_test.go index 05b09adf4..9ad4897c5 100644 --- a/internal/search/photos_filter_stack_test.go +++ b/internal/search/photos_filter_stack_test.go @@ -31,11 +31,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -45,11 +40,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -63,11 +53,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -81,11 +66,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -117,11 +92,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -136,11 +106,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -154,11 +119,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -173,11 +133,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -192,11 +147,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -211,11 +161,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -230,11 +175,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +189,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -268,11 +203,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -287,11 +217,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -306,11 +231,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -325,11 +245,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -344,11 +259,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -363,11 +273,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -382,11 +287,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -401,11 +301,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -420,11 +315,6 @@ func TestPhotosQueryStack(t *testing.T) { f.Query = "stack:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_stackable_test.go b/internal/search/photos_filter_stackable_test.go index 3ca40935a..9f341a193 100644 --- a/internal/search/photos_filter_stackable_test.go +++ b/internal/search/photos_filter_stackable_test.go @@ -31,11 +31,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -45,11 +40,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -63,11 +53,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -81,11 +66,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -117,11 +92,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -136,11 +106,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -154,11 +119,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -173,11 +133,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -192,11 +147,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -211,11 +161,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -230,11 +175,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +189,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -268,11 +203,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -287,11 +217,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -306,11 +231,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -325,11 +245,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -344,11 +259,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -363,11 +273,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -382,11 +287,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -401,11 +301,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -420,11 +315,6 @@ func TestPhotosQueryStackable(t *testing.T) { f.Query = "stackable:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_state_test.go b/internal/search/photos_filter_state_test.go index 987730648..422233175 100644 --- a/internal/search/photos_filter_state_test.go +++ b/internal/search/photos_filter_state_test.go @@ -15,11 +15,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "State of Mexico" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -33,11 +28,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "Rheinland*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -51,11 +41,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "State of Mexico|Rheinland-Pfalz" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -69,11 +54,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "State of Mexico | Rheinland-Pfalz" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -87,11 +67,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "State of Mexico or Rheinland-Pfalz" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -105,11 +80,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "State of Mexico OR Rheinland-Pfalz" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -123,11 +93,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "%gold" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -141,11 +106,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "I love % dog" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -159,11 +119,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "sale%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -177,11 +132,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "&IlikeFood" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -195,11 +145,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "Pets & Dogs" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -213,11 +158,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -231,11 +171,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "'Family" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +184,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "Father's state" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -268,11 +198,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "Ice Cream'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -286,11 +211,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "*Forrest" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -304,11 +224,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "My*Kids" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -322,11 +237,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "Yoga***" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -340,11 +250,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "|New york" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -359,11 +264,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "Red|Green" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -378,11 +278,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "Rheinland-Pfalz|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -396,11 +291,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "345 Shirt" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -414,11 +304,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "state555 Blue" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -432,11 +317,6 @@ func TestPhotosFilterState(t *testing.T) { f.State = "Route 66" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -453,11 +333,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"State of Mexico\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -471,11 +346,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"Rheinland*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -489,11 +359,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"State of Mexico|Rheinland-Pfalz\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -507,11 +372,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"State of Mexico | Rheinland-Pfalz\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -525,11 +385,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"State of Mexico or Rheinland-Pfalz\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -543,11 +398,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"State of Mexico OR Rheinland-Pfalz\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -561,11 +411,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -579,11 +424,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -597,11 +437,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -615,11 +450,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -633,11 +463,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -651,11 +476,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -669,11 +489,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -687,11 +502,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"Father's state\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -706,11 +516,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -724,11 +529,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -742,11 +542,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -760,11 +555,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -778,11 +568,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -796,11 +581,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -815,11 +595,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -833,11 +608,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -851,11 +621,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"state555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -869,11 +634,6 @@ func TestPhotosQueryState(t *testing.T) { f.Query = "state:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_subject_test.go b/internal/search/photos_filter_subject_test.go index 17ed87039..275b806fe 100644 --- a/internal/search/photos_filter_subject_test.go +++ b/internal/search/photos_filter_subject_test.go @@ -15,11 +15,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "Ac*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -33,11 +28,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "Actress" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -51,11 +41,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "Actress A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -69,11 +54,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "Actor A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -87,11 +67,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "Actor A|Actress A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -105,11 +80,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "Actor A | Actress A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -123,11 +93,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "Actor A&Actress A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -141,11 +106,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "Actor A & Actress A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -159,11 +119,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "%gold" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -177,11 +132,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "I love % dog" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -195,11 +145,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "sale%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -214,11 +159,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "&IlikeFood" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -232,11 +172,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "Pets & Dogs" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -251,11 +186,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -269,11 +199,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "'Family" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -287,11 +212,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "Father's type" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -306,11 +226,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "Ice Cream'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -324,11 +239,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "*Forrest" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -342,11 +252,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "My*Kids" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -360,11 +265,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "Yoga***" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -378,11 +278,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "|Banana" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -396,11 +291,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "Red|Green" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -415,11 +305,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "Blue|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -434,11 +319,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "345 Shirt" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -452,11 +332,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "type555 Blue" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -470,11 +345,6 @@ func TestPhotosFilterSubject(t *testing.T) { f.Subject = "Route 66" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -491,11 +361,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"Ac*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -509,11 +374,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"Actress\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -527,11 +387,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"Actress A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -545,11 +400,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"Actor A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -563,11 +413,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"Actor A|Actress A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -581,11 +426,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"Actor A | Actress A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -599,11 +439,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"Actor A&Actress A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -617,11 +452,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"Actor A & Actress A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -635,11 +465,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -653,11 +478,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -671,11 +491,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -690,11 +505,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -708,11 +518,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -727,11 +532,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -745,11 +545,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -763,11 +558,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"Father's type\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -782,11 +572,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -800,11 +585,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -818,11 +598,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -836,11 +611,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -854,11 +624,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -872,11 +637,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -891,11 +651,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -909,11 +664,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -927,11 +677,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"type555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -945,11 +690,6 @@ func TestPhotosQuerySubject(t *testing.T) { f.Query = "subject:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_subjects_test.go b/internal/search/photos_filter_subjects_test.go index 22af67d4a..649c24ab8 100644 --- a/internal/search/photos_filter_subjects_test.go +++ b/internal/search/photos_filter_subjects_test.go @@ -15,11 +15,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "Ac*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -33,11 +28,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "Actress" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -51,11 +41,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "Actress A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -69,11 +54,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "Actor A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -87,11 +67,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "Actor A|Actress A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -105,11 +80,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "Actor A | Actress A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -123,11 +93,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "Actor A&Actress A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -141,11 +106,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "Actor A & Actress A" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -159,11 +119,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "%gold" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -177,11 +132,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "I love % dog" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -195,11 +145,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "sale%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -213,11 +158,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "&IlikeFood" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -231,11 +171,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "Pets & Dogs" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +184,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -267,11 +197,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "'Family" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -285,11 +210,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "Father's type" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -304,11 +224,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "Ice Cream'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -322,11 +237,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "*Forrest" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -340,11 +250,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "My*Kids" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -358,11 +263,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "Yoga***" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -376,11 +276,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "|Banana" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -394,11 +289,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "Red|Green" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -413,11 +303,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "Blue|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -432,11 +317,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "345 Shirt" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -450,11 +330,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "type555 Blue" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -468,11 +343,6 @@ func TestPhotosFilterSubjects(t *testing.T) { f.Subjects = "Route 66" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -489,11 +359,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"Ac*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -507,11 +372,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"Actress\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -525,11 +385,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"Actress A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -543,11 +398,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"Actor A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -561,11 +411,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"Actor A|Actress A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -579,11 +424,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"Actor A | Actress A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -597,11 +437,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"Actor A&Actress A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -615,11 +450,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"Actor A & Actress A\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -633,11 +463,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -651,11 +476,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -669,11 +489,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -687,11 +502,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -705,11 +515,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -723,11 +528,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -741,11 +541,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -759,11 +554,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"Father's type\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -778,11 +568,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -796,11 +581,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -814,11 +594,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -832,11 +607,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -850,11 +620,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -868,11 +633,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -887,11 +647,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -905,11 +660,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -923,11 +673,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"type555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -941,11 +686,6 @@ func TestPhotosQuerySubjects(t *testing.T) { f.Query = "subjects:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_title_test.go b/internal/search/photos_filter_title_test.go index 54bdf9b01..6c7fd4cd8 100644 --- a/internal/search/photos_filter_title_test.go +++ b/internal/search/photos_filter_title_test.go @@ -14,11 +14,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "Lake / 2790" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -32,11 +27,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "Lake*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -50,11 +40,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "Neckarbrücke" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -68,11 +53,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "Neckarbrücke OR Lake*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -86,11 +66,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "Neckarbrücke | Lake*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -104,11 +79,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "Neckarbrücke|Lake*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -122,11 +92,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "%Salad" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -140,11 +105,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "hon%ey" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -158,11 +118,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "cloud%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -177,11 +132,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "&dad" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -196,11 +146,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "leader&ship" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -215,11 +160,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "mom&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -234,11 +174,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "'poetry'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -253,11 +188,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "amaz'ing" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -272,11 +202,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "pollution'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -291,11 +216,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "*area" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -310,11 +230,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "farm*animal" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -329,11 +244,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "engine*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -348,11 +258,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "|football" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -367,11 +272,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "pain|ting" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -386,11 +286,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "supermarket|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -404,11 +299,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "123community" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -422,11 +312,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "cli44mate" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -441,11 +326,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "guest456" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -460,11 +340,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "\"member" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -479,11 +354,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "sol\"ution" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -498,11 +368,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "desk\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -517,11 +382,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "guest456|engine*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -535,11 +395,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "guest456|amaz'ing" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -553,11 +408,6 @@ func TestPhotosFilterTitle(t *testing.T) { f.Title = "farm*animal|amaz'ing" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -574,11 +424,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"Lake / 2790\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -592,11 +437,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"Lake*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -610,11 +450,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"Neckarbrücke\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -628,11 +463,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"Neckarbrücke OR Lake*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -646,11 +476,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"Neckarbrücke | Lake*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -664,11 +489,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"Neckarbrücke|Lake*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -682,11 +502,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"%Salad\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -700,11 +515,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"hon%ey\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -718,11 +528,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"cloud%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -737,11 +542,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"&dad\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -756,11 +556,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"leader&ship\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -775,11 +570,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"mom&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -794,11 +584,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"'poetry'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -813,11 +598,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"amaz'ing\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -832,11 +612,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"pollution'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -851,11 +626,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"*area\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -870,11 +640,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"farm*animal\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -889,11 +654,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"engine*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -908,11 +668,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"|football\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -927,11 +682,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"pain|ting\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -946,11 +696,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"supermarket|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -965,11 +710,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"123community\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -983,11 +723,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"cli44mate\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1002,11 +737,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"guest456\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1021,11 +751,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"\"member\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1040,11 +765,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"sol\"ution\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1059,11 +779,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"desk\"\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1078,11 +793,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"guest456|engine*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1096,11 +806,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"guest456|amaz'ing\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1114,11 +819,6 @@ func TestPhotosQueryTitle(t *testing.T) { f.Query = "title:\"farm*animal|amaz'ing\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_type_test.go b/internal/search/photos_filter_type_test.go index fb612c150..b536cc885 100644 --- a/internal/search/photos_filter_type_test.go +++ b/internal/search/photos_filter_type_test.go @@ -15,11 +15,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "video" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -33,11 +28,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "raw" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -51,11 +41,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "animated" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -69,11 +54,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "raw|video" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -87,11 +67,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "raw | video" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -105,11 +80,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "raw or video" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -123,11 +93,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "raw OR video" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -141,11 +106,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "%gold" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -159,11 +119,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "I love % dog" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -177,11 +132,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "sale%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -195,11 +145,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "&IlikeFood" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -213,11 +158,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "Pets & Dogs" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -231,11 +171,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +184,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "'Family" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -267,11 +197,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "Father's type" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -286,11 +211,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "Ice Cream'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -304,11 +224,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "*Forrest" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -322,11 +237,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "My*Kids" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -340,11 +250,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "Yoga***" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -358,11 +263,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "|Banana" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -376,11 +276,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "Red|Green" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -395,11 +290,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "Blue|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -414,11 +304,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "345 Shirt" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -432,11 +317,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "type555 Blue" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -450,11 +330,6 @@ func TestPhotosFilterType(t *testing.T) { f.Type = "Route 66" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -471,11 +346,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"video\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -489,11 +359,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"raw\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -507,11 +372,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"animated\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -525,11 +385,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"raw|video\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -543,11 +398,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"raw | video\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -561,11 +411,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"raw or video\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -579,11 +424,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"raw OR video\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -597,11 +437,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -615,11 +450,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -633,11 +463,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -651,11 +476,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -669,11 +489,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -687,11 +502,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -705,11 +515,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -723,11 +528,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"Father's type\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -742,11 +542,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -760,11 +555,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -778,11 +568,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -796,11 +581,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -814,11 +594,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -832,11 +607,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -851,11 +621,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -869,11 +634,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -887,11 +647,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"type555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -905,11 +660,6 @@ func TestPhotosQueryType(t *testing.T) { f.Query = "type:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_uid_test.go b/internal/search/photos_filter_uid_test.go index 3403f38df..168244271 100644 --- a/internal/search/photos_filter_uid_test.go +++ b/internal/search/photos_filter_uid_test.go @@ -15,11 +15,6 @@ func TestPhotosFilterUid(t *testing.T) { f.UID = "pt9jtdre2lvl0yh0" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -33,16 +28,9 @@ func TestPhotosFilterUid(t *testing.T) { f.UID = "pt9jtdre2lvl0yh*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("StartsWithPercent", func(t *testing.T) { @@ -51,16 +39,9 @@ func TestPhotosFilterUid(t *testing.T) { f.UID = "%gold" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("CenterPercent", func(t *testing.T) { @@ -69,16 +50,9 @@ func TestPhotosFilterUid(t *testing.T) { f.UID = "I love % dog" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("EndsWithPercent", func(t *testing.T) { @@ -87,16 +61,9 @@ func TestPhotosFilterUid(t *testing.T) { f.UID = "sale%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("StartsWithAmpersand", func(t *testing.T) { @@ -105,16 +72,9 @@ func TestPhotosFilterUid(t *testing.T) { f.UID = "&IlikeFood" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("CenterAmpersand", func(t *testing.T) { @@ -123,16 +83,9 @@ func TestPhotosFilterUid(t *testing.T) { f.UID = "Pets & Dogs" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("EndsWithAmpersand", func(t *testing.T) { @@ -141,16 +94,9 @@ func TestPhotosFilterUid(t *testing.T) { f.UID = "Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("StartsWithSingleQuote", func(t *testing.T) { @@ -159,16 +105,9 @@ func TestPhotosFilterUid(t *testing.T) { f.UID = "'Family" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("CenterSingleQuote", func(t *testing.T) { @@ -177,17 +116,9 @@ func TestPhotosFilterUid(t *testing.T) { f.UID = "Father's uid" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } - + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("EndsWithSingleQuote", func(t *testing.T) { @@ -196,16 +127,9 @@ func TestPhotosFilterUid(t *testing.T) { f.UID = "Ice Cream'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("StartsWithAsterisk", func(t *testing.T) { @@ -214,16 +138,9 @@ func TestPhotosFilterUid(t *testing.T) { f.UID = "*Forrest" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("CenterAsterisk", func(t *testing.T) { @@ -232,16 +149,9 @@ func TestPhotosFilterUid(t *testing.T) { f.UID = "My*Kids" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("EndsWithAsterisk", func(t *testing.T) { @@ -250,16 +160,9 @@ func TestPhotosFilterUid(t *testing.T) { f.UID = "Yoga***" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("StartsWithPipe", func(t *testing.T) { @@ -268,16 +171,9 @@ func TestPhotosFilterUid(t *testing.T) { f.UID = "|Banana" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("CenterPipe", func(t *testing.T) { @@ -286,17 +182,9 @@ func TestPhotosFilterUid(t *testing.T) { f.UID = "Red|Green" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } - + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("EndsWithPipe", func(t *testing.T) { @@ -305,17 +193,9 @@ func TestPhotosFilterUid(t *testing.T) { f.UID = "Blue|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } - + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("StartsWithNumber", func(t *testing.T) { @@ -324,16 +204,9 @@ func TestPhotosFilterUid(t *testing.T) { f.UID = "345 Shirt" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("CenterNumber", func(t *testing.T) { @@ -342,16 +215,9 @@ func TestPhotosFilterUid(t *testing.T) { f.UID = "uid555 Blue" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("EndsWithNumber", func(t *testing.T) { @@ -360,37 +226,40 @@ func TestPhotosFilterUid(t *testing.T) { f.UID = "Route 66" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) } func TestPhotosQueryUid(t *testing.T) { - t.Run("pt9jtdre2lvl0yh0", func(t *testing.T) { + t.Run("PhotoUID", func(t *testing.T) { var f form.SearchPhotos - f.Query = "uid:\"pt9jtdre2lvl0yh0\"" + f.Query = "uid:pt9jtdre2lvl0yh0" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { t.Fatal(err) } + + assert.Equal(t, len(photos), 1) + }) + t.Run("QuotedPhotoUID", func(t *testing.T) { + var f form.SearchPhotos + + f.Query = "uid:\"pt9jtdre2lvl0yh0\"" + f.Merged = true + + photos, _, err := Photos(f) + + if err != nil { + t.Fatal(err) + } + assert.Equal(t, len(photos), 1) }) t.Run("pt9jtdre2lvl0yh*", func(t *testing.T) { @@ -399,16 +268,9 @@ func TestPhotosQueryUid(t *testing.T) { f.Query = "uid:\"pt9jtdre2lvl0yh*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("StartsWithPercent", func(t *testing.T) { @@ -417,16 +279,9 @@ func TestPhotosQueryUid(t *testing.T) { f.Query = "uid:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("CenterPercent", func(t *testing.T) { @@ -435,16 +290,9 @@ func TestPhotosQueryUid(t *testing.T) { f.Query = "uid:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("EndsWithPercent", func(t *testing.T) { @@ -453,16 +301,9 @@ func TestPhotosQueryUid(t *testing.T) { f.Query = "uid:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("StartsWithAmpersand", func(t *testing.T) { @@ -471,16 +312,9 @@ func TestPhotosQueryUid(t *testing.T) { f.Query = "uid:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("CenterAmpersand", func(t *testing.T) { @@ -489,16 +323,9 @@ func TestPhotosQueryUid(t *testing.T) { f.Query = "uid:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("EndsWithAmpersand", func(t *testing.T) { @@ -507,16 +334,9 @@ func TestPhotosQueryUid(t *testing.T) { f.Query = "uid:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("StartsWithSingleQuote", func(t *testing.T) { @@ -525,16 +345,9 @@ func TestPhotosQueryUid(t *testing.T) { f.Query = "uid:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("CenterSingleQuote", func(t *testing.T) { @@ -543,17 +356,9 @@ func TestPhotosQueryUid(t *testing.T) { f.Query = "uid:\"Father's uid\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } - + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("EndsWithSingleQuote", func(t *testing.T) { @@ -562,16 +367,9 @@ func TestPhotosQueryUid(t *testing.T) { f.Query = "uid:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("StartsWithAsterisk", func(t *testing.T) { @@ -580,16 +378,9 @@ func TestPhotosQueryUid(t *testing.T) { f.Query = "uid:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("CenterAsterisk", func(t *testing.T) { @@ -598,16 +389,9 @@ func TestPhotosQueryUid(t *testing.T) { f.Query = "uid:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("EndsWithAsterisk", func(t *testing.T) { @@ -616,16 +400,9 @@ func TestPhotosQueryUid(t *testing.T) { f.Query = "uid:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("StartsWithPipe", func(t *testing.T) { @@ -634,16 +411,9 @@ func TestPhotosQueryUid(t *testing.T) { f.Query = "uid:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("CenterPipe", func(t *testing.T) { @@ -652,17 +422,9 @@ func TestPhotosQueryUid(t *testing.T) { f.Query = "uid:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } - + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("EndsWithPipe", func(t *testing.T) { @@ -671,16 +433,9 @@ func TestPhotosQueryUid(t *testing.T) { f.Query = "uid:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("StartsWithNumber", func(t *testing.T) { @@ -689,16 +444,9 @@ func TestPhotosQueryUid(t *testing.T) { f.Query = "uid:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("CenterNumber", func(t *testing.T) { @@ -707,16 +455,9 @@ func TestPhotosQueryUid(t *testing.T) { f.Query = "uid:\"uid555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) t.Run("EndsWithNumber", func(t *testing.T) { @@ -725,16 +466,9 @@ func TestPhotosQueryUid(t *testing.T) { f.Query = "uid:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) - if err != nil { - t.Fatal(err) - } + assert.Error(t, err) assert.Equal(t, len(photos), 0) }) } diff --git a/internal/search/photos_filter_unsorted_test.go b/internal/search/photos_filter_unsorted_test.go index 530172b6d..15f31481a 100644 --- a/internal/search/photos_filter_unsorted_test.go +++ b/internal/search/photos_filter_unsorted_test.go @@ -31,11 +31,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -45,11 +40,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -63,11 +53,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -81,11 +66,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -117,11 +92,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -136,11 +106,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -154,11 +119,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -173,11 +133,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -192,11 +147,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -211,11 +161,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -230,11 +175,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +189,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -268,11 +203,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -287,11 +217,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -306,11 +231,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -325,11 +245,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -344,11 +259,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -363,11 +273,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -382,11 +287,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -401,11 +301,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -420,11 +315,6 @@ func TestPhotosQueryUnsorted(t *testing.T) { f.Query = "unsorted:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_unstacked_test.go b/internal/search/photos_filter_unstacked_test.go index 24b28bf9c..c8459fc90 100644 --- a/internal/search/photos_filter_unstacked_test.go +++ b/internal/search/photos_filter_unstacked_test.go @@ -31,11 +31,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -45,11 +40,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -63,11 +53,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -81,11 +66,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -117,11 +92,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -136,11 +106,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -154,11 +119,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -173,16 +133,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -197,11 +147,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -216,11 +161,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -235,11 +175,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -254,11 +189,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -273,11 +203,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -292,11 +217,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -311,11 +231,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -330,11 +245,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -349,11 +259,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -368,11 +273,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -387,11 +287,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -406,11 +301,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -425,11 +315,6 @@ func TestPhotosQueryUnstacked(t *testing.T) { f.Query = "unstacked:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_vector_test.go b/internal/search/photos_filter_vector_test.go index 977984fd2..bd4f2cbad 100644 --- a/internal/search/photos_filter_vector_test.go +++ b/internal/search/photos_filter_vector_test.go @@ -31,11 +31,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -49,11 +44,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -63,11 +53,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -81,11 +66,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -117,11 +92,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -135,11 +105,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -154,11 +119,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -172,16 +132,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -196,11 +146,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -214,11 +159,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -233,11 +173,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -252,11 +187,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -271,11 +201,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -290,11 +215,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -309,11 +229,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -328,11 +243,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -347,11 +257,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -366,11 +271,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -385,11 +285,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -404,11 +299,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -423,11 +313,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -442,11 +327,6 @@ func TestPhotosQueryVector(t *testing.T) { f.Query = "vector:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_video_test.go b/internal/search/photos_filter_video_test.go index bf361ae91..d301a19e0 100644 --- a/internal/search/photos_filter_video_test.go +++ b/internal/search/photos_filter_video_test.go @@ -31,11 +31,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:yes" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -45,11 +40,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:false" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -63,11 +53,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -81,11 +66,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -117,11 +92,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -136,11 +106,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -154,11 +119,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -173,11 +133,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -192,11 +147,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:\"Mother's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -211,11 +161,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -230,11 +175,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -249,11 +189,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -268,11 +203,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -287,11 +217,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -306,11 +231,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -325,11 +245,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -344,11 +259,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -363,11 +273,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:\"Color555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -382,11 +287,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -401,11 +301,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:\"Route 66 & Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -420,11 +315,6 @@ func TestPhotosQueryVideo(t *testing.T) { f.Query = "video:\"Route %66 | *Father's Day\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_filter_year_test.go b/internal/search/photos_filter_year_test.go index 74ce4aabb..22d1adbf8 100644 --- a/internal/search/photos_filter_year_test.go +++ b/internal/search/photos_filter_year_test.go @@ -20,11 +20,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "2008" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -38,11 +33,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "2018" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -56,11 +46,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "19*" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -74,11 +59,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "2018|2008" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -92,11 +72,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "2018 | 2008" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -110,11 +85,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "%gold" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -128,11 +98,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "I love % dog" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -146,11 +111,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "sale%" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -164,11 +124,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "&IlikeFood" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -182,11 +137,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "Pets & Dogs" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -200,11 +150,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "Light&" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -218,11 +163,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "'Family" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -236,11 +176,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "Father's year" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -255,11 +190,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "Ice Cream'" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -273,11 +203,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "*Forrest" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -291,11 +216,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "My*Kids" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -309,11 +229,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "Yoga***" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -327,11 +242,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "|Banana" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -345,11 +255,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "Red|Green" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -364,11 +269,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "Blue|" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -383,11 +283,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "345 Shirt" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -401,11 +296,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "year555 Blue" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -419,11 +309,6 @@ func TestPhotosFilterYear(t *testing.T) { f.Year = "Route 66" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -446,11 +331,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"2008\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -464,11 +344,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"2018\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -482,11 +357,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"19*\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -500,11 +370,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"2018|2008\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -518,11 +383,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"2018 | 2008\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -536,11 +396,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"%gold\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -554,11 +409,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"I love % dog\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -572,11 +422,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"sale%\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -590,11 +435,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"&IlikeFood\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -608,11 +448,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"Pets & Dogs\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -626,11 +461,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"Light&\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -644,11 +474,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"'Family\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -662,11 +487,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"Father's year\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -681,11 +501,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"Ice Cream'\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -699,11 +514,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"*Forrest\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -717,11 +527,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"My*Kids\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -735,11 +540,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"Yoga***\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -753,11 +553,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"|Banana\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -771,11 +566,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"Red|Green\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -790,11 +580,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"Blue|\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -808,11 +593,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"345 Shirt\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -826,11 +606,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"year555 Blue\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -844,11 +619,6 @@ func TestPhotosQueryYear(t *testing.T) { f.Query = "year:\"Route 66\"" f.Merged = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_geo.go b/internal/search/photos_geo.go index a030a55ac..a88081dbe 100644 --- a/internal/search/photos_geo.go +++ b/internal/search/photos_geo.go @@ -9,9 +9,10 @@ import ( "github.com/dustin/go-humanize/english" "github.com/jinzhu/gorm" + "github.com/photoprism/photoprism/internal/acl" "github.com/photoprism/photoprism/internal/entity" + "github.com/photoprism/photoprism/internal/event" "github.com/photoprism/photoprism/internal/form" - "github.com/photoprism/photoprism/pkg/fs" "github.com/photoprism/photoprism/pkg/pluscode" "github.com/photoprism/photoprism/pkg/rnd" @@ -19,20 +20,32 @@ import ( "github.com/photoprism/photoprism/pkg/txt" ) -// GeoCols contains the geo query column names. +// GeoCols specifies the UserPhotosGeo result column names. var GeoCols = SelectString(GeoResult{}, []string{"*"}) -// PhotosGeo searches for photos based on Form values and returns GeoResults ([]GeoResult). +// PhotosGeo finds photos based on the search form and returns them as GeoResults. func PhotosGeo(f form.SearchPhotosGeo) (results GeoResults, err error) { + return UserPhotosGeo(f, nil) +} + +// UserPhotosGeo finds photos based on the search form and user session then returns them as GeoResults. +func UserPhotosGeo(f form.SearchPhotosGeo, sess *entity.Session) (results GeoResults, err error) { start := time.Now() + // Parse query string and filter. + if err = f.ParseQueryString(); err != nil { + log.Debugf("search: %s", err) + return GeoResults{}, ErrBadRequest + } + S2Levels := 7 // Search for nearby photos? if f.Near != "" { photo := Photo{} - if err := Db().First(&photo, "photo_uid = ?", f.Near).Error; err != nil { + // Find photo to get location. + if err = Db().First(&photo, "photo_uid = ?", f.Near).Error; err != nil { return GeoResults{}, err } @@ -43,16 +56,110 @@ func PhotosGeo(f form.SearchPhotosGeo) (results GeoResults, err error) { S2Levels = 12 } - s := UnscopedDb() - - // s.LogMode(true) - - s = s.Table("photos").Select(GeoCols). + // Specify table names and joins. + s := UnscopedDb().Table(entity.Photo{}.TableName()).Select(GeoCols). Joins(`JOIN files ON files.photo_id = photos.id AND files.file_primary = 1 AND files.media_id IS NOT NULL`). Joins("LEFT JOIN places ON photos.place_id = places.id"). Where("photos.deleted_at IS NULL"). Where("photos.photo_lat <> 0") + // Limit offset and count. + if f.Count > 0 { + s = s.Limit(f.Count).Offset(f.Offset) + } else { + s = s.Limit(1000000).Offset(f.Offset) + } + + // Limit search results to a specific UID scope, e.g. when sharing. + if txt.NotEmpty(f.In) { + f.In = strings.ToLower(f.In) + if idType, idPrefix := rnd.IdType(f.In); idType != rnd.TypeUID || idPrefix != entity.AlbumUID { + return GeoResults{}, ErrInvalidId + } else if a, err := entity.CachedAlbumByUID(f.In); err != nil || a.AlbumUID == "" { + return GeoResults{}, ErrInvalidId + } else if a.AlbumFilter == "" { + s = s.Joins("JOIN photos_albums ON photos_albums.photo_uid = files.photo_uid"). + Where("photos_albums.hidden = 0 AND photos_albums.album_uid = ?", a.AlbumUID) + } else if err = form.Unserialize(&f, a.AlbumFilter); err != nil { + return GeoResults{}, ErrBadFilter + } else { + f.Filter = a.AlbumFilter + s = s.Where("files.photo_uid NOT IN (SELECT photo_uid FROM photos_albums pa WHERE pa.hidden = 1 AND pa.album_uid = ?)", a.AlbumUID) + } + } else { + f.In = "" + } + + // Check session permissions and apply as needed. + if sess != nil { + aclRole := sess.User().AclRole() + + // Visitors and other restricted users can only access shared content. + if !sess.HasShare(f.In) && (sess.IsVisitor() || sess.Unregistered()) || + f.In == "" && acl.Resources.Deny(acl.ResourcePhotos, aclRole, acl.ActionSearch) || + f.In == "" && acl.Resources.Deny(acl.ResourcePlaces, aclRole, acl.ActionSearch) { + event.AuditErr([]string{sess.IP(), "session %s", "%s %s as %s", "denied"}, sess.RefID, acl.ActionSearch.String(), string(acl.ResourcePlaces), aclRole) + return GeoResults{}, ErrForbidden + } + + // Exclude private content? + if acl.Resources.Deny(acl.ResourcePhotos, aclRole, acl.AccessPrivate) { + f.Public = true + f.Private = false + } + + // Exclude archived content? + if acl.Resources.Deny(acl.ResourcePhotos, aclRole, acl.ActionDelete) { + f.Archived = false + f.Review = false + } + + // Restrict the search to a sub-folder, if specified. + if dir := sess.User().BasePath; f.In == "" && dir != "" { + s = s.Where("photos.photo_path LIKE ?", dir+"%") + } + } + + // Set sort order. + if f.Near == "" { + s = s.Order("taken_at, photos.photo_uid") + } else { + // Sort by distance to UID. + s = s.Order(gorm.Expr("(photos.photo_uid = ?) DESC, ABS(? - photos.photo_lat)+ABS(? - photos.photo_lng)", f.Near, f.Lat, f.Lng)) + } + + // Find only certain unique IDs? + if txt.NotEmpty(f.UID) { + ids := SplitOr(strings.ToLower(f.UID)) + + if idType, prefix := rnd.ContainsType(ids); idType == rnd.TypeUID { + switch prefix { + case entity.PhotoUID: + s = s.Where("photos.photo_uid IN (?)", ids) + case entity.FileUID: + s = s.Where("files.file_uid IN (?)", ids) + default: + return GeoResults{}, fmt.Errorf("invalid %s specified", idType) + } + } else if idType.SHA() { + s = s.Where("files.file_hash IN (?)", ids) + } + + // Find UIDs only to improve performance? + if f.FindByIdOnly() { + // Fetch results. + if result := s.Scan(&results); result.Error != nil { + return results, result.Error + } + + log.Debugf("places: found %s for %s [%s]", english.Plural(len(results), "result", "results"), f.SerializeAll(), time.Since(start)) + + return results, nil + } + } else { + f.UID = "" + } + // Set search filters based on search terms. if terms := txt.SearchTerms(f.Query); f.Query != "" && len(terms) == 0 { if f.Title == "" { @@ -197,6 +304,7 @@ func PhotosGeo(f form.SearchPhotosGeo) (results GeoResults, err error) { // Filter by album? if rnd.IsUID(f.Album, 'a') { + S2Levels = 15 if f.Filter != "" { s = s.Where("photos.photo_uid NOT IN (SELECT photo_uid FROM photos_albums pa WHERE pa.hidden = 1 AND pa.album_uid = ?)", f.Album) } else { @@ -384,19 +492,6 @@ func PhotosGeo(f form.SearchPhotosGeo) (results GeoResults, err error) { s = s.Where("photos.taken_at >= ?", f.After.Format("2006-01-02")) } - if f.Near == "" { - // Default sort order. - s = s.Order("taken_at, photos.photo_uid") - } else { - // Sort by distance to UID. - s = s.Order(gorm.Expr("(photos.photo_uid = ?) DESC, ABS(? - photos.photo_lat)+ABS(? - photos.photo_lng)", f.Near, f.Lat, f.Lng)) - } - - // Limit result count? - if f.Count > 0 { - s = s.Limit(f.Count).Offset(f.Offset) - } - // Fetch results. if result := s.Scan(&results); result.Error != nil { return results, result.Error diff --git a/internal/search/photos_geo_filter_albums_test.go b/internal/search/photos_geo_filter_albums_test.go index 8ec8caf9c..8b387ba58 100644 --- a/internal/search/photos_geo_filter_albums_test.go +++ b/internal/search/photos_geo_filter_albums_test.go @@ -16,11 +16,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -52,11 +47,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -88,11 +78,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -125,11 +110,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -161,11 +141,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -197,11 +172,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -234,11 +204,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -270,11 +235,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -306,11 +266,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -342,11 +297,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -378,11 +328,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -414,11 +359,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -450,11 +390,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -486,11 +421,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -522,11 +452,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -558,11 +483,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -594,11 +514,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -630,11 +545,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -666,11 +576,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -702,11 +607,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -738,11 +638,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -774,11 +669,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -810,11 +700,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -846,11 +731,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, count, err := Photos(f) if err != nil { @@ -887,11 +767,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -923,11 +798,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -959,11 +829,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -995,11 +860,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1031,11 +891,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1067,11 +922,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1103,11 +953,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1139,11 +984,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1175,11 +1015,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1211,11 +1046,6 @@ func TestPhotosGeoFilterAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1250,11 +1080,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1287,11 +1112,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1322,11 +1142,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1357,11 +1172,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1392,11 +1202,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1427,11 +1232,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1462,11 +1262,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1497,11 +1292,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1532,11 +1322,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1567,11 +1352,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1602,11 +1382,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1636,11 +1411,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1670,11 +1440,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1705,11 +1470,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1739,11 +1499,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1773,11 +1528,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1808,11 +1558,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1842,11 +1587,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1878,11 +1618,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1913,11 +1648,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1947,11 +1677,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1982,11 +1707,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -2017,11 +1737,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -2051,11 +1766,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, count, err := Photos(f) if err != nil { @@ -2092,11 +1802,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -2127,11 +1832,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -2162,11 +1862,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -2197,11 +1892,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -2232,11 +1922,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -2267,11 +1952,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -2302,11 +1982,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -2337,11 +2012,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -2372,11 +2042,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -2407,11 +2072,6 @@ func TestPhotosGeoQueryAlbums(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_geo_filter_favorite_test.go b/internal/search/photos_geo_filter_favorite_test.go index f47e01e7f..c609dabb6 100644 --- a/internal/search/photos_geo_filter_favorite_test.go +++ b/internal/search/photos_geo_filter_favorite_test.go @@ -33,11 +33,6 @@ func TestPhotosGeoQueryFavorite(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -68,11 +63,6 @@ func TestPhotosGeoQueryFavorite(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -103,11 +93,6 @@ func TestPhotosGeoQueryFavorite(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -138,11 +123,6 @@ func TestPhotosGeoQueryFavorite(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -174,11 +154,6 @@ func TestPhotosGeoQueryFavorite(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -209,11 +184,6 @@ func TestPhotosGeoQueryFavorite(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -245,11 +215,6 @@ func TestPhotosGeoQueryFavorite(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -281,11 +246,6 @@ func TestPhotosGeoQueryFavorite(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -317,11 +277,6 @@ func TestPhotosGeoQueryFavorite(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -353,11 +308,6 @@ func TestPhotosGeoQueryFavorite(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -389,11 +339,6 @@ func TestPhotosGeoQueryFavorite(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -425,11 +370,6 @@ func TestPhotosGeoQueryFavorite(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -461,11 +401,6 @@ func TestPhotosGeoQueryFavorite(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -497,11 +432,6 @@ func TestPhotosGeoQueryFavorite(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -533,11 +463,6 @@ func TestPhotosGeoQueryFavorite(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -569,11 +494,6 @@ func TestPhotosGeoQueryFavorite(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -605,11 +525,6 @@ func TestPhotosGeoQueryFavorite(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -641,11 +556,6 @@ func TestPhotosGeoQueryFavorite(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -677,11 +587,6 @@ func TestPhotosGeoQueryFavorite(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -713,11 +618,6 @@ func TestPhotosGeoQueryFavorite(t *testing.T) { f.Primary = true f.Geo = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_geo_filter_near_test.go b/internal/search/photos_geo_filter_near_test.go index 6203828dc..883fa93b4 100644 --- a/internal/search/photos_geo_filter_near_test.go +++ b/internal/search/photos_geo_filter_near_test.go @@ -14,11 +14,6 @@ func TestPhotosGeoFilterNear(t *testing.T) { f.Near = "pt9jtdre2lvl0y24" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -31,11 +26,6 @@ func TestPhotosGeoFilterNear(t *testing.T) { f.Near = "pr2xu7myk7wrbk30" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -65,11 +55,6 @@ func TestPhotosGeoFilterNear(t *testing.T) { f.Near = "sale%" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -82,11 +67,6 @@ func TestPhotosGeoFilterNear(t *testing.T) { f.Near = "&IlikeFood" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -99,11 +79,6 @@ func TestPhotosGeoFilterNear(t *testing.T) { f.Near = "Pets & Dogs" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -116,11 +91,6 @@ func TestPhotosGeoFilterNear(t *testing.T) { f.Near = "Light&" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -133,11 +103,6 @@ func TestPhotosGeoFilterNear(t *testing.T) { f.Near = "'Family" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -150,11 +115,6 @@ func TestPhotosGeoFilterNear(t *testing.T) { f.Near = "Father's type" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -168,11 +128,6 @@ func TestPhotosGeoFilterNear(t *testing.T) { f.Near = "Ice Cream'" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -185,11 +140,6 @@ func TestPhotosGeoFilterNear(t *testing.T) { f.Near = "*Forrest" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -202,11 +152,6 @@ func TestPhotosGeoFilterNear(t *testing.T) { f.Near = "My*Kids" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -219,11 +164,6 @@ func TestPhotosGeoFilterNear(t *testing.T) { f.Near = "Yoga***" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -236,11 +176,6 @@ func TestPhotosGeoFilterNear(t *testing.T) { f.Near = "|Banana" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -253,11 +188,6 @@ func TestPhotosGeoFilterNear(t *testing.T) { f.Near = "Red|Green" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -271,11 +201,6 @@ func TestPhotosGeoFilterNear(t *testing.T) { f.Near = "Blue|" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -289,11 +214,6 @@ func TestPhotosGeoFilterNear(t *testing.T) { f.Near = "345 Shirt" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -306,11 +226,6 @@ func TestPhotosGeoFilterNear(t *testing.T) { f.Near = "type555 Blue" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -323,11 +238,6 @@ func TestPhotosGeoFilterNear(t *testing.T) { f.Near = "Route 66" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -343,11 +253,6 @@ func TestPhotosGeoQueryNear(t *testing.T) { f.Query = "near:pt9jtdre2lvl0y24" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -360,11 +265,6 @@ func TestPhotosGeoQueryNear(t *testing.T) { f.Query = "near:pr2xu7myk7wrbk30" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -378,11 +278,6 @@ func TestPhotosGeoQueryNear(t *testing.T) { f.Query = "near:pt9jtdre2lvl0y24|pr2xu7myk7wrbk30" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -395,11 +290,6 @@ func TestPhotosGeoQueryNear(t *testing.T) { f.Query = "near:\"%gold\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -412,11 +302,6 @@ func TestPhotosGeoQueryNear(t *testing.T) { f.Query = "near:\"I love % dog\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -429,11 +314,6 @@ func TestPhotosGeoQueryNear(t *testing.T) { f.Query = "near:\"sale%\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -446,11 +326,6 @@ func TestPhotosGeoQueryNear(t *testing.T) { f.Query = "near:\"&IlikeFood\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -463,11 +338,6 @@ func TestPhotosGeoQueryNear(t *testing.T) { f.Query = "near:\"Pets & Dogs\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -480,11 +350,6 @@ func TestPhotosGeoQueryNear(t *testing.T) { f.Query = "near:\"Light&\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -497,11 +362,6 @@ func TestPhotosGeoQueryNear(t *testing.T) { f.Query = "near:\"'Family\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -514,11 +374,6 @@ func TestPhotosGeoQueryNear(t *testing.T) { f.Query = "near:\"Father's type\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -532,11 +387,6 @@ func TestPhotosGeoQueryNear(t *testing.T) { f.Query = "near:\"Ice Cream'\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -549,11 +399,6 @@ func TestPhotosGeoQueryNear(t *testing.T) { f.Query = "near:\"*Forrest\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -566,11 +411,6 @@ func TestPhotosGeoQueryNear(t *testing.T) { f.Query = "near:\"My*Kids\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -583,11 +423,6 @@ func TestPhotosGeoQueryNear(t *testing.T) { f.Query = "near:\"Yoga***\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -600,11 +435,6 @@ func TestPhotosGeoQueryNear(t *testing.T) { f.Query = "near:\"|Banana\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -617,11 +447,6 @@ func TestPhotosGeoQueryNear(t *testing.T) { f.Query = "near:\"Red|Green\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -635,11 +460,6 @@ func TestPhotosGeoQueryNear(t *testing.T) { f.Query = "near:\"Blue|\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -652,11 +472,6 @@ func TestPhotosGeoQueryNear(t *testing.T) { f.Query = "near:\"345 Shirt\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -669,11 +484,6 @@ func TestPhotosGeoQueryNear(t *testing.T) { f.Query = "near:\"type555 Blue\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -686,11 +496,6 @@ func TestPhotosGeoQueryNear(t *testing.T) { f.Query = "near:\"Route 66\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { diff --git a/internal/search/photos_geo_filter_s2_test.go b/internal/search/photos_geo_filter_s2_test.go index 3302672ae..c7989dc76 100644 --- a/internal/search/photos_geo_filter_s2_test.go +++ b/internal/search/photos_geo_filter_s2_test.go @@ -14,11 +14,6 @@ func TestPhotosGeoFilterS2(t *testing.T) { f.S2 = "1ef744d1e283" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -31,11 +26,6 @@ func TestPhotosGeoFilterS2(t *testing.T) { f.S2 = "85d1ea7d382c" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -48,11 +38,6 @@ func TestPhotosGeoFilterS2(t *testing.T) { f.S2 = "%gold" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -65,11 +50,6 @@ func TestPhotosGeoFilterS2(t *testing.T) { f.S2 = "I love % dog" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -82,11 +62,6 @@ func TestPhotosGeoFilterS2(t *testing.T) { f.S2 = "sale%" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -99,11 +74,6 @@ func TestPhotosGeoFilterS2(t *testing.T) { f.S2 = "&IlikeFood" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -116,11 +86,6 @@ func TestPhotosGeoFilterS2(t *testing.T) { f.S2 = "Pets & Dogs" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -133,11 +98,6 @@ func TestPhotosGeoFilterS2(t *testing.T) { f.S2 = "Light&" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -150,11 +110,6 @@ func TestPhotosGeoFilterS2(t *testing.T) { f.S2 = "'Family" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -167,11 +122,6 @@ func TestPhotosGeoFilterS2(t *testing.T) { f.S2 = "Father's type" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -185,11 +135,6 @@ func TestPhotosGeoFilterS2(t *testing.T) { f.S2 = "Ice Cream'" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -202,11 +147,6 @@ func TestPhotosGeoFilterS2(t *testing.T) { f.S2 = "*Forrest" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -219,11 +159,6 @@ func TestPhotosGeoFilterS2(t *testing.T) { f.S2 = "My*Kids" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -236,11 +171,6 @@ func TestPhotosGeoFilterS2(t *testing.T) { f.S2 = "Yoga***" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -253,11 +183,6 @@ func TestPhotosGeoFilterS2(t *testing.T) { f.S2 = "|Banana" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -270,11 +195,6 @@ func TestPhotosGeoFilterS2(t *testing.T) { f.S2 = "Red|Green" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -288,11 +208,6 @@ func TestPhotosGeoFilterS2(t *testing.T) { f.S2 = "Blue|" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -306,11 +221,6 @@ func TestPhotosGeoFilterS2(t *testing.T) { f.S2 = "345 Shirt" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -323,11 +233,6 @@ func TestPhotosGeoFilterS2(t *testing.T) { f.S2 = "type555 Blue" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -340,11 +245,6 @@ func TestPhotosGeoFilterS2(t *testing.T) { f.S2 = "Route 66" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -360,11 +260,6 @@ func TestPhotosGeoQueryS2(t *testing.T) { f.Query = "s2:1ef744d1e283" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -377,11 +272,6 @@ func TestPhotosGeoQueryS2(t *testing.T) { f.Query = "s2:85d1ea7d382c" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -394,11 +284,6 @@ func TestPhotosGeoQueryS2(t *testing.T) { f.Query = "s2:85d1ea7d382c|1ef744d1e283" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -411,11 +296,6 @@ func TestPhotosGeoQueryS2(t *testing.T) { f.Query = "s2:\"%gold\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -428,11 +308,6 @@ func TestPhotosGeoQueryS2(t *testing.T) { f.Query = "s2:\"I love % dog\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -445,11 +320,6 @@ func TestPhotosGeoQueryS2(t *testing.T) { f.Query = "s2:\"sale%\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -462,11 +332,6 @@ func TestPhotosGeoQueryS2(t *testing.T) { f.Query = "s2:\"&IlikeFood\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -479,11 +344,6 @@ func TestPhotosGeoQueryS2(t *testing.T) { f.Query = "s2:\"Pets & Dogs\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -496,11 +356,6 @@ func TestPhotosGeoQueryS2(t *testing.T) { f.Query = "s2:\"Light&\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -513,11 +368,6 @@ func TestPhotosGeoQueryS2(t *testing.T) { f.Query = "s2:\"'Family\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -530,11 +380,6 @@ func TestPhotosGeoQueryS2(t *testing.T) { f.Query = "s2:\"Father's type\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -548,11 +393,6 @@ func TestPhotosGeoQueryS2(t *testing.T) { f.Query = "s2:\"Ice Cream'\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -565,11 +405,6 @@ func TestPhotosGeoQueryS2(t *testing.T) { f.Query = "s2:\"*Forrest\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -582,11 +417,6 @@ func TestPhotosGeoQueryS2(t *testing.T) { f.Query = "s2:\"My*Kids\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -599,11 +429,6 @@ func TestPhotosGeoQueryS2(t *testing.T) { f.Query = "s2:\"Yoga***\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -616,11 +441,6 @@ func TestPhotosGeoQueryS2(t *testing.T) { f.Query = "s2:\"|Banana\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -633,11 +453,6 @@ func TestPhotosGeoQueryS2(t *testing.T) { f.Query = "s2:\"Red|Green\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -651,11 +466,6 @@ func TestPhotosGeoQueryS2(t *testing.T) { f.Query = "s2:\"Blue|\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -668,11 +478,6 @@ func TestPhotosGeoQueryS2(t *testing.T) { f.Query = "s2:\"345 Shirt\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -685,11 +490,6 @@ func TestPhotosGeoQueryS2(t *testing.T) { f.Query = "s2:\"type555 Blue\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -702,11 +502,6 @@ func TestPhotosGeoQueryS2(t *testing.T) { f.Query = "s2:\"Route 66\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { diff --git a/internal/search/photos_geo_test.go b/internal/search/photos_geo_test.go index 1d51ee77c..978ad9883 100644 --- a/internal/search/photos_geo_test.go +++ b/internal/search/photos_geo_test.go @@ -136,11 +136,6 @@ func TestGeo(t *testing.T) { Review: true, } - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - result, err := PhotosGeo(f) if err != nil { @@ -169,11 +164,6 @@ func TestGeo(t *testing.T) { Review: false, } - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - result, err := PhotosGeo(f) if err != nil { @@ -197,11 +187,6 @@ func TestGeo(t *testing.T) { Review: false, } - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - result, err := PhotosGeo(f) if err != nil { @@ -225,11 +210,6 @@ func TestGeo(t *testing.T) { Review: false, } - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - result, err := PhotosGeo(f) if err != nil { @@ -242,11 +222,6 @@ func TestGeo(t *testing.T) { Query: "flower", } - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - result, err := PhotosGeo(f) if err != nil { t.Fatal(err) @@ -272,11 +247,6 @@ func TestGeo(t *testing.T) { Private: true, } - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - result, err := PhotosGeo(f) if err != nil { t.Fatal(err) @@ -295,11 +265,6 @@ func TestGeo(t *testing.T) { Public: true, } - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - result, err := PhotosGeo(f) if err != nil { t.Fatal(err) @@ -316,11 +281,6 @@ func TestGeo(t *testing.T) { Archived: true, } - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - result, err := PhotosGeo(f) if err != nil { t.Fatal(err) @@ -332,11 +292,6 @@ func TestGeo(t *testing.T) { var f form.SearchPhotosGeo f.Query = "faces:true" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -349,11 +304,6 @@ func TestGeo(t *testing.T) { var f form.SearchPhotosGeo f.Faces = "Yes" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -366,11 +316,6 @@ func TestGeo(t *testing.T) { var f form.SearchPhotosGeo f.Face = "Yes" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -384,11 +329,6 @@ func TestGeo(t *testing.T) { f.Faces = "New" f.Face = "" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -401,11 +341,6 @@ func TestGeo(t *testing.T) { var f form.SearchPhotosGeo f.Faces = "No" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -418,11 +353,6 @@ func TestGeo(t *testing.T) { var f form.SearchPhotosGeo f.Faces = "2" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -435,11 +365,6 @@ func TestGeo(t *testing.T) { var f form.SearchPhotosGeo f.Face = "TOSCDXCS4VI3PGIUTCNIQCNI6HSFXQVZ" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -453,11 +378,6 @@ func TestGeo(t *testing.T) { f.Day = "18" f.Month = "4" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -470,11 +390,6 @@ func TestGeo(t *testing.T) { var f form.SearchPhotosGeo f.Query = "Actress" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -487,11 +402,6 @@ func TestGeo(t *testing.T) { var f form.SearchPhotosGeo f.Album = "Berlin" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -504,11 +414,6 @@ func TestGeo(t *testing.T) { var f form.SearchPhotosGeo f.Albums = "Holiday|Christmas" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -521,11 +426,6 @@ func TestGeo(t *testing.T) { var f form.SearchPhotosGeo f.City = "Teotihuacán" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -538,11 +438,6 @@ func TestGeo(t *testing.T) { var f form.SearchPhotosGeo f.Path = "1990/04" + "|" + "2015/11" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -555,11 +450,6 @@ func TestGeo(t *testing.T) { var f form.SearchPhotosGeo f.Name = "20151101_000000_51C501B5" + "|" + "Video" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -736,11 +626,6 @@ func TestGeo(t *testing.T) { var f form.SearchPhotosGeo f.Query = "keywords:kuh|bridge" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -761,11 +646,6 @@ func TestGeo(t *testing.T) { var f form.SearchPhotosGeo f.Query = "albums:Holiday|Berlin" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -803,11 +683,6 @@ func TestGeo(t *testing.T) { var f form.SearchPhotosGeo f.Subjects = "Actor A|Actress A" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - t.Logf("S1: %s", f.SerializeAll()) photos, err := PhotosGeo(f) @@ -818,11 +693,6 @@ func TestGeo(t *testing.T) { f.Subjects = "Actor A&Actress A" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - t.Logf("S2: %s", f.SerializeAll()) photos2, err2 := PhotosGeo(f) @@ -837,11 +707,6 @@ func TestGeo(t *testing.T) { var f form.SearchPhotosGeo f.People = "Actor" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -1026,11 +891,6 @@ func TestGeo(t *testing.T) { f.Query = "panorama:true" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -1044,11 +904,6 @@ func TestGeo(t *testing.T) { f.Query = "portrait:true" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -1062,11 +917,6 @@ func TestGeo(t *testing.T) { f.Query = "landscape:true" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { @@ -1080,11 +930,6 @@ func TestGeo(t *testing.T) { f.Query = "square:true" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, err := PhotosGeo(f) if err != nil { diff --git a/internal/search/photos_test.go b/internal/search/photos_test.go index 464ce6d7a..f18264de0 100644 --- a/internal/search/photos_test.go +++ b/internal/search/photos_test.go @@ -42,11 +42,6 @@ func TestPhotos(t *testing.T) { frm.Count = 10 frm.Offset = 0 - // Parse query string and filter. - if err := frm.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(frm) if err != nil { @@ -75,11 +70,6 @@ func TestPhotos(t *testing.T) { frm.UID = "pt9jtdre2lvl0yh7" frm.Merged = true - // Parse query string and filter. - if err := frm.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(frm) if err != nil { @@ -96,11 +86,6 @@ func TestPhotos(t *testing.T) { frm.UID = "pt9jtdre2lvl0yh7" frm.Merged = false - // Parse query string and filter. - if err := frm.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(frm) if err != nil { @@ -129,11 +114,6 @@ func TestPhotos(t *testing.T) { frm.Offset = 0 frm.Order = "relevance" - // Parse query string and filter. - if err := frm.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(frm) if err != nil { t.Fatal(err) @@ -162,11 +142,6 @@ func TestPhotos(t *testing.T) { frm.Offset = 0 frm.Geo = true - // Parse query string and filter. - if err := frm.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(frm) if err != nil { @@ -184,11 +159,6 @@ func TestPhotos(t *testing.T) { frm.Geo = true frm.Error = false - // Parse query string and filter. - if err := frm.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(frm) if err != nil { @@ -204,11 +174,6 @@ func TestPhotos(t *testing.T) { frm.Count = 5000 frm.Offset = 0 - // Parse query string and filter. - if err := frm.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(frm) if err != nil { @@ -224,11 +189,6 @@ func TestPhotos(t *testing.T) { frm.Count = 5000 frm.Offset = 0 - // Parse query string and filter. - if err := frm.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(frm) if err != nil { @@ -245,11 +205,6 @@ func TestPhotos(t *testing.T) { f.Offset = 0 f.Archived = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -266,11 +221,6 @@ func TestPhotos(t *testing.T) { f.Private = true f.Error = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -286,11 +236,6 @@ func TestPhotos(t *testing.T) { f.Offset = 0 f.Public = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -306,11 +251,6 @@ func TestPhotos(t *testing.T) { f.Offset = 0 f.Review = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -327,11 +267,6 @@ func TestPhotos(t *testing.T) { f.Quality = 3 f.Private = false - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -347,11 +282,6 @@ func TestPhotos(t *testing.T) { f.Offset = 0 f.Error = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -367,11 +297,6 @@ func TestPhotos(t *testing.T) { f.Offset = 0 f.Camera = "Canon EOS 6D" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -387,11 +312,6 @@ func TestPhotos(t *testing.T) { f.Count = 10 f.Offset = 0 - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -408,11 +328,6 @@ func TestPhotos(t *testing.T) { f.Offset = 0 f.Camera = "1000003" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -428,11 +343,6 @@ func TestPhotos(t *testing.T) { f.Offset = 0 f.Color = "blue" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -447,11 +357,6 @@ func TestPhotos(t *testing.T) { f.Count = 10 f.Offset = 0 - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -466,11 +371,6 @@ func TestPhotos(t *testing.T) { f.Count = 10 f.Offset = 0 - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -486,11 +386,6 @@ func TestPhotos(t *testing.T) { f.Count = 10 f.Offset = 0 - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -506,11 +401,6 @@ func TestPhotos(t *testing.T) { f.Count = 10 f.Offset = 0 - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -527,11 +417,6 @@ func TestPhotos(t *testing.T) { f.Count = 10 f.Offset = 0 - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -547,11 +432,6 @@ func TestPhotos(t *testing.T) { f.Count = 10 f.Offset = 0 - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -567,11 +447,6 @@ func TestPhotos(t *testing.T) { f.Count = 10 f.Offset = 0 - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -587,11 +462,6 @@ func TestPhotos(t *testing.T) { f.Count = 10 f.Offset = 0 - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -607,11 +477,6 @@ func TestPhotos(t *testing.T) { f.Count = 10 f.Offset = 0 - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -627,11 +492,6 @@ func TestPhotos(t *testing.T) { f.Count = 3 f.Offset = 0 - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -648,11 +508,6 @@ func TestPhotos(t *testing.T) { f.Count = 10 f.Offset = 0 - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -670,11 +525,6 @@ func TestPhotos(t *testing.T) { f.Offset = 0 f.Archived = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -689,11 +539,6 @@ func TestPhotos(t *testing.T) { f.Count = 3 f.Offset = 0 - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -710,11 +555,6 @@ func TestPhotos(t *testing.T) { f.Offset = 0 f.Error = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -731,11 +571,6 @@ func TestPhotos(t *testing.T) { f.Offset = 0 f.Order = "oldest" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -751,11 +586,6 @@ func TestPhotos(t *testing.T) { f.Offset = 0 f.Order = "newest" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -772,11 +602,6 @@ func TestPhotos(t *testing.T) { f.Offset = 0 f.Order = "imported" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -792,11 +617,6 @@ func TestPhotos(t *testing.T) { f.Offset = 0 f.Order = "imported" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -813,11 +633,6 @@ func TestPhotos(t *testing.T) { f.Merged = true f.Order = "relevance" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -832,11 +647,6 @@ func TestPhotos(t *testing.T) { f.Count = 5000 f.Offset = 0 - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -852,11 +662,6 @@ func TestPhotos(t *testing.T) { f.Camera = "canon" f.Lens = "" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -872,11 +677,6 @@ func TestPhotos(t *testing.T) { f.Camera = "" f.Lens = "apple" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -892,11 +692,6 @@ func TestPhotos(t *testing.T) { f.Camera = "" f.Lens = "Apple F380" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -911,11 +706,6 @@ func TestPhotos(t *testing.T) { f.Offset = 0 f.Camera = "" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -933,11 +723,6 @@ func TestPhotos(t *testing.T) { f.Year = strconv.Itoa(2790) f.Album = "at9lxuqxpogaaba8" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -950,11 +735,6 @@ func TestPhotos(t *testing.T) { f.Query = "" f.Albums = "Berlin" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -967,11 +747,6 @@ func TestPhotos(t *testing.T) { f.Query = "" f.Album = "Berlin" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -983,11 +758,6 @@ func TestPhotos(t *testing.T) { var f form.SearchPhotos f.State = "KwaZulu-Natal" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1000,11 +770,6 @@ func TestPhotos(t *testing.T) { var f form.SearchPhotos f.City = "Mandeni" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1017,11 +782,6 @@ func TestPhotos(t *testing.T) { var f form.SearchPhotos f.Category = "botanical garden" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1035,11 +795,6 @@ func TestPhotos(t *testing.T) { var f form.SearchPhotos f.Label = "botanical-garden|nature|landscape|park" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1053,11 +808,6 @@ func TestPhotos(t *testing.T) { var f form.SearchPhotos f.Primary = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1071,11 +821,6 @@ func TestPhotos(t *testing.T) { var f form.SearchPhotos f.Query = "landscape" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1097,11 +842,6 @@ func TestPhotos(t *testing.T) { f.Path = "/xxx/xxx/" f.Order = entity.SortOrderName - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1126,11 +866,6 @@ func TestPhotos(t *testing.T) { f.Filter = "" f.Order = entity.SortOrderAdded - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1246,11 +981,6 @@ func TestPhotos(t *testing.T) { f.Count = 10 f.Offset = 0 - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1263,11 +993,6 @@ func TestPhotos(t *testing.T) { var f form.SearchPhotos f.Faces = "Yes" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1280,11 +1005,6 @@ func TestPhotos(t *testing.T) { var f form.SearchPhotos f.Faces = "No" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1297,11 +1017,6 @@ func TestPhotos(t *testing.T) { var f form.SearchPhotos f.Face = "yes" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1314,11 +1029,6 @@ func TestPhotos(t *testing.T) { var f form.SearchPhotos f.Faces = "2" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1854,11 +1564,6 @@ func TestPhotos(t *testing.T) { var f form.SearchPhotos f.Filename = "1990/04/Quality1FavoriteTrue.jpg" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1871,11 +1576,6 @@ func TestPhotos(t *testing.T) { var f form.SearchPhotos f.Original = "my-videos/IMG_88888" + "|" + "Vacation/exampleFileNameOriginal" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1888,11 +1588,6 @@ func TestPhotos(t *testing.T) { var f form.SearchPhotos f.Stack = true - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1905,11 +1600,6 @@ func TestPhotos(t *testing.T) { var f form.SearchPhotos f.Query = "keywords:kuh|bridge" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1918,11 +1608,6 @@ func TestPhotos(t *testing.T) { f.Query = "keywords:bridge&kuh" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -1935,11 +1620,6 @@ func TestPhotos(t *testing.T) { var f form.SearchPhotos f.Query = "albums:Holiday|Berlin" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1953,11 +1633,6 @@ func TestPhotos(t *testing.T) { f.Query = "albums:\"Berlin&Holiday\"" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1969,11 +1644,6 @@ func TestPhotos(t *testing.T) { var f form.SearchPhotos f.Subjects = "Actor A|Actress A" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -1982,11 +1652,6 @@ func TestPhotos(t *testing.T) { f.Subjects = "Actor A&Actress A" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos2, _, err2 := Photos(f) if err2 != nil { @@ -1999,11 +1664,6 @@ func TestPhotos(t *testing.T) { var f form.SearchPhotos f.People = "Actor" - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { @@ -2066,11 +1726,6 @@ func TestPhotos(t *testing.T) { f.Count = 10 f.Offset = 0 - // Parse query string and filter. - if err := f.ParseQueryString(); err != nil { - t.Fatal(err) - } - photos, _, err := Photos(f) if err != nil { diff --git a/internal/search/photos_viewer.go b/internal/search/photos_viewer.go index 7905e6b74..e9b2c1808 100644 --- a/internal/search/photos_viewer.go +++ b/internal/search/photos_viewer.go @@ -3,6 +3,8 @@ package search import ( "encoding/json" + "github.com/photoprism/photoprism/internal/entity" + "github.com/photoprism/photoprism/internal/form" "github.com/photoprism/photoprism/internal/thumb" "github.com/photoprism/photoprism/internal/viewer" @@ -10,7 +12,12 @@ import ( // PhotosViewerResults finds photos based on the search form provided and returns them as viewer.Results. func PhotosViewerResults(f form.SearchPhotos, contentUri, apiUri, previewToken, downloadToken string) (viewer.Results, int, error) { - if results, count, err := searchPhotos(f, PhotosColsView); err != nil { + return UserPhotosViewerResults(f, nil, contentUri, apiUri, previewToken, downloadToken) +} + +// UserPhotosViewerResults finds photos based on the search form and user session and returns them as viewer.Results. +func UserPhotosViewerResults(f form.SearchPhotos, sess *entity.Session, contentUri, apiUri, previewToken, downloadToken string) (viewer.Results, int, error) { + if results, count, err := searchPhotos(f, sess, PhotosColsView); err != nil { return viewer.Results{}, count, err } else { return results.ViewerResults(contentUri, apiUri, previewToken, downloadToken), count, err diff --git a/internal/service/session.go b/internal/service/session.go index 1123d6c44..511e2f9bd 100644 --- a/internal/service/session.go +++ b/internal/service/session.go @@ -2,7 +2,6 @@ package service import ( "sync" - "time" "github.com/photoprism/photoprism/internal/session" ) @@ -11,7 +10,7 @@ var onceSession sync.Once func initSession() { // Sessions are valid for 7 days by default. - services.Session = session.New(168*time.Hour, Config()) + services.Session = session.New(session.ExpiresAfter, Config()) } func Session() *session.Session { diff --git a/internal/session/session.go b/internal/session/session.go index f93d876aa..9e1b5bf8e 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -35,6 +35,8 @@ import ( var log = event.Log +var ExpiresAfter = 168 * time.Hour + // Session represents a session store. type Session struct { conf *config.Config diff --git a/internal/session/session_delete_test.go b/internal/session/session_delete_test.go index 6820a63de..d8e92daf2 100644 --- a/internal/session/session_delete_test.go +++ b/internal/session/session_delete_test.go @@ -2,7 +2,6 @@ package session import ( "testing" - "time" "github.com/stretchr/testify/assert" @@ -12,7 +11,7 @@ import ( ) func TestSession_Delete(t *testing.T) { - s := New(time.Hour, config.TestConfig()) + s := New(ExpiresAfter, config.TestConfig()) assert.Error(t, s.Delete("abc")) diff --git a/internal/session/session_get_test.go b/internal/session/session_get_test.go index 8ce877a45..22d33fa37 100644 --- a/internal/session/session_get_test.go +++ b/internal/session/session_get_test.go @@ -2,7 +2,6 @@ package session import ( "testing" - "time" "github.com/stretchr/testify/assert" @@ -12,7 +11,7 @@ import ( ) func TestSession_Get(t *testing.T) { - s := New(time.Hour, config.TestConfig()) + s := New(ExpiresAfter, config.TestConfig()) assert.Error(t, s.Delete("abc")) @@ -41,7 +40,7 @@ func TestSession_Get(t *testing.T) { } func TestSession_Exists(t *testing.T) { - s := New(time.Hour, config.TestConfig()) + s := New(ExpiresAfter, config.TestConfig()) assert.False(t, s.Exists("xyz")) diff --git a/internal/session/session_public.go b/internal/session/session_public.go index 8f1a6d189..0301b2f2f 100644 --- a/internal/session/session_public.go +++ b/internal/session/session_public.go @@ -9,12 +9,15 @@ var PublicID = "234200000000000000000000000000000000000000000000" // Public returns a client session for use in public mode. func (s *Session) Public() *entity.Session { - if Public != nil { + if Public == nil { + // Do nothing. + } else if !Public.Expired() { return Public } Public = entity.NewSession(s.expiresAfter) Public.ID = PublicID + Public.AuthMethod = "public" Public.SetUser(&entity.Admin) Public.CacheDuration(-1) diff --git a/internal/session/session_public_test.go b/internal/session/session_public_test.go index 0d4b7cfb5..6e884b6da 100644 --- a/internal/session/session_public_test.go +++ b/internal/session/session_public_test.go @@ -2,7 +2,6 @@ package session import ( "testing" - "time" "github.com/stretchr/testify/assert" @@ -11,7 +10,7 @@ import ( ) func TestSession_Public(t *testing.T) { - s := New(time.Hour, config.TestConfig()) + s := New(ExpiresAfter, config.TestConfig()) sess := s.Public() @@ -19,5 +18,5 @@ func TestSession_Public(t *testing.T) { assert.Truef(t, s.Exists(sess.ID), "session %s should exist", clean.LogQuote(sess.ID)) assert.Equal(t, PublicID, sess.ID) - // t.Logf("Public Session: %#v", sess) + t.Logf("Public Session: %#v", sess) } diff --git a/internal/session/session_save_test.go b/internal/session/session_save_test.go index e52b0a8e6..351bced1a 100644 --- a/internal/session/session_save_test.go +++ b/internal/session/session_save_test.go @@ -2,7 +2,6 @@ package session import ( "testing" - "time" "github.com/stretchr/testify/assert" @@ -13,7 +12,7 @@ import ( ) func TestSession_Save(t *testing.T) { - s := New(time.Hour, config.TestConfig()) + s := New(ExpiresAfter, config.TestConfig()) data := entity.NewSessionData() @@ -46,7 +45,7 @@ func TestSession_Save(t *testing.T) { } func TestSession_Create(t *testing.T) { - s := New(time.Hour, config.TestConfig()) + s := New(ExpiresAfter, config.TestConfig()) data := entity.NewSessionData() diff --git a/internal/workers/sync_download.go b/internal/workers/sync_download.go index d8aeeba9f..2b61830c9 100644 --- a/internal/workers/sync_download.go +++ b/internal/workers/sync_download.go @@ -176,7 +176,7 @@ func (worker *Sync) download(a entity.Account) (complete bool, err error) { FileName: mf.FileName(), Related: related, IndexOpt: photoprism.IndexOptionsAll(), - ImportOpt: photoprism.ImportOptionsMove(baseDir), + ImportOpt: photoprism.ImportOptionsMove(baseDir, worker.conf.ImportDest()), Imp: service.Import(), } } diff --git a/internal/workers/workers_test.go b/internal/workers/workers_test.go index b6409fc1e..0ecf53525 100644 --- a/internal/workers/workers_test.go +++ b/internal/workers/workers_test.go @@ -4,19 +4,19 @@ import ( "os" "testing" - "github.com/photoprism/photoprism/internal/config" "github.com/sirupsen/logrus" + + "github.com/photoprism/photoprism/internal/config" ) func TestMain(m *testing.M) { log = logrus.StandardLogger() log.SetLevel(logrus.TraceLevel) - c := config.NewTestConfig("workers") + c := config.TestConfig() + defer c.CloseDb() code := m.Run() - _ = c.CloseDb() - os.Exit(code) } diff --git a/pkg/clean/name.go b/pkg/clean/name.go index e9296ae5e..d143b7816 100644 --- a/pkg/clean/name.go +++ b/pkg/clean/name.go @@ -6,18 +6,27 @@ import ( "github.com/photoprism/photoprism/pkg/txt" ) -// Name returns the sanitized and capitalized names. +// Name sanitizes a name string. func Name(name string) string { // Empty or too long? if name == "" || reject(name, txt.ClipDefault) { return "" } + var prev rune + // Remove unwanted characters. name = strings.Map(func(r rune) rune { + if r == ' ' && (prev == 0 || prev == ' ') { + return -1 + } + + prev = r + if r < 32 || r == 127 { return -1 } + switch r { case '"', '$', '%', '\\', '*', '`', ';', '<', '>', '{', '}': return -1 @@ -25,13 +34,16 @@ func Name(name string) string { return r }, name) - name = strings.TrimSpace(name) - - // Now empty? - if name == "" { + // OK? + if name = strings.TrimSpace(name); name == "" { return "" } - // Shorten and capitalize. - return txt.Clip(txt.Title(name), txt.ClipDefault) + // Make sure name isn't too long. + return txt.Clip(name, txt.ClipDefault) +} + +// NameCapitalized sanitizes and capitalizes a name. +func NameCapitalized(name string) string { + return txt.Title(Name(name)) } diff --git a/pkg/clean/name_test.go b/pkg/clean/name_test.go index 5c7d8c614..326e5e953 100644 --- a/pkg/clean/name_test.go +++ b/pkg/clean/name_test.go @@ -14,14 +14,14 @@ func TestName(t *testing.T) { assert.Equal(t, "William Henry Gates III", Name("William Henry Gates III")) }) t.Run("Quotes", func(t *testing.T) { - assert.Equal(t, "William HenRy Gates'", Name("william \"HenRy\" gates' ")) + assert.Equal(t, "william HenRy gates'", Name("william \"HenRy\" gates' ")) }) t.Run("Slash", func(t *testing.T) { - assert.Equal(t, "William McCorn / Gates'", Name("william\\ \"McCorn\" / gates' ")) + assert.Equal(t, "william McCorn / gates'", Name("william\\ \"McCorn\" / gates' ")) }) t.Run("SpecialCharacters", func(t *testing.T) { assert.Equal(t, - "'', '', '~', '', ' / ', '', '', '&', '|', '+', '=', '', Foo '@', '!', '?', ':', '', '', '', McBar '', ''", + "'', '', '~', '', '/', '', '', '&', '|', '+', '=', '', Foo '@', '!', '?', ':', '', '', '', McBar '', ''", Name("'\"', '`', '~', '\\\\', '/', '*', '%', '&', '|', '+', '=', '$', Foo '@', '!', '?', ':', ';', '<', '>', McBar '{', '}'"), ) }) @@ -29,3 +29,27 @@ func TestName(t *testing.T) { assert.Equal(t, "陈 赵", Name(" 陈 赵")) }) } + +func TestNameCapitalized(t *testing.T) { + t.Run("Empty", func(t *testing.T) { + assert.Equal(t, "", NameCapitalized("")) + }) + t.Run("BillGates", func(t *testing.T) { + assert.Equal(t, "William Henry Gates III", NameCapitalized("William Henry Gates III")) + }) + t.Run("Quotes", func(t *testing.T) { + assert.Equal(t, "William HenRy Gates'", NameCapitalized("william \"HenRy\" gates' ")) + }) + t.Run("Slash", func(t *testing.T) { + assert.Equal(t, "William McCorn / Gates'", NameCapitalized("william\\ \"McCorn\" / gates' ")) + }) + t.Run("SpecialCharacters", func(t *testing.T) { + assert.Equal(t, + "'', '', '~', '', '/', '', '', '&', '|', '+', '=', '', Foo '@', '!', '?', ':', '', '', '', McBar '', ''", + Name("'\"', '`', '~', '\\\\', '/', '*', '%', '&', '|', '+', '=', '$', Foo '@', '!', '?', ':', ';', '<', '>', McBar '{', '}'"), + ) + }) + t.Run("Chinese", func(t *testing.T) { + assert.Equal(t, "陈 赵", NameCapitalized(" 陈 赵")) + }) +} diff --git a/pkg/clean/path.go b/pkg/clean/path.go index c6f0ad9e8..e2caacdbc 100644 --- a/pkg/clean/path.go +++ b/pkg/clean/path.go @@ -1,6 +1,7 @@ package clean import ( + "path" "strings" "unicode" ) @@ -30,3 +31,18 @@ func Path(s string) string { return s } + +// UserPath sanitizes and normalizes a user provided path so it can be used +func UserPath(dir string) string { + if dir == "" { + return dir + } + + dir = strings.Trim(path.Clean(Path(strings.ReplaceAll(dir, "\\", "/"))), "./ \\*%#~?|<>:") + + if strings.Contains(dir, "/.") || strings.Contains(dir, "..") || strings.Contains(dir, "//") { + return "" + } + + return dir +} diff --git a/pkg/clean/path_test.go b/pkg/clean/path_test.go index df74e1578..6f8082013 100644 --- a/pkg/clean/path_test.go +++ b/pkg/clean/path_test.go @@ -35,3 +35,45 @@ func TestPath(t *testing.T) { assert.Equal(t, "", Path("${https://:/}")) }) } + +func TestUserPath(t *testing.T) { + t.Run("ValidPath", func(t *testing.T) { + assert.Equal(t, "go/src/github.com/photoprism/photoprism", UserPath("/go/src/github.com/photoprism/photoprism")) + }) + t.Run("ValidFile", func(t *testing.T) { + assert.Equal(t, "filename.TXT", UserPath("filename.TXT")) + }) + t.Run("The quick brown fox.", func(t *testing.T) { + assert.Equal(t, "The quick brown fox", UserPath("The quick brown fox.")) + }) + t.Run("filename.txt", func(t *testing.T) { + assert.Equal(t, "filename.txt", UserPath("filename.txt")) + }) + t.Run("Empty", func(t *testing.T) { + assert.Equal(t, "", UserPath("")) + }) + t.Run("Dot", func(t *testing.T) { + assert.Equal(t, "", UserPath(".")) + }) + t.Run("DotDot", func(t *testing.T) { + assert.Equal(t, "", UserPath("..")) + }) + t.Run("DotDotDot", func(t *testing.T) { + assert.Equal(t, "", UserPath("...")) + }) + t.Run("Replace", func(t *testing.T) { + assert.Equal(t, "", UserPath("${https://:/}")) + }) + t.Run("Unclean", func(t *testing.T) { + assert.Equal(t, "foo/bar/baz", UserPath("/foo/bar/baz/")) + assert.Equal(t, "dirty/path", UserPath("/dirty/path/")) + assert.Equal(t, "dev.txt", UserPath("dev.txt")) + assert.Equal(t, "", UserPath("../hello/foo/bar/../todo.txt")) + assert.Equal(t, "hello/foo/bar/todo.txt", UserPath(". ./hello/foo/bar/./todo.txt")) + assert.Equal(t, "", UserPath("./hello/foo/./bar/. ./todo.txt")) + assert.Equal(t, "", UserPath("..")) + assert.Equal(t, "", UserPath(".")) + assert.Equal(t, "", UserPath("/")) + assert.Equal(t, "", UserPath("")) + }) +} diff --git a/pkg/rnd/contains.go b/pkg/rnd/contains.go new file mode 100644 index 000000000..80401b48d --- /dev/null +++ b/pkg/rnd/contains.go @@ -0,0 +1,55 @@ +package rnd + +// ContainsUID checks if a slice of strings contains ContainsUID only. +func ContainsUID(s []string, prefix byte) bool { + if len(s) < 1 { + return false + } + + for _, id := range s { + switch prefix { + case 0: + if !IsUnique(id, prefix) { + return false + } + default: + if !IsUID(id, prefix) { + return false + } + } + } + + return true +} + +// ContainsType checks if a slice of strings contains only random IDs of a given type and returns it. +func ContainsType(ids []string) (idType Type, idPrefix byte) { + if len(ids) < 1 { + return TypeNone, PrefixNone + } + + idType = TypeUnknown + idPrefix = PrefixNone + + for _, id := range ids { + t, p := IdType(id) + + if t == TypeUnknown { + return TypeUnknown, PrefixNone + } else if idType == TypeUnknown { + idType = t + } else if idType != t { + return TypeMixed, PrefixNone + } + + if t != TypeUID { + continue + } else if idPrefix == PrefixNone { + idPrefix = p + } else if idPrefix != PrefixMixed && idPrefix != p { + idPrefix = PrefixMixed + } + } + + return idType, idPrefix +} diff --git a/pkg/rnd/contains_test.go b/pkg/rnd/contains_test.go new file mode 100644 index 000000000..7dcd212de --- /dev/null +++ b/pkg/rnd/contains_test.go @@ -0,0 +1,80 @@ +package rnd + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestContainsUID(t *testing.T) { + assert.False(t, ContainsUID([]string{}, 'l')) + assert.True(t, ContainsUID([]string{"lt9k3pw1wowuy3c2", "ltxk3pwawowuy0c0"}, 'l')) + assert.False(t, ContainsUID([]string{"lt9k3pw1wowuy3c2", "atxk3pwawowuy0c0"}, 'l')) + assert.True(t, ContainsUID([]string{"dafbfeb8-a129-4e7c-9cf0-e7996a701cdb"}, PrefixNone)) + assert.False(t, ContainsUID([]string{"dafbfeb8-a129-4e7c-9cf0-e7996a701cdb"}, 'l')) + assert.False(t, ContainsUID([]string{"_"}, '_')) + assert.False(t, ContainsUID([]string{""}, '_')) +} + +func TestContainsType(t *testing.T) { + t.Run("None", func(t *testing.T) { + result, prefix := ContainsType([]string{}) + assert.Equal(t, TypeNone, result) + assert.Equal(t, PrefixNone, prefix) + }) + t.Run("Unknown", func(t *testing.T) { + result, prefix := ContainsType([]string{"dgsgseh24t"}) + assert.Equal(t, TypeUnknown, result) + assert.Equal(t, PrefixNone, prefix) + }) + t.Run("LabelUID", func(t *testing.T) { + result, prefix := ContainsType([]string{"lt9k3pw1wowuy3c2", "ltxk3pwawowuy0c0"}) + assert.Equal(t, TypeUID, result) + assert.Equal(t, byte('l'), prefix) + }) + t.Run("MixedUID", func(t *testing.T) { + result, prefix := ContainsType([]string{"lt9k3pw1wowuy3c2", "atxk3pwawowuy0c0"}) + assert.Equal(t, TypeUID, result) + assert.Equal(t, PrefixMixed, prefix) + }) + t.Run("TypeUUID", func(t *testing.T) { + result, prefix := ContainsType([]string{"dafbfeb8-a129-4e7c-9cf0-e7996a701cdb"}) + assert.Equal(t, TypeUUID, result) + assert.Equal(t, PrefixNone, prefix) + }) + t.Run("TypeSessionID", func(t *testing.T) { + result, prefix := ContainsType([]string{"69be27ac5ca305b394046a83f6fda18167ca3d3f2dbe7ac0"}) + assert.Equal(t, TypeSessionID, result) + assert.Equal(t, PrefixNone, prefix) + }) + t.Run("TypeMD5", func(t *testing.T) { + result, prefix := ContainsType([]string{"79054025255fb1a26e4bc422aef54eb4"}) + assert.Equal(t, TypeMD5, result) + assert.Equal(t, PrefixNone, prefix) + }) + t.Run("TypeSHA1", func(t *testing.T) { + result, prefix := ContainsType([]string{"de9f2c7fd25e1b3afad3e85a0bd17d9b100db4b3"}) + assert.Equal(t, TypeSHA1, result) + assert.Equal(t, PrefixNone, prefix) + }) + t.Run("TypeSHA224", func(t *testing.T) { + result, prefix := ContainsType([]string{"d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f", "d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42a"}) + assert.Equal(t, TypeSHA224, result) + assert.Equal(t, PrefixNone, prefix) + }) + t.Run("TypeSHA256", func(t *testing.T) { + result, prefix := ContainsType([]string{"a3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"}) + assert.Equal(t, TypeSHA256, result) + assert.Equal(t, PrefixNone, prefix) + }) + t.Run("TypeSHA384", func(t *testing.T) { + result, prefix := ContainsType([]string{"18b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b", "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b"}) + assert.Equal(t, TypeSHA384, result) + assert.Equal(t, PrefixNone, prefix) + }) + t.Run("TypeSHA512", func(t *testing.T) { + result, prefix := ContainsType([]string{"af83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e", "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e"}) + assert.Equal(t, TypeSHA512, result) + assert.Equal(t, PrefixNone, prefix) + }) +} diff --git a/pkg/rnd/hash.go b/pkg/rnd/hash.go new file mode 100644 index 000000000..ec71a5b35 --- /dev/null +++ b/pkg/rnd/hash.go @@ -0,0 +1,62 @@ +package rnd + +// IsMD5 checks if the string appears to be an MD5 hash. +// Example: 79054025255fb1a26e4bc422aef54eb4 +func IsMD5(s string) bool { + if len(s) != 32 { + return false + } + + return IsHex(s) +} + +// IsSHA1 checks if the string appears to be a SHA1 hash. +// Example: de9f2c7fd25e1b3afad3e85a0bd17d9b100db4b3 +func IsSHA1(s string) bool { + if len(s) != 40 { + return false + } + + return IsHex(s) +} + +// IsSHA224 checks if the string appears to be a SHA224 hash. +// Example: d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f +func IsSHA224(s string) bool { + if len(s) != 56 { + return false + } + + return IsHex(s) +} + +// IsSHA256 checks if the string appears to be a SHA256 hash. +// Example: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 +func IsSHA256(s string) bool { + if len(s) != 64 { + return false + } + + return IsHex(s) +} + +// IsSHA384 checks if the string appears to be a SHA384 hash. +// Example: 38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b +func IsSHA384(s string) bool { + if len(s) != 96 { + return false + } + + return IsHex(s) + +} + +// IsSHA512 checks if the string appears to be a SHA512 hash. +// Example: cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e +func IsSHA512(s string) bool { + if len(s) != 128 { + return false + } + + return IsHex(s) +} diff --git a/pkg/rnd/hash_test.go b/pkg/rnd/hash_test.go new file mode 100644 index 000000000..3847c2ac4 --- /dev/null +++ b/pkg/rnd/hash_test.go @@ -0,0 +1,35 @@ +package rnd + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestIsSHA(t *testing.T) { + t.Run("SHA1", func(t *testing.T) { + assert.False(t, IsSHA1("")) + assert.True(t, IsSHA1("de9f2c7fd25e1b3afad3e85a0bd17d9b100db4b3")) + assert.False(t, IsSHA1("de9f2c7fd25e1b3afad3e85a0bd17d9b100db4b3a")) + }) + t.Run("SHA224", func(t *testing.T) { + assert.False(t, IsSHA224("")) + assert.True(t, IsSHA224("d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f")) + assert.False(t, IsSHA224("de9f2c7fd25e1b3afad3e85a0bd17d9b100db4b3")) + }) + t.Run("SHA256", func(t *testing.T) { + assert.False(t, IsSHA256("")) + assert.True(t, IsSHA256("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")) + assert.False(t, IsSHA256("de9f2c7fd25e1b3afad3e85a0bd17d9b100db4b3a")) + }) + t.Run("SHA384", func(t *testing.T) { + assert.False(t, IsSHA384("")) + assert.True(t, IsSHA384("38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")) + assert.False(t, IsSHA384("de9f2c7fd25e1b3afad3e85a0bd17d9b100db4b3a")) + }) + t.Run("SHA512", func(t *testing.T) { + assert.False(t, IsSHA512("")) + assert.True(t, IsSHA512("cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e")) + assert.False(t, IsSHA512("de9f2c7fd25e1b3afad3e85a0bd17d9b100db4b3a")) + }) +} diff --git a/pkg/rnd/type.go b/pkg/rnd/type.go new file mode 100644 index 000000000..a4ac88b3f --- /dev/null +++ b/pkg/rnd/type.go @@ -0,0 +1,135 @@ +package rnd + +import ( + "strings" +) + +const ( + TypeUUID Type = "UUID" + TypeUID Type = "UID" + TypeRefID Type = "RID" + TypeSessionID Type = "SID" + TypeCrcToken Type = "CRC" + TypeMD5 Type = "MD5" + TypeSHA1 Type = "SHA1" + TypeSHA224 Type = "SHA224" + TypeSHA256 Type = "SHA256" + TypeSHA384 Type = "SHA384" + TypeSHA512 Type = "SHA512" + TypeNone Type = "none" + TypeMixed Type = "mixed" + TypeUnknown Type = "unknown" +) + +// IdType checks what kind of random ID a string contains +// and returns it along with the id prefix, if any. +func IdType(id string) (Type, byte) { + if l := len(id); l == 0 { + return TypeNone, PrefixNone + } else if l < 14 || l > 128 { + return TypeUnknown, PrefixNone + } + + switch { + case IsUID(id, 0): + return TypeUID, id[0] + case IsUUID(id): + return TypeUUID, PrefixNone + case IsSHA1(id): + return TypeSHA1, PrefixNone + case IsRefID(id): + return TypeRefID, PrefixNone + case IsSessionID(id): + return TypeSessionID, PrefixNone + case ValidateCrcToken(id): + return TypeCrcToken, PrefixNone + case IsSHA224(id): + return TypeSHA224, PrefixNone + case IsSHA256(id): + return TypeSHA256, PrefixNone + case IsSHA384(id): + return TypeSHA384, PrefixNone + case IsSHA512(id): + return TypeSHA512, PrefixNone + case IsMD5(id): + return TypeMD5, PrefixNone + default: + return TypeUnknown, PrefixNone + } +} + +// Type represents a random id type. +type Type string + +// String returns the type as string. +func (t Type) String() string { + return string(t) +} + +// Equal checks if the type matches. +func (t Type) Equal(s string) bool { + return strings.EqualFold(s, t.String()) +} + +// NotEqual checks if the type is different. +func (t Type) NotEqual(s string) bool { + return !t.Equal(s) +} + +func (t Type) EntityID() bool { + switch t { + case TypeUID, TypeUUID, TypeRefID, TypeCrcToken, TypeSessionID: + return true + default: + return false + } +} + +func (t Type) SessionID() bool { + return t == TypeSessionID +} + +func (t Type) CrcToken() bool { + switch t { + case TypeCrcToken: + return true + default: + return false + } +} + +func (t Type) Hash() bool { + switch t { + case TypeMD5: + return true + default: + return t.SHA() + } +} + +func (t Type) SHA() bool { + return t.SHA1() || t.SHA2() +} + +func (t Type) SHA1() bool { + switch t { + case TypeSHA1: + return true + default: + return false + } +} + +func (t Type) SHA2() bool { + switch t { + case TypeSHA224, TypeSHA256, TypeSHA384, TypeSHA512: + return true + default: + return false + } +} + +// Unknown checks if the type is unknown. +func (t Type) Unknown() bool { + return t == TypeUnknown +} diff --git a/pkg/rnd/type_test.go b/pkg/rnd/type_test.go new file mode 100644 index 000000000..cb76919b2 --- /dev/null +++ b/pkg/rnd/type_test.go @@ -0,0 +1,25 @@ +package rnd + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestUidType(t *testing.T) { + t.Run("None", func(t *testing.T) { + result, prefix := IdType("") + assert.Equal(t, TypeNone, result) + assert.Equal(t, PrefixNone, prefix) + }) + t.Run("Unknown", func(t *testing.T) { + result, prefix := IdType("lt9kr7ur57iru5i7uy3c2") + assert.Equal(t, TypeUnknown, result) + assert.Equal(t, PrefixNone, prefix) + }) + t.Run("LabelUID", func(t *testing.T) { + result, prefix := IdType("lt9k3pw1wowuy3c2") + assert.Equal(t, TypeUID, result) + assert.Equal(t, byte('l'), prefix) + }) +} diff --git a/pkg/rnd/uid.go b/pkg/rnd/uid.go index 1f9e133c6..9180eda3b 100644 --- a/pkg/rnd/uid.go +++ b/pkg/rnd/uid.go @@ -5,6 +5,11 @@ import ( "time" ) +const ( + PrefixNone = byte(0) + PrefixMixed = byte('*') +) + // GenerateUID returns a unique id with prefix as string. func GenerateUID(prefix byte) string { result := make([]byte, 0, 16) diff --git a/pkg/rnd/uid_test.go b/pkg/rnd/uid_test.go index 1dfbb729d..0e3e83991 100644 --- a/pkg/rnd/uid_test.go +++ b/pkg/rnd/uid_test.go @@ -35,13 +35,6 @@ func TestIsUID(t *testing.T) { assert.False(t, IsUID(RefID(""), 'r')) } -func TestContainsUID(t *testing.T) { - assert.True(t, ContainsUID([]string{"lt9k3pw1wowuy3c2", "ltxk3pwawowuy0c0"}, 'l')) - assert.True(t, ContainsUID([]string{"dafbfeb8-a129-4e7c-9cf0-e7996a701cdb"}, 'l')) - assert.False(t, ContainsUID([]string{"_"}, '_')) - assert.False(t, ContainsUID([]string{""}, '_')) -} - func TestInvalidUID(t *testing.T) { prefix := byte('x') diff --git a/pkg/rnd/validation.go b/pkg/rnd/validation.go index 3b3067c86..b49abb9ac 100644 --- a/pkg/rnd/validation.go +++ b/pkg/rnd/validation.go @@ -12,21 +12,6 @@ func IsUnique(s string, prefix byte) bool { return IsUID(s, prefix) } -// ContainsUID checks if a slice of strings contains ContainsUID only. -func ContainsUID(s []string, prefix byte) bool { - if len(s) < 1 { - return false - } - - for _, id := range s { - if !IsUnique(id, prefix) { - return false - } - } - - return true -} - // IsUID checks if the string is a valid entity UID. func IsUID(s string, prefix byte) bool { if len(s) != 16 { diff --git a/pkg/s2/s2.go b/pkg/s2/s2.go index c986de53f..6c3eb012b 100644 --- a/pkg/s2/s2.go +++ b/pkg/s2/s2.go @@ -30,7 +30,7 @@ import ( gs2 "github.com/golang/geo/s2" ) -// Default cell level, see https://s2geometry.io/resources/s2cell_statistics.html. +// DefaultLevel see https://s2geometry.io/resources/s2cell_statistics.html. var DefaultLevel = 21 // Token returns the S2 cell token for coordinates using the default level. @@ -38,7 +38,7 @@ func Token(lat, lng float64) string { return TokenLevel(lat, lng, DefaultLevel) } -// Token returns the S2 cell token for coordinates. +// TokenLevel returns the S2 cell token for coordinates. func TokenLevel(lat, lng float64, level int) string { if lat == 0.0 && lng == 0.0 { return "" diff --git a/pkg/txt/countries.go b/pkg/txt/countries.go index 6bb3a8fe1..722283c0a 100644 --- a/pkg/txt/countries.go +++ b/pkg/txt/countries.go @@ -27,6 +27,7 @@ var Countries = map[string]string{ "cambodia": "kh", "vientiane": "la", "lao republic": "la", + "laos": "la", "vietnam": "vn", "denmark": "dk", "myanmar": "mm", @@ -216,6 +217,7 @@ var Countries = map[string]string{ "koprivshtitsa": "bg", "melnik": "bg", "sofia": "bg", + "corfu": "gr", "greece": "gr", "hellas": "gr", "north korea": "kp",