From a8e14f6305cbf898a1a081bbee687a79334b101e Mon Sep 17 00:00:00 2001 From: Niels Simenon Date: Sat, 29 Feb 2020 23:57:45 +0100 Subject: [PATCH] Improved search query prep. Showing query in header after refresh. --- assets/components/header/header.vue | 5 ----- assets/components/header/search.vue | 2 +- migrations/20190325001339_releases.js | 4 ++-- traxxx.stop | 1 + 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/assets/components/header/header.vue b/assets/components/header/header.vue index 57035722..18e69322 100644 --- a/assets/components/header/header.vue +++ b/assets/components/header/header.vue @@ -84,11 +84,6 @@ export default { components: { Search, }, - data() { - return { - query: this.$route.query ? this.$route.query.q : null, - }; - }, }; diff --git a/assets/components/header/search.vue b/assets/components/header/search.vue index 9e9507ea..4040e029 100644 --- a/assets/components/header/search.vue +++ b/assets/components/header/search.vue @@ -26,7 +26,7 @@ async function search() { export default { data() { return { - query: null, + query: this.$route.query ? this.$route.query.q : null, }; }, methods: { diff --git a/migrations/20190325001339_releases.js b/migrations/20190325001339_releases.js index 2ddbf8c8..4e9cd188 100644 --- a/migrations/20190325001339_releases.js +++ b/migrations/20190325001339_releases.js @@ -496,8 +496,8 @@ exports.up = knex => Promise.resolve() CREATE FUNCTION search_releases(query text) RETURNS SETOF releases_search AS $$ SELECT * FROM releases_search AS search - WHERE search.document @@ plainto_tsquery('traxxx', regexp_replace(query, '\\.|-', ' ', 'g')) - ORDER BY ts_rank(search.document, plainto_tsquery('traxxx', regexp_replace(query, '\\.|-', ' ', 'g'))) DESC; + WHERE search.document @@ plainto_tsquery('traxxx', regexp_replace(query, '\\.|-|(XXX\\.[\\d+|hd|sd].*$)', ' ', 'ig')) + ORDER BY ts_rank(search.document, plainto_tsquery('traxxx', regexp_replace(query, '\\.|-|(XXX\\.[\\d+|hd|sd].*$)', ' ', 'ig'))) DESC; $$ LANGUAGE SQL STABLE; CREATE FUNCTION search_sites(search text) RETURNS SETOF sites AS $$ diff --git a/traxxx.stop b/traxxx.stop index e8fbc1c0..3d5d6b20 100644 --- a/traxxx.stop +++ b/traxxx.stop @@ -141,6 +141,7 @@ ktr mkv mov mp4 +rarbg rartv robots scenes