diff --git a/README.md b/README.md
index bb5f602..a0d3ff3 100644
--- a/README.md
+++ b/README.md
@@ -1,39 +1,49 @@
-WiMM - Web Interface Media Manager
-====
+
-WiMM is a cross platform tool to manage the Kodi Media Databases. It is completely web based, so you don't need to install anything on your workstation to manage your media.
+### Web Interface Media Manager for Kodi
+
+WIMM is a cross platform tool to manage the Kodi Media Databases. It is completely web based, so you don't need to install anything on your workstation to manage your media.
This tool is intended to facilitate the use of the Kodi media management features (media infos, media categorization, scraping, etc ...)
#### Useful Links
-* [Releases](https://github.com/slash2009/XWMM/releases "Grab the very latest WiMM release")
+* [Releases](https://github.com/slash2009/XWMM/releases "Grab the very latest WIMM release")
* [Support and discussion thread](http://forum.kodi.tv/showthread.php?tid=188839 "Support and discussion forum thread")
* [Report an issue or make feature request](https://github.com/slash2009/XWMM/issues "Report an issue Report an issue or make feature request")
* [F.A.Q. - Frequently Asked Questions](https://github.com/slash2009/XWMM/wiki/F.A.Q.-Frequently-asked-questions "F.A.Q. - Frequently Asked Questions")
-* [WiMM wiki](https://github.com/slash2009/XWMM/wiki "WiMM Wiki open to you!")
+* [WIMM wiki](https://github.com/slash2009/XWMM/wiki "WIMM Wiki open to you!")
+* [##wimm] (https://webchat.freenode.net/?channels=##wimm "click here to join ##wimm via webchat") official channel via freenode IRC.
- - -
-### DEVELOPERS NEEDED - We don't pay either hehe ;)
-Please join WiMM project, help this Kodi web-interface be nr#1, skilled developers are needed to help improve and fix or add exciting new features to WiMM.
+#### DEVELOPERS NEEDED - We don't pay either hehe ;)
+Consider joining the **WIMM** project, and help this web-interface for Kodi be **nr #1**, skilled developers are needed to help improve and fix or add exciting new features to WIMM.
- - -
### Installation Instructions
-- Install WiMM:
- - Download [WiMM](https://github.com/slash2009/XWMM/releases)
+- Install WIMM:
+ - Download [WIMM](https://github.com/slash2009/XWMM/releases)
- Go to System > Add-ons
- Select **[Install from a zip file](http://kodi.wiki/view/HOW-TO:Install_an_Add-on_from_a_zip_file "HOW-TO:Install an Add-on from a zip file")**
+#### WIMM **auto-updates**
+
+From version 4.1.10 a **repo** has been added, the addon will self update once a release is made within 6 hours or less.
+
+ - Installing from WIMM repository
+ Go to System > Add-ons > WIMM
+ Select Web interfaces > WIMM
+
- Enable web interface:
- Go to System > Services > Webserver > Services
- Enable **Allow control Kodi via HTTP**
- - Set **Web Interface** to WiMM *(optional)*
+ - Set **Web Interface** to WIMM *(optional)*
-- Access WiMM:
- - If you made WiMM the default web interface open your browser to http://*WiMM_ip*:*port*/
- - Otherwise open your browser to http://*WiMM_ip*:*port*/addons/webinterface.WiMM/
+- Access WIMM:
+ - If you made WIMM the default web interface open your browser to http://*WIMM_ip*:*port*/
+ - Otherwise open your browser to http://*WIMM_ip*:*port*/addons/webinterface.WIMM/
- - -
@@ -43,10 +53,9 @@ The idea is to fork this repo work on your changes and make a pull request (PR)
* What the patch addresses, if its a bug-fix a feature or improvement or something else.
* Any comments in code for what is not immediately obvious.
-#### Note:
-A pull request (PR) should be made to **master**, (using branches is ok if your going to make the same PR to master) by using master then your working with latest code and fixes. Any work can then be easily picked and pulled into branches if needed, especially if its a bug-fix.
+:information_source: A pull request (PR) should be made to **master**, (using branches is ok if your going to make the same PR to master) by using master then your working with latest code and fixes. Any work can then be easily picked and pulled into branches if needed, especially if its a bug-fix.
-#### What will happen to patches & PRs
+#### What will happen to patches & PR's
* Subject to review and is merged as soon as possible by a member of the project.
- - -
diff --git a/changelog.txt b/changelog.txt
index 684fee0..67eb6a3 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,7 +1,8 @@
-[B]WIMM Change log[/B]
+# WIMM Change log
4.1.14
- Fix music genre field not being split correctly (Issue #120)
+ - Rename minor id fields now correctly show WIMM
4.1.13
- Allow semi-colon (;) to be used as a list delimiter
@@ -38,7 +39,7 @@
- Clear episode details when show or season is changed. (Issue #105)
- Collapse extra details panels. (Issue #99)
-[B]XWMM Change log[/B]
+# XWMM Change log
4.1.7
- Add option to scan/clean the library (Issue #100)
@@ -158,34 +159,34 @@
2.0.6
- fixes:
--- images caching (thanks to niiko)
--- load Mask display (thanks to niiko)
--- syntax error for compatibility with IE 8
+ - images caching (thanks to niiko)
+ - load Mask display (thanks to niiko)
+ - syntax error for compatibility with IE 8
2.0.5
- fixes:
--- changed xbmc.gui version to 3.00 for compatibility
+ - changed xbmc.gui version to 3.00 for compatibility
2.0.4
- Fixes:
--- set watched / unwatched
--- Movie genres management tool (add, update, delete)
--- Display movies in a set
--- Mosic artists display
+ - set watched / unwatched
+ - Movie genres management tool (add, update, delete)
+ - Display movies in a set
+ - Mosic artists display
- Added
--- imdb number movie field can now be changed
+ - imdb number movie field can now be changed
2.0.3
- Fixes:
--- Movie Genres updates
--- TvShow save
--- Music save
+ - Movie Genres updates
+ - TvShow save
+ - Music save
2.0.2
- Fixes:
--- Compatibility with XBMC Addons standards
+ - Compatibility with XBMC Addons standards
2.0.1
- Fixes:
--- Changed most request from http to JSON-RPC
+ - Changed most request from http to JSON-RPC
diff --git a/resources/images/wimm-text-black-simple-no_bg.png b/resources/images/wimm-text-black-simple-no_bg.png
new file mode 100644
index 0000000..9227b09
Binary files /dev/null and b/resources/images/wimm-text-black-simple-no_bg.png differ
diff --git a/resources/js/app/common/audio.js b/resources/js/app/common/audio.js
index 67f06cd..5f8a283 100644
--- a/resources/js/app/common/audio.js
+++ b/resources/js/app/common/audio.js
@@ -1,4 +1,4 @@
-/* global Ext: false, XWMM: false */
+/* global Ext: false, WIMM: false */
/*
* Copyright 2014 Andrew Fyfe.
*
@@ -18,39 +18,39 @@
* along with WIMM. If not, see .
*/
-Ext.ns('XWMM.audio');
+Ext.ns('WIMM.audio');
(function() {
/**
* Cleans the audio library from non-existent items.
*/
- XWMM.audio.cleanLibrary = function() {
+ WIMM.audio.cleanLibrary = function() {
var request = {
jsonrpc: '2.0',
method: 'AudioLibrary.Clean',
- id: 'XWMM'
+ id: 'WIMM'
};
- xbmcJsonRPC(request);
+ kodiJsonRPC(request);
};
/**
* Scans the audio sources for new library items.
* @param {string} directory Scan a specific directory.
*/
- XWMM.audio.scanLibrary = function(directory) {
+ WIMM.audio.scanLibrary = function(directory) {
var request = {
jsonrpc: '2.0',
method: 'AudioLibrary.Scan',
- id: 'XWMM'
+ id: 'WIMM'
};
if (directory !== undefined) {
request.params = { directory: directory };
}
- xbmcJsonRPC(request);
+ kodiJsonRPC(request);
};
})();
diff --git a/resources/js/app/common/ext.ux.xbmc.js b/resources/js/app/common/ext.ux.xbmc.js
index d05bf7e..2a471aa 100644
--- a/resources/js/app/common/ext.ux.xbmc.js
+++ b/resources/js/app/common/ext.ux.xbmc.js
@@ -20,7 +20,7 @@
* along with WIMM. If not, see .
*/
-function xbmcJsonRPC(params) {
+function kodiJsonRPC(params) {
var result;
if (typeof(params) === 'object') {
@@ -58,24 +58,24 @@ function xbmcJsonRPC(params) {
return result;
}
-// Name space for XBMC objects
+// Name space for kodi objects
Ext.namespace('Ext.ux');
/**
- * Ext.ux.XbmcImages Extension Class
+ * Ext.ux.KodiImages Extension Class
* @author slash
* @version 1.0
- * @class Ext.ux.XbmcImages
+ * @class Ext.ux.KodiImages
* @extends Ext.Container
* @constructor
*/
-Ext.ux.XbmcImages = function(config) {
- Ext.ux.XbmcImages.superclass.constructor.call(this, config);
+Ext.ux.KodiImages = function(config) {
+ Ext.ux.KodiImages.superclass.constructor.call(this, config);
};
-Ext.extend(Ext.ux.XbmcImages, Ext.Container, {
+Ext.extend(Ext.ux.KodiImages, Ext.Container, {
// refresh image
refreshMe: function() {
this.el.dom.src = this.el.dom.src + '?dc=' + new Date().getTime();
@@ -92,19 +92,19 @@ Ext.extend(Ext.ux.XbmcImages, Ext.Container, {
});
/**
- * Ext.ux.XbmcStars Extension Class
+ * Ext.ux.KodiStars Extension Class
* @author slash
* @version 1.0
- * @class Ext.ux.XbmcStars
+ * @class Ext.ux.KodiStars
* @extends Ext.Container
* @constructor
*/
-Ext.ux.XbmcStars = function(config) {
- Ext.ux.XbmcStars.superclass.constructor.call(this, config);
+Ext.ux.KodiStars = function(config) {
+ Ext.ux.KodiStars.superclass.constructor.call(this, config);
};
-Ext.extend(Ext.ux.XbmcStars, Ext.Container, {
+Ext.extend(Ext.ux.KodiStars, Ext.Container, {
border: 0,
autoEl: {tag: 'img', src: '../resources/images/stars/0.png'},
updateSrc: function(r) {
diff --git a/resources/js/app/common/genre.js b/resources/js/app/common/genre.js
index ab7e99c..97f2b4e 100644
--- a/resources/js/app/common/genre.js
+++ b/resources/js/app/common/genre.js
@@ -1,4 +1,4 @@
-/* global Ext: false, XWMM: false */
+/* global Ext: false, WIMM: false */
/*
* Copyright 2013 Zernable.
* Copyright 2013 uNiversal.
@@ -20,7 +20,7 @@
* along with WIMM. If not, see .
*/
-Ext.ns('XWMM.video');
+Ext.ns('WIMM.video');
(function() {
@@ -31,8 +31,8 @@ Ext.ns('XWMM.video');
var sortArticles = docCookies.getItem('sortArticles') === '1';
- XWMM.video.genreStore = new Ext.data.Store({
- proxy: new Ext.data.XBMCProxy({
+ WIMM.video.genreStore = new Ext.data.Store({
+ proxy: new Ext.data.KodiProxy({
jsonData: {
jsonrpc: '2.0',
method: 'VideoLibrary.GetGenres',
@@ -43,7 +43,7 @@ Ext.ns('XWMM.video');
method: 'label'
}
},
- id: 'XWMM'
+ id: 'WIMM'
}
}),
reader: new Ext.data.JsonReader({ root:'result.genres' }, genreRecord)
@@ -63,14 +63,14 @@ Ext.ns('XWMM.video');
function renameGenre(oldGenre, newGenre) {
var idField, resultField, readMethod, writeMethod, gridId;
- if (XWMM.video.genreMode === 'movie') {
+ if (WIMM.video.genreMode === 'movie') {
idField = 'movieid';
resultField = 'movies';
readMethod = 'VideoLibrary.GetMovies';
writeMethod = 'VideoLibrary.SetMovieDetails';
gridId = 'Moviegrid';
}
- else if (XWMM.video.genreMode === 'tvshow') {
+ else if (WIMM.video.genreMode === 'tvshow') {
idField = 'tvshowid';
resultField = 'tvshows';
readMethod = 'VideoLibrary.GetTVShows';
@@ -78,7 +78,7 @@ Ext.ns('XWMM.video');
gridId = 'tvshowgrid';
}
else {
- console.error('Unknown XWMM.video.mode. [' + XWMM.video.mode + ']');
+ console.error('Unknown WIMM.video.mode. [' + WIMM.video.mode + ']');
return;
}
@@ -89,9 +89,9 @@ Ext.ns('XWMM.video');
properties: ['genre'],
filter: { field: 'genre', operator: 'contains', value: oldGenre }
},
- id: 'XWMM'
+ id: 'WIMM'
};
- var response = xbmcJsonRPC(request);
+ var response = kodiJsonRPC(request);
var i, i_len, j, j_len, oldGenreList, newGenreList, updateRequest;
for (i = 0, i_len = response[resultField].length; i < i_len; i++) {
@@ -113,10 +113,10 @@ Ext.ns('XWMM.video');
jsonrpc: '2.0',
method: writeMethod,
params: { genre: newGenreList },
- id: 'XWMM'
+ id: 'WIMM'
};
updateRequest.params[idField] = response[resultField][i][idField];
- xbmcJsonRPC(updateRequest);
+ kodiJsonRPC(updateRequest);
}
Ext.getCmp(gridId).getStore().load();
@@ -143,7 +143,7 @@ Ext.ns('XWMM.video');
clicksToEdit: 1,
stripeRows: true,
plugins: [rowEditor],
- store: XWMM.video.genreStore,
+ store: WIMM.video.genreStore,
tbar: [
{
text: 'Add',
@@ -213,23 +213,23 @@ Ext.ns('XWMM.video');
header: false,
listeners: {
selectionchange: function(sm) {
- if (XWMM.video.genreMode === 'movie') {
+ if (WIMM.video.genreMode === 'movie') {
movieGenreChange(sm);
}
- else if (XWMM.video.genreMode === 'tvshow') {
+ else if (WIMM.video.genreMode === 'tvshow') {
tvShowGenreChange(sm);
}
else {
- console.error('Unknown XWMM.video.mode. [' + XWMM.video.mode + ']');
+ console.error('Unknown WIMM.video.mode. [' + WIMM.video.mode + ']');
}
}
}
});
- XWMM.video.genresGrid = new Ext.grid.GridPanel({
+ WIMM.video.genresGrid = new Ext.grid.GridPanel({
id: 'genresGrid',
title: 'Genres',
- store: XWMM.video.genreStore,
+ store: WIMM.video.genreStore,
cm: new Ext.grid.ColumnModel([
genreChkBoxSM,
@@ -271,16 +271,16 @@ Ext.ns('XWMM.video');
});
- XWMM.video.setGenreMode = function(mode) {
+ WIMM.video.setGenreMode = function(mode) {
if (mode === 'movie' || mode === 'tvshow') {
- XWMM.video.genreMode = mode;
+ WIMM.video.genreMode = mode;
}
else {
- console.error('XWMM.video.setGenreMode :: Unknown mode. [' + mode + ']');
+ console.error('WIMM.video.setGenreMode :: Unknown mode. [' + mode + ']');
return;
}
- XWMM.video.genreStore.load({ params: { type: mode } });
+ WIMM.video.genreStore.load({ params: { type: mode } });
};
})();
diff --git a/resources/js/app/common/util.js b/resources/js/app/common/util.js
index 71ad4f6..92c8314 100644
--- a/resources/js/app/common/util.js
+++ b/resources/js/app/common/util.js
@@ -1,4 +1,4 @@
-/* global Ext: false, XWMM: false */
+/* global Ext: false, WIMM: false */
/*
* Copyright 2011 slash2009.
* Copyright 2013 Zernable.
@@ -21,14 +21,14 @@
* along with WIMM. If not, see .
*/
-Ext.ns('XWMM.util');
+Ext.ns('WIMM.util');
/**
* Convert a string to title case.
* @param {string} str The string to convert.
* @return {string} The string converted to title case.
*/
-XWMM.util.toTitleCase = function(str) {
+WIMM.util.toTitleCase = function(str) {
return str.replace(/\w\S*/g, function(txt) { return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase(); });
};
@@ -38,7 +38,7 @@ XWMM.util.toTitleCase = function(str) {
* @param {array} value The array to convert.
* @return {string} The list.
*/
-XWMM.util.convertArrayToList = function(value, delim) {
+WIMM.util.convertArrayToList = function(value, delim) {
if (value === undefined || value.length === 0) {
return '';
}
@@ -57,7 +57,7 @@ XWMM.util.convertArrayToList = function(value, delim) {
* @param {(string|RegExp)} sep The separator to split the list on.
* @returns {Array} The string list as an array.
*/
-XWMM.util.convertListToArray = function(stringList, sep) {
+WIMM.util.convertListToArray = function(stringList, sep) {
var inList = stringList.split(sep);
var outList = [];
for (var i = 0, len = inList.length; i < len; i++) {
@@ -74,7 +74,7 @@ XWMM.util.convertListToArray = function(stringList, sep) {
* @param {string} value The artwork url to convert.
* @return {string} The converted url.
*/
-XWMM.util.convertArtworkURL = function(value) {
+WIMM.util.convertArtworkURL = function(value) {
if (value === undefined || value === '') {
return '';
}
@@ -89,7 +89,7 @@ XWMM.util.convertArtworkURL = function(value) {
* @param {string} value The file path to convert.
* @return {string} The converted url.
*/
-XWMM.util.convertVFSURL = function(value) {
+WIMM.util.convertVFSURL = function(value) {
if (value === undefined || value === '') {
return '';
}
@@ -103,7 +103,7 @@ XWMM.util.convertVFSURL = function(value) {
* @param {string} value The rating to convert.
* @return {string} The converted rating.
*/
-XWMM.util.convertRating = function(value) {
+WIMM.util.convertRating = function(value) {
return value.toFixed(1);
};
@@ -112,7 +112,7 @@ XWMM.util.convertRating = function(value) {
* @param {string} value The path.
* @return {string} The file name.
*/
-XWMM.util.convertPathToFileName = function(value) {
+WIMM.util.convertPathToFileName = function(value) {
var fileName = /([^\\\/]+)$/.exec(value);
return fileName === null ?
@@ -125,7 +125,7 @@ XWMM.util.convertPathToFileName = function(value) {
* @param {string} value The path.
* @return {string} The directory.
*/
-XWMM.util.convertPathToDirectory = function(value, record) {
+WIMM.util.convertPathToDirectory = function(value, record) {
var dirPath = value.replace(/([^\\\/]+)$/, '');
return dirPath === null ?
value :
@@ -137,13 +137,13 @@ XWMM.util.convertPathToDirectory = function(value, record) {
* @param {string} object1 The first object to merge.
* @param {string} object2 The second object to merge.
*/
-XWMM.util.merge2Objects = function(object1, object2) {
+WIMM.util.merge2Objects = function(object1, object2) {
for (var prop in object2) {
object1[prop] = object2[prop];
}
};
-XWMM.util.findResolution = function(width) {
+WIMM.util.findResolution = function(width) {
var resolution;
if (width === 0) {
@@ -165,7 +165,7 @@ XWMM.util.findResolution = function(width) {
return resolution;
};
-XWMM.util.findAspect = function(aspect) {
+WIMM.util.findAspect = function(aspect) {
var ratio;
if (aspect === 0) {
diff --git a/resources/js/app/common/video.js b/resources/js/app/common/video.js
index aba4433..d43d129 100644
--- a/resources/js/app/common/video.js
+++ b/resources/js/app/common/video.js
@@ -1,4 +1,4 @@
-/* global Ext: false, XWMM: false */
+/* global Ext: false, WIMM: false */
/*
* Copyright 2014 Andrew Fyfe.
*
@@ -18,39 +18,39 @@
* along with WIMM. If not, see .
*/
-Ext.ns('XWMM.video');
+Ext.ns('WIMM.video');
(function() {
/**
* Cleans the video library from non-existent items.
*/
- XWMM.video.cleanLibrary = function() {
+ WIMM.video.cleanLibrary = function() {
var request = {
jsonrpc: '2.0',
method: 'VideoLibrary.Clean',
- id: 'XWMM'
+ id: 'WIMM'
};
- xbmcJsonRPC(request);
+ kodiJsonRPC(request);
};
/**
* Scans the video sources for new library items.
* @param {string} directory Scan a specific directory.
*/
- XWMM.video.scanLibrary = function(directory) {
+ WIMM.video.scanLibrary = function(directory) {
var request = {
jsonrpc: '2.0',
method: 'VideoLibrary.Scan',
- id: 'XWMM'
+ id: 'WIMM'
};
if (directory !== undefined) {
request.params = { directory: directory };
}
- xbmcJsonRPC(request);
+ kodiJsonRPC(request);
};
})();
diff --git a/resources/js/app/common/xbmc.js b/resources/js/app/common/xbmc.js
index 75b7453..5f31663 100644
--- a/resources/js/app/common/xbmc.js
+++ b/resources/js/app/common/xbmc.js
@@ -23,12 +23,12 @@
*/
/**
- * Save the watched state back to XBMC.
+ * Save the watched state back to Kodi.
* @param {int} mediaId The media id.
* @param {string} mediaType The type of media.
* @param {boolean} watched Has it been watched?
*/
-function setXBMCWatched(mediaId, mediaType, watched) {
+function setKodiWatched(mediaId, mediaType, watched) {
var playCount = (watched === true) ? 1 : 0;
var rpcCmd = {
jsonrpc: '2.0',
@@ -57,17 +57,17 @@ function setXBMCWatched(mediaId, mediaType, watched) {
return;
}
- //console.debug('XWMM::updateXBMCSet rpcCmd: ' + rpcCmd);
- xbmcJsonRPC(rpcCmd);
+ //console.debug('WIMM::updateKodiSet rpcCmd: ' + rpcCmd);
+ kodiJsonRPC(rpcCmd);
}
/**
- * Save the changes back to XBMC.
+ * Save the changes back to Kodi.
* @param {Ext.form.BasicForm} form The form containing the record.
* @param {string}recordType The type of record.
* @param {int} recordId The id of the item record saved.
*/
-function updateXBMCTables(form, recordType, recordId) {
+function updateKodiTables(form, recordType, recordId) {
var itemsList = form.items.items;
var params = {};
@@ -99,7 +99,7 @@ function updateXBMCTables(form, recordType, recordId) {
case 'mood':
case 'style':
case 'artist':
- params[f.name] = XWMM.util.convertListToArray(f.getValue(), /[,\/\|;]+/); // Split list separated with , / or |.
+ params[f.name] = WIMM.util.convertListToArray(f.getValue(), /[,\/\|;]+/); // Split list separated with , / or |.
break;
default:
@@ -144,11 +144,11 @@ function updateXBMCTables(form, recordType, recordId) {
return;
}
- //console.debug('XWMM::updateXBMCTables rpcCmd: ' + rpcCmd);
- xbmcJsonRPC(rpcCmd);
+ //console.debug('WIMM::updateKodiTables rpcCmd: ' + rpcCmd);
+ kodiJsonRPC(rpcCmd);
}
-Ext.data.XBMCProxy = function(conn) {
+Ext.data.KodiProxy = function(conn) {
// default connection settings
this.conn = {
url: '/jsonrpc',
@@ -164,14 +164,14 @@ Ext.data.XBMCProxy = function(conn) {
// apply store specific settings
Ext.applyIf(this.conn, conn);
- Ext.data.XBMCProxy.superclass.constructor.call(this, conn);
+ Ext.data.KodiProxy.superclass.constructor.call(this, conn);
- // XBMCProxy only supports read actions
+ // KodiProxy only supports read actions
this.api = { read: '/jsonrpc' };
this.activeRequest = undefined;
};
-Ext.extend(Ext.data.XBMCProxy, Ext.data.DataProxy, {
+Ext.extend(Ext.data.KodiProxy, Ext.data.DataProxy, {
doRequest: function(action, rs, params, reader, cb, scope, arg) {
var request = {
request: {
diff --git a/resources/js/app/movies/app.js b/resources/js/app/movies/app.js
index 3e6a78a..4cd346a 100644
--- a/resources/js/app/movies/app.js
+++ b/resources/js/app/movies/app.js
@@ -32,7 +32,7 @@ Ext.onReady(function() {
text: 'Scan Library',
iconCls: 'silk-plugin',
handler: function() {
- XWMM.video.scanLibrary();
+ WIMM.video.scanLibrary();
Ext.MessageBox.alert(
'Scan Library',
'A library scan has begun.'
@@ -43,7 +43,7 @@ Ext.onReady(function() {
text: 'Clean Library',
iconCls: 'silk-plugin',
handler: function() {
- XWMM.video.cleanLibrary();
+ WIMM.video.cleanLibrary();
Ext.MessageBox.alert(
'Clean Library',
'The library is being cleaned.'
@@ -116,6 +116,6 @@ Ext.onReady(function() {
addQuickSearch('quicksearch', storeMovie, 'Movietitle');
- XWMM.video.setGenreMode('movie');
- XWMM.video.movieSetStore.load();
+ WIMM.video.setGenreMode('movie');
+ WIMM.video.movieSetStore.load();
});
diff --git a/resources/js/app/movies/htmlexport.js b/resources/js/app/movies/htmlexport.js
index b57c9e8..429b2ef 100644
--- a/resources/js/app/movies/htmlexport.js
+++ b/resources/js/app/movies/htmlexport.js
@@ -1,4 +1,4 @@
-/* global Ext: false, XWMM: false */
+/* global Ext: false, WIMM: false */
/*
* Copyright 2013 Zernable.
* Copyright 2013 uNiversal.
@@ -25,7 +25,7 @@
function formatField(field, value) {
switch (field) {
case 'rating':
- value = XWMM.util.convertRating(value);
+ value = WIMM.util.convertRating(value);
break;
case 'country':
@@ -41,7 +41,7 @@
case 'fanart':
case 'thumbnail':
- value = decodeURIComponent(XWMM.util.convertArtworkURL(value));
+ value = decodeURIComponent(WIMM.util.convertArtworkURL(value));
break;
}
@@ -60,7 +60,7 @@
method: options.sortby.toLowerCase().replace(' ', '')
}
},
- id: 'XWMM'
+ id: 'WIMM'
};
if ('ignoreArticle' in options && options.ignoreArticle === 'on') {
@@ -91,9 +91,9 @@
};
}
- var response = xbmcJsonRPC(request);
+ var response = kodiJsonRPC(request);
- var win = open('', 'XWMM.exportToHTML', 'width=900,height=700,status=yes,toolbar=yes,scrollbars=yes');
+ var win = open('', 'WIMM.exportToHTML', 'width=900,height=700,status=yes,toolbar=yes,scrollbars=yes');
win.document.open();
win.document.write(
'\n' +
@@ -113,7 +113,7 @@
var i, i_len, j, j_len;
for (i = 0, i_len = options.fields.length; i < i_len; i++) {
- win.document.write(' | ' + XWMM.util.toTitleCase(options.fields[i]) + ' | ');
+ win.document.write(' ' + WIMM.util.toTitleCase(options.fields[i]) + ' | ');
}
win.document.write(
diff --git a/resources/js/app/movies/include.js b/resources/js/app/movies/include.js
index f4b8ecb..4bd13b6 100644
--- a/resources/js/app/movies/include.js
+++ b/resources/js/app/movies/include.js
@@ -27,7 +27,7 @@ function setWatched() {
var selectedMovie = movieGrid.getSelectionModel().getSelected();
if (selectedMovie !== undefined && selectedMovie.data.watched === 0) {
- setXBMCWatched(selectedMovie.data.movieid, 'movie', true);
+ setKodiWatched(selectedMovie.data.movieid, 'movie', true);
selectedMovie.data.watched = 1;
movieGrid.getView().refresh();
}
@@ -38,13 +38,13 @@ function setUnwatched() {
var selectedMovie = movieGrid.getSelectionModel().getSelected();
if (selectedMovie !== undefined && selectedMovie.data.watched !== 0) {
- setXBMCWatched(selectedMovie.data.movieid, 'movie', false);
+ setKodiWatched(selectedMovie.data.movieid, 'movie', false);
selectedMovie.data.watched = 0;
movieGrid.getView().refresh();
}
}
-function updateXBMCAll() {
+function updateKodiAll() {
Ext.MessageBox.show({
title: 'Please wait',
msg: 'Saving changes',
@@ -71,14 +71,14 @@ function updateXBMCAll() {
form = Ext.getCmp('MoviedetailPanel').getForm();
if (form.isDirty()) {
- updateXBMCTables(form, 'movie',
+ updateKodiTables(form, 'movie',
Ext.getCmp('Moviegrid').getSelectionModel().getSelected().data.movieid);
mesg = 'updating movie info';
}
form = Ext.getCmp('filedetailPanel').getForm();
if (form.isDirty()) {
- updateXBMCTables(form, 'movie',
+ updateKodiTables(form, 'movie',
Ext.getCmp('Moviegrid').getSelectionModel().getSelected().data.movieid);
mesg = 'updating additional info';
}
@@ -133,11 +133,11 @@ function updateMovieDetails(record) {
Ext.BLANK_IMAGE_URL;
aspect.src = (record.data.streamdetails.video[0].aspect !== undefined) ?
'../resources/images/flags/aspectratio/' +
- XWMM.util.findAspect(record.data.streamdetails.video[0].aspect) + '.png' :
+ WIMM.util.findAspect(record.data.streamdetails.video[0].aspect) + '.png' :
Ext.BLANK_IMAGE_URL;
resolution.src = (record.data.streamdetails.video[0].width !== undefined) ?
'../resources/images/flags/video/' +
- XWMM.util.findResolution(record.data.streamdetails.video[0].width) + '.png' :
+ WIMM.util.findResolution(record.data.streamdetails.video[0].width) + '.png' :
Ext.BLANK_IMAGE_URL;
}
if (record.data.streamdetails.audio !== undefined &&
@@ -165,21 +165,21 @@ function loadMovieDetails(record) {
'fanart', 'thumbnail', 'file', 'sorttitle', 'tag'
]
},
- id: 'XWMM'
+ id: 'WIMM'
};
- var response = xbmcJsonRPC(request);
- XWMM.util.merge2Objects(record.data, response.moviedetails);
+ var response = kodiJsonRPC(request);
+ WIMM.util.merge2Objects(record.data, response.moviedetails);
//fix up some data retrieved
- record.data.genre = XWMM.util.convertArrayToList(response.moviedetails.genre);
- record.data.director = XWMM.util.convertArrayToList(response.moviedetails.director);
- record.data.writer = XWMM.util.convertArrayToList(response.moviedetails.writer);
- record.data.studio = XWMM.util.convertArrayToList(response.moviedetails.studio);
- record.data.country = XWMM.util.convertArrayToList(response.moviedetails.country);
- record.data.tag = XWMM.util.convertArrayToList(response.moviedetails.tag);
- record.data.fanart = XWMM.util.convertArtworkURL(response.moviedetails.fanart);
- record.data.thumbnail = XWMM.util.convertArtworkURL(response.moviedetails.thumbnail);
- record.data.rating = XWMM.util.convertRating(response.moviedetails.rating);
+ record.data.genre = WIMM.util.convertArrayToList(response.moviedetails.genre);
+ record.data.director = WIMM.util.convertArrayToList(response.moviedetails.director);
+ record.data.writer = WIMM.util.convertArrayToList(response.moviedetails.writer);
+ record.data.studio = WIMM.util.convertArrayToList(response.moviedetails.studio);
+ record.data.country = WIMM.util.convertArrayToList(response.moviedetails.country);
+ record.data.tag = WIMM.util.convertArrayToList(response.moviedetails.tag);
+ record.data.fanart = WIMM.util.convertArtworkURL(response.moviedetails.fanart);
+ record.data.thumbnail = WIMM.util.convertArtworkURL(response.moviedetails.thumbnail);
+ record.data.rating = WIMM.util.convertRating(response.moviedetails.rating);
record.data.runtime = Math.round(response.moviedetails.runtime / 60);
updateMovieDetails(record);
}
@@ -207,7 +207,7 @@ function movieGenreChange(sm) {
function updateMovieGenreGrid(record) {
var genreGrid = Ext.getCmp('genresGrid');
var genreIds = [];
- var genres = XWMM.util.convertListToArray(record.data.genre, /[,\/\|]+/); // Split list separated with , / or |.
+ var genres = WIMM.util.convertListToArray(record.data.genre, /[,\/\|]+/); // Split list separated with , / or |.
var index;
for (var i = 0, genreCount = genres.length; i < genreCount; i++) {
diff --git a/resources/js/app/movies/movie.js b/resources/js/app/movies/movie.js
index f5aeb19..06b2951 100644
--- a/resources/js/app/movies/movie.js
+++ b/resources/js/app/movies/movie.js
@@ -24,7 +24,7 @@
// movie.js
//------------------------------------------
-var MovieFanart = new Ext.ux.XbmcImages ({
+var MovieFanart = new Ext.ux.KodiImages ({
id: 'fanart',
border: 0,
width: 295,
@@ -32,14 +32,14 @@ var MovieFanart = new Ext.ux.XbmcImages ({
autoEl: {tag: 'img', src: '../resources/images/defaultMovieFanart.jpg'}//, qtip:'Double-click to change'}
});
-var Stars = new Ext.ux.XbmcStars ({
+var Stars = new Ext.ux.KodiStars ({
id: 'movierating',
border: 0,
width: 96,
height:27
});
-var MovieCover = new Ext.ux.XbmcImages ({
+var MovieCover = new Ext.ux.KodiImages ({
id: 'cover',
cls: 'center-align',
border: 0,
@@ -55,7 +55,7 @@ var actorRecord = Ext.data.Record.create([
var storeActor = new Ext.data.Store({
sortInfo: { field: 'name', direction: 'ASC' },
- proxy: new Ext.data.XBMCProxy({
+ proxy: new Ext.data.KodiProxy({
jsonData: {
jsonrpc: '2.0',
method: 'VideoLibrary.GetMovieDetails',
@@ -63,7 +63,7 @@ var storeActor = new Ext.data.Store({
// movieid: -1, // Replaced by valid movie id before loaded.
properties: ['cast']
},
- id: 'XWMM'
+ id: 'WIMM'
}
}),
reader: new Ext.data.JsonReader({ root: 'result.moviedetails.cast' }, actorRecord)
@@ -127,7 +127,7 @@ var otherDetailsPanel = new Ext.FormPanel({
},
{
id: 'moviesetcombo',
- store: XWMM.video.movieSetStore,
+ store: WIMM.video.movieSetStore,
xtype: 'combo',
fieldLabel: 'Set',
@@ -170,7 +170,7 @@ var movieDetailsPanel = new Ext.FormPanel({
text: 'Save',
id: 'savebutton',
handler: function() {
- updateXBMCAll();
+ updateKodiAll();
this.disable();
}
},
@@ -300,7 +300,7 @@ var movieDetailsPanel = new Ext.FormPanel({
path = selectedMovie.data.file;
if (path !== '') {
- window.open(XWMM.util.convertVFSURL(path), '');
+ window.open(WIMM.util.convertVFSURL(path), '');
}
}
},
diff --git a/resources/js/app/movies/moviegenre.js b/resources/js/app/movies/moviegenre.js
index f4f69e9..7e88b9a 100644
--- a/resources/js/app/movies/moviegenre.js
+++ b/resources/js/app/movies/moviegenre.js
@@ -32,7 +32,7 @@ var sortArticles = docCookies.getItem('sortArticles') === '1';
var storeMovie = new Ext.data.Store({
autoLoad: true,
- proxy: new Ext.data.XBMCProxy({
+ proxy: new Ext.data.KodiProxy({
jsonData: {
jsonrpc: '2.0',
method: 'VideoLibrary.GetMovies',
@@ -46,7 +46,7 @@ var storeMovie = new Ext.data.Store({
method: 'sorttitle'
}
},
- id: 'XWMM'
+ id: 'WIMM'
}
}),
reader: new Ext.data.JsonReader({ root: 'result.movies' }, MovieRecord)
@@ -87,7 +87,7 @@ var movieGrid = new Ext.grid.GridPanel({
items: [
{
id: 'genreFilterCombo',
- store: XWMM.video.genreStore,
+ store: WIMM.video.genreStore,
xtype: 'combo',
name: 'label',
diff --git a/resources/js/app/movies/movielist.js b/resources/js/app/movies/movielist.js
index 1bf7316..cd6f4ec 100644
--- a/resources/js/app/movies/movielist.js
+++ b/resources/js/app/movies/movielist.js
@@ -32,7 +32,7 @@ var MovieRecord = Ext.data.Record.create([
var sortArticles = docCookies.getItem('sortArticles') === '1';
var storeMovie = new Ext.data.Store({
autoLoad: true,
- proxy: new Ext.data.XBMCProxy({
+ proxy: new Ext.data.KodiProxy({
jsonData: {
jsonrpc: '2.0',
method: 'VideoLibrary.GetMovies',
@@ -46,7 +46,7 @@ var storeMovie = new Ext.data.Store({
method: 'sorttitle'
}
},
- id: 'XWMM'
+ id: 'WIMM'
}
}),
reader: new Ext.data.JsonReader({ root: 'result.movies' }, MovieRecord)
diff --git a/resources/js/app/movies/movierecent.js b/resources/js/app/movies/movierecent.js
index 1e5354d..12d3b45 100644
--- a/resources/js/app/movies/movierecent.js
+++ b/resources/js/app/movies/movierecent.js
@@ -31,7 +31,7 @@ var MovieRecord = Ext.data.Record.create([
var sortArticles = docCookies.getItem('sortArticles') === '1';
var storeMovie = new Ext.data.Store({
autoLoad: true,
- proxy: new Ext.data.XBMCProxy({
+ proxy: new Ext.data.KodiProxy({
jsonData: {
jsonrpc: '2.0',
method: 'VideoLibrary.GetMovies',
@@ -45,7 +45,7 @@ var storeMovie = new Ext.data.Store({
method: 'dateadded'
}
},
- id: 'XWMM'
+ id: 'WIMM'
}
}),
reader: new Ext.data.JsonReader({ root: 'result.movies' }, MovieRecord)
diff --git a/resources/js/app/movies/movieset.js b/resources/js/app/movies/movieset.js
index 0a72e73..333f6c0 100644
--- a/resources/js/app/movies/movieset.js
+++ b/resources/js/app/movies/movieset.js
@@ -1,4 +1,4 @@
-/* global Ext: false, XWMM: false */
+/* global Ext: false, WIMM: false */
/*
* Copyright 2011, 2013 slash2009.
* Copyright 2013 Zernable.
@@ -21,7 +21,7 @@
* along with WIMM. If not, see .
*/
-Ext.ns('XWMM.video');
+Ext.ns('WIMM.video');
(function() {
@@ -32,8 +32,8 @@ Ext.ns('XWMM.video');
var sortArticles = docCookies.getItem('sortArticles') === '1';
- XWMM.video.movieSetStore = new Ext.data.Store({
- proxy: new Ext.data.XBMCProxy({
+ WIMM.video.movieSetStore = new Ext.data.Store({
+ proxy: new Ext.data.KodiProxy({
jsonData: {
jsonrpc: '2.0',
method: 'VideoLibrary.GetMovieSets',
@@ -44,7 +44,7 @@ Ext.ns('XWMM.video');
method: 'label'
}
},
- id: 'XWMM'
+ id: 'WIMM'
}
}),
reader: new Ext.data.JsonReader({ root:'result.sets' }, movieSetRecord)
@@ -74,9 +74,9 @@ Ext.ns('XWMM.video');
params: {
filter: { field: 'set', operator: 'contains', value: oldMovieSet }
},
- id: 'XWMM'
+ id: 'WIMM'
};
- var response = xbmcJsonRPC(request);
+ var response = kodiJsonRPC(request);
var i, i_len, updateRequest;
for (i = 0, i_len = response.movies.length; i < i_len; i++) {
@@ -87,9 +87,9 @@ Ext.ns('XWMM.video');
movieid: response.movies[i].movieid,
set: newMovieSet
},
- id: 'XWMM'
+ id: 'WIMM'
};
- xbmcJsonRPC(updateRequest);
+ kodiJsonRPC(updateRequest);
}
Ext.getCmp('Moviegrid').getStore().load();
@@ -116,7 +116,7 @@ Ext.ns('XWMM.video');
clicksToEdit: 1,
stripeRows: true,
plugins: [rowEditor],
- store: XWMM.video.movieSetStore,
+ store: WIMM.video.movieSetStore,
tbar: [
{
text: 'Add',
diff --git a/resources/js/app/music/app.js b/resources/js/app/music/app.js
index 4378e5c..8b83de0 100644
--- a/resources/js/app/music/app.js
+++ b/resources/js/app/music/app.js
@@ -32,7 +32,7 @@ Ext.onReady(function() {
text: 'Scan Library',
iconCls: 'silk-plugin',
handler: function() {
- XWMM.audio.scanLibrary();
+ WIMM.audio.scanLibrary();
Ext.MessageBox.alert(
'Scan Library',
'A library scan has begun.'
@@ -43,7 +43,7 @@ Ext.onReady(function() {
text: 'Clean Library',
iconCls: 'silk-plugin',
handler: function() {
- XWMM.audio.cleanLibrary();
+ WIMM.audio.cleanLibrary();
Ext.MessageBox.alert(
'Clean Library',
'The library is being cleaned.'
diff --git a/resources/js/app/music/genre.js b/resources/js/app/music/genre.js
index 042bc7c..0c28567 100644
--- a/resources/js/app/music/genre.js
+++ b/resources/js/app/music/genre.js
@@ -47,7 +47,7 @@ var GenrecolModel = new Ext.grid.ColumnModel([
var GenreStore = new Ext.data.Store({
sortInfo: {field: 'strGenre', direction: 'ASC'},
autoLoad: true,
- proxy: new Ext.data.XBMCProxy({
+ proxy: new Ext.data.KodiProxy({
jsonData : {'jsonrpc': '2.0', 'method': 'AudioLibrary.GetGenres', 'id': 1}
}),
reader: new Ext.data.JsonReader({
@@ -62,11 +62,11 @@ var editor = new Ext.ux.grid.RowEditor({
listeners: {
afteredit: function(roweditor, changes, record, rowIndex) {
if (record.data.idGenre === -1) {
- AddXBMCNewMusicGenre(record);
+ AddKodiNewMusicGenre(record);
GenreStore.reload();
}
else {
- updateXBMCMusicGenreString(record);
+ updateKodiMusicGenreString(record);
GenreStore.reload();
}
@@ -120,12 +120,12 @@ function onDelete() {
var rec = GenreMgmtGrid.getSelectionModel().getSelected();
if (!rec) {return false;}
- if (checkXBMCGenreUsed(rec)){
+ if (checkKodiGenreUsed(rec)){
Ext.Msg.alert('Error', 'this genre is still in use');
console.log('cannot remove');
}
else {
- removeXBMCGenre(rec);
+ removeKodiGenre(rec);
GenreMgmtGrid.store.remove(rec);
}
*/
diff --git a/resources/js/app/music/include.js b/resources/js/app/music/include.js
index 00c1ecc..e1408a4 100644
--- a/resources/js/app/music/include.js
+++ b/resources/js/app/music/include.js
@@ -44,14 +44,14 @@ function updateMusicAlbum() {
if (v === 1) {
myText = 'Checking changes...';
if (standardInfo.getForm().isDirty()) {
- updateXBMCTables(standardInfo.form, 'album', AlbumGrid.getSelectionModel().getSelected().data.albumid);
+ updateKodiTables(standardInfo.form, 'album', AlbumGrid.getSelectionModel().getSelected().data.albumid);
myText = 'updating Album info';
}
}
if (v === 19) {
if ((extraInfo.getForm().isDirty()) || (albumDescription.getForm().isDirty())) {
- updateXBMCTables(extraInfo.form, 'albuminfo', AlbumGrid.getSelectionModel().getSelected().data.albumid);
- updateXBMCTables(albumDescription.form, 'albuminfo', AlbumGrid.getSelectionModel().getSelected().data.albumid);
+ updateKodiTables(extraInfo.form, 'albuminfo', AlbumGrid.getSelectionModel().getSelected().data.albumid);
+ updateKodiTables(albumDescription.form, 'albuminfo', AlbumGrid.getSelectionModel().getSelected().data.albumid);
myText = 'updating Extra info';
}
}
@@ -75,16 +75,16 @@ function GetAlbumDetails(record) {
'type', 'albumlabel', 'rating', 'thumbnail'
]
},
- id: 'XWMM'
+ id: 'WIMM'
};
- var response = xbmcJsonRPC(request);
- XWMM.util.merge2Objects(record.data, response.albumdetails);
+ var response = kodiJsonRPC(request);
+ WIMM.util.merge2Objects(record.data, response.albumdetails);
- record.data.genre = XWMM.util.convertArrayToList(response.albumdetails.genre, ' | ');
- record.data.theme = XWMM.util.convertArrayToList(response.albumdetails.theme, ' | ');
- record.data.mood = XWMM.util.convertArrayToList(response.albumdetails.mood, ' | ');
- record.data.style = XWMM.util.convertArrayToList(response.albumdetails.style, ' | ');
- record.data.rating = XWMM.util.convertRating(record.data.rating);
+ record.data.genre = WIMM.util.convertArrayToList(response.albumdetails.genre, ' | ');
+ record.data.theme = WIMM.util.convertArrayToList(response.albumdetails.theme, ' | ');
+ record.data.mood = WIMM.util.convertArrayToList(response.albumdetails.mood, ' | ');
+ record.data.style = WIMM.util.convertArrayToList(response.albumdetails.style, ' | ');
+ record.data.rating = WIMM.util.convertRating(record.data.rating);
if (record.data.rating < 0) {
record.data.rating = 0;
}
diff --git a/resources/js/app/music/music.js b/resources/js/app/music/music.js
index 823d5ce..1f0d1e0 100644
--- a/resources/js/app/music/music.js
+++ b/resources/js/app/music/music.js
@@ -23,9 +23,9 @@
var AlbumRecord = Ext.data.Record.create([
{ name: 'albumid' },
{ name: 'title' },
- { name: 'artist', convert: XWMM.util.convertArrayToList },
+ { name: 'artist', convert: WIMM.util.convertArrayToList },
{ name: 'displayartist' },
- { name: 'genre', convert: XWMM.util.convertArrayToList },
+ { name: 'genre', convert: WIMM.util.convertArrayToList },
{ name: 'year' }
]);
@@ -33,7 +33,7 @@ var sortArticles = docCookies.getItem('sortArticles') === '1';
var AlbumStore = new Ext.data.GroupingStore({
autoLoad: true,
sortInfo: { field: 'title', direction: 'ASC' },
- proxy: new Ext.data.XBMCProxy({
+ proxy: new Ext.data.KodiProxy({
jsonData: {
jsonrpc: '2.0',
method: 'AudioLibrary.GetAlbums',
@@ -47,7 +47,7 @@ var AlbumStore = new Ext.data.GroupingStore({
method: 'title'
}
},
- id: 'XWMM'
+ id: 'WIMM'
}
}),
reader: new Ext.data.JsonReader({ root: 'result.albums' }, AlbumRecord)
@@ -84,14 +84,14 @@ var AlbumGrid = new Ext.grid.GridPanel({
// ------------ Album information -------------
-var AlbumCover = new Ext.ux.XbmcImages ({
+var AlbumCover = new Ext.ux.KodiImages ({
autoEl: { tag: 'img', src: Ext.BLANK_IMAGE_URL },
border: 0,
width: 160,
height: 160
});
-var AlbumStars = new Ext.ux.XbmcStars ({
+var AlbumStars = new Ext.ux.KodiStars ({
border: 0,
width: 58,
height: 16
@@ -278,11 +278,11 @@ var SongRecord = Ext.data.Record.create([
{ name: 'title' },
{ name: 'track' },
{ name: 'duration' },
- { name: 'rating', convert: XWMM.util.convertRating },
+ { name: 'rating', convert: WIMM.util.convertRating },
]);
var SongStore = new Ext.data.Store({
- proxy: new Ext.data.XBMCProxy({
+ proxy: new Ext.data.KodiProxy({
jsonData: {
jsonrpc: '2.0',
method: 'AudioLibrary.GetSongs',
@@ -296,7 +296,7 @@ var SongStore = new Ext.data.Store({
method: 'track'
}
},
- id: 'XWMM'
+ id: 'WIMM'
}
}),
reader: new Ext.data.JsonReader({ root: 'result.songs' }, SongRecord)
diff --git a/resources/js/app/tvshows/app.js b/resources/js/app/tvshows/app.js
index ce27668..1540340 100644
--- a/resources/js/app/tvshows/app.js
+++ b/resources/js/app/tvshows/app.js
@@ -31,7 +31,7 @@ Ext.onReady(function() {
text: 'Scan Library',
iconCls: 'silk-plugin',
handler: function() {
- XWMM.video.scanLibrary();
+ WIMM.video.scanLibrary();
Ext.MessageBox.alert(
'Scan Library',
'A library scan has begun.'
@@ -42,7 +42,7 @@ Ext.onReady(function() {
text: 'Clean Library',
iconCls: 'silk-plugin',
handler: function() {
- XWMM.video.cleanLibrary();
+ WIMM.video.cleanLibrary();
Ext.MessageBox.alert(
'Clean Library',
'The library is being cleaned.'
@@ -105,6 +105,6 @@ Ext.onReady(function() {
addQuickSearch('quicksearch', storeTVShow, 'title');
- XWMM.video.setGenreMode('tvshow');
+ WIMM.video.setGenreMode('tvshow');
storeTVShow.load();
});
diff --git a/resources/js/app/tvshows/include.js b/resources/js/app/tvshows/include.js
index d7a45aa..ff14faa 100644
--- a/resources/js/app/tvshows/include.js
+++ b/resources/js/app/tvshows/include.js
@@ -25,7 +25,7 @@ function setWatched() {
var selectedEpisode = episodeGrid.getSelectionModel().getSelected();
if (selectedEpisode.data.playcount === 0) {
- setXBMCWatched(selectedEpisode.data.episodeid, 'episode', true);
+ setKodiWatched(selectedEpisode.data.episodeid, 'episode', true);
selectedEpisode.data.playcount = 1;
episodeGrid.getView().refresh();
}
@@ -36,13 +36,13 @@ function setUnwatched() {
var selectedEpisode = episodeGrid.getSelectionModel().getSelected();
if (selectedEpisode.data.playcount !== 0) {
- setXBMCWatched(selectedEpisode.data.episodeid, 'episode', false);
+ setKodiWatched(selectedEpisode.data.episodeid, 'episode', false);
selectedEpisode.data.playcount = 0;
episodeGrid.getView().refresh();
}
}
-function updateXBMCAll() {
+function updateKodiAll() {
Ext.MessageBox.show({
title: 'Please wait',
msg: 'Saving changes',
@@ -67,7 +67,7 @@ function updateXBMCAll() {
mesg = 'Checking for changes...';
form = Ext.getCmp('episodedetailPanel').getForm();
if (form.isDirty()) {
- updateXBMCTables(form, 'episode',
+ updateKodiTables(form, 'episode',
Ext.getCmp('episodeGird').getSelectionModel().getSelected().data.episodeid);
mesg = 'Updating episode information...';
}
@@ -75,7 +75,7 @@ function updateXBMCAll() {
if (v === 10) {
form = Ext.getCmp('tvShowdetailPanel').getForm();
if (form.isDirty()) {
- updateXBMCTables(form, 'tvshow',
+ updateKodiTables(form, 'tvshow',
Ext.getCmp('tvshowgrid').getSelectionModel().getSelected().data.tvshowid);
mesg = 'Updating TV show information...';
}
@@ -101,17 +101,17 @@ function loadTVShowDetails(record) {
'premiered', 'votes', 'fanart', 'thumbnail', 'file', 'episodeguide'
]
},
- id: 'XWMM'
+ id: 'WIMM'
};
- var response = xbmcJsonRPC(request);
- XWMM.util.merge2Objects(record.data, response.tvshowdetails);
+ var response = kodiJsonRPC(request);
+ WIMM.util.merge2Objects(record.data, response.tvshowdetails);
//fix up some data retrieved
- record.data.genre = XWMM.util.convertArrayToList(response.tvshowdetails.genre);
- record.data.studio = XWMM.util.convertArrayToList(response.tvshowdetails.studio);
- record.data.rating = XWMM.util.convertRating(response.tvshowdetails.rating);
- record.data.fanart = XWMM.util.convertArtworkURL(response.tvshowdetails.fanart);
- record.data.thumbnail = XWMM.util.convertArtworkURL(response.tvshowdetails.thumbnail);
+ record.data.genre = WIMM.util.convertArrayToList(response.tvshowdetails.genre);
+ record.data.studio = WIMM.util.convertArrayToList(response.tvshowdetails.studio);
+ record.data.rating = WIMM.util.convertRating(response.tvshowdetails.rating);
+ record.data.fanart = WIMM.util.convertArtworkURL(response.tvshowdetails.fanart);
+ record.data.thumbnail = WIMM.util.convertArtworkURL(response.tvshowdetails.thumbnail);
updateTVShowDetails(record);
}
@@ -146,11 +146,11 @@ function updateEpisodeDetails(record) {
Ext.BLANK_IMAGE_URL;
aspect.src = (record.data.streamdetails.video[0].aspect !== undefined) ?
'../resources/images/flags/aspectratio/' +
- XWMM.util.findAspect(record.data.streamdetails.video[0].aspect) + '.png' :
+ WIMM.util.findAspect(record.data.streamdetails.video[0].aspect) + '.png' :
Ext.BLANK_IMAGE_URL;
resolution.src = (record.data.streamdetails.video[0].width !== undefined) ?
'../resources/images/flags/video/' +
- XWMM.util.findResolution(record.data.streamdetails.video[0].width) + '.png' :
+ WIMM.util.findResolution(record.data.streamdetails.video[0].width) + '.png' :
Ext.BLANK_IMAGE_URL;
}
if (record.data.streamdetails.audio !== undefined &&
@@ -198,7 +198,7 @@ function tvShowGenreChange(sm) {
function updateTVShowGenreGrid(record) {
var genreGrid = Ext.getCmp('genresGrid');
var genreIds = [];
- var genres = XWMM.util.convertListToArray(record.data.genre, /[,\/\|]+/); // Split list separated with , / or |.
+ var genres = WIMM.util.convertListToArray(record.data.genre, /[,\/\|]+/); // Split list separated with , / or |.
var index;
for (var i = 0, genreCount = genres.length; i < genreCount; i++) {
diff --git a/resources/js/app/tvshows/tvshow.js b/resources/js/app/tvshows/tvshow.js
index 6f982fa..923c8b7 100644
--- a/resources/js/app/tvshows/tvshow.js
+++ b/resources/js/app/tvshows/tvshow.js
@@ -23,22 +23,22 @@
Ext.ns('TVShow');
function bannerConvert(value, record) {
- return XWMM.util.convertArtworkURL(value.banner);
+ return WIMM.util.convertArtworkURL(value.banner);
}
function fanartConvert(value, record) {
- return XWMM.util.convertArtworkURL(value.fanart);
+ return WIMM.util.convertArtworkURL(value.fanart);
}
var tvShowRecord = Ext.data.Record.create([
{ name: 'tvshowid' },
{ name: 'title' },
{ name: 'sorttitle' },
- { name: 'genre', convert: XWMM.util.convertArrayToList },
+ { name: 'genre', convert: WIMM.util.convertArrayToList },
{ name: 'year' },
- { name: 'rating', convert: XWMM.util.convertRating },
+ { name: 'rating', convert: WIMM.util.convertRating },
{ name: 'plot' },
- { name: 'studio', convert: XWMM.util.convertArrayToList },
+ { name: 'studio', convert: WIMM.util.convertArrayToList },
{ name: 'mpaa' },
{ name: 'playcount' },
{ name: 'episode' },
@@ -46,28 +46,28 @@ var tvShowRecord = Ext.data.Record.create([
{ name: 'fanart', mapping: 'art', convert: fanartConvert },
{ name: 'banner', mapping: 'art', convert: bannerConvert },
{ name: 'watchedepisodes' },
- { name: 'tag', convert: XWMM.util.convertArrayToList }
+ { name: 'tag', convert: WIMM.util.convertArrayToList }
]);
var seasonRecord = Ext.data.Record.create([
{ name: 'season' },
{ name: 'label' },
- { name: 'thumbnail', convert: XWMM.util.convertArtworkURL }
+ { name: 'thumbnail', convert: WIMM.util.convertArtworkURL }
]);
var episodeRecord = Ext.data.Record.create([
{ name: 'episode' },
{ name: 'title' },
- { name: 'rating', convert: XWMM.util.convertRating },
+ { name: 'rating', convert: WIMM.util.convertRating },
{ name: 'plot' },
{ name: 'firstaired' },
- { name: 'director', convert: XWMM.util.convertArrayToList },
- { name: 'writer', convert: XWMM.util.convertArrayToList },
+ { name: 'director', convert: WIMM.util.convertArrayToList },
+ { name: 'writer', convert: WIMM.util.convertArrayToList },
{ name: 'streamdetails' },
{ name: 'playcount' },
{ name: 'episodeid' },
- { name: 'file', convert: XWMM.util.convertPathToFileName },
- { name: 'directory', mapping: 'file', convert: XWMM.util.convertPathToDirectory }
+ { name: 'file', convert: WIMM.util.convertPathToFileName },
+ { name: 'directory', mapping: 'file', convert: WIMM.util.convertPathToDirectory }
]);
var actorRecord = Ext.data.Record.create([
@@ -77,7 +77,7 @@ var actorRecord = Ext.data.Record.create([
var sortArticles = docCookies.getItem('sortArticles') === '1';
var storeTVShow = new Ext.data.Store({
- proxy: new Ext.data.XBMCProxy({
+ proxy: new Ext.data.KodiProxy({
jsonData: {
jsonrpc: '2.0',
method: 'VideoLibrary.GetTVShows',
@@ -93,7 +93,7 @@ var storeTVShow = new Ext.data.Store({
method: 'sorttitle'
}
},
- id: 'XWMM'
+ id: 'WIMM'
}
}),
reader: new Ext.data.JsonReader({ root: 'result.tvshows' }, tvShowRecord)
@@ -101,7 +101,7 @@ var storeTVShow = new Ext.data.Store({
var storeSeason = new Ext.data.Store({
sortInfo: { field: 'season', direction: 'ASC' },
- proxy: new Ext.data.XBMCProxy({
+ proxy: new Ext.data.KodiProxy({
jsonData: {
jsonrpc: '2.0',
method: 'VideoLibrary.GetSeasons',
@@ -109,7 +109,7 @@ var storeSeason = new Ext.data.Store({
// tvshowid: -1, // Replaced by valid tv show id before loaded.
properties: ['season', 'thumbnail']
},
- id: 'XWMM'
+ id: 'WIMM'
}
}),
reader: new Ext.data.JsonReader({ root: 'result.seasons' }, seasonRecord)
@@ -117,7 +117,7 @@ var storeSeason = new Ext.data.Store({
var storeEpisode = new Ext.data.Store({
sortInfo: { field: 'episode', direction: 'ASC' },
- proxy: new Ext.data.XBMCProxy({
+ proxy: new Ext.data.KodiProxy({
jsonData: {
jsonrpc: '2.0',
method: 'VideoLibrary.GetEpisodes',
@@ -129,7 +129,7 @@ var storeEpisode = new Ext.data.Store({
'director', 'streamdetails', 'playcount', 'file', 'writer'
]
},
- id: 'XWMM'
+ id: 'WIMM'
}
}),
reader: new Ext.data.JsonReader({ root: 'result.episodes' }, episodeRecord)
@@ -137,7 +137,7 @@ var storeEpisode = new Ext.data.Store({
var storeActor = new Ext.data.Store({
sortInfo: { field: 'name', direction: 'ASC' },
- proxy: new Ext.data.XBMCProxy({
+ proxy: new Ext.data.KodiProxy({
jsonData: {
jsonrpc: '2.0',
method: 'VideoLibrary.GetTVShowDetails',
@@ -145,26 +145,26 @@ var storeActor = new Ext.data.Store({
// tvshowid: -1, // Replaced by valid tv show id before loaded.
properties: ['cast']
},
- id: 'XWMM'
+ id: 'WIMM'
}
}),
reader: new Ext.data.JsonReader({ root: 'result.tvshowdetails.cast' }, actorRecord)
});
-var tvshowStars = new Ext.ux.XbmcStars ({
+var tvshowStars = new Ext.ux.KodiStars ({
id: 'tvShowStarRating',
border: 0,
width: 96,
height:27
});
-var episodeStars = new Ext.ux.XbmcStars ({
+var episodeStars = new Ext.ux.KodiStars ({
id: 'episodeStarRating',
width: 72,
height:20
});
-var TVShowCover = new Ext.ux.XbmcImages({
+var TVShowCover = new Ext.ux.KodiImages({
id: 'tvshowcover',
cls: 'center-align',
border: 0,
@@ -173,7 +173,7 @@ var TVShowCover = new Ext.ux.XbmcImages({
autoEl: {tag: 'img', src: Ext.BLANK_IMAGE_URL}
});
-var SeasonCover = new Ext.ux.XbmcImages({
+var SeasonCover = new Ext.ux.KodiImages({
id: 'seasoncover',
cls: 'center-align',
border: 0,
@@ -338,7 +338,7 @@ var episodeDetailsPanel = new Ext.FormPanel({
path = selectedEpisode.data.directory + selectedEpisode.data.file;
if (path !== '') {
- window.open(XWMM.util.convertVFSURL(path), '');
+ window.open(WIMM.util.convertVFSURL(path), '');
}
}
}
@@ -546,7 +546,7 @@ TVShow.Mainpanel = new Ext.Panel({
text: 'Save',
id: 'savebutton',
handler: function(e) {
- updateXBMCAll();
+ updateKodiAll();
this.disable();
}
},