MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-27 23:55:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix for byRating function

Browse Source
This commit is contained in:
Alain Nussbaumer 2023-04-04 08:42:46 +02:00
parent 41d80c4f1a
commit 21173d6480
1 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
web-src/src/lib/GroupByList.js
View File

@ -31,7 +31,6 @@ export function byName(field, defaultValue = '_') {
compareFn: (a, b) => { compareFn: (a, b) => {
const fieldA = a[field] || defaultValue const fieldA = a[field] || defaultValue
const fieldB = b[field] || defaultValue const fieldB = b[field] || defaultValue
return fieldA.localeCompare(fieldB, locale.value) return fieldA.localeCompare(fieldB, locale.value)
}, },
@ -47,7 +46,7 @@ export function byRating(field, { direction = 'asc', defaultValue = 0 }) {
compareFn: (a, b) => { compareFn: (a, b) => {
const fieldA = a[field] || defaultValue const fieldA = a[field] || defaultValue
const fieldB = b[field] || defaultValue const fieldB = b[field] || defaultValue
const result = fieldA > fieldB const result = fieldA - fieldB
return direction === 'asc' ? result : result * -1 return direction === 'asc' ? result : result * -1
}, },
@ -63,7 +62,6 @@ export function byYear(field, { direction = 'asc', defaultValue = '0000' }) {
compareFn: (a, b) => { compareFn: (a, b) => {
const fieldA = a[field] || defaultValue const fieldA = a[field] || defaultValue
const fieldB = b[field] || defaultValue const fieldB = b[field] || defaultValue
const result = fieldA.localeCompare(fieldB, locale.value) const result = fieldA.localeCompare(fieldB, locale.value)
return direction === 'asc' ? result : result * -1 return direction === 'asc' ? result : result * -1
}, },
@ -80,19 +78,15 @@ export function byDateSinceToday(field, defaultValue = '0000') {
compareFn: (a, b) => { compareFn: (a, b) => {
const fieldA = a[field] || defaultValue const fieldA = a[field] || defaultValue
const fieldB = b[field] || defaultValue const fieldB = b[field] || defaultValue
return fieldB.localeCompare(fieldA, locale.value) return fieldB.localeCompare(fieldA, locale.value)
}, },
groupKeyFn: (item) => { groupKeyFn: (item) => {
const fieldValue = item[field] const fieldValue = item[field]
if (!fieldValue) { if (!fieldValue) {
return defaultValue return defaultValue
} }
const diff = new Date().getTime() - new Date(fieldValue).getTime() const diff = new Date().getTime() - new Date(fieldValue).getTime()
if (diff < 86400000) { if (diff < 86400000) {
// 24h // 24h
return t('group-by-list.today') return t('group-by-list.today')
@ -159,14 +153,6 @@ export class GroupByList {
return { return {
next: () => { next: () => {
/*
console.log(
'[group-by-list] itemIndex=' +
itemIndex +
', groupIndex=' +
groupIndex
)
*/
if (this.isEmpty()) { if (this.isEmpty()) {
return { done: true } return { done: true }
} else if (groupIndex >= this.indexList.length) { } else if (groupIndex >= this.indexList.length) {
@ -175,11 +161,6 @@ export class GroupByList {
// This should never happen, as the we already // This should never happen, as the we already
// return "done" after we reached the last item // return "done" after we reached the last item
// of the last group // of the last group
/*
console.log(
'[group-by-list] done! (groupIndex >= this.indexList.length)'
)
*/
return { done: true } return { done: true }
} else if (groupIndex < 0) { } else if (groupIndex < 0) {
// We start iterating // We start iterating
@ -240,11 +221,6 @@ export class GroupByList {
} }
} else { } else {
// No group left, we are done iterating // No group left, we are done iterating
/*
console.log(
'[group-by-list] done! (groupIndex >= this.indexList.length)'
)
*/
return { done: true } return { done: true }
} }
} }