mirror of
https://github.com/FreeTubeApp/FreeTube
synced 2024-12-02 07:00:32 +01:00
Replace lodash.isequal with simple comparison (#2827)
This commit is contained in:
parent
56416700bc
commit
b3bf37132d
@ -60,7 +60,6 @@
|
||||
"http-proxy-agent": "^5.0.0",
|
||||
"https-proxy-agent": "^5.0.0",
|
||||
"lodash.debounce": "^4.0.8",
|
||||
"lodash.isequal": "^4.5.0",
|
||||
"marked": "^4.1.1",
|
||||
"nedb-promises": "^6.2.1",
|
||||
"opml-to-json": "^1.0.1",
|
||||
|
@ -480,3 +480,10 @@ export function formatDurationAsTimestamp(lengthSeconds) {
|
||||
|
||||
return timestamp
|
||||
}
|
||||
|
||||
export function searchFiltersMatch(filtersA, filtersB) {
|
||||
return filtersA?.sortBy === filtersB?.sortBy &&
|
||||
filtersA?.time === filtersB?.time &&
|
||||
filtersA?.type === filtersB?.type &&
|
||||
filtersA?.duration === filtersB?.duration
|
||||
}
|
||||
|
@ -1,10 +1,15 @@
|
||||
import IsEqual from 'lodash.isequal'
|
||||
import fs from 'fs'
|
||||
import path from 'path'
|
||||
import i18n from '../../i18n/index'
|
||||
|
||||
import { IpcChannels } from '../../../constants'
|
||||
import { createWebURL, openExternalLink, showSaveDialog, showToast } from '../../helpers/utils'
|
||||
import {
|
||||
createWebURL,
|
||||
openExternalLink,
|
||||
searchFiltersMatch,
|
||||
showSaveDialog,
|
||||
showToast
|
||||
} from '../../helpers/utils'
|
||||
|
||||
const state = {
|
||||
isSideNavOpen: false,
|
||||
@ -753,7 +758,7 @@ const mutations = {
|
||||
|
||||
addToSessionSearchHistory (state, payload) {
|
||||
const sameSearch = state.sessionSearchHistory.findIndex((search) => {
|
||||
return search.query === payload.query && IsEqual(payload.searchSettings, search.searchSettings)
|
||||
return search.query === payload.query && searchFiltersMatch(payload.searchSettings, search.searchSettings)
|
||||
})
|
||||
|
||||
if (sameSearch !== -1) {
|
||||
|
@ -2,12 +2,12 @@ import ytdl from 'ytdl-core'
|
||||
import ytsr from 'ytsr'
|
||||
import ytpl from 'ytpl'
|
||||
|
||||
import IsEqual from 'lodash.isequal'
|
||||
import { SocksProxyAgent } from 'socks-proxy-agent'
|
||||
import { HttpsProxyAgent } from 'https-proxy-agent'
|
||||
import { HttpProxyAgent } from 'http-proxy-agent'
|
||||
|
||||
import i18n from '../../i18n/index'
|
||||
import { searchFiltersMatch } from '../../helpers/utils'
|
||||
|
||||
const state = {
|
||||
isYtSearchRunning: false
|
||||
@ -79,7 +79,7 @@ const actions = {
|
||||
|
||||
commit('toggleIsYtSearchRunning')
|
||||
|
||||
if (!IsEqual(defaultFilters, rootState.utils.searchSettings)) {
|
||||
if (!searchFiltersMatch(defaultFilters, rootState.utils.searchSettings)) {
|
||||
dispatch('ytSearchGetFilters', payload).then((filter) => {
|
||||
if (typeof (payload.options.nextpageRef) === 'undefined' && filter !== payload.query) {
|
||||
payload.options.nextpageRef = filter
|
||||
|
@ -1,11 +1,10 @@
|
||||
import Vue from 'vue'
|
||||
import { mapActions } from 'vuex'
|
||||
import IsEqual from 'lodash.isequal'
|
||||
import FtLoader from '../../components/ft-loader/ft-loader.vue'
|
||||
import FtCard from '../../components/ft-card/ft-card.vue'
|
||||
import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
|
||||
import { calculateLengthInSeconds } from '@freetube/yt-trending-scraper/src/HtmlParser'
|
||||
import { copyToClipboard, showToast } from '../../helpers/utils'
|
||||
import { copyToClipboard, searchFiltersMatch, showToast } from '../../helpers/utils'
|
||||
|
||||
export default Vue.extend({
|
||||
name: 'Search',
|
||||
@ -93,7 +92,7 @@ export default Vue.extend({
|
||||
methods: {
|
||||
checkSearchCache: function (payload) {
|
||||
const sameSearch = this.sessionSearchHistory.filter((search) => {
|
||||
return search.query === payload.query && IsEqual(payload.searchSettings, search.searchSettings)
|
||||
return search.query === payload.query && searchFiltersMatch(payload.searchSettings, search.searchSettings)
|
||||
})
|
||||
|
||||
this.shownResults = []
|
||||
|
@ -5526,11 +5526,6 @@ lodash.debounce@^4.0.8:
|
||||
resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
|
||||
integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
|
||||
|
||||
lodash.isequal@^4.5.0:
|
||||
version "4.5.0"
|
||||
resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
|
||||
integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
|
||||
|
||||
lodash.memoize@^4.1.2:
|
||||
version "4.1.2"
|
||||
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
|
||||
|
Loading…
Reference in New Issue
Block a user