Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IV: Fix search cache issues when fetching more #3486

Merged
merged 3 commits into from
May 13, 2023
Merged

IV: Fix search cache issues when fetching more #3486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec1ca0d
Fix IV search cache issues
ChunkyProgrammer May 3, 2023
57af984
Add comment
ChunkyProgrammer May 4, 2023
63ed793
add apiUsed
ChunkyProgrammer May 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/renderer/store/modules/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,13 @@ const mutations = {

if (sameSearch !== -1) {
state.sessionSearchHistory[sameSearch].data = payload.data
state.sessionSearchHistory[sameSearch].nextPageRef = payload.nextPageRef
if (payload.nextPageRef) {
// Local API
state.sessionSearchHistory[sameSearch].nextPageRef = payload.nextPageRef
} else if (payload.searchPage) {
// Invidious API
state.sessionSearchHistory[sameSearch].searchPage = payload.searchPage
}
} else {
state.sessionSearchHistory.push(payload)
}
Expand Down
14 changes: 9 additions & 5 deletions src/renderer/views/Search/Search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ export default defineComponent({

if (sameSearch.length > 0) {
// No loading effect needed here, only rendered result update

this.replaceShownResults(sameSearch[0])
} else {
// Show loading effect coz there will be network request(s)
Expand Down Expand Up @@ -130,7 +129,8 @@ export default defineComponent({
query: payload.query,
data: this.shownResults,
searchSettings: this.searchSettings,
nextPageRef: this.nextPageRef
nextPageRef: this.nextPageRef,
apiUsed: this.apiUsed
}

this.$store.commit('addToSessionSearchHistory', historyPayload)
Expand Down Expand Up @@ -166,7 +166,8 @@ export default defineComponent({
query: payload.query,
data: this.shownResults,
searchSettings: this.searchSettings,
nextPageRef: this.nextPageRef
nextPageRef: this.nextPageRef,
apiUsed: this.apiUsed
}

this.$store.commit('addToSessionSearchHistory', historyPayload)
Expand Down Expand Up @@ -223,14 +224,16 @@ export default defineComponent({
this.shownResults = returnData
}

this.searchPage++
this.isLoading = false

this.searchPage++

const historyPayload = {
query: payload.query,
data: this.shownResults,
searchSettings: this.searchSettings,
searchPage: this.searchPage
searchPage: this.searchPage,
apiUsed: this.apiUsed
}

this.$store.commit('addToSessionSearchHistory', historyPayload)
Expand Down Expand Up @@ -277,6 +280,7 @@ export default defineComponent({
this.shownResults = history.data
this.searchSettings = history.searchSettings
this.amountOfResults = history.amountOfResults
this.apiUsed = history.apiUsed

if (typeof (history.nextPageRef) !== 'undefined') {
this.nextPageRef = history.nextPageRef
Expand Down