admin/jellycon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add music recent, frequent, latest nodes

Browse Source
This commit is contained in:
faush01
2018-11-28 20:20:03 +11:00
parent 21db5be45d
commit 24a1f42ab9
4 changed files with 97 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
addon.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.embycon"
name="EmbyCon"
version="1.6.14"
version="1.6.15"
provider-name="Team B">
<requires>
<import addon="xbmc.python" version="2.25.0"/>

24
resources/language/resource.language.en_gb/strings.po
View File

@@ -610,18 +610,10 @@ msgctxt "#30318"
msgid "Music - All Albums"
msgstr ""
msgctxt "#30319"
msgid "Music - All Album Artists"
msgstr ""
msgctxt "#30320"
msgid " - Albums"
msgstr ""
msgctxt "#30321"
msgid " - Album Artists"
msgstr ""
msgctxt "#30322"
msgid "Auto Resume"
msgstr ""
@@ -721,3 +713,19 @@ msgstr ""
msgctxt "#30348"
msgid "Add user ratings"
msgstr ""
msgctxt "#30349"
msgid " - Recently Played"
msgstr ""
msgctxt "#30350"
msgid "Music - Recently Added"
msgstr ""
msgctxt "#30351"
msgid "Music - Recently Played"
msgstr ""
msgctxt "#30352"
msgid "Music - Frequently Played"
msgstr ""

15
resources/lib/functions.py
View File

@@ -593,17 +593,6 @@ def processDirectory(url, progress, params, use_cache_data=False):
if gui_item:
dir_items.append(gui_item)
elif item_details.item_type == "MusicArtist":
u = ('{server}/emby/Users/{userid}/items' +
'?ArtistIds=' + item_details.id +
'&IncludeItemTypes=MusicAlbum' +
'&CollapseBoxSetItems=false' +
'&Recursive=true' +
'&format=json')
gui_item = add_gui_item(u, item_details, display_options)
if gui_item:
dir_items.append(gui_item)
else:
u = item_details.id
gui_item = add_gui_item(u, item_details, display_options, folder=False)
@@ -668,8 +657,8 @@ def show_menu(params):
return
action_items = []
if result["Type"] in ["Episode", "Movie", "Music", "Video"]:
if result["Type"] in ["Episode", "Movie", "Music", "Video", "Audio"]:
li = xbmcgui.ListItem(string_load(30314))
li.setProperty('menu_id', 'play')
action_items.append(li)

86
resources/lib/menu_functions.py
View File

@@ -338,19 +338,54 @@ def getCollections():
collections.append(item_data)
item_data = {}
item_data['title'] = item_name + string_load(30321)
item_data['title'] = item_name + string_load(30268) + " (" + show_x_filtered_items + ")"
item_data['art'] = art
item_data['media_type'] = 'MusicArtists'
item_data['path'] = ('{server}/emby/Artists/AlbumArtists' +
'?Recursive=true' +
item_data['media_type'] = 'MusicAlbums'
item_data['path'] = ('{server}/emby/Users/{userid}/Items/Latest' +
'?IncludeItemTypes=Audio' +
'&ParentId=' + item.get("Id") +
'&ImageTypeLimit=1' +
'&Limit={ItemLimit}' +
'&EnableImageTypes=Primary,Backdrop,Banner,Thumb' +
'&SortBy=Name' +
'&SortOrder=Ascending' +
'&format=json')
collections.append(item_data)
item_data = {}
item_data['title'] = item_name + string_load(30349) + " (" + show_x_filtered_items + ")"
item_data['art'] = art
item_data['media_type'] = 'MusicAlbum'
item_data['path'] = ('{server}/emby/Users/{userid}/Items' +
'?SortBy=DatePlayed' +
'&SortOrder=Descending' +
'&IncludeItemTypes=Audio' +
'&Limit={ItemLimit}' +
'&Recursive=true' +
'&ParentId=' + item.get("Id") +
'&ImageTypeLimit=1' +
'&EnableImageTypes=Primary,Backdrop,Banner,Thumb' +
'&Filters=IsPlayed' +
'&format=json')
collections.append(item_data)
item_data = {}
item_data['title'] = item_name + " - Frequently Played" + " (" + show_x_filtered_items + ")"
item_data['art'] = art
item_data['media_type'] = 'MusicAlbum'
item_data['path'] = ('{server}/emby/Users/{userid}/Items' +
'?SortBy=PlayCount' +
'&SortOrder=Descending' +
'&IncludeItemTypes=Audio' +
'&Limit={ItemLimit}' +
'&Recursive=true' +
'&ParentId=' + item.get("Id") +
'&ImageTypeLimit=1' +
'&EnableImageTypes=Primary,Backdrop,Banner,Thumb' +
'&Filters=IsPlayed' +
'&format=json')
collections.append(item_data)
if collection_type in ["homevideos"]:
collections.append({
'title': item_name,
@@ -876,17 +911,52 @@ def getCollections():
collections.append(item_data)
item_data = {}
item_data['title'] = string_load(30319)
item_data['media_type'] = 'MusicArtists'
item_data['path'] = ('{server}/emby/Artists/AlbumArtists' +
'?Recursive=true' +
item_data['title'] = string_load(30350) + " (" + show_x_filtered_items + ")"
item_data['art'] = art
item_data['media_type'] = 'MusicAlbums'
item_data['path'] = ('{server}/emby/Users/{userid}/Items/Latest' +
'?IncludeItemTypes=Audio' +
'&ImageTypeLimit=1' +
'&Limit={ItemLimit}' +
'&EnableImageTypes=Primary,Backdrop,Banner,Thumb' +
'&SortBy=Name' +
'&SortOrder=Ascending' +
'&format=json')
collections.append(item_data)
item_data = {}
item_data['title'] = string_load(30351) + " (" + show_x_filtered_items + ")"
item_data['art'] = art
item_data['media_type'] = 'MusicAlbum'
item_data['path'] = ('{server}/emby/Users/{userid}/Items' +
'?SortBy=DatePlayed' +
'&SortOrder=Descending' +
'&IncludeItemTypes=Audio' +
'&Limit={ItemLimit}' +
'&Recursive=true' +
'&ImageTypeLimit=1' +
'&EnableImageTypes=Primary,Backdrop,Banner,Thumb' +
'&Filters=IsPlayed' +
'&format=json')
collections.append(item_data)
item_data = {}
item_data['title'] = string_load(30352) + " (" + show_x_filtered_items + ")"
item_data['art'] = art
item_data['media_type'] = 'MusicAlbum'
item_data['path'] = ('{server}/emby/Users/{userid}/Items' +
'?SortBy=PlayCount' +
'&SortOrder=Descending' +
'&IncludeItemTypes=Audio' +
'&Limit={ItemLimit}' +
'&Recursive=true' +
'&ImageTypeLimit=1' +
'&EnableImageTypes=Primary,Backdrop,Banner,Thumb' +
'&Filters=IsPlayed' +
'&format=json')
collections.append(item_data)
return collections