Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
videodb: use strings instead of numbers in videodb:// URL
- Loading branch information
1 parent
e2efdc2
commit 66263ca
Showing
54 changed files
with
274 additions
and
275 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="4" type="folder"> | ||
<label>344</label> | ||
<path>videodb://1/4</path> | ||
<path>videodb://movies/actors/</path> | ||
<icon>DefaultActor.png</icon> | ||
</node> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="8" type="folder"> | ||
<label>20451</label> | ||
<path>videodb://1/8</path> | ||
<path>videodb://movies/countries/</path> | ||
<icon>DefaultCountry.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="5" type="folder"> | ||
<label>20348</label> | ||
<path>videodb://1/5</path> | ||
<path>videodb://movies/directors/</path> | ||
<icon>DefaultDirector.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="1" type="folder"> | ||
<label>135</label> | ||
<path>videodb://1/1</path> | ||
<path>videodb://movies/genres/</path> | ||
<icon>DefaultGenre.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="7" type="folder" visible="Library.HasContent(MovieSets)"> | ||
<label>20434</label> | ||
<path>videodb://1/7</path> | ||
<path>videodb://movies/sets/</path> | ||
<icon>DefaultSets.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="6" type="folder"> | ||
<label>20388</label> | ||
<path>videodb://1/6</path> | ||
<path>videodb://movies/studios/</path> | ||
<icon>DefaultStudios.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="9" type="folder"> | ||
<label>20459</label> | ||
<path>videodb://1/9</path> | ||
<path>videodb://movies/tags/</path> | ||
<icon>DefaultTags.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="2" type="folder"> | ||
<label>369</label> | ||
<path>videodb://1/2</path> | ||
<path>videodb://movies/titles/</path> | ||
<icon>DefaultMovieTitle.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="3" type="folder"> | ||
<label>562</label> | ||
<path>videodb://1/3</path> | ||
<path>videodb://movies/years/</path> | ||
<icon>DefaultYear.png</icon> | ||
</node> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="5" type="folder"> | ||
<label>132</label> | ||
<path>videodb://3/5</path> | ||
<path>videodb://musicvideos/albums/</path> | ||
<icon>DefaultAlbum.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="4" type="folder"> | ||
<label>133</label> | ||
<path>videodb://3/4</path> | ||
<path>videodb://musicvideos/artists/</path> | ||
<icon>DefaultArtist.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="6" type="folder"> | ||
<label>20348</label> | ||
<path>videodb://3/6</path> | ||
<path>videodb://musicvideos/directors/</path> | ||
<icon>DefaultDirector.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="1" type="folder"> | ||
<label>135</label> | ||
<path>videodb://3/1</path> | ||
<path>videodb://musicvideos/genres/</path> | ||
<icon>DefaultGenre.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="7" type="folder"> | ||
<label>20388</label> | ||
<path>videodb://3/7</path> | ||
<path>videodb://musicvideos/studios/</path> | ||
<icon>DefaultStudios.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="8" type="folder"> | ||
<label>20459</label> | ||
<path>videodb://3/9</path> | ||
<path>videodb://musicvideos/tags/</path> | ||
<icon>DefaultTags.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="2" type="folder"> | ||
<label>369</label> | ||
<path>videodb://3/2</path> | ||
<path>videodb://musicvideos/titles/</path> | ||
<icon>DefaultMusicVideoTitle.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="3" type="folder"> | ||
<label>562</label> | ||
<path>videodb://3/3</path> | ||
<path>videodb://musicvideos/years/</path> | ||
<icon>DefaultYear.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="4" type="folder"> | ||
<label>344</label> | ||
<path>videodb://2/4</path> | ||
<path>videodb://tvshows/actors/</path> | ||
<icon>DefaultActor.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="1" type="folder"> | ||
<label>135</label> | ||
<path>videodb://2/1</path> | ||
<path>videodb://tvshows/genres/</path> | ||
<icon>DefaultGenre.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="5" type="folder"> | ||
<label>20388</label> | ||
<path>videodb://2/5</path> | ||
<path>videodb://tvshows/studios/</path> | ||
<icon>DefaultStudios.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="6" type="folder"> | ||
<label>20459</label> | ||
<path>videodb://2/9</path> | ||
<icon>DefaultTags.png</icon> | ||
<path>videodb://tvshows/tags/</path> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="2" type="folder"> | ||
<label>369</label> | ||
<path>videodb://2/2</path> | ||
<path>videodb://tvshows/titles/</path> | ||
<icon>DefaultTVShowTitle.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="3" type="folder"> | ||
<label>562</label> | ||
<path>videodb://2/3</path> | ||
<path>videodb://tvshows/years/</path> | ||
<icon>DefaultYear.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="1" type="folder" visible="Library.HasContent(Movies)"> | ||
<label>342</label> | ||
<path>videodb://1/2</path> | ||
<path>videodb://movies/titles/</path> | ||
<icon>DefaultMovies.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="3" type="folder" visible="Library.HasContent(MusicVideos)"> | ||
<label>20389</label> | ||
<path>videodb://3/2</path> | ||
<path>videodb://musicvideos/titles/</path> | ||
<icon>DefaultMusicVideos.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
<node order="2" type="folder" visible="Library.HasContent(TVShows)"> | ||
<label>20343</label> | ||
<path>videodb://2/2</path> | ||
<path>videodb://tvshows/titles/</path> | ||
<icon>DefaultTVShows.png</icon> | ||
</node> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
66263ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Montellese can you advise on a problem with video db paths in the UPnP server. this is probably down to misunderstanding on my part - we serve library://video as "Video LIbrary". Previously if I served videodb:// then no playlists or Files node was present.
Are paths such as "library://video/movies/genres.xml/" the new correct way to reference these (seems like maybe the .xml shouldn't be there)? Or should it be "videodb://movies/genres" instead? Currently I'm announcing using videodb:/// announces and fail to update the client's cache due to this.
EDIT: just to be clear, the .xml path is returned from the GetDirectory call, I'm not modifying the paths whatsoever
66263ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change (and the one on music) is a major break for a vast number of users that used those numbers.
This needs big communication.
66263ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indeed as this will most like also break skins. So we need to bump gui version
@ronie perhaps notify the skinners and time for Gotham repo?
66263ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a quick note: There's still code in CGUIWindowVideoNav/CGUIWindowMusicNav that maps old paths like videodb://1/2/ to videodb://movies/titles/. So if a skin uses such an (old) path to open a specific view it should still work.
@alcoheca: library:// is only for custom video nodes which are controlled through the XML files and don't have anything to do directly with the videodb:// paths. Those are the paths that xbmc uses internally to reference a specific view/listing of the video/music library. Before this commit/PR these XML files just triggered a certain videodb:// path which resulted in a DB lookup which returns a list of items. Now those XML files are interpreted as smartplaylists, also result in a DB lookup (but through CSmartPlaylistDirectory and not through VIDEODATABASEDIRECTORY::CDirectoryNodeFoo) and also returns a list of items.
66263ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So my problem is due to the fact I'm using library:// paths at all? OK I can fix that pretty easily, adding in Playlists & Files node manually
66263ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@alcoheca: I'm not sure. You should read library://video/ for all the video nodes of an xbmc installation. That will give you paths like library://video/movies/genres.xml/ which should be browseable and give you a list of genres which in turn have paths like videodb://movies/genres/X where X is the ID of the genre.
66263ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Basically this shouldn't have altered the behaviour of UPnP (or in skins) at all. In UPnP you can continue to use library://video/ to list stuff (note that XML filter nodes are IIRC referenced without the .XML extension, but you don't need to know this anyway). All that changes is instead of returning a bunch of items that have paths like videodb://1/2/1235 when you do a CDirectory::GetDirectory(), it will instead return paths like videodb://movies/titles/1235. So as long as you're aren't making assumptions about the path construct, nothing should need change.
66263ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well path like videodb://1/2/id and such are broken from everywhere but the GUI.
If you try to find media with those path in upnp does not work anymore, or from json Files.GetDirectory is impacted also.
And I do know for sure that lot's of people use this in remotes and in scripts / plugins, so this is major change and needs communication.
The correction is not hard for people but it's better if devs are aware of that before users complains things does not work anymore and have problems to understand why.
66263ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it even broken over UPnP - it's not clear to me.
Yes, it will be broken if you access the paths from a script or plugin or over JSON-RPC. However, I don't see why you'd need to - this is what JSON-RPC is for, to make sure you don't need to care about internal paths that might change.
It was simply overlooked that folk might be using this. We could consider adding backward compatibility for these cases perhaps, or alternatively just announce and see what demand there is for that atm.
66263ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well doing the announce and see how much are impacted seems the minimal start.
Those urls are useful for some case for example to get the upnp stream url since there's no answer to my posts the solution is to seek Xbmc Upnp server then use a browse to this kind of urls to get the streaming url that can then be played.
Those urls are way easier and takes less resource too for offline sync than the full path for this purpose too.
And using those urls from Files.GetDirectory permit also some tricks.
I know the situation is not perfect but lots used this trick and will need to make adjustment.
For example on my dev xmbc instance AWxi web interface does use this at least 10 times (and I only have 1 plugin on this one )
66263ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
UPnP - announcements were broken as sending a GUIMessage UPDATE_PATH with path set to the new path ie library://movies/titles.xml/ did not match the path browsed in the client ie videodb://movies/titles/
Also I've noticed that playback from a server is also broken, but I haven't had time to track it down.
Feel free to run a couple of XBMC instances, browse one from the other and see if the error messages give you any clues
EDIT I'll have a look at this tomorrow in any case
66263ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Need to say, since there is a bit of negativity here. That this is an amazing change. It adds an insane amount of readability.
And I agree with jmarshall here, It sounds like we really shouldn't even be allowing these paths in Files.GetDirectory or scripts at all. the special:// paths do make sense but the db should probably be accesed in another maner.
66263ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just so everyone's clear, there's no negativity coming from me! I hated the old style urls, and am 100% behind the change
66263ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same here this is not negativity this is informing that lot's of users do use those path so it needs big communication.
I don't think I say anything else :)
About removal of those, well JSON is not yet complete enough to support all database needs.
The removal of HTTP Api removed direct random queries that was cool, those permit to fills some needs like accessing actors in videolibrary for example and should really not be removed without more feedback from community and provide alternatives to users needs.
66263ca
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the broken playback was due to an ID-10T error, three cheers for new beginnings..