From db20e9e3ea297c2d4bcb9646b422fb80139186de Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Thu, 21 Mar 2013 16:20:00 -0400 Subject: [PATCH] update to latest js api client --- MediaBrowser.WebDashboard/ApiClient.js | 2252 +++++++++-------- .../Html/scripts/DashboardPage.js | 20 +- .../Html/scripts/site.js | 10 +- MediaBrowser.WebDashboard/packages.config | 2 +- 4 files changed, 1216 insertions(+), 1068 deletions(-) diff --git a/MediaBrowser.WebDashboard/ApiClient.js b/MediaBrowser.WebDashboard/ApiClient.js index af26e46146..a9aeedab7e 100644 --- a/MediaBrowser.WebDashboard/ApiClient.js +++ b/MediaBrowser.WebDashboard/ApiClient.js @@ -1,1393 +1,1533 @@ -/** - * Represents a javascript version of ApiClient. - * This should be kept up to date with all possible api methods and parameters - */ -var ApiClient = { +if (!window.MediaBrowser) { + window.MediaBrowser = {}; +} - serverProtocol: "http", +MediaBrowser.ApiClient = function ($, navigator) { /** - * Gets or sets the host name of the server + * Creates a new api client instance + * @param {String} serverProtocol + * @param {String} serverHostName + * @param {String} serverPortNumber + * @param {String} clientName */ - serverHostName: "localhost", + return function (serverProtocol, serverHostName, serverPortNumber, clientName) { - serverPortNumber: 8096, + var self = this; + var deviceName = "Web Browser"; + var deviceId = SHA1(navigator.userAgent + (navigator.cpuClass || "")); + var currentUserId; - currentUserId: null, + /** + * Gets the server host name. + */ + self.serverHostName = function () { - /** - * Detects the hostname and port of MB server based on the current url - */ - inferServerFromUrl: function () { + return serverHostName; + }; - var loc = window.location; + /** + * Gets the server port number. + */ + self.serverPortNumber = function () { - ApiClient.serverProtocol = loc.protocol; - ApiClient.serverHostName = loc.hostname; - ApiClient.serverPortNumber = loc.port; - }, + return serverPortNumber; + }; - /** - * Creates an api url based on a handler name and query string parameters - * @param {String} name - * @param {Object} params - */ - getUrl: function (name, params) { + /** + * Gets or sets the current user id. + */ + self.currentUserId = function (val) { - if (!name) { - throw new Error("Url name cannot be empty"); - } + if (val !== undefined) { + currentUserId = val; + } else { + return currentUserId; + } + }; - var url = ApiClient.serverProtocol + "//" + ApiClient.serverHostName + ":" + ApiClient.serverPortNumber + "/mediabrowser/" + name; + self.ajax = function (request) { - if (params) { - url += "?" + $.param(params); - } + if (!request) { + throw new Error("Request cannot be null"); + } - return url; - }, + var auth = 'MediaBrowser Client="' + clientName + '", Device="' + deviceName + '", DeviceId="' + deviceId + '"'; - /** - * Returns the name of the current browser - */ - getDeviceName: function () { - - /*if ($.browser.chrome) { - return "Chrome"; - } - if ($.browser.safari) { - return "Safari"; - } - if ($.browser.webkit) { - return "WebKit"; - } - if ($.browser.msie) { - return "Internet Explorer"; - } - if ($.browser.firefox) { - return "Firefox"; - } - if ($.browser.mozilla) { - return "Firefox"; - } - if ($.browser.opera) { - return "Opera"; - }*/ - - return "Web Browser"; - }, - - getDeviceId: function() { - return SHA1(navigator.userAgent + (navigator.cpuClass || "")); - }, + if (currentUserId) { + auth += ', UserId="' + currentUserId + '"'; + } - /** - * Creates a custom api url based on a handler name and query string parameters - * @param {String} name - * @param {Object} params - */ - getCustomUrl: function (name, params) { + request.headers = { + Authorization: auth + }; - if (!name) { - throw new Error("Url name cannot be empty"); - } + return $.ajax(request); + }; - params = params || {}; - params.format = "json"; + /** + * Creates an api url based on a handler name and query string parameters + * @param {String} name + * @param {Object} params + */ + self.getUrl = function (name, params) { - var url = ApiClient.serverProtocol + "//" + ApiClient.serverHostName + ":" + ApiClient.serverPortNumber + "/mediabrowser/" + name; + if (!name) { + throw new Error("Url name cannot be empty"); + } - if (params) { - url += "?" + $.param(params); - } + var url = serverProtocol + "//" + serverHostName + ":" + serverPortNumber + "/mediabrowser/" + name; - return url; - }, + if (params) { + url += "?" + $.param(params); + } - /** - * Gets an item from the server - * Omit itemId to get the root folder. - */ - getItem: function (userId, itemId) { + return url; + }; - if (!userId) { - throw new Error("null userId"); - } + /** + * Gets an item from the server + * Omit itemId to get the root folder. + */ + self.getItem = function (userId, itemId) { - var url = ApiClient.getUrl("Users/" + userId + "/Items/" + itemId); + if (!userId) { + throw new Error("null userId"); + } - return $.getJSON(url); - }, + var url = self.getUrl("Users/" + userId + "/Items/" + itemId); - /** - * Gets the root folder from the server - */ - getRootFolder: function (userId) { + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - return ApiClient.getItem(userId); - }, + /** + * Gets the root folder from the server + */ + self.getRootFolder = function (userId) { - /** - * Gets the current server status - */ - getSystemInfo: function () { + return self.getItem(userId); + }; - var url = ApiClient.getUrl("System/Info"); + /** + * Gets the current server status + */ + self.getSystemInfo = function () { - return $.getJSON(url); - }, + var url = self.getUrl("System/Info"); - /** - * Gets all cultures known to the server - */ - getCultures: function () { + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - var url = ApiClient.getUrl("Localization/cultures"); + /** + * Gets all cultures known to the server + */ + self.getCultures = function () { - return $.getJSON(url); - }, + var url = self.getUrl("Localization/cultures"); - /** - * Gets all countries known to the server - */ - getCountries: function () { + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - var url = ApiClient.getUrl("Localization/countries"); + /** + * Gets all countries known to the server + */ + self.getCountries = function () { - return $.getJSON(url); - }, + var url = self.getUrl("Localization/countries"); - /** - * Gets plugin security info - */ - getPluginSecurityInfo: function () { + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - var url = ApiClient.getUrl("Plugins/SecurityInfo"); + /** + * Gets plugin security info + */ + self.getPluginSecurityInfo = function () { - return $.getJSON(url); - }, + var url = self.getUrl("Plugins/SecurityInfo"); - /** - * Gets the directory contents of a path on the server - */ - getDirectoryContents: function (path, options) { + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - if (!path) { - throw new Error("null path"); - } + /** + * Gets the directory contents of a path on the server + */ + self.getDirectoryContents = function (path, options) { - options = options || {}; + if (!path) { + throw new Error("null path"); + } - options.path = path; + options = options || {}; - var url = ApiClient.getUrl("Environment/DirectoryContents", options); + options.path = path; - return $.getJSON(url); - }, + var url = self.getUrl("Environment/DirectoryContents", options); - /** - * Gets a list of physical drives from the server - */ - getDrives: function () { + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - var url = ApiClient.getUrl("Environment/Drives"); + /** + * Gets a list of physical drives from the server + */ + self.getDrives = function () { - return $.getJSON(url); - }, + var url = self.getUrl("Environment/Drives"); - /** - * Gets a list of network devices from the server - */ - getNetworkDevices: function () { + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - var url = ApiClient.getUrl("Environment/NetworkDevices"); + /** + * Gets a list of network devices from the server + */ + self.getNetworkDevices = function () { - return $.getJSON(url); - }, + var url = self.getUrl("Environment/NetworkDevices"); - /** - * Cancels a package installation - */ - cancelPackageInstallation: function (installationId) { + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - if (!installationId) { - throw new Error("null installationId"); - } + /** + * Cancels a package installation + */ + self.cancelPackageInstallation = function (installationId) { - var url = ApiClient.getUrl("Packages/Installing/" + id); + if (!installationId) { + throw new Error("null installationId"); + } - return $.ajax({ - type: "DELETE", - url: url, - dataType: "json" - }); - }, + var url = self.getUrl("Packages/Installing/" + id); - /** - * Installs or updates a new plugin - */ - installPlugin: function (name, updateClass, version) { + return self.ajax({ + type: "DELETE", + url: url, + dataType: "json" + }); + }; + + /** + * Installs or updates a new plugin + */ + self.installPlugin = function (name, updateClass, version) { + + if (!name) { + throw new Error("null name"); + } - if (!name) { - throw new Error("null name"); - } + if (!updateClass) { + throw new Error("null updateClass"); + } - if (!updateClass) { - throw new Error("null updateClass"); - } + var options = { + updateClass: updateClass + }; - var options = { - updateClass: updateClass + if (version) { + options.version = version; + } + + var url = self.getUrl("Packages/Installed/" + name, options); + + return self.ajax({ + type: "POST", + url: url + }); }; - if (version) { - options.version = version; - } + /** + * Instructs the server to perform a pending kernel reload or app restart. + * If a restart is not currently required, nothing will happen. + */ + self.performPendingRestart = function () { - var url = ApiClient.getUrl("Packages/Installed/" + name, options); + var url = self.getUrl("System/Restart"); - return $.post(url); - }, + return self.ajax({ + type: "POST", + url: url + }); + }; - /** - * Instructs the server to perform a pending kernel reload or app restart. - * If a restart is not currently required, nothing will happen. - */ - performPendingRestart: function () { + /** + * Gets information about an installable package + */ + self.getPackageInfo = function (name) { - var url = ApiClient.getUrl("System/Restart"); + if (!name) { + throw new Error("null name"); + } - return $.post(url); - }, + var url = self.getUrl("Packages/" + name); - /** - * Gets information about an installable package - */ - getPackageInfo: function (name) { + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - if (!name) { - throw new Error("null name"); - } + /** + * Gets the latest available application update (if any) + */ + self.getAvailableApplicationUpdate = function () { - var url = ApiClient.getUrl("Packages/" + name); + var url = self.getUrl("Packages/Updates", { PackageType: "System" }); - return $.getJSON(url); - }, + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - /** - * Gets the latest available application update (if any) - */ - getAvailableApplicationUpdate: function () { + /** + * Gets the latest available plugin updates (if any) + */ + self.getAvailablePluginUpdates = function () { - var url = ApiClient.getUrl("Packages/Updates", { PackageType: "System" }); + var url = self.getUrl("Packages/Updates", { PackageType: "UserInstalled" }); - return $.getJSON(url); - }, + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - /** - * Gets the latest available plugin updates (if any) - */ - getAvailablePluginUpdates: function () { + /** + * Gets the virtual folder for a view. Specify a userId to get a user view, or omit for the default view. + */ + self.getVirtualFolders = function (userId) { - var url = ApiClient.getUrl("Packages/Updates", { PackageType: "UserInstalled" }); + var url = userId ? "Users/" + userId + "/VirtualFolders" : "Library/VirtualFolders"; - return $.getJSON(url); - }, + url = self.getUrl(url); - /** - * Gets the virtual folder for a view. Specify a userId to get a user view, or omit for the default view. - */ - getVirtualFolders: function (userId) { + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - var url = userId ? "Users/" + userId + "/VirtualFolders" : "Library/VirtualFolders"; + /** + * Gets all the paths of the locations in the physical root. + */ + self.getPhysicalPaths = function () { - url = ApiClient.getUrl(url); + var url = self.getUrl("Library/PhysicalPaths"); - return $.getJSON(url); - }, + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - /** - * Gets all the paths of the locations in the physical root. - */ - getPhysicalPaths: function () { + /** + * Gets the current server configuration + */ + self.getServerConfiguration = function () { - var url = ApiClient.getUrl("Library/PhysicalPaths"); + var url = self.getUrl("System/Configuration"); - return $.getJSON(url); - }, + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - /** - * Gets the current server configuration - */ - getServerConfiguration: function () { + /** + * Gets the server's scheduled tasks + */ + self.getScheduledTasks = function () { - var url = ApiClient.getUrl("System/Configuration"); + var url = self.getUrl("ScheduledTasks"); - return $.getJSON(url); - }, + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - /** - * Gets the server's scheduled tasks - */ - getScheduledTasks: function () { + /** + * Starts a scheduled task + */ + self.startScheduledTask = function (id) { - var url = ApiClient.getUrl("ScheduledTasks"); + if (!id) { + throw new Error("null id"); + } - return $.getJSON(url); - }, + var url = self.getUrl("ScheduledTasks/Running/" + id); - /** - * Starts a scheduled task - */ - startScheduledTask: function (id) { + return self.ajax({ + type: "POST", + url: url + }); + }; - if (!id) { - throw new Error("null id"); - } + /** + * Gets a scheduled task + */ + self.getScheduledTask = function (id) { - var url = ApiClient.getUrl("ScheduledTasks/Running/" + id); + if (!id) { + throw new Error("null id"); + } - return $.post(url); - }, + var url = self.getUrl("ScheduledTasks/" + id); - /** - * Gets a scheduled task - */ - getScheduledTask: function (id) { + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - if (!id) { - throw new Error("null id"); - } + /** + * Stops a scheduled task + */ + self.stopScheduledTask = function (id) { - var url = ApiClient.getUrl("ScheduledTasks/" + id); + if (!id) { + throw new Error("null id"); + } - return $.getJSON(url); - }, + var url = self.getUrl("ScheduledTasks/Running/" + id); - /** - * Stops a scheduled task - */ - stopScheduledTask: function (id) { + return self.ajax({ + type: "DELETE", + url: url, + dataType: "json" + }); + }; - if (!id) { - throw new Error("null id"); - } + /** + * Gets the configuration of a plugin + * @param {String} Id + */ + self.getPluginConfiguration = function (id) { - var url = ApiClient.getUrl("ScheduledTasks/Running/" + id); + if (!id) { + throw new Error("null Id"); + } - return $.ajax({ - type: "DELETE", - url: url, - dataType: "json" - }); - }, + var url = self.getUrl("Plugins/" + id + "/Configuration"); - /** - * Gets the configuration of a plugin - * @param {String} Id - */ - getPluginConfiguration: function (id) { + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - if (!id) { - throw new Error("null Id"); - } + /** + * Gets a list of plugins that are available to be installed + */ + self.getAvailablePlugins = function () { - var url = ApiClient.getUrl("Plugins/" + id + "/Configuration"); + var url = self.getUrl("Packages", { PackageType: "UserInstalled" }); - return $.getJSON(url); - }, + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - /** - * Gets a list of plugins that are available to be installed - */ - getAvailablePlugins: function () { + /** + * Uninstalls a plugin + * @param {String} Id + */ + self.uninstallPlugin = function (id) { - var url = ApiClient.getUrl("Packages", { PackageType: "UserInstalled" }); + if (!id) { + throw new Error("null Id"); + } - return $.getJSON(url); - }, + var url = self.getUrl("Plugins/" + id); - /** - * Uninstalls a plugin - * @param {String} Id - */ - uninstallPlugin: function (id) { + return self.ajax({ + type: "DELETE", + url: url, + dataType: "json" + }); + }; - if (!id) { - throw new Error("null Id"); - } + /** + * Removes a virtual folder from either the default view or a user view + * @param {String} name + */ + self.removeVirtualFolder = function (name, userId) { - var url = ApiClient.getUrl("Plugins/" + id); + if (!name) { + throw new Error("null name"); + } - return $.ajax({ - type: "DELETE", - url: url, - dataType: "json" - }); - }, + var url = userId ? "Users/" + userId + "/VirtualFolders" : "Library/VirtualFolders"; - /** - * Removes a virtual folder from either the default view or a user view - * @param {String} name - */ - removeVirtualFolder: function (name, userId) { + url += "/" + name; + url = self.getUrl(url); - if (!name) { - throw new Error("null name"); - } + return self.ajax({ + type: "DELETE", + url: url, + dataType: "json" + }); + }; - var url = userId ? "Users/" + userId + "/VirtualFolders" : "Library/VirtualFolders"; + /** + * Adds a virtual folder to either the default view or a user view + * @param {String} name + */ + self.addVirtualFolder = function (name, userId) { - url += "/" + name; - url = ApiClient.getUrl(url); + if (!name) { + throw new Error("null name"); + } - return $.ajax({ - type: "DELETE", - url: url, - dataType: "json" - }); - }, + var url = userId ? "Users/" + userId + "/VirtualFolders" : "Library/VirtualFolders"; - /** - * Adds a virtual folder to either the default view or a user view - * @param {String} name - */ - addVirtualFolder: function (name, userId) { + url += "/" + name; + url = self.getUrl(url); - if (!name) { - throw new Error("null name"); - } + return self.ajax({ + type: "POST", + url: url + }); + }; - var url = userId ? "Users/" + userId + "/VirtualFolders" : "Library/VirtualFolders"; + /** + * Renames a virtual folder, within either the default view or a user view + * @param {String} name + */ + self.renameVirtualFolder = function (name, newName, userId) { - url += "/" + name; - url = ApiClient.getUrl(url); + if (!name) { + throw new Error("null name"); + } - return $.post(url); - }, + var url = userId ? "Users/" + userId + "/VirtualFolders" : "Library/VirtualFolders"; - /** - * Renames a virtual folder, within either the default view or a user view - * @param {String} name - */ - renameVirtualFolder: function (name, newName, userId) { + url += "/" + name + "/Name"; - if (!name) { - throw new Error("null name"); - } + url = self.getUrl(url, { newName: newName }); - var url = userId ? "Users/" + userId + "/VirtualFolders" : "Library/VirtualFolders"; + return self.ajax({ + type: "POST", + url: url + }); + }; - url += "/" + name + "/Name"; + /** + * Adds an additional mediaPath to an existing virtual folder, within either the default view or a user view + * @param {String} name + */ + self.addMediaPath = function (virtualFolderName, mediaPath, userId) { - url = ApiClient.getUrl(url, { newName: newName }); + if (!virtualFolderName) { + throw new Error("null virtualFolderName"); + } - return $.post(url); - }, + if (!mediaPath) { + throw new Error("null mediaPath"); + } - /** - * Adds an additional mediaPath to an existing virtual folder, within either the default view or a user view - * @param {String} name - */ - addMediaPath: function (virtualFolderName, mediaPath, userId) { + var url = userId ? "Users/" + userId + "/VirtualFolders" : "Library/VirtualFolders"; - if (!virtualFolderName) { - throw new Error("null virtualFolderName"); - } + url += "/" + virtualFolderName + "/Paths"; - if (!mediaPath) { - throw new Error("null mediaPath"); - } + url = self.getUrl(url, { path: mediaPath }); - var url = userId ? "Users/" + userId + "/VirtualFolders" : "Library/VirtualFolders"; + return self.ajax({ + type: "POST", + url: url + }); + }; - url += "/" + virtualFolderName + "/Paths"; + /** + * Removes a media path from a virtual folder, within either the default view or a user view + * @param {String} name + */ + self.removeMediaPath = function (virtualFolderName, mediaPath, userId) { - url = ApiClient.getUrl(url, { path: mediaPath }); + if (!virtualFolderName) { + throw new Error("null virtualFolderName"); + } - return $.post(url); - }, + if (!mediaPath) { + throw new Error("null mediaPath"); + } - /** - * Removes a media path from a virtual folder, within either the default view or a user view - * @param {String} name - */ - removeMediaPath: function (virtualFolderName, mediaPath, userId) { + var url = userId ? "Users/" + userId + "/VirtualFolders" : "Library/VirtualFolders"; - if (!virtualFolderName) { - throw new Error("null virtualFolderName"); - } + url += "/" + virtualFolderName + "/Paths"; - if (!mediaPath) { - throw new Error("null mediaPath"); - } + url = self.getUrl(url, { path: mediaPath }); - var url = userId ? "Users/" + userId + "/VirtualFolders" : "Library/VirtualFolders"; + return self.ajax({ + type: "DELETE", + url: url, + dataType: "json" + }); + }; - url += "/" + virtualFolderName + "/Paths"; + /** + * Deletes a user + * @param {String} id + */ + self.deleteUser = function (id) { - url = ApiClient.getUrl(url, { path: mediaPath }); + if (!id) { + throw new Error("null id"); + } - return $.ajax({ - type: "DELETE", - url: url, - dataType: "json" - }); - }, + var url = self.getUrl("Users/" + id); - /** - * Deletes a user - * @param {String} id - */ - deleteUser: function (id) { + return self.ajax({ + type: "DELETE", + url: url, + dataType: "json" + }); + }; - if (!id) { - throw new Error("null id"); - } + /** + * Deletes a user image + * @param {String} userId + * @param {String} imageType The type of image to delete, based on the server-side ImageType enum. + */ + self.deleteUserImage = function (userId, imageType) { - var url = ApiClient.getUrl("Users/" + id); + if (!userId) { + throw new Error("null userId"); + } - return $.ajax({ - type: "DELETE", - url: url, - dataType: "json" - }); - }, + if (!imageType) { + throw new Error("null imageType"); + } - /** - * Deletes a user image - * @param {String} userId - * @param {String} imageType The type of image to delete, based on the server-side ImageType enum. - */ - deleteUserImage: function (userId, imageType) { + var url = self.getUrl("Users/" + userId + "/Images/" + imageType); - if (!userId) { - throw new Error("null userId"); - } + return self.ajax({ + type: "DELETE", + url: url, + dataType: "json" + }); + }; - if (!imageType) { - throw new Error("null imageType"); - } + /** + * Uploads a user image + * @param {String} userId + * @param {String} imageType The type of image to delete, based on the server-side ImageType enum. + * @param {Object} file The file from the input element + */ + self.uploadUserImage = function (userId, imageType, file) { - var url = ApiClient.getUrl("Users/" + userId + "/Images/" + imageType); + if (!userId) { + throw new Error("null userId"); + } - return $.ajax({ - type: "DELETE", - url: url, - dataType: "json" - }); - }, + if (!imageType) { + throw new Error("null imageType"); + } - /** - * Uploads a user image - * @param {String} userId - * @param {String} imageType The type of image to delete, based on the server-side ImageType enum. - * @param {Object} file The file from the input element - */ - uploadUserImage: function (userId, imageType, file) { + if (!file || !file.type.match('image.*')) { + throw new Error("File must be an image."); + } - if (!userId) { - throw new Error("null userId"); - } + var deferred = $.Deferred(); - if (!imageType) { - throw new Error("null imageType"); - } + var reader = new FileReader(); - if (!file || !file.type.match('image.*')) { - throw new Error("File must be an image."); - } + reader.onerror = function () { + deferred.reject(); + }; - var deferred = $.Deferred(); + reader.onabort = function () { + deferred.reject(); + }; - var reader = new FileReader(); + // Closure to capture the file information. + reader.onload = function (e) { - reader.onerror = function () { - deferred.reject(); - }; + var data = window.btoa(e.target.result); - reader.onabort = function () { - deferred.reject(); - }; + var url = self.getUrl("Users/" + userId + "/Images/" + imageType); - // Closure to capture the file information. - reader.onload = function (e) { + self.ajax({ + type: "POST", + url: url, + data: data, + contentType: "image/" + file.name.substring(file.name.lastIndexOf('.') + 1) + }).done(function (result) { - var data = window.btoa(e.target.result); + deferred.resolveWith(null, [result]); - var url = ApiClient.getUrl("Users/" + userId + "/Images/" + imageType); + }).fail(function () { + deferred.reject(); + }); + }; - $.ajax({ - type: "POST", - url: url, - data: data, - contentType: "image/" + file.name.substring(file.name.lastIndexOf('.') + 1) + // Read in the image file as a data URL. + reader.readAsBinaryString(file); - }).done(function (result) { + return deferred.promise(); + }; - deferred.resolveWith(null, [result]); + /** + * Gets the list of installed plugins on the server + */ + self.getInstalledPlugins = function () { - }).fail(function () { - deferred.reject(); + var url = self.getUrl("Plugins"); + + return self.ajax({ + type: "GET", + url: url, + dataType: "json" }); }; - // Read in the image file as a data URL. - reader.readAsBinaryString(file); + /** + * Gets a user by id + * @param {String} id + */ + self.getUser = function (id) { - return deferred.promise(); - }, + if (!id) { + throw new Error("Must supply a userId"); + } - /** - * Gets the list of installed plugins on the server - */ - getInstalledPlugins: function () { + var url = self.getUrl("Users/" + id); - var url = ApiClient.getUrl("Plugins"); + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - return $.getJSON(url); - }, + /** + * Gets a studio + */ + self.getStudio = function (name) { - /** - * Gets a user by id - * @param {String} id - */ - getUser: function (id) { + if (!name) { + throw new Error("null name"); + } - if (!id) { - throw new Error("Must supply a userId"); - } + var url = self.getUrl("Studios/" + name); - var url = ApiClient.getUrl("Users/" + id); + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - return $.getJSON(url); - }, + /** + * Gets a genre + */ + self.getGenre = function (name) { - /** - * Gets a studio - */ - getStudio: function (name) { + if (!name) { + throw new Error("null name"); + } - if (!name) { - throw new Error("null name"); - } + var url = self.getUrl("Genres/" + name); - var url = ApiClient.getUrl("Studios/" + name); + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - return $.getJSON(url); - }, + /** + * Gets a year + */ + self.getYear = function (year) { - /** - * Gets a genre - */ - getGenre: function (name) { + if (!year) { + throw new Error("null year"); + } - if (!name) { - throw new Error("null name"); - } + var url = self.getUrl("Years/" + year); - var url = ApiClient.getUrl("Genres/" + name); + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - return $.getJSON(url); - }, + /** + * Gets a Person + */ + self.getPerson = function (name) { - /** - * Gets a year - */ - getYear: function (year) { + if (!name) { + throw new Error("null name"); + } - if (!year) { - throw new Error("null year"); - } + var url = self.getUrl("Persons/" + name); - var url = ApiClient.getUrl("Years/" + year); + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - return $.getJSON(url); - }, + /** + * Gets weather info + * @param {String} location - us zip code / city, state, country / city, country + * Omit location to get weather info using stored server configuration value + */ + self.getWeatherInfo = function (location) { - /** - * Gets a Person - */ - getPerson: function (name) { + var url = self.getUrl("weather", { + location: location + }); - if (!name) { - throw new Error("null name"); - } + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - var url = ApiClient.getUrl("Persons/" + name); + /** + * Gets all users from the server + */ + self.getAllUsers = function () { - return $.getJSON(url); - }, + var url = self.getUrl("users"); - /** - * Gets weather info - * @param {String} location - us zip code / city, state, country / city, country - * Omit location to get weather info using stored server configuration value - */ - getWeatherInfo: function (location) { + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - var url = ApiClient.getUrl("weather", { - location: location - }); + /** + * Gets all available parental ratings from the server + */ + self.getParentalRatings = function () { - return $.getJSON(url); - }, + var url = self.getUrl("Localization/ParentalRatings"); - /** - * Gets all users from the server - */ - getAllUsers: function () { + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - var url = ApiClient.getUrl("users"); + /** + * Gets a list of all available conrete BaseItem types from the server + */ + self.getItemTypes = function (options) { - return $.getJSON(url); - }, + var url = self.getUrl("Library/ItemTypes", options); - /** - * Gets all available parental ratings from the server - */ - getParentalRatings: function () { + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - var url = ApiClient.getUrl("Localization/ParentalRatings"); + /** + * Constructs a url for a user image + * @param {String} userId + * @param {Object} options + * Options supports the following properties: + * width - download the image at a fixed width + * height - download the image at a fixed height + * maxWidth - download the image at a maxWidth + * maxHeight - download the image at a maxHeight + * quality - A scale of 0-100. This should almost always be omitted as the default will suffice. + * For best results do not specify both width and height together, as aspect ratio might be altered. + */ + self.getUserImageUrl = function (userId, options) { - return $.getJSON(url); - }, + if (!userId) { + throw new Error("null userId"); + } - /** - * Gets a list of all available conrete BaseItem types from the server - */ - getItemTypes: function (options) { + options = options || { - var url = ApiClient.getUrl("Library/ItemTypes", options); + }; - return $.getJSON(url); - }, + var url = "Users/" + userId + "/Images/" + options.type; - /** - * Constructs a url for a user image - * @param {String} userId - * @param {Object} options - * Options supports the following properties: - * width - download the image at a fixed width - * height - download the image at a fixed height - * maxWidth - download the image at a maxWidth - * maxHeight - download the image at a maxHeight - * quality - A scale of 0-100. This should almost always be omitted as the default will suffice. - * For best results do not specify both width and height together, as aspect ratio might be altered. - */ - getUserImageUrl: function (userId, options) { + if (options.index != null) { + url += "/" + options.index; + } - if (!userId) { - throw new Error("null userId"); - } + // Don't put these on the query string + delete options.type; + delete options.index; - options = options || { + return self.getUrl(url, options); }; - var url = "Users/" + userId + "/Images/" + options.type; + /** + * Constructs a url for a person image + * @param {String} name + * @param {Object} options + * Options supports the following properties: + * width - download the image at a fixed width + * height - download the image at a fixed height + * maxWidth - download the image at a maxWidth + * maxHeight - download the image at a maxHeight + * quality - A scale of 0-100. This should almost always be omitted as the default will suffice. + * For best results do not specify both width and height together, as aspect ratio might be altered. + */ + self.getPersonImageUrl = function (name, options) { - if (options.index != null) { - url += "/" + options.index; - } + if (!name) { + throw new Error("null name"); + } - // Don't put these on the query string - delete options.type; - delete options.index; + options = options || { - return ApiClient.getUrl(url, options); - }, + }; - /** - * Constructs a url for a person image - * @param {String} name - * @param {Object} options - * Options supports the following properties: - * width - download the image at a fixed width - * height - download the image at a fixed height - * maxWidth - download the image at a maxWidth - * maxHeight - download the image at a maxHeight - * quality - A scale of 0-100. This should almost always be omitted as the default will suffice. - * For best results do not specify both width and height together, as aspect ratio might be altered. - */ - getPersonImageUrl: function (name, options) { + var url = "Persons/" + name + "/Images/" + options.type; - if (!name) { - throw new Error("null name"); - } + if (options.index != null) { + url += "/" + options.index; + } - options = options || { + // Don't put these on the query string + delete options.type; + delete options.index; + + return self.getUrl(url, options); }; - var url = "Persons/" + name + "/Images/" + options.type; + /** + * Constructs a url for a year image + * @param {String} year + * @param {Object} options + * Options supports the following properties: + * width - download the image at a fixed width + * height - download the image at a fixed height + * maxWidth - download the image at a maxWidth + * maxHeight - download the image at a maxHeight + * quality - A scale of 0-100. This should almost always be omitted as the default will suffice. + * For best results do not specify both width and height together, as aspect ratio might be altered. + */ + self.getYearImageUrl = function (year, options) { - if (options.index != null) { - url += "/" + options.index; - } + if (!year) { + throw new Error("null year"); + } - // Don't put these on the query string - delete options.type; - delete options.index; + options = options || { - return ApiClient.getUrl(url, options); - }, + }; - /** - * Constructs a url for a year image - * @param {String} year - * @param {Object} options - * Options supports the following properties: - * width - download the image at a fixed width - * height - download the image at a fixed height - * maxWidth - download the image at a maxWidth - * maxHeight - download the image at a maxHeight - * quality - A scale of 0-100. This should almost always be omitted as the default will suffice. - * For best results do not specify both width and height together, as aspect ratio might be altered. - */ - getYearImageUrl: function (year, options) { + var url = "Years/" + year + "/Images/" + options.type; - if (!year) { - throw new Error("null year"); - } + if (options.index != null) { + url += "/" + options.index; + } - options = options || { + // Don't put these on the query string + delete options.type; + delete options.index; + + return self.getUrl(url, options); }; - var url = "Years/" + year + "/Images/" + options.type; + /** + * Constructs a url for a genre image + * @param {String} name + * @param {Object} options + * Options supports the following properties: + * width - download the image at a fixed width + * height - download the image at a fixed height + * maxWidth - download the image at a maxWidth + * maxHeight - download the image at a maxHeight + * quality - A scale of 0-100. This should almost always be omitted as the default will suffice. + * For best results do not specify both width and height together, as aspect ratio might be altered. + */ + self.getGenreImageUrl = function (name, options) { - if (options.index != null) { - url += "/" + options.index; - } + if (!name) { + throw new Error("null name"); + } - // Don't put these on the query string - delete options.type; - delete options.index; + options = options || { - return ApiClient.getUrl(url, options); - }, + }; - /** - * Constructs a url for a genre image - * @param {String} name - * @param {Object} options - * Options supports the following properties: - * width - download the image at a fixed width - * height - download the image at a fixed height - * maxWidth - download the image at a maxWidth - * maxHeight - download the image at a maxHeight - * quality - A scale of 0-100. This should almost always be omitted as the default will suffice. - * For best results do not specify both width and height together, as aspect ratio might be altered. - */ - getGenreImageUrl: function (name, options) { + var url = "Genres/" + name + "/Images/" + options.type; - if (!name) { - throw new Error("null name"); - } + if (options.index != null) { + url += "/" + options.index; + } - options = options || { + // Don't put these on the query string + delete options.type; + delete options.index; + + return self.getUrl(url, options); }; - var url = "Genres/" + name + "/Images/" + options.type; + /** + * Constructs a url for a genre image + * @param {String} name + * @param {Object} options + * Options supports the following properties: + * width - download the image at a fixed width + * height - download the image at a fixed height + * maxWidth - download the image at a maxWidth + * maxHeight - download the image at a maxHeight + * quality - A scale of 0-100. This should almost always be omitted as the default will suffice. + * For best results do not specify both width and height together, as aspect ratio might be altered. + */ + self.getStudioImageUrl = function (name, options) { - if (options.index != null) { - url += "/" + options.index; - } + if (!name) { + throw new Error("null name"); + } - // Don't put these on the query string - delete options.type; - delete options.index; + options = options || { - return ApiClient.getUrl(url, options); - }, + }; - /** - * Constructs a url for a genre image - * @param {String} name - * @param {Object} options - * Options supports the following properties: - * width - download the image at a fixed width - * height - download the image at a fixed height - * maxWidth - download the image at a maxWidth - * maxHeight - download the image at a maxHeight - * quality - A scale of 0-100. This should almost always be omitted as the default will suffice. - * For best results do not specify both width and height together, as aspect ratio might be altered. - */ - getStudioImageUrl: function (name, options) { + var url = "Studios/" + name + "/Images/" + options.type; - if (!name) { - throw new Error("null name"); - } + if (options.index != null) { + url += "/" + options.index; + } - options = options || { + // Don't put these on the query string + delete options.type; + delete options.index; + + return self.getUrl(url, options); }; - var url = "Studios/" + name + "/Images/" + options.type; + /** + * Constructs a url for an item image + * @param {String} itemId + * @param {Object} options + * Options supports the following properties: + * type - Primary, logo, backdrop, etc. See the server-side enum ImageType + * index - When downloading a backdrop, use this to specify which one (omitting is equivalent to zero) + * width - download the image at a fixed width + * height - download the image at a fixed height + * maxWidth - download the image at a maxWidth + * maxHeight - download the image at a maxHeight + * quality - A scale of 0-100. This should almost always be omitted as the default will suffice. + * For best results do not specify both width and height together, as aspect ratio might be altered. + */ + self.getImageUrl = function (itemId, options) { + + if (!itemId) { + throw new Error("itemId cannot be empty"); + } + + options = options || { + + }; + + var url = "Items/" + itemId + "/Images/" + options.type; + + if (options.index != null) { + url += "/" + options.index; + } + + // Don't put these on the query string + delete options.type; + delete options.index; + + return self.getUrl(url, options); + }; - if (options.index != null) { - url += "/" + options.index; - } + /** + * Constructs a url for an item logo image + * If the item doesn't have a logo, it will inherit a logo from a parent + * @param {Object} item A BaseItem + * @param {Object} options + * Options supports the following properties: + * width - download the image at a fixed width + * height - download the image at a fixed height + * maxWidth - download the image at a maxWidth + * maxHeight - download the image at a maxHeight + * quality - A scale of 0-100. This should almost always be omitted as the default will suffice. + * For best results do not specify both width and height together, as aspect ratio might be altered. + */ + self.getLogoImageUrl = function (item, options) { - // Don't put these on the query string - delete options.type; - delete options.index; + if (!item) { + throw new Error("null item"); + } - return ApiClient.getUrl(url, options); - }, + options = options || { - /** - * Constructs a url for an item image - * @param {String} itemId - * @param {Object} options - * Options supports the following properties: - * type - Primary, logo, backdrop, etc. See the server-side enum ImageType - * index - When downloading a backdrop, use this to specify which one (omitting is equivalent to zero) - * width - download the image at a fixed width - * height - download the image at a fixed height - * maxWidth - download the image at a maxWidth - * maxHeight - download the image at a maxHeight - * quality - A scale of 0-100. This should almost always be omitted as the default will suffice. - * For best results do not specify both width and height together, as aspect ratio might be altered. - */ - getImageUrl: function (itemId, options) { + }; + + options.imageType = "logo"; - if (!itemId) { - throw new Error("itemId cannot be empty"); - } + var logoItemId = item.HasLogo ? item.Id : item.ParentLogoItemId; - options = options || { + return logoItemId ? self.getImageUrl(logoItemId, options) : null; }; - var url = "Items/" + itemId + "/Images/" + options.type; + /** + * Constructs an array of backdrop image url's for an item + * If the item doesn't have any backdrops, it will inherit them from a parent + * @param {Object} item A BaseItem + * @param {Object} options + * Options supports the following properties: + * width - download the image at a fixed width + * height - download the image at a fixed height + * maxWidth - download the image at a maxWidth + * maxHeight - download the image at a maxHeight + * quality - A scale of 0-100. This should almost always be omitted as the default will suffice. + * For best results do not specify both width and height together, as aspect ratio might be altered. + */ + self.getBackdropImageUrl = function (item, options) { - if (options.index != null) { - url += "/" + options.index; - } + if (!item) { + throw new Error("null item"); + } - // Don't put these on the query string - delete options.type; - delete options.index; + options = options || { - return ApiClient.getUrl(url, options); - }, + }; - /** - * Constructs a url for an item logo image - * If the item doesn't have a logo, it will inherit a logo from a parent - * @param {Object} item A BaseItem - * @param {Object} options - * Options supports the following properties: - * width - download the image at a fixed width - * height - download the image at a fixed height - * maxWidth - download the image at a maxWidth - * maxHeight - download the image at a maxHeight - * quality - A scale of 0-100. This should almost always be omitted as the default will suffice. - * For best results do not specify both width and height together, as aspect ratio might be altered. - */ - getLogoImageUrl: function (item, options) { + options.imageType = "backdrop"; - if (!item) { - throw new Error("null item"); - } + var backdropItemId; + var backdropCount; - options = options || { - }; + if (!item.BackdropCount) { + backdropItemId = item.ParentBackdropItemId; + backdropCount = item.ParentBackdropCount || 0; + } else { + backdropItemId = item.Id; + backdropCount = item.BackdropCount; + } - options.imageType = "logo"; + if (!backdropItemId) { + return []; + } - var logoItemId = item.HasLogo ? item.Id : item.ParentLogoItemId; + var files = []; - return logoItemId ? ApiClient.getImageUrl(logoItemId, options) : null; - }, + for (var i = 0; i < backdropCount; i++) { - /** - * Constructs an array of backdrop image url's for an item - * If the item doesn't have any backdrops, it will inherit them from a parent - * @param {Object} item A BaseItem - * @param {Object} options - * Options supports the following properties: - * width - download the image at a fixed width - * height - download the image at a fixed height - * maxWidth - download the image at a maxWidth - * maxHeight - download the image at a maxHeight - * quality - A scale of 0-100. This should almost always be omitted as the default will suffice. - * For best results do not specify both width and height together, as aspect ratio might be altered. - */ - getBackdropImageUrl: function (item, options) { + options.imageIndex = i; - if (!item) { - throw new Error("null item"); - } + files[i] = self.getImageUrl(backdropItemId, options); + } - options = options || { + return files; }; - options.imageType = "backdrop"; + /** + * Authenticates a user + * @param {String} userId + * @param {String} password + */ + self.authenticateUser = function (userId, password) { - var backdropItemId; - var backdropCount; + if (!userId) { + throw new Error("null userId"); + } - if (!item.BackdropCount) { - backdropItemId = item.ParentBackdropItemId; - backdropCount = item.ParentBackdropCount || 0; - } else { - backdropItemId = item.Id; - backdropCount = item.BackdropCount; - } + var url = self.getUrl("Users/" + userId + "/authenticate"); - if (!backdropItemId) { - return []; - } + var postData = { + password: SHA1(password || "") + }; - var files = []; + return self.ajax({ + type: "POST", + url: url, + data: JSON.stringify(postData), + dataType: "json", + contentType: "application/json" + }); + }; - for (var i = 0; i < backdropCount; i++) { + /** + * Updates a user's password + * @param {String} userId + * @param {String} currentPassword + * @param {String} newPassword + */ + self.updateUserPassword = function (userId, currentPassword, newPassword) { - options.imageIndex = i; + if (!userId) { + throw new Error("null userId"); + } - files[i] = ApiClient.getImageUrl(backdropItemId, options); - } + var url = self.getUrl("Users/" + userId + "/Password"); - return files; - }, + var postData = { - /** - * Authenticates a user - * @param {String} userId - * @param {String} password - */ - authenticateUser: function (userId, password) { + }; - if (!userId) { - throw new Error("null userId"); - } + postData.currentPassword = SHA1(currentPassword); - var url = ApiClient.getUrl("Users/" + userId + "/authenticate"); + if (newPassword) { + postData.newPassword = newPassword; + } - var postData = { - password: SHA1(password || "") + return self.ajax({ + type: "POST", + url: url, + data: postData + }); }; - return $.ajax({ - type: "POST", - url: url, - data: JSON.stringify(postData), - dataType: "json", - contentType: "application/json" - }); - }, + /** + * Resets a user's password + * @param {String} userId + */ + self.resetUserPassword = function (userId) { - /** - * Updates a user's password - * @param {String} userId - * @param {String} currentPassword - * @param {String} newPassword - */ - updateUserPassword: function (userId, currentPassword, newPassword) { + if (!userId) { + throw new Error("null userId"); + } - if (!userId) { - throw new Error("null userId"); - } + var url = self.getUrl("Users/" + userId + "/Password"); - var url = ApiClient.getUrl("Users/" + userId + "/Password"); + var postData = { - var postData = { - }; + }; - postData.currentPassword = SHA1(currentPassword); - if (newPassword) { - postData.newPassword = newPassword; - } - return $.post(url, postData); - }, + postData.resetPassword = true; - /** - * Resets a user's password - * @param {String} userId - */ - resetUserPassword: function (userId) { - - if (!userId) { - throw new Error("null userId"); - } - - var url = ApiClient.getUrl("Users/" + userId + "/Password"); - - var postData = { + return self.ajax({ + type: "POST", + url: url, + data: postData + }); }; - postData.resetPassword = true; - return $.post(url, postData); - }, - - /** - * Updates the server's configuration - * @param {Object} configuration - */ - updateServerConfiguration: function (configuration) { - - if (!configuration) { - throw new Error("null configuration"); - } + /** + * Updates the server's configuration + * @param {Object} configuration + */ + self.updateServerConfiguration = function (configuration) { - var url = ApiClient.getUrl("System/Configuration"); + if (!configuration) { + throw new Error("null configuration"); + } - return $.ajax({ - type: "POST", - url: url, - data: JSON.stringify(configuration), - dataType: "json", - contentType: "application/json" - }); - }, + var url = self.getUrl("System/Configuration"); - /** - * Updates plugin security info - */ - updatePluginSecurityInfo: function (info) { - - var url = ApiClient.getUrl("Plugins/SecurityInfo"); + return self.ajax({ + type: "POST", + url: url, + data: JSON.stringify(configuration), + dataType: "json", + contentType: "application/json" + }); + }; - return $.ajax({ - type: "POST", - url: url, - data: JSON.stringify(info), - dataType: "json", - contentType: "application/json" - }); - }, + /** + * Updates plugin security info + */ + self.updatePluginSecurityInfo = function (info) { - /** - * Creates a user - * @param {Object} user - */ - createUser: function (user) { + var url = self.getUrl("Plugins/SecurityInfo"); - if (!user) { - throw new Error("null user"); - } + return self.ajax({ + type: "POST", + url: url, + data: JSON.stringify(info), + dataType: "json", + contentType: "application/json" + }); + }; - var url = ApiClient.getUrl("Users"); + /** + * Creates a user + * @param {Object} user + */ + self.createUser = function (user) { - return $.ajax({ - type: "POST", - url: url, - data: JSON.stringify(user), - dataType: "json", - contentType: "application/json" - }); - }, + if (!user) { + throw new Error("null user"); + } - /** - * Updates a user - * @param {Object} user - */ - updateUser: function (user) { + var url = self.getUrl("Users"); - if (!user) { - throw new Error("null user"); - } + return self.ajax({ + type: "POST", + url: url, + data: JSON.stringify(user), + dataType: "json", + contentType: "application/json" + }); + }; - var url = ApiClient.getUrl("Users/" + user.Id); + /** + * Updates a user + * @param {Object} user + */ + self.updateUser = function (user) { - return $.ajax({ - type: "POST", - url: url, - data: JSON.stringify(user), - dataType: "json", - contentType: "application/json" - }); - }, + if (!user) { + throw new Error("null user"); + } - /** - * Updates the Triggers for a ScheduledTask - * @param {String} id - * @param {Object} triggers - */ - updateScheduledTaskTriggers: function (id, triggers) { + var url = self.getUrl("Users/" + user.Id); - if (!id) { - throw new Error("null id"); - } + return self.ajax({ + type: "POST", + url: url, + data: JSON.stringify(user), + dataType: "json", + contentType: "application/json" + }); + }; - if (!triggers) { - throw new Error("null triggers"); - } + /** + * Updates the Triggers for a ScheduledTask + * @param {String} id + * @param {Object} triggers + */ + self.updateScheduledTaskTriggers = function (id, triggers) { - var url = ApiClient.getUrl("ScheduledTasks/" + id + "/Triggers"); + if (!id) { + throw new Error("null id"); + } - return $.ajax({ - type: "POST", - url: url, - data: JSON.stringify(triggers), - dataType: "json", - contentType: "application/json" - }); - }, + if (!triggers) { + throw new Error("null triggers"); + } - /** - * Updates a plugin's configuration - * @param {String} Id - * @param {Object} configuration - */ - updatePluginConfiguration: function (id, configuration) { + var url = self.getUrl("ScheduledTasks/" + id + "/Triggers"); - if (!id) { - throw new Error("null Id"); - } + return self.ajax({ + type: "POST", + url: url, + data: JSON.stringify(triggers), + dataType: "json", + contentType: "application/json" + }); + }; - if (!configuration) { - throw new Error("null configuration"); - } + /** + * Updates a plugin's configuration + * @param {String} Id + * @param {Object} configuration + */ + self.updatePluginConfiguration = function (id, configuration) { - var url = ApiClient.getUrl("Plugins/" + id + "/Configuration"); + if (!id) { + throw new Error("null Id"); + } - return $.ajax({ - type: "POST", - url: url, - data: JSON.stringify(configuration), - dataType: "json", - contentType: "application/json" - }); - }, + if (!configuration) { + throw new Error("null configuration"); + } - /** - * Gets items based on a query, typicall for children of a folder - * @param {String} userId - * @param {Object} options - * Options accepts the following properties: - * itemId - Localize the search to a specific folder (root if omitted) - * startIndex - Use for paging - * limit - Use to limit results to a certain number of items - * filter - Specify one or more ItemFilters, comma delimeted (see server-side enum) - * sortBy - Specify an ItemSortBy (comma-delimeted list see server-side enum) - * sortOrder - ascending/descending - * fields - additional fields to include aside from basic info. This is a comma delimited list. See server-side enum ItemFields. - * index - the name of the dynamic, localized index function - * dynamicSortBy - the name of the dynamic localized sort function - * recursive - Whether or not the query should be recursive - * searchTerm - search term to use as a filter - */ - getItems: function (userId, options) { + var url = self.getUrl("Plugins/" + id + "/Configuration"); - if (!userId) { - throw new Error("null userId"); - } + return self.ajax({ + type: "POST", + url: url, + data: JSON.stringify(configuration), + dataType: "json", + contentType: "application/json" + }); + }; - return $.getJSON(ApiClient.getUrl("Users/" + userId + "/Items", options)); - }, + /** + * Gets items based on a query, typicall for children of a folder + * @param {String} userId + * @param {Object} options + * Options accepts the following properties: + * itemId - Localize the search to a specific folder (root if omitted) + * startIndex - Use for paging + * limit - Use to limit results to a certain number of items + * filter - Specify one or more ItemFilters, comma delimeted (see server-side enum) + * sortBy - Specify an ItemSortBy (comma-delimeted list see server-side enum) + * sortOrder - ascending/descending + * fields - additional fields to include aside from basic info. This is a comma delimited list. See server-side enum ItemFields. + * index - the name of the dynamic, localized index function + * dynamicSortBy - the name of the dynamic localized sort function + * recursive - Whether or not the query should be recursive + * searchTerm - search term to use as a filter + */ + self.getItems = function (userId, options) { + + if (!userId) { + throw new Error("null userId"); + } + + var url = self.getUrl("Users/" + userId + "/Items", options); + + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; - /** - * Marks an item as played or unplayed - * This should not be used to update playstate following playback. - * There are separate playstate check-in methods for that. This should be used for a - * separate option to reset playstate. - * @param {String} userId - * @param {String} itemId - * @param {Boolean} wasPlayed - */ - updatePlayedStatus: function (userId, itemId, wasPlayed) { + /** + * Marks an item as played or unplayed + * This should not be used to update playstate following playback. + * There are separate playstate check-in methods for that. This should be used for a + * separate option to reset playstate. + * @param {String} userId + * @param {String} itemId + * @param {Boolean} wasPlayed + */ + self.updatePlayedStatus = function (userId, itemId, wasPlayed) { - if (!userId) { - throw new Error("null userId"); - } + if (!userId) { + throw new Error("null userId"); + } - if (!itemId) { - throw new Error("null itemId"); - } + if (!itemId) { + throw new Error("null itemId"); + } - var url = "Users/" + userId + "/PlayedItems/" + itemId; + var url = "Users/" + userId + "/PlayedItems/" + itemId; - var method = wasPlayed ? "POST" : "DELETE"; + var method = wasPlayed ? "POST" : "DELETE"; - return $.ajax({ - type: method, - url: url, - dataType: "json" - }); - }, + return self.ajax({ + type: method, + url: url, + dataType: "json" + }); + }; - /** - * Updates a user's favorite status for an item and returns the updated UserItemData object. - * @param {String} userId - * @param {String} itemId - * @param {Boolean} isFavorite - */ - updateFavoriteStatus: function (userId, itemId, isFavorite) { + /** + * Updates a user's favorite status for an item and returns the updated UserItemData object. + * @param {String} userId + * @param {String} itemId + * @param {Boolean} isFavorite + */ + self.updateFavoriteStatus = function (userId, itemId, isFavorite) { - if (!userId) { - throw new Error("null userId"); - } + if (!userId) { + throw new Error("null userId"); + } - if (!itemId) { - throw new Error("null itemId"); - } + if (!itemId) { + throw new Error("null itemId"); + } - var url = "Users/" + userId + "/FavoriteItems/" + itemId; + var url = "Users/" + userId + "/FavoriteItems/" + itemId; - var method = isFavorite ? "POST" : "DELETE"; + var method = isFavorite ? "POST" : "DELETE"; - return $.ajax({ - type: method, - url: url, - dataType: "json" - }); - }, + return self.ajax({ + type: method, + url: url, + dataType: "json" + }); + }; - /** - * Updates a user's personal rating for an item - * @param {String} userId - * @param {String} itemId - * @param {Boolean} likes - */ - updateUserItemRating: function (userId, itemId, likes) { + /** + * Updates a user's personal rating for an item + * @param {String} userId + * @param {String} itemId + * @param {Boolean} likes + */ + self.updateUserItemRating = function (userId, itemId, likes) { - if (!userId) { - throw new Error("null userId"); - } + if (!userId) { + throw new Error("null userId"); + } - if (!itemId) { - throw new Error("null itemId"); - } + if (!itemId) { + throw new Error("null itemId"); + } - var url = ApiClient.getUrl("Users/" + userId + "/Items/" + itemId + "/Rating", { - likes: likes - }); + var url = self.getUrl("Users/" + userId + "/Items/" + itemId + "/Rating", { + likes: likes + }); - return $.post(url); - }, + return self.ajax({ + type: "POST", + url: url + }); + }; - /** - * Clears a user's personal rating for an item - * @param {String} userId - * @param {String} itemId - */ - clearUserItemRating: function (userId, itemId) { + /** + * Clears a user's personal rating for an item + * @param {String} userId + * @param {String} itemId + */ + self.clearUserItemRating = function (userId, itemId) { - if (!userId) { - throw new Error("null userId"); - } + if (!userId) { + throw new Error("null userId"); + } - if (!itemId) { - throw new Error("null itemId"); - } + if (!itemId) { + throw new Error("null itemId"); + } - var url = ApiClient.getUrl("Users/" + userId + "/Items/" + itemId + "/Rating"); + var url = self.getUrl("Users/" + userId + "/Items/" + itemId + "/Rating"); - return $.ajax({ - type: "DELETE", - url: url, - dataType: "json" - }); - } -}; + return self.ajax({ + type: "DELETE", + url: url, + dataType: "json" + }); + }; + }; -// Do this initially. The consumer can always override later -ApiClient.inferServerFromUrl(); +}(jQuery, navigator); -$(document).ajaxSend(function (event, jqXHR) { +/** + * Provides a friendly way to create an api client instance using information from the browser's current url + */ +MediaBrowser.ApiClient.create = function (clientName) { - if (ApiClient.currentUserId) { + var loc = window.location; - var auth = 'MediaBrowser UserId="' + ApiClient.currentUserId + '", Client="Dashboard", Device="' + ApiClient.getDeviceName() + '", DeviceId="' + ApiClient.getDeviceId() + '"'; - jqXHR.setRequestHeader("Authorization", auth); - } -}); \ No newline at end of file + return new MediaBrowser.ApiClient(loc.protocol, loc.hostname, loc.port, clientName); +}; \ No newline at end of file diff --git a/MediaBrowser.WebDashboard/Html/scripts/DashboardPage.js b/MediaBrowser.WebDashboard/Html/scripts/DashboardPage.js index 5b06851478..47ff3b0c12 100644 --- a/MediaBrowser.WebDashboard/Html/scripts/DashboardPage.js +++ b/MediaBrowser.WebDashboard/Html/scripts/DashboardPage.js @@ -114,31 +114,37 @@ getClientType: function (connection) { - if (connection.Client.toLowerCase() == "dashboard") { + var clientLowered = connection.Client.toLowerCase(); + + if (clientLowered == "dashboard") { return "Dashboard"; } - if (connection.Client.toLowerCase() == "mediabrowsertheater") { + if (clientLowered == "media browser classic") { + + return "Media Browser Classic"; + } + if (clientLowered == "media browser theater") { return "Media Browser Theater"; } - if (connection.Client.toLowerCase() == "android") { + if (clientLowered == "android") { return "Android"; } - if (connection.Client.toLowerCase() == "ios") { + if (clientLowered == "ios") { return "iOS"; } - if (connection.Client.toLowerCase() == "windowsrt") { + if (clientLowered == "windows rt") { return "Windows RT"; } - if (connection.Client.toLowerCase() == "windowsphone") { + if (clientLowered == "windows phone") { return "Windows Phone"; } - if (connection.Client.toLowerCase() == "dlna") { + if (clientLowered == "dlna") { return "Dlna"; } diff --git a/MediaBrowser.WebDashboard/Html/scripts/site.js b/MediaBrowser.WebDashboard/Html/scripts/site.js index 47f0c85085..27dc97810d 100644 --- a/MediaBrowser.WebDashboard/Html/scripts/site.js +++ b/MediaBrowser.WebDashboard/Html/scripts/site.js @@ -81,14 +81,14 @@ var Dashboard = { setCurrentUser: function (userId) { localStorage.setItem("userId", userId); - ApiClient.currentUserId = userId; + ApiClient.currentUserId(userId); Dashboard.getUserPromise = null; }, logout: function () { localStorage.removeItem("userId"); Dashboard.getUserPromise = null; - ApiClient.currentUserId = null; + ApiClient.currentUserId(null); window.location = "login.html"; }, @@ -857,7 +857,7 @@ var Dashboard = { systemInfo = systemInfo || Dashboard.lastSystemInfo; - var url = "ws://" + ApiClient.serverHostName + ":" + systemInfo.WebSocketPortNumber + "/mediabrowser"; + var url = "ws://" + ApiClient.serverHostName() + ":" + systemInfo.WebSocketPortNumber + "/mediabrowser"; var ws = new WebSocket(url); @@ -1171,6 +1171,8 @@ var Dashboard = { }; +var ApiClient = MediaBrowser.ApiClient.create("Dashboard"); + $(function () { var footerHtml = '