lasers/FreeTube
1
0
Fork 0
mirror of https://github.com/FreeTubeApp/FreeTube synced 2024-12-13 21:19:45 +01:00
Code Issues Projects Releases Wiki Activity

IV: Fix search cache issues when fetching more (#3486)

Browse Source 
* Fix IV search cache issues

* Add comment

Co-authored-by: PikachuEXE <pikachuexe@gmail.com>

* add apiUsed

---------

Co-authored-by: PikachuEXE <pikachuexe@gmail.com>
This commit is contained in:
ChunkyProgrammer 2023-05-13 07:18:49 -04:00 committed by GitHub
parent a044b77416
commit ff19c233c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/renderer/store/modules/utils.js
View File

@ -612,7 +612,13 @@ const mutations = {
if (sameSearch !== -1) { if (sameSearch !== -1) {
state.sessionSearchHistory[sameSearch].data = payload.data 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 { } else {
state.sessionSearchHistory.push(payload) state.sessionSearchHistory.push(payload)
} }

14
src/renderer/views/Search/Search.js
View File

@ -91,7 +91,6 @@ export default defineComponent({
if (sameSearch.length > 0) { if (sameSearch.length > 0) {
// No loading effect needed here, only rendered result update // No loading effect needed here, only rendered result update
this.replaceShownResults(sameSearch[0]) this.replaceShownResults(sameSearch[0])
} else { } else {
// Show loading effect coz there will be network request(s) // Show loading effect coz there will be network request(s)
@ -130,7 +129,8 @@ export default defineComponent({
query: payload.query, query: payload.query,
data: this.shownResults, data: this.shownResults,
searchSettings: this.searchSettings, searchSettings: this.searchSettings,
nextPageRef: this.nextPageRef nextPageRef: this.nextPageRef,
apiUsed: this.apiUsed
} }
this.$store.commit('addToSessionSearchHistory', historyPayload) this.$store.commit('addToSessionSearchHistory', historyPayload)
@ -166,7 +166,8 @@ export default defineComponent({
query: payload.query, query: payload.query,
data: this.shownResults, data: this.shownResults,
searchSettings: this.searchSettings, searchSettings: this.searchSettings,
nextPageRef: this.nextPageRef nextPageRef: this.nextPageRef,
apiUsed: this.apiUsed
} }
this.$store.commit('addToSessionSearchHistory', historyPayload) this.$store.commit('addToSessionSearchHistory', historyPayload)
@ -223,14 +224,16 @@ export default defineComponent({
this.shownResults = returnData this.shownResults = returnData
} }
this.searchPage++
this.isLoading = false this.isLoading = false
this.searchPage++
const historyPayload = { const historyPayload = {
query: payload.query, query: payload.query,
data: this.shownResults, data: this.shownResults,
searchSettings: this.searchSettings, searchSettings: this.searchSettings,
searchPage: this.searchPage searchPage: this.searchPage,
apiUsed: this.apiUsed
} }
this.$store.commit('addToSessionSearchHistory', historyPayload) this.$store.commit('addToSessionSearchHistory', historyPayload)
@ -277,6 +280,7 @@ export default defineComponent({
this.shownResults = history.data this.shownResults = history.data
this.searchSettings = history.searchSettings this.searchSettings = history.searchSettings
this.amountOfResults = history.amountOfResults this.amountOfResults = history.amountOfResults
this.apiUsed = history.apiUsed
if (typeof (history.nextPageRef) !== 'undefined') { if (typeof (history.nextPageRef) !== 'undefined') {
this.nextPageRef = history.nextPageRef this.nextPageRef = history.nextPageRef