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.

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

Implement case sensitive search in history #5446

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
66 changes: 35 additions & 31 deletions src/renderer/views/History/History.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,25 @@ import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
import FtButton from '../../components/ft-button/ft-button.vue'
import FtInput from '../../components/ft-input/ft-input.vue'
import FtAutoLoadNextPageWrapper from '../../components/ft-auto-load-next-page-wrapper/ft-auto-load-next-page-wrapper.vue'
import FtToggleSwitch from '../../components/ft-toggle-switch/ft-toggle-switch.vue'
import { ctrlFHandler } from '../../helpers/utils'

const identity = (v) => v

function filterVideosWithQuery(videos, query, attrProcessor = identity) {
return videos.filter((video) => {
if (typeof (video.title) === 'string' && attrProcessor(video.title).includes(query)) {
return true
} else if (typeof (video.author) === 'string' && attrProcessor(video.author).includes(query)) {
return true
}

return false
}).sort((a, b) => {
return b.timeWatched - a.timeWatched
})
}

export default defineComponent({
name: 'History',
components: {
Expand All @@ -19,12 +36,14 @@ export default defineComponent({
'ft-button': FtButton,
'ft-input': FtInput,
'ft-auto-load-next-page-wrapper': FtAutoLoadNextPageWrapper,
'ft-toggle-switch': FtToggleSwitch,
},
data: function () {
return {
isLoading: false,
dataLimit: 100,
searchDataLimit: 100,
doCaseSensitiveSearch: false,
showLoadMoreButton: false,
query: '',
activeData: [],
Expand All @@ -49,9 +68,11 @@ export default defineComponent({
this.filterHistoryAsync()
},
fullData() {
this.activeData = this.fullData
this.filterHistory()
}
},
doCaseSensitiveSearch() {
this.filterHistory()
},
},
mounted: function () {
document.addEventListener('keydown', this.keyboardShortcutHandler)
Expand All @@ -63,11 +84,7 @@ export default defineComponent({

this.activeData = this.fullData

if (this.activeData.length < this.historyCacheSorted.length) {
this.showLoadMoreButton = true
} else {
this.showLoadMoreButton = false
}
this.showLoadMoreButton = this.activeData.length < this.historyCacheSorted.length

this.filterHistoryDebounce = debounce(this.filterHistory, 500)
},
Expand All @@ -92,34 +109,21 @@ export default defineComponent({
filterHistory: function() {
if (this.query === '') {
this.activeData = this.fullData
if (this.activeData.length < this.historyCacheSorted.length) {
this.showLoadMoreButton = true
} else {
this.showLoadMoreButton = false
}
} else {
const lowerCaseQuery = this.query.toLowerCase()
const filteredQuery = this.historyCacheSorted.filter((video) => {
if (typeof (video.title) === 'string' && video.title.toLowerCase().includes(lowerCaseQuery)) {
return true
} else if (typeof (video.author) === 'string' && video.author.toLowerCase().includes(lowerCaseQuery)) {
return true
}
this.showLoadMoreButton = this.activeData.length < this.historyCacheSorted.length
return
}

return false
}).sort((a, b) => {
return b.timeWatched - a.timeWatched
})
if (filteredQuery.length <= this.searchDataLimit) {
this.showLoadMoreButton = false
} else {
this.showLoadMoreButton = true
}
this.activeData = filteredQuery.length < this.searchDataLimit ? filteredQuery : filteredQuery.slice(0, this.searchDataLimit)
let filteredQuery = []
if (this.doCaseSensitiveSearch) {
filteredQuery = filterVideosWithQuery(this.historyCacheSorted, this.query)
} else {
filteredQuery = filterVideosWithQuery(this.historyCacheSorted, this.query.toLowerCase(), (s) => s.toLowerCase())
}
this.activeData = filteredQuery.length < this.searchDataLimit ? filteredQuery : filteredQuery.slice(0, this.searchDataLimit)
this.showLoadMoreButton = this.activeData.length > this.searchDataLimit
},
keyboardShortcutHandler: function (event) {
ctrlFHandler(event, this.$refs.searchBar)
}
},
}
})
11 changes: 11 additions & 0 deletions src/renderer/views/History/History.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,17 @@
@input="(input) => query = input"
@clear="query = ''"
/>
<div
class="optionsRow"
>
<ft-toggle-switch
v-if="fullData.length > 1"
:label="$t('History.Case Sensitive Search')"
:compact="true"
:default-value="doCaseSensitiveSearch"
@change="doCaseSensitiveSearch = !doCaseSensitiveSearch"
/>
</div>
<ft-flex-box
v-show="fullData.length === 0"
>
Expand Down
1 change: 1 addition & 0 deletions static/locales/en-US.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ History:
Your history list is currently empty.: Your history list is currently empty.
Empty Search Message: There are no videos in your history that match your search
Search bar placeholder: "Search in History"
Case Sensitive Search: Case Sensitive Search
Settings:
# On Settings Page
Settings: Settings
Expand Down