The branch, eden-pre has been updated
via d2d86d6881d1b48d6af5dd9d86ecd9c725c40302 (commit)
from bfa48b60dcd5d45e0c94f514f916e24962fa0722 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/webinterfaces;a=commit;h=d2d86d6881d1b48d6af5dd9d86ecd9c725c40302
commit d2d86d6881d1b48d6af5dd9d86ecd9c725c40302
Author: montellese <[email protected]>
Date: Tue Dec 27 18:56:46 2011 +0100
[webinterface.XWMM] updated to v2.0.3
diff --git a/webinterface.XWMM/addon.xml b/webinterface.XWMM/addon.xml
index 08b0025..f0407f6 100644
--- a/webinterface.XWMM/addon.xml
+++ b/webinterface.XWMM/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="webinterface.XWMM"
- version="2.0.2"
+ version="2.0.3"
name="XWMM"
provider-name="slash">
<requires>
diff --git a/webinterface.XWMM/changelog.txt b/webinterface.XWMM/changelog.txt
index 8ae9294..c0ad7a9 100644
--- a/webinterface.XWMM/changelog.txt
+++ b/webinterface.XWMM/changelog.txt
@@ -34,3 +34,9 @@ XWMM Change log
2.0.2
- Fixes:
-- Compatibility with XBMC Addons standards
+
+2.0.3
+- Fixes:
+-- Movie Genres updates
+-- TvShow save
+-- Music save
diff --git a/webinterface.XWMM/global.js b/webinterface.XWMM/global.js
index 8a51fb8..9b1b51c 100644
--- a/webinterface.XWMM/global.js
+++ b/webinterface.XWMM/global.js
@@ -1,5 +1,5 @@
-var myVersion = '2.0.2'
+var myVersion = '2.0.3'
function mergeJson(object1, object2) {
var i;
@@ -7,6 +7,10 @@ function mergeJson(object1, object2) {
object1[i]=object2[i];
}
+function removeSpace(string) {
+ string = string.replace(/^\s*|\s*$/g,'');
+ return string;
+}
var menuBar = new Ext.Toolbar({
region: "north",
diff --git a/webinterface.XWMM/include/genre.js
b/webinterface.XWMM/include/genre.js
index 8c8e6fd..019ca06 100644
--- a/webinterface.XWMM/include/genre.js
+++ b/webinterface.XWMM/include/genre.js
@@ -71,8 +71,6 @@ var storegenre = new Ext.data.Store({
}
});
-
-
var editor = new Ext.ux.grid.RowEditor({
saveText: 'Update',
listeners: {
diff --git a/webinterface.XWMM/include/xbmc.js
b/webinterface.XWMM/include/xbmc.js
index 686c973..1c6e9f2 100644
--- a/webinterface.XWMM/include/xbmc.js
+++ b/webinterface.XWMM/include/xbmc.js
@@ -437,16 +437,16 @@ function updateXBMCTables(myForm, myTable) {
}
if (myTable == 'episode') {
var idEpisode =
EpisodeGrid.getSelectionModel().getSelected().data.episodeid;
- var myIndex = 'idEpisode='+idEpisode;
+ var myIndex = 'idEpisode='+idEpisode
};
if (myTable == 'tvshow') {
var idShow =
TvShowGrid.getSelectionModel().getSelected().data.tvshowid;
- var myIndex = 'idShow='+idShow;
+ var myIndex = 'idShow='+idShow
};
if (myTable == 'movie') {
var idMovie = selectedMovie;
- var myIndex = 'idMovie='+idMovie;
+ var myIndex = 'idMovie='+idMovie
};
if ((myTable == 'album') || (myTable == 'albuminfo')) {
diff --git a/webinterface.XWMM/movies/include.js
b/webinterface.XWMM/movies/include.js
index 855d615..446c35e 100644
--- a/webinterface.XWMM/movies/include.js
+++ b/webinterface.XWMM/movies/include.js
@@ -183,7 +183,6 @@ function updateXBMCMovieDetails() {
}
function movieGenreChange(sm){
-
var sel = sm.getSelections();
var strTemp = "";
for (var i = 0; i < sel.length; i++) {
@@ -229,32 +228,14 @@ function updateXBMCGenreMovie(){
}
}
-// Query XBMC DB genrelinkmovie
function GetMovieGenres(record){
- if (record.data.genres == undefined){
- // get movie genre once
- var inputUrl =
'/xbmcCmds/xbmcHttp?command=queryvideodatabase(select idGenre FROM
genrelinkmovie where idmovie='+record.data.idMovie+')'
- Ext.Ajax.request({
- url: inputUrl,
- method: 'GET',
- async: false,
- success: function (t){
- var responseArr =
TrimXbmcXml(t);
- responseArr =
responseArr.split("<record>");
- //first field is always empty
- responseArr.remove("");
-
- for (var i = 0; i <
responseArr.length; i++) {
- responseArr[i]=
storegenre.findExact('genreid',responseArr[i],0,false,false)
- };
- record.data.genres =
responseArr;
-
updateGenreGrid(record.data.genres);
- },
- failure: function(t){},
- timeout: 2000
- });
- }
- else{updateGenreGrid(record.data.genres)};
+ var responseArr = [];
+ var myGenres = record.data.Moviegenres.split('/');
+
+ for (var i = 0; i < myGenres.length; i++) {
+ responseArr[i]=
storegenre.findExact('label',removeSpace(myGenres[i]),0,false,false)
+ };
+ updateGenreGrid(responseArr);
}
function checkWatched(val) {
diff --git a/webinterface.XWMM/movies/movie.js
b/webinterface.XWMM/movies/movie.js
index 2f69718..915a8ad 100644
--- a/webinterface.XWMM/movies/movie.js
+++ b/webinterface.XWMM/movies/movie.js
@@ -279,19 +279,12 @@ Movie.Mainpanel = Ext.extend(Ext.Panel, {
selectedMovie = r.data.idMovie;
currentRecord = r;
- storeActor.proxy.conn.xbmcParams = {"jsonrpc": "2.0", "method":
"VideoLibrary.GetMovieDetails", "params": {"movieid": selectedMovie,
"properties": ["cast"]},"id": 1};
- storeActor.reload();
-
- if (r.data.details == undefined){
- GetMovieGenres(r);
- GetMovieDetails(r);
- Ext.getCmp('filedetailPanel').getForm().loadRecord(r)
- }
- else{
- updateGenreGrid(r.data.genres);
- updateAllForms(r)
- };
+ GetMovieGenres(r);
+ GetMovieDetails(r);
+ Ext.getCmp('filedetailPanel').getForm().loadRecord(r)
+ storeActor.proxy.conn.xbmcParams = {"jsonrpc": "2.0", "method":
"VideoLibrary.GetMovieDetails", "params": {"movieid": selectedMovie,
"properties": ["cast"]},"id": 1};
+ storeActor.reload();
}
});
diff --git a/webinterface.XWMM/music/include.js
b/webinterface.XWMM/music/include.js
index 187b7e8..525abfe 100644
--- a/webinterface.XWMM/music/include.js
+++ b/webinterface.XWMM/music/include.js
@@ -51,10 +51,12 @@ function updateMusicAlbum() {
function ValidateAlbuminfo (record) {
// check if record exists otherwise create it
- AlbumInfoStore.reload();
- if (AlbumInfoStore.find('idAlbum',record.data.albumid,0,false,false) ==
-1) {
+ // AlbumInfoStore.reload();
+ // if (AlbumInfoStore.find('idAlbum',record.data.albumid,0,false,false)
== -1) {
+ if (record.data.scraperInfo = false) {
var inputUrl =
'/xbmcCmds/xbmcHttp?command=execmusicdatabase(INSERT INTO albuminfo (idAlbum,
iYear, idGenre) VALUES ("'+record.data.albumid+'"," '+record.data.year+'",
"'+record.data.genre+'"))';
- XBMCExecSql(inputUrl)
+ XBMCExecSql(inputUrl);
+ record.data.scraperInfo = true
}
}
@@ -124,16 +126,17 @@ function GetAlbumDetails(r) {
temp = temp.replace(/<\/html>/g, "");
temp = temp.replace(/<\/field>/g, "");
temp = temp.split("<field>");
-
- r.data.idAlbumInfo = temp[1];
- r.data.iYearScraper = temp[2];
- r.data.strGenreScraper = temp[3];
- r.data.strExtraGenres = temp[4];
- //r.data.strMoods = temp[5];
- //r.data.strStyles = temp[6];
- //r.data.strThemes = temp[7];
- //r.data.strReview = temp[8];
- r.data.strLabel = temp[5];
- //r.data.strType = temp[10];
- r.data.MusicCoverUrl = getMusicCoverList(temp[6], r)
+
+ // If the ajax request returns an empty record, flag the album to
create and albuminfo record when saving
+ if (typeof temp[1] === "undefined")
+ r.data.scraperInfo = false
+ else
+ {
+ r.data.idAlbumInfo = temp[1];
+ r.data.iYearScraper = temp[2];
+ r.data.strGenreScraper = temp[3];
+ r.data.strExtraGenres = temp[4];
+ r.data.strLabel = temp[5];
+ r.data.MusicCoverUrl = getMusicCoverList(temp[6], r)
+ }
}
\ No newline at end of file
diff --git a/webinterface.XWMM/music/musiclist.js
b/webinterface.XWMM/music/musiclist.js
index c3cd845..abaa8b2 100644
--- a/webinterface.XWMM/music/musiclist.js
+++ b/webinterface.XWMM/music/musiclist.js
@@ -252,35 +252,6 @@ var albumDetailPanel = new Ext.Panel({
]
});
-// ------------ Album Extra Info --------------
-
-// var AlbumInfoRecord = Ext.data.Record.create([
- // {name: 'idAlbumInfo', mapping: 'field:nth(1)'},
- // {name: 'idAlbum', mapping: 'field:nth(2)'},
- // {name: 'iYear', mapping: 'field:nth(3)'},
- // {name: 'idGenre', mapping: 'field:nth(4)'},
- // {name: 'strExtraGenres', mapping: 'field:nth(5)'},
- // {name: 'stMoods', mapping: 'field:nth(6)'},
- // {name: 'strStyles', mapping: 'field:nth(7)'},
- // {name: 'strThemes', mapping: 'field:nth(8)'},
- // {name: 'strReview', mapping: 'field:nth(9)'},
- // {name: 'strImage', mapping: 'field:nth(10)'},
- // {name: 'strLabel', mapping: 'field:nth(11)'},
- // {name: 'strType', mapping: 'field:nth(12)'},
- // {name: 'iRating', mapping: 'field:nth(13)'},
-// ]);
-
-// var AlbumInfoStore = new Ext.data.GroupingStore({
- // sortInfo: {field: 'idAlbumInfo', direction: "ASC"},
- // reader: new Ext.data.JsonXBMCReader({
- // root:'data'
- // }, AlbumInfoRecord),
- // url: '/xbmcCmds/xbmcHttp?command=querymusicdatabase(select
idAlbumInfo, idAlbum, iYear, idGenre, strExtraGenres, strMoods, strStyles,
strThemes, strReview, strImage, strLabel, strType, iRating FROM albuminfo)'
-// });
-
-// --------------------------------------------
-
-
// ------------ Track information -------------
function convertTime(val) {
@@ -331,13 +302,6 @@ var SongStore = new Ext.data.Store({
}, SongRecord)
});
-// var SongStore = new Ext.data.GroupingStore({
- // sortInfo: {field: 'iTrack', direction: "ASC"},
- // reader: new Ext.data.JsonXBMCReader({
- // root:'data'
- // }, SongRecord),
- // url: '/xbmcCmds/xbmcHttp?command=querymusicdatabase(select idSong,
strGenre FROM songview WHERE idSong = -1)'
-// });
SongGrid = new Ext.grid.GridPanel({
cm: SongcolModel,
@@ -360,8 +324,6 @@ SongGrid = new Ext.grid.GridPanel({
Ext.onReady(function() {
- //AlbumInfoStore.load();
-
menuBar.add({
xtype: 'tbbutton',
text: 'Tools',
diff --git a/webinterface.XWMM/tvshows/include.js
b/webinterface.XWMM/tvshows/include.js
index 5fa7cd5..95a8a99 100644
--- a/webinterface.XWMM/tvshows/include.js
+++ b/webinterface.XWMM/tvshows/include.js
@@ -55,13 +55,13 @@ function updateXBMCAll() {
if (v == 1) {
myText = 'Checking changes...';
if (EpisodedetailPanel.getForm().isDirty()) {
- updateXBMCTables(EpisodedetailPanel,
'episode');
+
updateXBMCTables(EpisodedetailPanel.getForm(), 'episode');
myText = 'updating Episode info';
};
};
if (v == 10) {
if (TVShowdetailPanel.getForm().isDirty()) {
- updateXBMCTables(TVShowdetailPanel,
'tvshow');
+
updateXBMCTables(TVShowdetailPanel.getForm(), 'tvshow');
myText = 'updating TV Show info';
//need commit here
};
@@ -97,7 +97,7 @@ function updateTvShowForms(r) {
tvshowStars.updateSrc(r);
Ext.getCmp('tvshowcover').updateSrc(r.data.thumbnail)
- Ext.getCmp('seasoncover').updateSrc(r, -1);
+ //Ext.getCmp('seasoncover').updateSrc(r, -1);
var myForm = Ext.getCmp('tvShowdetailPanel');
myForm.getForm().loadRecord(r)
}
diff --git a/webinterface.XWMM/tvshows/tvshow.js
b/webinterface.XWMM/tvshows/tvshow.js
index 4a7dc4f..14eff3d 100644
--- a/webinterface.XWMM/tvshows/tvshow.js
+++ b/webinterface.XWMM/tvshows/tvshow.js
@@ -8,7 +8,7 @@
Ext.ns('TVShow');
var tvShowRecord = Ext.data.Record.create([
- {name: 'title'}, {name: 'genre'}, {name: 'year'}, {name: 'plot'}, {name:
'fanart'}, {name: 'thumbnail'},
+ {name: 'title'}, {name: 'genre'}, {name: 'year'}, {name: 'plot'}, {name:
'fanart'}, {name: 'thumbnail'}, {name: 'tvshowid'},
{name: 'studio'}, {name: 'episode'}, {name: 'rating'}, {name: 'premiered'},
{name: 'tvshowid'}, {name: 'playcount'}
]);
@@ -18,7 +18,7 @@ var seasonRecord = Ext.data.Record.create([
var episodeRecord = Ext.data.Record.create([
{name: 'episode'}, {name: 'title'}, {name: 'rating'}, {name: 'plot'},
{name: 'firstaired'}, {name: 'director'},
- {name: 'streamdetails'}, {name: 'playcount'}
+ {name: 'streamdetails'}, {name: 'playcount'}, {name: 'episodeid'}
]);
var tvshowStars = new Ext.ux.XbmcStars ({
-----------------------------------------------------------------------
Summary of changes:
webinterface.XWMM/addon.xml | 2 +-
webinterface.XWMM/changelog.txt | 6 +++++
webinterface.XWMM/global.js | 6 ++++-
webinterface.XWMM/include/genre.js | 2 -
webinterface.XWMM/include/xbmc.js | 6 ++--
webinterface.XWMM/movies/include.js | 33 ++++++-----------------------
webinterface.XWMM/movies/movie.js | 17 ++++----------
webinterface.XWMM/music/include.js | 33 ++++++++++++++++-------------
webinterface.XWMM/music/musiclist.js | 38 ----------------------------------
webinterface.XWMM/tvshows/include.js | 6 ++--
webinterface.XWMM/tvshows/tvshow.js | 4 +-
11 files changed, 50 insertions(+), 103 deletions(-)
hooks/post-receive
--
Web Interfaces
------------------------------------------------------------------------------
Write once. Port to many.
Get the SDK and tools to simplify cross-platform app development. Create
new or port existing apps to sell to consumers worldwide. Explore the
Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join
http://p.sf.net/sfu/intel-appdev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
