Add sort options to playback requests

CONTRIBUTORS.md

@@ -66,6 +66,7 @@
  - [Fishbigger](https://github.com/fishbigger)
  - [sleepycatcoding](https://github.com/sleepycatcoding)
  - [TheMelmacian](https://github.com/TheMelmacian)
+ - [v0idMrK](https://github.com/v0idMrK)
 
 # Emby Contributors
 

src/components/playback/playbackmanager.js

@@ -1773,6 +1773,18 @@ class PlaybackManager {
             });
         }
 
+        function getSortOptions(options) {
+            const sortOptions = options.sortOptions || {};
+            let sortByValue = options.shuffle ? 'Random' : sortOptions.sortBy;
+            if (sortByValue == null) {
+                sortByValue = 'SortName';
+            }
+            return {
+                sortBy: sortByValue,
+                sortOrder: sortOptions.sortOrder
+            };
+        }
+
         function translateItemsForPlayback(items, options) {
             if (items.length > 1 && options && options.ids) {
                 // Use the original request id array for sorting the result in the proper order
@@ -1788,6 +1800,8 @@ class PlaybackManager {
 
             const queryOptions = options.queryOptions || {};
 
+            const sortOptions = getSortOptions(options);
+
             if (firstItem.Type === 'Program') {
                 promise = getItemsForPlayback(serverId, {
                     Ids: firstItem.ChannelId
@@ -1802,7 +1816,8 @@ class PlaybackManager {
                     ArtistIds: firstItem.Id,
                     Filters: 'IsNotFolder',
                     Recursive: true,
-                    SortBy: options.shuffle ? 'Random' : 'SortName',
+                    SortBy: sortOptions.sortBy,
+                    SortOrder: sortOptions.sortOrder,
                     MediaTypes: 'Audio'
                 });
             } else if (firstItem.MediaType === 'Photo') {
@@ -1811,7 +1826,8 @@ class PlaybackManager {
                     Filters: 'IsNotFolder',
                     // Setting this to true may cause some incorrect sorting
                     Recursive: false,
-                    SortBy: options.shuffle ? 'Random' : 'SortName',
+                    SortBy: sortOptions.sortBy,
+                    SortOrder: sortOptions.sortOrder,
                     MediaTypes: 'Photo,Video',
                     Limit: UNLIMITED_ITEMS
                 }).then(function (result) {
@@ -1835,7 +1851,8 @@ class PlaybackManager {
                     Filters: 'IsNotFolder',
                     // Setting this to true may cause some incorrect sorting
                     Recursive: false,
-                    SortBy: options.shuffle ? 'Random' : 'SortName',
+                    SortBy: sortOptions.sortBy,
+                    SortOrder: sortOptions.sortOrder,
                     // Only include Photos because we do not handle mixed queues currently
                     MediaTypes: 'Photo',
                     Limit: UNLIMITED_ITEMS
@@ -1845,32 +1862,37 @@ class PlaybackManager {
                     GenreIds: firstItem.Id,
                     Filters: 'IsNotFolder',
                     Recursive: true,
-                    SortBy: options.shuffle ? 'Random' : 'SortName',
+                    SortBy: sortOptions.sortBy,
+                    SortOrder: sortOptions.sortOrder,
                     MediaTypes: 'Audio'
                 });
             } else if (firstItem.IsFolder && firstItem.CollectionType === 'homevideos') {
                 promise = getItemsForPlayback(serverId, mergePlaybackQueries({
                     ParentId: firstItem.Id,
                     Filters: 'IsNotFolder',
                     Recursive: true,
-                    SortBy: options.shuffle ? 'Random' : 'SortName',
+                    SortBy: sortOptions.sortBy,
+                    SortOrder: sortOptions.sortOrder,
                     // Only include Photos because we do not handle mixed queues currently
                     MediaTypes: 'Photo',
                     Limit: UNLIMITED_ITEMS
                 }, queryOptions));
             } else if (firstItem.IsFolder) {
                 let sortBy = null;
+                let sortOrder = null;
                 if (options.shuffle) {
                     sortBy = 'Random';
                 } else if (firstItem.Type !== 'BoxSet') {
-                    sortBy = 'SortName';
+                    sortBy = sortOptions.sortBy;
+                    sortOrder = sortOptions.sortOrder;
                 }
                 promise = getItemsForPlayback(serverId, mergePlaybackQueries({
                     ParentId: firstItem.Id,
                     Filters: 'IsNotFolder',
                     Recursive: true,
                     // These are pre-sorted
                     SortBy: sortBy,
+                    SortOrder: sortOrder,
                     MediaTypes: 'Audio,Video'
                 }, queryOptions));
             } else if (firstItem.Type === 'Episode' && items.length === 1 && getPlayer(firstItem, options).supportsProgress !== false) {

src/components/shortcuts.js

@@ -11,6 +11,7 @@ import dom from '../scripts/dom';
 import recordingHelper from './recordingcreator/recordinghelper';
 import ServerConnections from './ServerConnections';
 import toast from './toast/toast';
+import * as userSettings from '../scripts/settings/userSettings';
 
 function playAllFromHere(card, serverId, queue) {
     const parent = card.parentNode;
@@ -165,6 +166,14 @@ 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;
 
@@ -175,6 +184,10 @@ function executeAction(card, target, action) {
         id = card.getAttribute('data-id');
     }
 
+    const itemsContainer = dom.parentWithClass(card, 'itemsContainer');
+
+    const parentId = itemsContainer.getAttribute('data-parentid');
+
     const item = getItemInfoFromCard(card);
 
     const serverId = item.ServerId;
@@ -205,7 +218,8 @@ function executeAction(card, target, action) {
             playbackManager.play({
                 ids: [playableItemId],
                 startPositionTicks: startPositionTicks,
-                serverId: serverId
+                serverId: serverId,
+                sortOptions: getSortValues(parentId)
             });
         } else {
             console.warn('Unable to play item', item);

src/controllers/list.js

@@ -722,11 +722,13 @@ class ItemsView {
 
         function play() {
             const currentItem = self.currentItem;
+            const values = self.getSortValues();
 
             if (currentItem && !self.hasFilters) {
                 playbackManager.play({
                     items: [currentItem],
-                    autoplay: true
+                    autoplay: true,
+                    sortOptions: values
                 });
             } else {
                 getItems(self, self.params, currentItem, null, 0, 300).then(function (result) {