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

Add sort options to playback requests #4786

Merged
merged 16 commits into from
Oct 18, 2023
Merged

Add sort options to playback requests #4786

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6cfcf36
Fixing bug #5584 by sending the proper Sort params to the API
v0idMrK Sep 17, 2023
344a6bf
Updated CONTRIBUTORS.md
v0idMrK Sep 17, 2023
ecba6dc
Removing bad trailing space
v0idMrK Sep 18, 2023
f922742
Contributors file updated correctly
v0idMrK Sep 18, 2023
580ad5f
Added getSortOptions to userSettings.js and cleaned up the shortcuts.…
v0idMrK Sep 19, 2023
ee791f9
Changed from using sortOptions to using already implemented queryOptions
v0idMrK Sep 20, 2023
4488a58
Removed unneeded calls to getSortValues on playbackManager calls that…
v0idMrK Sep 20, 2023
af61ae0
Added queryOptions to MusicGenre call on playbackmanager
v0idMrK Sep 20, 2023
ef8d923
Code cleanup
v0idMrK Sep 20, 2023
c935ba9
Removed unused imports
v0idMrK Sep 20, 2023
5d20523
Reverting itemContextMenu changes to support folder/playlist ordering…
v0idMrK Sep 23, 2023
d62a36a
itemContextMenu only supports folders and using parentId instead for …
v0idMrK Oct 2, 2023
ad5bcb6
Removed unused method
v0idMrK Oct 5, 2023
0f8d29a
Merge branch 'master' into Sorting-Only-Thumbnail-Fix-5584
v0idMrK Oct 5, 2023
b33d927
Using lodash implementation to merge playback queries
v0idMrK Oct 16, 2023
fa40c3f
Merge branch 'master' into Sorting-Only-Thumbnail-Fix-5584
v0idMrK Oct 16, 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
16 changes: 4 additions & 12 deletions src/components/shortcuts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,14 +166,6 @@ function showPlayMenu(card, target) {
});
}

function getSortValues(parentId) {
const basekey = 'items-' + parentId + '-Folder';
return {
sortBy: userSettings.getFilter(basekey + '-sortby'),
sortOrder: userSettings.getFilter(basekey + '-sortorder') === 'Descending' ? 'Descending' : 'Ascending'
};
}

function executeAction(card, target, action) {
target = target || card;

Expand All @@ -184,11 +176,11 @@ function executeAction(card, target, action) {
id = card.getAttribute('data-id');
}

const itemsContainer = dom.parentWithClass(card, 'itemsContainer');
const item = getItemInfoFromCard(card);

const parentId = itemsContainer.getAttribute('data-parentid');
const itemsContainer = dom.parentWithClass(card, 'itemsContainer');

const item = getItemInfoFromCard(card);
const sortParentId = 'items-' + (item.IsFolder ? item.Id : itemsContainer.getAttribute('data-parentid')) + '-Folder';
dmitrylyzo marked this conversation as resolved.
Show resolved Hide resolved

const serverId = item.ServerId;
const type = item.Type;
Expand Down Expand Up @@ -219,7 +211,7 @@ function executeAction(card, target, action) {
ids: [playableItemId],
startPositionTicks: startPositionTicks,
serverId: serverId,
sortOptions: getSortValues(parentId)
sortOptions: userSettings.getSortValues(sortParentId)
});
} else {
console.warn('Unable to play item', item);
Expand Down
5 changes: 1 addition & 4 deletions src/controllers/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,10 +962,7 @@ class ItemsView {

getSortValues() {
const basekey = this.getSettingsKey();
return {
sortBy: userSettings.getFilter(basekey + '-sortby') || this.getDefaultSortBy(),
dmitrylyzo marked this conversation as resolved.
Show resolved Hide resolved
sortOrder: userSettings.getFilter(basekey + '-sortorder') === 'Descending' ? 'Descending' : 'Ascending'
};
return userSettings.getSortValues(basekey);
}

getDefaultSortBy() {
Expand Down
13 changes: 13 additions & 0 deletions src/scripts/settings/userSettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,18 @@ export class UserSettings {
getFilter(key) {
return this.get(key, true);
}

/**
* Gets the current sort values
* @param {string} key - Filter key.
v0idMrK marked this conversation as resolved.
Show resolved Hide resolved
* @return {Object} sortOptions object
*/
getSortValues(key) {
return {
sortBy: this.getFilter(key + '-sortby'),
sortOrder: this.getFilter(key + '-sortorder') === 'Descending' ? 'Descending' : 'Ascending'
};
}
}

export const currentSettings = new UserSettings;
Expand Down Expand Up @@ -672,3 +684,4 @@ export const customCss = currentSettings.customCss.bind(currentSettings);
export const disableCustomCss = currentSettings.disableCustomCss.bind(currentSettings);
export const getSavedView = currentSettings.getSavedView.bind(currentSettings);
export const saveViewSetting = currentSettings.saveViewSetting.bind(currentSettings);
export const getSortValues = currentSettings.getSortValues.bind(currentSettings);