pixeldrain/fnx_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better error checking for search API

Browse Source
This commit is contained in:
Fornax
2023-05-25 17:32:59 +02:00
parent 9e5f2ae6d4
commit 88676a928e
1 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
svelte/src/filesystem/SearchView.svelte
View File

@@ -8,6 +8,7 @@ export let fs_navigator
let dispatch = createEventDispatcher() let dispatch = createEventDispatcher()
let error = ""
let search_term = "" let search_term = ""
let search_results = [] let search_results = []
let searching = false let searching = false
@@ -29,6 +30,7 @@ const search = async (limit = 10) => {
console.debug("Searching for", search_term) console.debug("Searching for", search_term)
error = ""
last_searched_term = search_term last_searched_term = search_term
last_limit = limit last_limit = limit
searching = true searching = true
@@ -37,9 +39,13 @@ const search = async (limit = 10) => {
try { try {
search_results = await fs_search(state.root.id, state.base.path, search_term, limit) search_results = await fs_search(state.root.id, state.base.path, search_term, limit)
} catch (err) { } catch (err) {
try {
error = JSON.parse(err).value
} catch {
alert(err) alert(err)
console.error(err) console.error(err)
} }
}
searching = false searching = false
dispatch("loading", false) dispatch("loading", false)
@@ -65,15 +71,27 @@ const node_click = index => {
} }
</script> </script>
{#if error === "path_not_found" || error === "node_is_a_directory"}
<div class="highlight_yellow center">
Search index not found. The search index is a file called
'.search_index.gz' in your home directory. If you delete this file then
search will not work. The file is regenerated 10 minutes after modifying
a file in your filesystem.
</div>
{:else if error !== ""}
<div class="highlight_red center">
An error ocurred while executing the search request: {error}
</div>
{/if}
<form class="search_bar highlight_shaded" on:submit|preventDefault={submit_search}> <form class="search_bar highlight_shaded center" on:submit|preventDefault={submit_search}>
<i class="icon">search</i> <i class="icon">search</i>
<!-- svelte-ignore a11y-autofocus --> <!-- svelte-ignore a11y-autofocus -->
<input class="term" type="text" style="width: 100%;" bind:value={search_term} on:keyup={() => search()} autofocus /> <input class="term" type="text" style="width: 100%;" bind:value={search_term} on:keyup={() => search()} autofocus />
<input class="submit" type="submit" value="Search"/> <input class="submit" type="submit" value="Search"/>
</form> </form>
<div class="directory"> <div class="directory center">
<tr> <tr>
<td></td> <td></td>
<td>Name</td> <td>Name</td>
@@ -107,13 +125,17 @@ const node_click = index => {
</div> </div>
<style> <style>
.center {
margin: auto;
width: 1000px;
max-width: 100%;
}
.search_bar { .search_bar {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
width: 100%; margin-top: 10px;
max-width: 1000px;
margin: 10px auto;
} }
.term { .term {
flex: 1 1 auto; flex: 1 1 auto;
@@ -131,9 +153,6 @@ const node_click = index => {
background: var(--body_color); background: var(--body_color);
border-collapse: collapse; border-collapse: collapse;
border-radius: 8px; border-radius: 8px;
max-width: 100%;
width: 1000px;
} }
.directory > * { .directory > * {
display: table-row; display: table-row;