diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index ccc61957..880efe68 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -126,21 +126,10 @@
- Loop Theme Music
Enable Background Image (Requires Restart)
Services
- Enable Info Loader (Requires Restart)
- Enable Menu Loader (Requires Restart)
- Enable WebSocket Remote (Requires Restart)
- Enable In Progress Loader (Requires Restart)
- Enable Recent Info Loader (Requires Restart)
- Enable Random Loader (Requires Restart)
- Enable Next Up Loader (Requires Restart)
Skin does not support setting views
Select item action (Requires Restart)
- Show Indicators
- - Show Watched Indicator
- - Show Unplayed Count Indicator
- - Show Played Percentage Indicator
Sort NextUp by Show Title
Enable Enhanced Images (eg CoverArt)
Metadata
@@ -151,26 +140,26 @@
Add Season Number
Flatten Seasons
- Direct Play - HTTP
+ Direct Play - HTTP
Direct Play
Transcoding
Server Detection Succeeded
Found server
Address :
-
- Recently Added Tv Shows
- In Progress Tv Shows
+
+ Recently Added TV Shows
+ In Progress TV Shows
All Music
- Channels
- Recently Added Movies
- Recently Added Episodes
+ Channels
+ Recently Added Movies
+ Recently Added Episodes
Recently Added Albums
- In Progress Movies
- In Progress Episodes
- Next Episodes
- Favorite Movies
- Favorite Shows
+ In Progress Movies
+ In Progress Episodes
+ Next Episodes
+ Favorite Movies
+ Favorite Shows
Favorite Episodes
Frequent Played Albums
Upcoming TV
@@ -178,7 +167,7 @@
Trailers
Music Videos
Photos
- Unwatched Movies
+ Unwatched Movies
Movie Genres
Movie Studios
Movie Actors
@@ -207,7 +196,7 @@
Enable Theme Videos (Requires Restart)
- Loop Theme Videos
-
+
AutoPlay remaining episodes in a season
Compress Artwork
Latest
@@ -220,33 +209,37 @@
Random Movies
Random Episodes
- Random Items
- Recommended Items
+ Random Items
+ Recommended Items
Extras
Sync Theme Music
Sync Extra Fanart
- Sync Movie BoxSets
+ Sync Movie BoxSets
Reset local Kodi database
Enable watched/resume status sync
DB Sync Indication:
Play Count Sync Indication:
Enable HTTPS
+ Force Transcoding Codecs
+ Enable Netflix style next up notification
+ - The number of seconds before the end to show the notification
+ Show Emby Info dialog on play/select action
Enable server connection message on startup
- Recently added Home Videos
- Recently added Photos
- Favourite Home Videos
- Favourite Photos
+ Recently added Home Videos
+ Recently added Photos
+ Favourite Home Videos
+ Favourite Photos
Favourite Albums
- Recently added Music videos
- In progress Music videos
- Unwatched Music videos
+ Recently added Music videos
+ In progress Music videos
+ Unwatched Music videos
-
+
Active
Clear Settings
Movies
@@ -260,8 +253,8 @@
Music Videos
Music Tracks
Channels
-
-
+
+
Emby options
Clear like for this item
Like this item
@@ -305,8 +298,8 @@
Startup delay (in seconds)
Enable server restart message
Enable new content notification
- Duration for the video library (in seconds)
- Duration for the music library (in seconds)
+ For the video library (in seconds)
+ For the music library (in seconds)
Welcome
diff --git a/resources/lib/videonodes.py b/resources/lib/videonodes.py
index 4ef8d273..6b5aba72 100644
--- a/resources/lib/videonodes.py
+++ b/resources/lib/videonodes.py
@@ -54,6 +54,7 @@ class VideoNodes(object):
def viewNode(self, indexnumber, tagname, mediatype, viewtype, delete=False):
+ window = utils.window
kodiversion = self.kodiversion
cleantagname = utils.normalize_nodes(tagname.encode('utf-8'))
@@ -92,13 +93,13 @@ class VideoNodes(object):
path = "library://video/Emby - %s/" % dirname
for i in range(1, indexnumber):
# Verify to make sure we don't create duplicates
- if utils.window('Emby.nodes.%s.index' % i) == path:
+ if window('Emby.nodes.%s.index' % i) == path:
return
- if mediatype=="photos":
+ if mediatype == "photos":
path = "plugin://plugin.video.emby/?id=%s&mode=getsubfolders" % indexnumber
- utils.window('Emby.nodes.%s.index' % indexnumber, value=path)
+ window('Emby.nodes.%s.index' % indexnumber, value=path)
# Root
if not mediatype=="photos":
@@ -163,13 +164,14 @@ class VideoNodes(object):
'8': 30255,
'11': 30254
},
+
'musicvideos':
{
'1': tagname,
'2': 30256,
'4': 30257,
'6': 30258
- },
+ }
}
nodes = mediatypes[mediatype]
@@ -189,10 +191,12 @@ class VideoNodes(object):
# Set window properties
if (mediatype == "homevideos" or mediatype == "photos") and nodetype == "all":
# Custom query
- path = "plugin://plugin.video.emby/?id=%s&mode=browsecontent&type=%s" %(tagname,mediatype)
+ path = ("plugin://plugin.video.emby/?id=%s&mode=browsecontent&type=%s"
+ % (tagname, mediatype))
elif (mediatype == "homevideos" or mediatype == "photos"):
# Custom query
- path = "plugin://plugin.video.emby/?id=%s&mode=browsecontent&type=%s&folderid=%s" %(tagname,mediatype,nodetype)
+ path = ("plugin://plugin.video.emby/?id=%s&mode=browsecontent&type=%s&folderid=%s"
+ % (tagname, mediatype, nodetype))
elif nodetype == "nextepisodes":
# Custom query
path = "plugin://plugin.video.emby/?id=%s&mode=nextup&limit=25" % tagname
@@ -218,19 +222,20 @@ class VideoNodes(object):
templabel = label
embynode = "Emby.nodes.%s" % indexnumber
- utils.window('%s.title' % embynode, value=templabel)
- utils.window('%s.path' % embynode, value=windowpath)
- utils.window('%s.content' % embynode, value=path)
- utils.window('%s.type' % embynode, value=mediatype)
+ window('%s.title' % embynode, value=templabel)
+ window('%s.path' % embynode, value=windowpath)
+ window('%s.content' % embynode, value=path)
+ window('%s.type' % embynode, value=mediatype)
else:
embynode = "Emby.nodes.%s.%s" % (indexnumber, nodetype)
- utils.window('%s.title' % embynode, value=label)
- utils.window('%s.path' % embynode, value=windowpath)
- utils.window('%s.content' % embynode, value=path)
+ window('%s.title' % embynode, value=label)
+ window('%s.path' % embynode, value=windowpath)
+ window('%s.content' % embynode, value=path)
- if mediatype=="photos":
- #for photos we do not create a node in videos but we do want the window props to be created
- #todo: add our photos nodes to kodi picture sources somehow
+ if mediatype == "photos":
+ # For photos, we do not create a node in videos but we do want the window props
+ # to be created.
+ # To do: add our photos nodes to kodi picture sources somehow
continue
if xbmcvfs.exists(nodeXML):
@@ -238,7 +243,8 @@ class VideoNodes(object):
continue
# Create the root
- if nodetype == "nextepisodes" or (kodiversion == 14 and nodetype in ('recentepisodes', 'inprogressepisodes')) or mediatype=="homevideos":
+ if (nodetype == "nextepisodes" or mediatype == "homevideos" or
+ (kodiversion == 14 and nodetype in ('recentepisodes', 'inprogressepisodes'))):
# Folder type with plugin path
root = self.commonRoot(order=node, label=label, tagname=tagname, roottype=2)
etree.SubElement(root, 'path').text = path
@@ -311,6 +317,8 @@ class VideoNodes(object):
def singleNode(self, indexnumber, tagname, mediatype, itemtype):
+ window = utils.window
+
tagname = tagname.encode('utf-8')
cleantagname = utils.normalize_nodes(tagname)
nodepath = xbmc.translatePath("special://profile/library/video/").decode('utf-8')
@@ -334,10 +342,10 @@ class VideoNodes(object):
}
label = utils.language(labels[tagname])
embynode = "Emby.nodes.%s" % indexnumber
- utils.window('%s.title' % embynode, value=label)
- utils.window('%s.path' % embynode, value=windowpath)
- utils.window('%s.content' % embynode, value=path)
- utils.window('%s.type' % embynode, value=itemtype)
+ window('%s.title' % embynode, value=label)
+ window('%s.path' % embynode, value=windowpath)
+ window('%s.content' % embynode, value=path)
+ window('%s.type' % embynode, value=itemtype)
if xbmcvfs.exists(nodeXML):
# Don't recreate xml if already exists
@@ -359,8 +367,10 @@ class VideoNodes(object):
def clearProperties(self):
+ window = utils.window
+
self.logMsg("Clearing nodes properties.", 1)
- embyprops = utils.window('Emby.nodes.total')
+ embyprops = window('Emby.nodes.total')
propnames = [
"index","path","title","content",
@@ -379,4 +389,4 @@ class VideoNodes(object):
totalnodes = int(embyprops)
for i in range(totalnodes):
for prop in propnames:
- utils.window('Emby.nodes.%s.%s' % (str(i), prop), clear=True)
\ No newline at end of file
+ window('Emby.nodes.%s.%s' % (str(i), prop), clear=True)
\ No newline at end of file