simon987/sist2
1
0
Fork 0
mirror of https://github.com/simon987/sist2.git synced 2025-04-19 18:26:43 +00:00
Code Issues Projects Releases Wiki Activity

Do blank search on page reload when media tab auto-reload is disabled

Browse Source
This commit is contained in:
simon987 2022-03-05 20:56:02 -05:00
parent eea5ce75f3
commit 0bf4244683
4 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sist2-vue/dist/js/index.js vendored
View File

File diff suppressed because one or more lines are too long

41
sist2-vue/src/Sist2Query.ts
View File

@ -69,7 +69,7 @@ interface SortMode {
class Sist2Query { class Sist2Query {
searchQuery(): any { searchQuery(blankSearch: boolean = false): any {
const getters = store.getters; const getters = store.getters;
@ -93,22 +93,6 @@ class Sist2Query {
{terms: {index: selectedIndexIds}} {terms: {index: selectedIndexIds}}
] as any[]; ] as any[];
if (sizeMin && sizeMax) {
filters.push({range: {size: {gte: sizeMin, lte: sizeMax}}})
} else if (sizeMin) {
filters.push({range: {size: {gte: sizeMin}}})
} else if (sizeMax) {
filters.push({range: {size: {lte: sizeMax}}})
}
if (dateMin && dateMax) {
filters.push({range: {mtime: {gte: dateMin, lte: dateMax}}})
} else if (dateMin) {
filters.push({range: {mtime: {gte: dateMin}}})
} else if (dateMax) {
filters.push({range: {mtime: {lte: dateMax}}})
}
const fields = [ const fields = [
"name^8", "name^8",
"content^3", "content^3",
@ -128,7 +112,25 @@ class Sist2Query {
fields.push("name.nGram^3"); fields.push("name.nGram^3");
} }
if (!blankSearch) {
if (sizeMin && sizeMax) {
filters.push({range: {size: {gte: sizeMin, lte: sizeMax}}})
} else if (sizeMin) {
filters.push({range: {size: {gte: sizeMin}}})
} else if (sizeMax) {
filters.push({range: {size: {lte: sizeMax}}})
}
if (dateMin && dateMax) {
filters.push({range: {mtime: {gte: dateMin, lte: dateMax}}})
} else if (dateMin) {
filters.push({range: {mtime: {gte: dateMin}}})
} else if (dateMax) {
filters.push({range: {mtime: {lte: dateMax}}})
}
const path = pathText.replace(/\/$/, "").toLowerCase(); //remove trailing slashes const path = pathText.replace(/\/$/, "").toLowerCase(); //remove trailing slashes
if (path !== "") { if (path !== "") {
filters.push({term: {path: path}}) filters.push({term: {path: path}})
} }
@ -144,6 +146,7 @@ class Sist2Query {
selectedTags.forEach((tag: string) => filters.push({term: {"tag": tag}})); selectedTags.forEach((tag: string) => filters.push({term: {"tag": tag}}));
} }
} }
}
let query; let query;
if (getters.optQueryMode === "simple") { if (getters.optQueryMode === "simple") {
@ -182,7 +185,7 @@ class Sist2Query {
size: size, size: size,
} as any; } as any;
if (!empty) { if (!empty && !blankSearch) {
q.query.bool.must = query; q.query.bool.must = query;
} }
@ -237,7 +240,7 @@ class Sist2Query {
} }
} }
if (!empty) { if (!empty && !blankSearch) {
q.query.function_score.query.bool.must.push(query); q.query.function_score.query.bool.must.push(query);
} }
} }

4
sist2-vue/src/views/SearchPage.vue
View File

@ -139,7 +139,9 @@ export default Vue.extend({
this.setSist2Info(data); this.setSist2Info(data);
this.setIndices(data.indices); this.setIndices(data.indices);
Sist2Api.getMimeTypes(Sist2Query.searchQuery()).then(({mimeMap}) => { const doBlankSearch = !this.$store.state.optUpdateMimeMap;
Sist2Api.getMimeTypes(Sist2Query.searchQuery(doBlankSearch)).then(({mimeMap}) => {
this.$store.commit("setUiMimeMap", mimeMap); this.$store.commit("setUiMimeMap", mimeMap);
this.uiLoading = false; this.uiLoading = false;
this.search(true); this.search(true);

10
src/web/static_generated.c vendored
View File

File diff suppressed because one or more lines are too long