') === null) {
- str = ''+str+' ';
- }
- str = str.replace(/\n/g,'');
-
- if (window.DOMParser)
- {
- parser=new DOMParser();
- xmlDoc=parser.parseFromString(str,'text/xml');
- }
- else // Internet Explorer
- {
- xmlDoc=new ActiveXObject('Microsoft.XMLDOM');
- xmlDoc.async='false';
- xmlDoc.loadXML(str);
- }
-
- var MasterUrl = getTagAttribute(xmlDoc.documentElement, 'url');
- if (MasterUrl === null){ MasterUrl = '';}
- for (var i=0 ; i < xmlDoc.documentElement.childNodes.length; i++) {
- var downloadUrl = MasterUrl + xmlDoc.getElementsByTagName('thumb')[i].childNodes[0].nodeValue;
- var previewUrl = xmlDoc.getElementsByTagName('thumb')[i].getAttribute('preview');
- if (previewUrl === '' || previewUrl === null) { previewUrl = downloadUrl;}
- else { previewUrl = MasterUrl + previewUrl;}
- // need to change preview url for impawards links
- if (previewUrl.match('impaward') !== null) {previewUrl = previewUrl.replace(/posters\//g,'thumbs/imp_');}
-
- result.push([previewUrl, downloadUrl, 'Remote', '']);
- }
- return result;
-}
-
-function getTagAttribute(xmlString, tag) {
- var temp ="";
- for (var i=0 ; i < xmlString.attributes.length; i++) {
- if (xmlString.attributes[i].nodeName == tag) {
- temp = xmlString.attributes[i].nodeValue
- }
+function GetAlbumDetails(record) {
+ var request = {
+ jsonrpc: '2.0',
+ method: 'AudioLibrary.GetAlbumDetails',
+ params: {
+ albumid: record.data.albumid,
+ properties: [
+ 'description', 'theme', 'mood', 'style',
+ 'type', 'albumlabel', 'rating', 'thumbnail'
+ ]
+ },
+ id: 'XWMM'
+ };
+ var response = xbmcJsonRPC(request);
+ XWMM.util.merge2Objects(record.data, response.albumdetails);
+
+ 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);
+ if (record.data.rating < 0) {
+ record.data.rating = 0;
}
- return temp;
-}
-
-function GetAlbumDetails(r) {
-
- var jsonResponse = xbmcJsonRPC('{"jsonrpc": "2.0", "method": "AudioLibrary.GetAlbumDetails", "params": {"albumid": '+r.data.albumid+', "properties": ["title", "genre", "year", "rating", "theme", "mood", "style", "type", "description", "albumlabel"]}, "id": 1}');
-
- XWMM.util.merge2Objects(r.data, jsonResponse.albumdetails);
-
- r.data.currentThumbnail = '/image/' + encodeURI(r.data.currentThumbnail);
- r.data.details = true;
+ record.data.thumbnail = '/image/' + encodeURI(record.data.thumbnail);
+ record.data.details = true;
}
diff --git a/resources/js/app/music/music.js b/resources/js/app/music/music.js
index 3b284e4..823d5ce 100644
--- a/resources/js/app/music/music.js
+++ b/resources/js/app/music/music.js
@@ -20,90 +20,344 @@
* along with WIMM. If not, see Select Album
',
+ defaults:{frame:true},
+ layout:'table',
+ layoutConfig: {columns:3},
+ items:[{
+ width:190,
+ items: [AlbumStars, AlbumCover]
+ },
+ standardInfo,
+ extraInfo,
+ albumDescription
+ ]
+});
- //add double-click event to cover object
- var element = AlbumCover.getEl();
- element.on('dblclick', function(){ChangeImages(currentRecord);});
- },
+// ------------ Track information -------------
+
+function convertTime(val) {
+ var minutes = Math.floor(val / 60);
+ var seconds = val - minutes * 60;
+ if (seconds < 10) seconds = '0' + seconds;
+ if (minutes < 10) minutes = '0' +minutes;
+ return minutes + ':' + seconds;
+}
+
+function starRating(val) {
+ val = parseInt(val);
+ return 'Album Tracks
',
+ region: 'center',
+ loadMask: true,
+ frame: 'true',
+ enableDragDrop: false,
+ stripeRows: true,
+ viewconfig: { forceFit: true },
+ selModel: new Ext.grid.RowSelectionModel({ singleSelect: true }),
+ width: 740,
+ height: 230,
+ split: true,
+ store: SongStore
+});
+
+var mainPanel = new Ext.Panel({
+ region: 'center',
+ layout: 'border',
- //albumDetailPanel.getForm().loadRecord(r);
- standardInfo.getForm().loadRecord(r);
- extraInfo.getForm().loadRecord(r);
- albumDescription.getForm().loadRecord(r);
- albumDetailPanel.setTitle(''+r.data.strAlbum+' / '+r.data.strArtist+'
');
+ frame: true,
+ loadMask: true,
+
+ items: [
+ menuBar,
+ AlbumGrid,
+ {
+ xtype: 'panel',
+ region: 'center',
+ defaults: { xtype:'container' },
+ items: [
+ albumDetailPanel,
+ SongGrid
+ ]
+ }
+ ],
- AlbumCover.updateSrc(r.data.currentThumbnail);
+ initEvents: function() {
+ Ext.getCmp('albumGrid').getSelectionModel().on('rowselect', this.albumSelect, this);
+ },
- if (r.data.rating < 10) { AlbumStars.updateSrc(r);}
+ albumSelect: function(sm, rowIdx, record) {
+ if (record.data.details === undefined){
+ GetAlbumDetails(record);
+ }
- r.data.details = true;
+ //albumDetailPanel.getForm().loadRecord(record);
+ standardInfo.getForm().loadRecord(record);
+ extraInfo.getForm().loadRecord(record);
+ albumDescription.getForm().loadRecord(record);
+ albumDetailPanel.setTitle('' + record.data.title + ' / ' + record.data.artist + '
');
- SongStore.proxy.conn.jsonData = {'jsonrpc': '2.0', 'method': 'AudioLibrary.GetSongs', 'params': {'properties': [ 'track', 'artist', 'duration'], 'filter': {'albumid': r.data.albumid}},'id': 1};
+ AlbumCover.updateSrc(record.data.thumbnail);
+ AlbumStars.updateSrc(record);
- //SongStore.proxy.conn.url = '/xbmcCmds/xbmcHttp?command=querymusicdatabase(select idSong, strTitle, iTrack, iDuration, iYear, strFileName, rating, idAlbum, strAlbum, strPath, idArtist, strArtist, idGenre, strGenre FROM songview WHERE idAlbum = '+r.data.albumid+')';
- SongStore.load();
+ SongStore.load({ params: { filter: { albumid: record.data.albumid } } });
Ext.getCmp('savebutton').disable();
}
});
-Ext.reg('Mainpanel', Audio.Mainpanel);
diff --git a/resources/js/app/music/musiclist.js b/resources/js/app/music/musiclist.js
deleted file mode 100644
index 688c84a..0000000
--- a/resources/js/app/music/musiclist.js
+++ /dev/null
@@ -1,497 +0,0 @@
-/*
- * Copyright 2011 slash2009.
- * Copyright 2013 Zernable.
- * Copyright 2013 uNiversal.
- * Copyright 2013, 2014 Andrew Fyfe.
- *
- * This file is part of Web interface Media Manager (WIMM) for kodi.
- *
- * WIMM is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * WIMM is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with WIMM. If not, see Select Album
',
- defaults:{frame:true},
- layout:'table',
- layoutConfig: {columns:3},
- items:[{
- width:190,
- items: [AlbumStars, AlbumCover]
- },
- standardInfo,
- extraInfo,
- albumDescription
- ]
-});
-
-// ------------ Track information -------------
-
-function convertTime(val) {
-
- var minutes = Math.floor(val / 60);
- var seconds = val - minutes*60;
- if (seconds < 10) seconds = '0'+seconds;
- if (minutes < 10) minutes = '0'+minutes;
- return minutes+':'+seconds;
-}
-
-function starRating(val) {
- return 'Album Tracks
',
- region: 'center',
- id: 'Moviegrid',
- loadMask: true,
- frame: 'true',
- enableDragDrop: false,
- stripeRows: true,
- viewconfig: {forceFit: true},
- selModel: new Ext.grid.RowSelectionModel({singleSelect: true}),
- width: 740,
- height: 230,
- split: true,
- store: SongStore
-
-});
-
-
-Ext.onReady(function() {
-
- menuBar.add({
- xtype: 'tbbutton',
- text: 'Tools',
- menu: [
- {
- text: 'Scan Library',
- iconCls: 'silk-plugin',
- handler: function() {
- XWMM.audio.scanLibrary();
- Ext.MessageBox.alert(
- 'Scan Library',
- 'A library scan has begun.'
- );
- }
- },
- {
- text: 'Clean Library',
- iconCls: 'silk-plugin',
- handler: function() {
- XWMM.audio.cleanLibrary();
- Ext.MessageBox.alert(
- 'Clean Library',
- 'The library is being cleaned.'
- );
- }
- },
- {
- text: 'Manage Genres',
- disabled: 'true',
- iconCls: 'silk-plugin',
- handler: function(){winGenre.show();}
- }]
- },{
- text: 'Quicksearch:',
- tooltip: 'Quickly search through the grid.'
- },{
- xtype: 'text',
- tag: 'input',
- id: 'quicksearch',
- size: 30,
- value: '',
- style: 'background: #F0F0F9;'
- });
-
- menuBar.add({
- text: 'X',
- tooltip: 'Clear quicksearch',
- handler: function() {
- if (searchBox.getValue().length!==0) {
- searchBox.setValue('');
- ArtistStore.clearFilter();
- }
- }
- });
-
- menuBar.add({
- xtype: 'tbfill'
- },{
- text: myVersion
- });
-
- //Start Application with Main Panel
- var App = new Audio.Mainpanel({
- renderTo: Ext.getBody()
- });
-
- ArtistStore.load();
-
- // We can retrieve a reference to the data store
- // via the StoreMgr by its storeId
- Ext.QuickTips.init();
-
- // begin search config
- var searchStore = new Ext.data.SimpleStore({
- fields: ['query'],
- data: []
- });
- var searchBox = new Ext.form.ComboBox({
- store: searchStore,
- displayField: 'query',
- typeAhead: false,
- mode: 'local',
- triggerAction: 'all',
- applyTo: 'quicksearch',
- hideTrigger: true
- });
-
- var searchRec = Ext.data.Record.create([
- {name: 'query', type: 'string'}
- ]);
-
-
- var onFilteringBeforeQuery = function(e) {
- //grid.getSelectionModel().clearSelections();
- if (this.getValue().length===0) {
- ArtistStore.clearFilter();
- } else {
- var strSearch = this.getValue().replace(/^\s+|\s+$/g, '');
- if (strSearch==='')
- return;
- AlbumStore.filterBy(function(r, id) {
- var regex = RegExp(strSearch, 'i');
- return regex.test(String(r.get('strAlbum'))) || regex.test(String(r.get('strArtist')));
- });
- }
- };
- var onQuickSearchBeforeQuery = function(e) {
- if (this.getValue().length===0) {
- } else {
- var value = this.getValue().replace(/^\s+|\s+$/g, '');
- if (value==='')
- return;
- searchStore.clearFilter();
- var vr_insert = true;
- searchStore.each(function(r) {
- if (r.data.query.indexOf(value)===0) {
- // backspace
- vr_insert = false;
- return false;
- } else if (value.indexOf(r.data.query)===0) {
- // forward typing
- searchStore.remove(r);
- }
- });
- if (vr_insert===true) {
- searchStore.each(function(r) {
- if (r.data.query===value) {
- vr_insert = false;
- }
- });
- }
- if (vr_insert===true) {
- var vr = new searchRec({query: value});
- searchStore.insert(0, vr);
- }
- var ss_max = 4; // max 5 query history, starts counting from 0; 0==1,1==2,2==3,etc
- if (searchStore.getCount()>ss_max) {
- var ssc = searchStore.getCount();
- var overflow = searchStore.getRange(ssc-(ssc-ss_max), ssc);
- for (var i=0; iWIMM Music Management
- WIMM Music
+
+ WIMM Music Management
- WIMM Music
+
+ WIMM Music Management
- WIMM Music
+
+ 
',
- '{title}
';
+}
- onRowSelect: function(sm, rowIdx, r) {
+var SongcolModel = new Ext.grid.ColumnModel([
+ { header: '#', dataIndex: 'songid', hidden: true },
+ { header: '#', dataIndex: 'track', width: 30 },
+ { header: 'Track', dataIndex: 'title', width: 300 },
+ { header: 'Duration', dataIndex: 'duration', width: 70, renderer: convertTime },
+ { header: 'Rating', dataIndex: 'rating', width: 100, renderer: starRating }
+]);
- currentRecord = r;
+var SongRecord = Ext.data.Record.create([
+ { name: 'songid' },
+ { name: 'title' },
+ { name: 'track' },
+ { name: 'duration' },
+ { name: 'rating', convert: XWMM.util.convertRating },
+]);
- if (r.data.details === undefined){
- GetAlbumDetails(r);
+var SongStore = new Ext.data.Store({
+ proxy: new Ext.data.XBMCProxy({
+ jsonData: {
+ jsonrpc: '2.0',
+ method: 'AudioLibrary.GetSongs',
+ params: {
+ properties: [
+ 'track', 'title', 'artist', 'duration', 'rating'
+ ],
+ sort: {
+ order: 'ascending',
+ ignorearticle: sortArticles,
+ method: 'track'
+ }
+ },
+ id: 'XWMM'
}
+ }),
+ reader: new Ext.data.JsonReader({ root: 'result.songs' }, SongRecord)
+});
+
+var SongGrid = new Ext.grid.GridPanel({
+ cm: SongcolModel,
+ title: '