Merge pull request #1328 from MrTimscampi/epub-format-detection

Add format checking to EPUB player

src/components/bookPlayer/plugin.js

@@ -215,24 +215,7 @@ export class BookPlayer {
                 Id: item.Id
             }
         };
-        if (!item.Path.endsWith('.epub')) {
-            return new Promise((resolve, reject) => {
-                let errorDialog = dialogHelper.createDialog({
-                    size: 'small',
-                    autoFocus: false,
-                    removeOnClose: true
-                });
 
-                errorDialog.innerHTML = '<h1 class="bookplayerErrorMsg">This book type is not supported yet</h1>';
-
-                this.stop();
-
-                dialogHelper.open(errorDialog);
-                loading.hide();
-
-                return resolve();
-            });
-        }
         let serverId = item.ServerId;
         let apiClient = connectionManager.getApiClient(serverId);
 
@@ -283,6 +266,13 @@ export class BookPlayer {
     canPlayMediaType(mediaType) {
         return (mediaType || '').toLowerCase() === 'book';
     }
+
+    canPlayItem(item) {
+        if (item.Path && (item.Path.endsWith('epub'))) {
+            return true;
+        }
+        return false;
+    }
 }
 
 export default BookPlayer;

src/components/homesections/homesections.js

@@ -229,7 +229,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
 
             var options = {
                 Limit: limit,
-                Fields: 'PrimaryImageAspectRatio,BasicSyncInfo',
+                Fields: 'PrimaryImageAspectRatio,BasicSyncInfo,Path',
                 ImageTypeLimit: 1,
                 EnableImageTypes: 'Primary,Backdrop,Thumb',
                 ParentId: parentId
@@ -667,7 +667,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
             var apiClient = connectionManager.getApiClient(serverId);
             return apiClient.getNextUpEpisodes({
                 Limit: enableScrollX() ? 24 : 15,
-                Fields: 'PrimaryImageAspectRatio,SeriesInfo,DateCreated,BasicSyncInfo',
+                Fields: 'PrimaryImageAspectRatio,SeriesInfo,DateCreated,BasicSyncInfo,Path',
                 UserId: apiClient.getCurrentUserId(),
                 ImageTypeLimit: 1,
                 EnableImageTypes: 'Primary,Backdrop,Banner,Thumb',

src/components/playback/playbackmanager.js

@@ -1129,7 +1129,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         }
 
         self.canPlay = function (item) {
-
             var itemType = item.Type;
 
             if (itemType === 'PhotoAlbum' || itemType === 'MusicGenre' || itemType === 'Season' || itemType === 'Series' || itemType === 'BoxSet' || itemType === 'MusicAlbum' || itemType === 'MusicArtist' || itemType === 'Playlist') {
@@ -1143,7 +1142,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             }
 
             if (itemType === 'Program') {
-
                 if (!item.EndDate || !item.StartDate) {
                     return false;
                 }

src/controllers/list.js

@@ -308,7 +308,7 @@ define(['globalize', 'listView', 'layoutManager', 'userSettings', 'focusManager'
         return apiClient.getItems(apiClient.getCurrentUserId(), modifyQueryWithFilters(instance, {
             StartIndex: startIndex,
             Limit: limit,
-            Fields: 'PrimaryImageAspectRatio,SortName',
+            Fields: 'PrimaryImageAspectRatio,SortName,Path',
             ImageTypeLimit: 1,
             ParentId: item.Id,
             SortBy: sortBy