diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/game.controller.default/addon.xml kodi-18.0+git20180909.0202-e70825a/addons/game.controller.default/addon.xml --- kodi-18.0+git20180908.0202-ef47f46/addons/game.controller.default/addon.xml 2018-05-01 00:00:07.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/game.controller.default/addon.xml 2018-09-09 00:01:56.000000000 +0000 @@ -1,7 +1,7 @@ @@ -9,7 +9,7 @@

Default Controller

The default media center controller is based on the Xbox 360 controller. - Image credit: Wikipedia (wikipedia.org) + Image credit: Wikipedia (wikipedia.org) all resources/icon.png diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.album.universal/addon.xml kodi-18.0+git20180909.0202-e70825a/addons/metadata.album.universal/addon.xml --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.album.universal/addon.xml 2018-02-11 01:00:56.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.album.universal/addon.xml 2018-09-09 00:01:56.000000000 +0000 @@ -1,7 +1,7 @@ - + diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.album.universal/albumuniversal.xml kodi-18.0+git20180909.0202-e70825a/addons/metadata.album.universal/albumuniversal.xml --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.album.universal/albumuniversal.xml 2017-11-15 01:02:37.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.album.universal/albumuniversal.xml 2018-09-09 00:01:56.000000000 +0000 @@ -26,29 +26,11 @@ - - id="([^"]*)"><title>([^<]*)</title><status>Official</status>(?:<packaging>[^<]*</packaging>)?<text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*</script>)*</text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\stype="Album"\sid="[^"]*">(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list>(?:<secondary-type>[^<]*</secondary-type>)+</secondary-type-list>)*</release-group>(?:<date>(\d{4})[^<]*</date>)*(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+) - - - id="([^"]*)"><title>([^<]*)</title><status>Official</status>(?:<packaging>[^<]*</packaging>)?<text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*</script>)*</text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>)*</artist-credit><release-group(?:\stype="[^"]*")*\sid="[^"]*">(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list>(?:<secondary-type>[^<]*</secondary-type>)+</secondary-type-list>)*</release-group>(?:<date>(\d{4})[^<]*</date>)*(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+) - - - id="([^"]*)" ext:score="(\d*)"><title>([^<]*)</title><status>Official</status>(?:<disambiguation>[^<]*</disambiguation>)*(?:<packaging>[^<]*</packaging>)?<text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*</script>)*</text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\sid="[^"]*"\stype="Album">(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list>(?:<secondary-type>[^<]*</secondary-type>)+</secondary-type-list>)*</release-group>(?:<date>(\d{4})[^<]*</date>)*(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+) - - - id="([^"]*)" ext:score="(\d*)"><title>([^<]*)</title><status>Official</status>(?:<disambiguation>[^<]*</disambiguation>)*(?:<packaging>[^<]*</packaging>)?<text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*<)*/script></text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\sid="[^"]*"(?:\stype="[^"]*")*>(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list>(?:<secondary-type>[^<]*</secondary-type>)+</secondary-type-list>)*</release-group>(?:<date>(\d{4})[^<]*</date>)*(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+) - - - id="([^"]*)"><title>([^<]*)</title><status>(?!Official)[^<]*</status>(?:<disambiguation>[^<]*</disambiguation>)*(?:<packaging>[^<]*</packaging>)?<text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*</script>)*</text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\stype="Album"\sid="[^"]*">(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list>(?:<secondary-type>[^<]*</secondary-type>)+</secondary-type-list>)*</release-group>(?:<date>(\d{4})[^<]*</date>)*(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+) - - - id="([^"]*)"><title>([^<]*)</title><status>(?!Official)[^<]*</status>(?:<disambiguation>[^<]*</disambiguation>)*(?:<packaging>[^<]*</packaging>)?<text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*</script>)*</text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>)*</artist-credit><release-group(?:\stype="[^"]*")*\sid="[^"]*">(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list>(?:<secondary-type>[^<]*</secondary-type>)+</secondary-type-list>)*</release-group>(?:<date>(\d{4})[^<]*</date>)*(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+) - - - id="([^"]*)" ext:score="(\d*)"><title>([^<]*)</title><status>(?!Official)[^<]*</status>(?:<disambiguation>[^<]*</disambiguation>)*(?:<packaging>[^<]*</packaging>)?<text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*</script>)*</text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\sid="[^"]*"\stype="Album">(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list>(?:<secondary-type>[^<]*</secondary-type>)+</secondary-type-list>)*</release-group>(?:<date>(\d{4})[^<]*</date>)*(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+) + + release\sid="([^"]*)"[^:]*:score="(\d*)"><title>([^<]*)</title><status>Official</status>(?:<disambiguation>[^<]*</disambiguation>)*(?:<packaging>[^<]*</packaging>)*<text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*</script>)*</text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\sid="[^"]*"\stype="Album"\stype-id="[^"]*"><title>[^<]*</title>(?:<disambiguation>[^<]*</disambiguation>)*(?:<primary-type\sid="[^"]*">[^<]*</primary-type>)*(?:<secondary-type-list>(?:<secondary-type\sid="[^"]*">[^<]*</secondary-type>)+</secondary-type-list>)*</release-group>(?:<date>(\d{4})[^<]*</date>)*(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+).*?</release> - id="([^"]*)" ext:score="(\d*)"><title>([^<]*)</title><status>(?!Official)[^<]*</status>(?:<disambiguation>[^<]*</disambiguation>)*(?:<packaging>[^<]*</packaging>)?<text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*</script>)*</text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\sid="[^"]*"(?:\stype="[^"]*")*>(?:<primary-type>[^<]*</primary-type>)*(?:<secondary-type-list>(?:<secondary-type>[^<]*</secondary-type>)+</secondary-type-list>)*</release-group>(?:<date>(\d{4})[^<]*</date>)*(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+) + release\sid="([^"]*)"[^:]*:score="(\d*)"><title>([^<]*)</title><status>Official</status>(?:<disambiguation>[^<]*</disambiguation>)*(?:<packaging>[^<]*</packaging>)*<text-representation>(?:<language>[^<]*</language>)*(?:<script>[^<]*</script>)*</text-representation><artist-credit><name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>([^<]*)</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>(?:<name-credit(?:>)*(?:\sjoinphrase="[^"]*">)*(?:<name>[^<]*</name)*(?:>)*<artist\sid="[^"]*"><name>[^<]*</name>(?:<sort-name>[^<]*</sort-name>)*(?:<disambiguation>[^<]*</disambiguation>)*(?:<alias-list>(?:<alias[^<]*</alias>)*</alias-list>)*</artist></name-credit>)*</artist-credit><release-group\sid="[^"]*"\stype="[^"]*"\stype-id="[^"]*"><title>[^<]*</title>(?:<disambiguation>[^<]*</disambiguation>)*(?:<primary-type\sid="[^"]*">[^<]*</primary-type>)*(?:<secondary-type-list>(?:<secondary-type\sid="[^"]*">[^<]*</secondary-type>)+</secondary-type-list>)*</release-group>(?:<date>(\d{4})[^<]*</date>)*(?:<country>)*([^<]*)?.*?<track-list\scount="(\d+).*?</release> @@ -140,9 +122,21 @@ (.+) + + (.+) + (.+) + + (.+) + + + (.+) + + + (.+) + (.+) diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.album.universal/changelog.txt kodi-18.0+git20180909.0202-e70825a/addons/metadata.album.universal/changelog.txt --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.album.universal/changelog.txt 2017-11-15 01:02:37.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.album.universal/changelog.txt 2018-09-09 00:01:56.000000000 +0000 @@ -1,3 +1,13 @@ +[B]3.1.1[/B] +Fixed: further fixes to search results + +[B]3.1.0[/B] +Added: scraping extra artwork from theaudiobdb.com + +[B]3.0.0[/B] +Fixed: albums won't be found on MusicBrainz +Added: scraping discart from fanart.tv + [B]2.7.3[/B] Fixed: albums without year on MusicBrainz won't be found diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.album.universal/resources/language/English/strings.po kodi-18.0+git20180909.0202-e70825a/addons/metadata.album.universal/resources/language/English/strings.po --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.album.universal/resources/language/English/strings.po 2017-11-15 01:02:37.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.album.universal/resources/language/English/strings.po 2018-09-09 00:01:56.000000000 +0000 @@ -66,4 +66,20 @@ msgctxt "#30012" msgid "MusicBrainz Mirror" +msgstr "" + +msgctxt "#30013" +msgid "Grab Album Discart from fanart.tv" +msgstr "" + +msgctxt "#30014" +msgid "Grab Album Back Cover from theaudiodb.com" +msgstr "" + +msgctxt "#30015" +msgid "Grab Album Discart from theaudiodb.com" +msgstr "" + +msgctxt "#30016" +msgid "Grab Album Spine from theaudiodb.com" msgstr "" \ No newline at end of file diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.album.universal/resources/settings.xml kodi-18.0+git20180909.0202-e70825a/addons/metadata.album.universal/resources/settings.xml --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.album.universal/resources/settings.xml 2017-11-15 01:02:37.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.album.universal/resources/settings.xml 2018-09-09 00:01:56.000000000 +0000 @@ -16,9 +16,13 @@ + + + + - + diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.artists.universal/addon.xml kodi-18.0+git20180909.0202-e70825a/addons/metadata.artists.universal/addon.xml --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.artists.universal/addon.xml 2018-07-31 18:47:36.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.artists.universal/addon.xml 2018-09-09 00:01:56.000000000 +0000 @@ -1,14 +1,14 @@ - + - + <artist.*?<name>([^<]*) + + <artist.*?<sort-name>([^<]*) + <artist.*?\stype="([Person|Group|Orchestra|Choir|Character|Other])" @@ -67,9 +70,24 @@ (.+) + + (.+) + (.+) + + (.+) + + + (.+) + + + (.+) + + + (.+) + (.+) diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.artists.universal/changelog.txt kodi-18.0+git20180909.0202-e70825a/addons/metadata.artists.universal/changelog.txt --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.artists.universal/changelog.txt 2018-07-31 18:47:36.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.artists.universal/changelog.txt 2018-09-09 00:01:56.000000000 +0000 @@ -1,3 +1,12 @@ +[B]4.2.1[/B] +fixed: dependency error + +[B]4.2.0[/B] +added: scraping extra artwork from theaudiodb.com + +[B]4.1.5[/B] +added: artist sort name from Musicbrainz and artist banner from fanart.tv + [B]4.1.4[/B] changed: include some other valid MB artist types in the previous fix diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.artists.universal/resources/language/English/strings.po kodi-18.0+git20180909.0202-e70825a/addons/metadata.artists.universal/resources/language/English/strings.po --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.artists.universal/resources/language/English/strings.po 2018-05-01 00:00:07.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.artists.universal/resources/language/English/strings.po 2018-09-09 00:01:56.000000000 +0000 @@ -124,4 +124,24 @@ msgctxt "#30027" msgid "Enable Artist Clearlogo from fanart.tv" +msgstr "" + +msgctxt "#30028" +msgid "Enable Artist Banner from fanart.tv" +msgstr "" + +msgctxt "#30029" +msgid "Enable Artist Clearlogo from theaudiodb.com" +msgstr "" + +msgctxt "#30030" +msgid "Enable Artist Clearart from theaudiodb.com" +msgstr "" + +msgctxt "#30031" +msgid "Enable Artist Landscape from theaudiodb.com" +msgstr "" + +msgctxt "#30032" +msgid "Enable Artist Banner from theaudiodb.com" msgstr "" \ No newline at end of file diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.artists.universal/resources/settings.xml kodi-18.0+git20180909.0202-e70825a/addons/metadata.artists.universal/resources/settings.xml --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.artists.universal/resources/settings.xml 2018-05-01 00:00:07.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.artists.universal/resources/settings.xml 2018-09-09 00:01:56.000000000 +0000 @@ -33,10 +33,15 @@ + + + + + - + diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.allmusic.com/addon.xml kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.allmusic.com/addon.xml --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.allmusic.com/addon.xml 2018-04-30 14:22:41.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.allmusic.com/addon.xml 2018-09-09 00:01:56.000000000 +0000 @@ -1,7 +1,7 @@ - + diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.allmusic.com/allmusic.xml kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.allmusic.com/allmusic.xml --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.allmusic.com/allmusic.xml 2018-04-30 14:22:41.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.allmusic.com/allmusic.xml 2018-09-09 00:01:56.000000000 +0000 @@ -1,7 +1,7 @@ - + @@ -17,54 +17,8 @@ - - - - - - - - - - - - " itemprop="description">(.*?)div class="advertisement leaderboard"> - - - - last.fm - - - TheAudioDb.com - - ^$ - - - (.+) - - - - - - - - - - - - - - - - - " itemprop="description">(.*?)div class="advertisement leaderboard"> - - - - - - + @@ -76,17 +30,17 @@ - - <h4>\s*Born\s*</h4>\s*<div>(.*?\d{4})\s*([^<]*)? + + <h4>\s.+Born.*?birthdate/[^"]+">([^<]*)(.*?"/birthplace/[^"]+">([^<]*))? - - <h4>\s*Died\s*</h4>\s*<div>(.*?\d{4})\s*([^<]*)? + + <h4>\s.+Died.*?deathdate/[^"]+">([^<]*)(.*?"/deathplace/[^"]+">([^<]*))? - <h4>\s*Formed\s*</h4>\s*<div>(.*?\d{4})\s*([^<]*)? + <h4>\s.+Formed.*?birthdate/[^"]+">([^<]*) - <h4>\s*Disbanded\s*</h4>\s*<div>(.*?\d{4})\s*([^<]*)? + <h4>\s.+Disbanded.*?deathdate/[^"]+[^"]+">([^<]*) @@ -105,7 +59,7 @@ - + @@ -131,7 +85,7 @@ - + @@ -148,7 +102,7 @@ - + @@ -164,7 +118,7 @@ <h4>Genre</h4>\s*<div>(.*?)</div> - <a\shref="http://www.allmusic.com/genre/[^"]*">([^<]*) + <a\shref="https://www.allmusic.com/genre/[^"]*">([^<]*) @@ -183,7 +137,7 @@ - + @@ -199,14 +153,14 @@ <h4>Genre</h4>\s*<div>(.*?)</div> - <a\shref="http://www.allmusic.com/genre/[^"]*">([^<]*) + <a\shref="https://www.allmusic.com/genre/[^"]*">([^<]*) - + @@ -222,7 +176,7 @@ <h4>Styles</h4>\s*<div>(.*?)</div> - <a\shref="http://www.allmusic.com/style/[^"]*">([^<]*) + <a\shref="https://www.allmusic.com/style/[^"]*">([^<]*) @@ -241,7 +195,7 @@ - + @@ -257,14 +211,14 @@ <h4>Styles</h4>\s*<div>(.*?)</div> - <a\shref="http://www.allmusic.com/style/[^"]*">([^<]*) + <a\shref="https://www.allmusic.com/style/[^"]*">([^<]*) - + @@ -296,7 +250,7 @@ - + @@ -318,74 +272,9 @@ - - - - - - - - - - - - - - - <h\d>Photo\sGallery</h\d>(.*?)<h2\sclass="artist-name" - - - <img src="http://cps-static.rovicorp.com/3/JPG_[^/]*/([^"]*) - - - - - - - - - - - - - - - <span itemprop="description">([^<]*) - - - - - - - - - - - - - - <div class="album-title">([^<]*) - - - - - - - - - - - - - - <div class="album-artist">[^>]*>([^<]*) - - - - - + @@ -398,59 +287,42 @@ - - - - - - - - - <dd class="release-date">([^<]*) - - - <dd class="release-date">([^,]*,)?([^<]*) - - - - - - + - <h4>Genre</h4>\s*<div>(.*?)</div> + class="genre">(.*?)</div> - <a\shref="http://www.allmusic.com/genre/[^"]*">([^<]*) + <a\shref="https://www.allmusic.com/genre/[^"]*">([^<]*) - + - <h4>Styles</h4>\s*<div>(.*?)</div> + class="styles">(.*?)</div> - <a\shref="http://www.allmusic.com/style/[^"]*">([^<]*) + <a\shref="https://www.allmusic.com/style/[^"]*">([^<]*) - + @@ -460,84 +332,41 @@ >\s*<h4>Album\sMoods</h4>(.*?)</section> - <a\shref="http://www.allmusic.com/mood/[^"]*">([^<]*) + <a\shref="https://www.allmusic.com/mood/[^"]*">([^<]*) - + - >\s*<h4>Themes</h4>(.*?)</ul> + <section\sclass="themes">(.*?)</section> - <a\shref="http://www.allmusic.com/theme/[^"]*">([^<]*) + <a\shref="https://www.allmusic.com/theme/[^"]*">([^<]*) - - - - - - - - - <td class="tracknum">([0-9]*).*?<div class="title">[^>]*>([^<]*).*?<td class="time">([^<]*) - - - - - - + - - "http://cps-static.rovicorp.com/3/JPG_[^/]*/([^"]*) + + <img src="https://cdn-s3.allmusic.com/release-covers/500/([^"]*) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.fanart.tv/addon.xml kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.fanart.tv/addon.xml --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.fanart.tv/addon.xml 2018-04-30 14:22:41.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.fanart.tv/addon.xml 2018-09-09 00:01:56.000000000 +0000 @@ -1,7 +1,7 @@ diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.fanart.tv/fanarttv.xml kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.fanart.tv/fanarttv.xml --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.fanart.tv/fanarttv.xml 2018-04-30 14:22:41.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.fanart.tv/fanarttv.xml 2018-09-09 00:01:56.000000000 +0000 @@ -16,13 +16,59 @@ "artistthumb":\s\[(.*?)\}\s*\] - + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*) + + + + + + + + + + + + + + + "hdmusiclogo":\s\[(.*?)\}\s*\] + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*) + + + + + + + + + + + + + + + + + + + + "musicbanner":\s\[(.*?)\}\s*\] + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*) + + + + + @@ -75,6 +121,29 @@ + + + + + + + + + + + + + + + "cdart":\s\[(.*?)\}\s*\] + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*) + + + + + @@ -107,15 +176,18 @@ - + - - + + (.+)::(.+) + + + (.+)::(.+) - + @@ -126,11 +198,524 @@ "movieposter":\s\[(.*?)\}\s*\] - + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"$$11" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"en" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"00" + + + + + + + + + .+::(.+) + + + (.+)::.+ + + + + + + + + + + + + + + "hdmovielogo":\s\[(.*?)\}\s*\] + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"$$18" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"en" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"00" + + + + + + + + + .+::(.+) + + + (.+)::.+ + + + + + + + + + + + + + + "hdmovieclearart":\s\[(.*?)\}\s*\] + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"$$18" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"en" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"00" + + + + + + + + + .+::(.+) + + + (.+)::.+ + + + + + + + + + + + + + + "moviebanner":\s\[(.*?)\}\s*\] + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"$$18" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"en" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"00" + + + + + + + + + .+::(.+) + + + (.+)::.+ + + + + + + + + + + + + + + "moviethumb":\s\[(.*?)\}\s*\] + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"$$18" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"en" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"00" + + + + + + + + + .+::(.+) + + + (.+)::.+ + + + + + + + + + + + + + + "moviedisc":\s\[(.*?)\}\s*\] + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"$$18" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"en" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"00" + + + + + + + + + .+::(.+) + + + (.+)::.+ + + + + + + + + + + + + + + "tvposter":\s\[(.*?)\}\s*\] + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"$$18" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"en" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"!$$18|!en" + + + + + + + + + .+::(.+) + + + (.+)::.+ + + + + + + + + + + + + + + "tvbanner":\s\[(.*?)\}\s*\] + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"$$18" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"en" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"!$$18|!en" + + + + + + + + + .+::(.+) + + + (.+)::.+ + + + + + + + + + + + + + + "tvthumb":\s\[(.*?)\}\s*\] + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"$$18" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"en" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"!$$18|!en" + + + + + + + + + .+::(.+) + + + (.+)::.+ + + + + + + + + + + + + + + "hdtvlogo":\s\[(.*?)\}\s*\] + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"$$18" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"en" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"!$$18|!en" + + + + + + + + + .+::(.+) + + + (.+)::.+ + + + + + + + + + + + + + + "hdclearart":\s\[(.*?)\}\s*\] + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"$$18" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"en" + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"!$$18|!en" + + + + + + + + + + + + + + + + + + + + + + + "showbackground":\s\[(.*?)\}\s*\] + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*) + + + + + + + + + + + + + + + + + + + + + + + "characterart":\s\[(.*?)\}\s*\] + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*) - - + + + + + + .+::(.+) + + + (.+)::.+ + + + + + + + + + + + + + + "seasonposter":\s\[(.*?)\}\s*\] + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"$$18",\s*"likes[^,]*,\s*"season":\s"([0-9,]+) + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"en",\s*"likes[^,]*,\s*"season":\s"([0-9,]+) + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"!$$18|!en",\s*"likes[^,]*,\s*"season":\s"([0-9,]+) + + + + + + + + + .+::(.+) + + + (.+)::.+ + + + + + + + + + + + + + + "seasonbanner":\s\[(.*?)\}\s*\] + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"$$18",\s*"likes[^,]*,\s*"season":\s"([0-9,]+) + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"en",\s*"likes[^,]*,\s*"season":\s"([0-9,]+) + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"!$$18|!en",\s*"likes[^,]*,\s*"season":\s"([0-9,]+) + + + + + + + + + .+::(.+) + + + (.+)::.+ + + + + + + + + + + + + + + "seasonthumb":\s\[(.*?)\}\s*\] + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"$$18",\s*"likes[^,]*,\s*"season":\s"([0-9,]+) + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"en",\s*"likes[^,]*,\s*"season":\s"([0-9,]+) + + + "id":\s"\d*",\s*"url":\s"https://([^/]*)/fanart/([^"]*)",\s*"lang":\s"!$$18|!en",\s*"likes[^,]*,\s*"season":\s"([0-9,]+) + + + + + diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.imdb.com/addon.xml kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.imdb.com/addon.xml --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.imdb.com/addon.xml 2018-05-01 00:00:07.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.imdb.com/addon.xml 2018-09-09 00:01:56.000000000 +0000 @@ -1,7 +1,7 @@ diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.imdb.com/changelog.txt kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.imdb.com/changelog.txt --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.imdb.com/changelog.txt 2018-05-01 00:00:07.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.imdb.com/changelog.txt 2018-09-09 00:01:56.000000000 +0000 @@ -1,3 +1,51 @@ +[B]3.1.0[/B] +- fixed: re-write most regular expressions following IMDb site layout changes + +[B]3.0.8[/B] +- changed: another change to IMDb outline + +[B]3.0.7[/B] +- changed: removed one of the IMDb outline catch + +[B]3.0.6[/B] +- fixed: try to limit world wide English to over ride proper USA title + +[B]3.0.5[/B] +- fixed: IMDb cast and outline following IMDb layout changes + +[B]3.0.4[/B] +- fixed: IMDb plot after IMDb layout changes + +[B]3.0.3[/B] +- fixed: World-wide English title won't scraped correctly + +[B]3.0.2[/B] +- Use TV certification in the absence of MPAA ones + +[B]3.0.1[/B] +- fixed: USA Title won't scraped correctly under some circumstances, plot outline quirks, IMDB Posters + +[B]3.0.0[/B] +- fixed: IMDb plot outline under some circumstances + +[B]2.9.9[/B] +- fixed: Thumb for IMDb cast + +[B]2.9.8[/B] +- fixed: IMDb outline for some movies + +[B]2.9.7[/B] +- changed: attempt to scrape generic local title from IMDb if multiple are available + +[B]2.9.6[/B] +- fixed: movie title issues after IMDb layout changes + +[B]2.9.5[/B] +- fixed: IMDb Full credits after IMDb layout changes + +[B]2.9.4[/B] +- fixed: USA certification rating due to IMDb changes + [B]2.9.3[/B] - fixed: always get USA rating regardless of the country set @@ -55,7 +103,7 @@ - fixed: MetaCritic Score [B]2.7.3[/B] -- fixed: orginal title won't scrape in some cases +- fixed: original title won't scrape in some cases [B]2.7.2[/B] - changed: make sure to parse the intended page @@ -115,7 +163,7 @@ - fixed: fetching directors and writers due to site changes [B]2.1.3[/B] -- fixed: make sure IMDb rating is geting fetched in every region +- fixed: make sure IMDb rating is getting fetched in every region [B]2.1.2[/B] - fixed: IMDb rating after another site change @@ -145,10 +193,10 @@ - reverted: fixchars removed from cast parsing, leads to Dharma Beta2 hanging, will be added back once next Beta is out [B]2.0.2[/B] -- fixed: some more cast won't get scraped under certain circumtances +- fixed: some more cast won't get scraped under certain circumstances [B]2.0.1[/B] -- fixed: cast won't get scraped under certain circumtances +- fixed: cast won't get scraped under certain circumstances [B]2.0.0[/B] - changed: adapted new IMDb layout diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.imdb.com/imdb.xml kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.imdb.com/imdb.xml --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.imdb.com/imdb.xml 2018-05-01 00:00:07.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.imdb.com/imdb.xml 2018-09-09 00:01:56.000000000 +0000 @@ -1,7 +1,7 @@ - + - + @@ -15,21 +15,21 @@ - + - - <span\sitemprop="ratingValue">([0-9.]+).*?ratingCount">([0-9,]+)< + + "ratingCount":\s([0-9,]+),\s*"bestRating":\s"[^"]*",\s*"worstRating":\s"[^"]*",\s*"ratingValue":\s"([0-9.]+) - + ^(tt\d+) @@ -38,15 +38,15 @@ - - <span\sitemprop="ratingValue">([0-9.]+).*?ratingCount">([0-9,]+)< + + "ratingCount":\s([0-9,]+),\s*"bestRating":\s"[^"]*",\s*"worstRating":\s"[^"]*",\s*"ratingValue":\s"([0-9.]+) - + @@ -60,21 +60,21 @@ - + - "/company/[^>]+>[^<]*<[^>]*>([^<]+)</span> + "/company/[^"]+"\s*>([^<]+)</a> - + @@ -84,34 +84,34 @@ Country:[^>]+>(.*?)</div> - itemprop='url'>([^<]+) + >([^<]+)</a> - + - (<div class="metascore_block".*) + <div\sclass="metacriticScore\sscore_mixed\stitleReviewBarSubItem"(.*?)<span\sclass="ghostText" - <span itemprop="ratingValue">(\d+)</span> + <span>(\d+)</span> - <span itemprop="ratingCount">(\d+)</span> + >(\d+)\suser</a> - + (tt\d+) @@ -122,13 +122,13 @@ - (<div class="metascore_block".*) + <div\sclass="metacriticScore\sscore_mixed\stitleReviewBarSubItem"(.*?)<span\sclass="ghostText" - <span itemprop="ratingValue">(\d+)</span> + <span>(\d+)</span> - <span itemprop="ratingCount">(\d+)</span> + >(\d+)\suser</a> @@ -137,21 +137,21 @@ - + - <h2>Storyline</h2>\s+<div\sclass="inline\scanwrap"\sitemprop="description">\s+<p>(.*?)<[^a/] + <h2>Storyline</h2>\s+<div\sclass="inline\scanwrap">\s+<p>\s+<span>(.*?)</span> - + @@ -165,38 +165,47 @@ - + - itemprop="description">(.+?)</div> + <div class="summary_text">(.+?)<div\sclass - itemprop="description">(.+?)See\sfull\ssummary + <div class="summary_text">(.+?)<a\shref="(.+?)=tt_ov_pl" + + + <div class="summary_text">(.+?)<a\shref="[^"]*"\s*>Add\sa\sPlot - + - - itemprop="description">([^<]+)< + + <div class="summary_text">(.+?)<div\sclass + + + <div class="summary_text">(.+?)<a\shref="(.+?)=tt_ov_pl" + + + <div class="summary_text">(.+?)<a\shref="[^"]*"\s*>Add\sa\sPlot - + @@ -206,10 +215,10 @@ <table\sclass="cast_list">(.*?)</table> - <img[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:[^"]*\.[^"]*"class="loadlate\shidden\s"\sloadlate="([^"]*)(_V._))[^>]*.*?ter">[^>]*>\n\s*(<[^>]*>)?([^<\(]*)? + <img[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:[^"]*\.[^"]*"\sclass="loadlate\shidden\s"\sloadlate="([^"]*)(_V..?_))[^>]*.*?ter">[^>]*>(<[^>]*>)?([^<\(]*)? - <img[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:[^"]*\.[^"]*\.png)"\sclass=".*?"\s/>*.*?ter">[^>]*>\n\s*(<[^>]*>)?([^<\(]*)? + <img[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:[^"]*\.[^"]*\.png)"\sclass=".*?"\s/>*.*?ter">[^>]*>(<[^>]*>)?([^<\(]*)? <actor><thumb>(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)?</thumb>(.*?)</actor> @@ -219,7 +228,7 @@ - + @@ -229,14 +238,14 @@ Director(?:s)?:.*?</h4>(.*?)<div class - href="/name[^>]*>[^<]*<[^>]*>([^<]*)< + href="/name[^>]*>([^<]*) - + @@ -246,41 +255,44 @@ Writer(?:s)?:.*?</h4>(.*?)<div class - href="/name[^>]*>[^<]*<[^>]*>([^<]*)< + href="/name[^>]*>([^<]*) - + - <table class="cast">(.*?)</table> + <table\sclass="cast_list">(.*?)</table> - - <img src="(?:([^"]*\.)[^"]*(\.jpg))?[^>]*[^"]*"nm"><a href="[^"]*[^>]*>([^<]*)<[^"]*"ddd">([^<]<)?[^"]*"char">(.*?)</td> + + <img[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:[^"]*\.[^"]*"\sclass="loadlate\shidden\s"\sloadlate="([^"]*)(_V..?_))[^>]*.*?ter">[^>]*>\n\s*(<[^>]*>)?([^<\(]*)? + + + <img[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:[^"]*\.[^"]*\.png)"\sclass=".*?"\s/>*.*?ter">[^>]*>\n\s*(<[^>]*>)?([^<$]*)? - <actor><thumb>(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)</thumb>(.*?)</actor> + <actor><thumb>(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)?</thumb>(.*?)</actor> - + - Director(?:s)?:.*?</h5>[^>]*>(.*?)</div + Director(?:s)?:.*?ipl-inline-list[^>]*>(.*?)</div <a href="/name/[^>]*>([^<]*)< @@ -290,14 +302,14 @@ - + - Writing\scredits(.*?)name=" + Writer(?:s)?:.*?ipl-inline-list[^>]*>(.*?)</div <a href="/name/[^>]*>([^<]*)< @@ -307,30 +319,30 @@ - + - - <a\sname="poster".*?src="(.*?)_S.*?(.jpg)".*?</a> - - - (.*?_SX[0-9]+_SY[0-9]+_.jpg) + + Poster"\s*src="(.*?)(_V._) - + - >\s*USA:(P?G|PG-13|R|NC-17)</a> + >\s*United\sStates:(TV-(Y7?|P?G|14|MA))</a> + + + >\s*United\sStates:(P?G|PG-13|R|NC-17)</a> MPAA</a>:</h5><div\sclass="info-content">Rated\s(P?G|PG-13|R|NC-17) @@ -338,14 +350,14 @@ - + - + - USA + United States @@ -355,81 +367,57 @@ - + - - <h1>([^<]*) + + 'og:title'\scontent="(IMDb\s-\s)?(?:")?([^"]*?)(?:")? \([^\(]*?([0-9]{4})(?:–\s)?$ - - <meta\sname="title"\scontent="(IMDb\s-\s)?(?:")?([^"]*?)(?:")? $[^\(]*?([0-9]{4})(?:–\s)?$ + + <td>$original\stitle$[^>]+>[^>]+>([^<]+) - class="originalTitle">([^<]*) + class="originalTitle">([^<]*) - >\s*?"([^<]+)"[^<]+[<em>]?[^"]+Hong Kong\s[<em>][^"]+English - - - (.+) - - - >\s*?"([^<]+)"[^<]+[<em>]?[^"]+((Canada)\s(<em>)?$(English|imdb)) - - - (.+) - - - >\s*?"([^<]+)"[^<]+[<em>]?[^"]+(UK(<em>)?<br>) + 'og:title'\scontent="(IMDb\s-\s)?(?:")?([^"]*?)(?:")? \([^\(]*?([0-9]{4})(?:–\s)?$ (.+) - >\s*?"([^<]+)"[^"]+International\s(<em>)?$English\stitle$(</em>)?(,|<)( |b) + <td>Hong Kong\s$English[^>]+>[^>]+>([^<]+) (.+) - >\s*?"([^<]+)"[^"]+International\s(<em>)?\(English\stitle$(</em>)? (<em>)?$imdb + <td>Canada\s\(English[^>]+>[^>]+>([^<]+) (.+) - - <a\shref="/country/[^>]+>(UK</a></div>) - - - (.+) - - - <a\shref="/country/[^>]+>(USA</a></div>) - - - (.+) - - >\s*?"([^<]+)"[^<]+[<em>]?[^"]+(USA(<em>)?<br>) + <td>UK<[^>]+>[^>]+>([^<]+) (.+) - >\s*?"([^<]+)"[^<]+[<em>]?[^"]+((USA)\s(<em>)?\((English|imdb)) + <td>World-wide\s\(English\stitle$<[^>]+>[^>]+>([^<]+) (.+) - >\s*?"([^<]+)"[^<]+[<em>]?[^"]+((USA)\s(<em>)?\((new\stitle)) + <td>USA<[^>]+>[^>]+>([^<]+) (.+) @@ -440,23 +428,14 @@ (.+) - >\s*?"([^<]+)"[^<]+[<em>]?[^"]+$INFO[imdbakatitles] - - - (.+) + <td>$INFO[imdbakatitles][^>]+>[^>]+>([^<]+) - >\s*?"([^<]+)"[^<]+[<em>]?[^"]+$INFO[imdbakatitles]\s(<em>)?\((imdb\sdisplay) + <td>$INFO[imdbakatitles]<[^>]+>[^>]+>([^<]+) (.+) - - <a\shref="/country/[^>]+>($INFO[imdbakatitles]) - - - ($INFO[imdbakatitles]) - Keep Original diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.musicbrainz.org/addon.xml kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.musicbrainz.org/addon.xml --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.musicbrainz.org/addon.xml 2018-02-11 01:00:56.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.musicbrainz.org/addon.xml 2018-09-09 00:01:56.000000000 +0000 @@ -1,7 +1,7 @@ - + diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.musicbrainz.org/musicbrainz.xml kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.musicbrainz.org/musicbrainz.xml --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.musicbrainz.org/musicbrainz.xml 2017-11-15 01:02:37.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.musicbrainz.org/musicbrainz.xml 2018-09-09 00:01:56.000000000 +0000 @@ -91,19 +91,19 @@ - + <release id="([^"]*)"><title>([^<]*)< - + <release-group\stype="[^"]*"\sid="([^"]*)" <release-group\stype="[^"]*"\stype-id="[^"]*"\sid="([^"]*)" - + <release-group\sid="([^"]*)"\stype="[^"]*" - + <release-group\sid="([^"]*)"\stype-id="[^"]*" @@ -112,7 +112,10 @@ <release-group\stype-id="[^"]*"\stype="[^"]*"\sid="([^"]*)" - + + + + (.+) diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.theaudiodb.com/addon.xml kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.theaudiodb.com/addon.xml --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.theaudiodb.com/addon.xml 2018-02-11 01:00:56.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.theaudiodb.com/addon.xml 2018-09-09 00:01:56.000000000 +0000 @@ -1,7 +1,7 @@ - + diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.theaudiodb.com/tadb.xml kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.theaudiodb.com/tadb.xml --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.theaudiodb.com/tadb.xml 2017-11-15 01:02:37.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.theaudiodb.com/tadb.xml 2018-09-09 00:01:56.000000000 +0000 @@ -50,6 +50,118 @@ + + + + + + + + + + + + + + + + + + + + strArtistLogo\d?":"([^"]*) + + + (.+) + + + + + + + + + + + + + + + + + + + + + + + + + strArtistClearart\d?":"([^"]*) + + + (.+) + + + + + + + + + + + + + + + + + + + + + + + + + strArtistWideThumb\d?":"([^"]*) + + + (.+) + + + + + + + + + + + + + + + + + + + + + + + + + strArtistBanner\d?":"([^"]*) + + + (.+) + + + + + @@ -575,4 +687,61 @@ + + + + + + + + + + + + + + strAlbumThumbBack\d?":"([^"]*) + + + + + + + + + + + + + + + + + + + strAlbumCDart\d?":"([^"]*) + + + + + + + + + + + + + + + + + + + strAlbumSpine\d?":"([^"]*) + + + + + diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.themoviedb.org/addon.xml kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.themoviedb.org/addon.xml --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.themoviedb.org/addon.xml 2018-05-01 00:00:07.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.themoviedb.org/addon.xml 2018-09-09 00:01:56.000000000 +0000 @@ -1,7 +1,7 @@ diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.themoviedb.org/tmdb.xml kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.themoviedb.org/tmdb.xml --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.common.themoviedb.org/tmdb.xml 2018-05-01 00:00:07.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.common.themoviedb.org/tmdb.xml 2018-09-09 00:01:56.000000000 +0000 @@ -1,88 +1,81 @@ - + - - + + .+::(.+)::(.+)? + + + .+::.+::(.+)? + + + (.+)::(.+)::(.+)? - - certification":"([^"]*)","[^"]*":"$INFO[tmdbcertcountry]"(.*?)," + + certification":"([^"]*)","[^"]*":"$$16"(.*?)," + + + (.+) - + - - + + (.+)::(.+) - - - - - - - + + (.+)::(.+) - - - + + + (.+):: - Keep Original + (.+)::Keep Original - + "title":"([^"]*) - + "original_title":"([^"]*) - Keep Original + (.+)::Keep Original - + - + (.+)::.+ - - + + (.+)::(.+) - - - - - - - - - - - "overview":"(.*?)"," - + ^$ @@ -100,34 +93,23 @@ - + - + (.+)::.+ - - + + (.+)::(.+) - - - - - - - - - - - - "tagline":"([^"]*) + "tagline":"(.*?)"," - + ^$ @@ -139,18 +121,18 @@ - "tagline":"([^"]*) + "tagline":"(.*?)"," - + - + @@ -165,57 +147,114 @@ - + - + (.+)::(.+) + + + (.+)::(.+) - + - - - - + + + + "belongs_to_collection":\{"id":([0-9]+),"name":"([^"]*) - - + + (.+) + + + (.+) - - + + - - "belongs_to_collection":\{"id":[0-9]+,"name":"([^"]*) + + + "id":[0-9]+,"name":"([^"]*) + + + (.+) + + + "id":([0-9]+) + + + "id":[0-9]+,"name":"[^"]*","overview":"(.*?)"," + + + (.+) + + + "posters":\[\{([^\]]*) + + + "file_path":"([^"]*)[^:]*:[^:]*:"$$10 + + + "file_path":"([^"]*)[^:]*:[^:]*:"en + + + "file_path":"([^"]*)[^:]*:[^:]*:null + + + "backdrops":\[\{([^\]]*) + + + "file_path":"([^"]*) + + - + ^$ - - (.+) - - - - - - "belongs_to_collection":\{"id":[0-9]+,"name":"([^"]*) + + + + + (.+) + + "id":[0-9]+,"name":"[^"]*","overview":"(.*?)"," + + + "posters":\[\{([^\]]*) + + + "file_path":"([^"]*)[^:]*:[^:]*:"$$10 + + + "file_path":"([^"]*)[^:]*:[^:]*:"en + + + "file_path":"([^"]*)[^:]*:[^:]*:null + + + "backdrops":\[\{([^\]]*) + + + "file_path":"([^"]*) + - + - + - + - + @@ -236,9 +275,9 @@ - + - + @@ -256,9 +295,9 @@ - + - + @@ -276,22 +315,14 @@ - + - - + + (.+)::(.+) - - - - - - - - @@ -306,8 +337,14 @@ - - + + (.+)::(..) + + + (.+)::([^\|]*) + + + ^(.+):: @@ -324,9 +361,15 @@ - + - + + (.+)::(..) + + + (.+)::([^\|]*) + + ^((tt)?\d+) @@ -347,10 +390,10 @@ - + - - + + (.+)::(.+) @@ -367,10 +410,10 @@ - + - - + + (.+)::(.+) @@ -387,22 +430,14 @@ - + - - + + (.+)::(.+) - - - - - - - - @@ -414,7 +449,7 @@ "source":"([^"]*) - + ^$ @@ -434,7 +469,7 @@ "source":"([^"]*) - + ^$ @@ -455,14 +490,17 @@ - + - - + + (.+)::(.+) - + + + (.+)::(.+) + @@ -478,116 +516,66 @@ - + - - + + (.+)::(.+) - - + + (.+)::(.+) - - - - - - + - - + + (.+)::(.+) - + - - "id":([0-9]*), - "posters":\[\{([^\]]*) - "file_path":"([^"]*) + "file_path":"([^"]*)[^:]*:[^:]*:"$$11 - - (.+) + + "file_path":"([^"]*)[^:]*:[^:]*:"en - - - en - - ^$ - - - ^((?!en).)*$ - - (.+) - - - - - - "id":([0-9]*), - - - "posters":\[\{([^\]]*) - - - "file_path":"([^"]*) + + "file_path":"([^"]*)[^:]*:[^:]*:null - (.+) + (.+) - - - en - + ^$ - - ^((?!en).)*$ - - (.+) - - - - - - "id":([0-9]*), - - - "posters":\[\{([^\]]*) - - - "file_path":"([^"]*) - - - (.+) - - + ^$ - (.+) + - - + + + "posters":\[\{([^\]]*) - "file_path":"([^"]*) + "file_path":"([^"]*)[^:]*:[^:]*:"[^"]* - (.+) + - + - "images":\{"base_url":"([^"]*)" + "images":\{"base_url":"([^"]*)" @@ -595,8 +583,17 @@ - - + + (.+)::(.+) + + + (.+)::(.+) + + + + + + Keep Original diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.tvdb.com/addon.xml kodi-18.0+git20180909.0202-e70825a/addons/metadata.tvdb.com/addon.xml --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.tvdb.com/addon.xml 2018-07-31 18:47:36.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.tvdb.com/addon.xml 2018-09-09 00:01:56.000000000 +0000 @@ -1,7 +1,7 @@ diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.tvdb.com/changelog.txt kodi-18.0+git20180909.0202-e70825a/addons/metadata.tvdb.com/changelog.txt --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.tvdb.com/changelog.txt 2018-07-31 18:47:36.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.tvdb.com/changelog.txt 2018-09-09 00:01:56.000000000 +0000 @@ -1,3 +1,9 @@ +[B]3.0.9[/B] +- Fixed: Character encoding fixes (part 2) + +[B]3.0.8[/B] +- Fixed: Character encoding fixes + [B]3.0.7[/B] - Fixed: Episode list changes diff -Nru kodi-18.0+git20180908.0202-ef47f46/addons/metadata.tvdb.com/tvdb.xml kodi-18.0+git20180909.0202-e70825a/addons/metadata.tvdb.com/tvdb.xml --- kodi-18.0+git20180908.0202-ef47f46/addons/metadata.tvdb.com/tvdb.xml 2018-07-31 18:47:36.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/addons/metadata.tvdb.com/tvdb.xml 2018-09-09 00:01:56.000000000 +0000 @@ -145,6 +145,9 @@ + + + @@ -237,7 +240,7 @@ "id":\s*?(\d+), - + @@ -260,7 +263,7 @@ missingplot - + @@ -276,7 +279,7 @@ "name":\s*?"([^}]+)",\s*?"role":\s*?"([^}]+)",\s*?"sortOrder":\s*?(\d+),\s*?"image":\s*?(?:""|null), - + @@ -443,7 +446,7 @@ http://(?:www\.)?thetvdb\.com/api/.+/series/(\d+)/all/ - + @@ -483,7 +486,7 @@ - + @@ -771,7 +774,7 @@ (?!^\Q$INFO[fallbacklanguage]\E$) - + @@ -797,7 +800,7 @@ - + @@ -1099,7 +1102,7 @@ - + diff -Nru kodi-18.0+git20180908.0202-ef47f46/BUILDDATE kodi-18.0+git20180909.0202-e70825a/BUILDDATE --- kodi-18.0+git20180908.0202-ef47f46/BUILDDATE 2018-09-08 00:02:25.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/BUILDDATE 2018-09-09 00:02:12.000000000 +0000 @@ -1 +1 @@ -20180908 +20180909 diff -Nru kodi-18.0+git20180908.0202-ef47f46/debian/changelog kodi-18.0+git20180909.0202-e70825a/debian/changelog --- kodi-18.0+git20180908.0202-ef47f46/debian/changelog 2018-09-08 00:03:01.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/debian/changelog 2018-09-09 00:03:04.000000000 +0000 @@ -1,4 +1,29 @@ -kodi (2:18.0+git20180908.0202-ef47f46-0bionic) bionic; urgency=high +kodi (2:18.0+git20180909.0202-e70825a-0bionic) bionic; urgency=high + + [Rechi] + * [addons] sync with repo + + [Kai Sommerfeld] + * [PVR] Guide window: Fix deadlock. + + [Rainer Hochecker] + * VideoPlayer: fix timeshift on demand, allow pause if no buffer exists + + [Kai Sommerfeld] + * [messaging] CID 1439117: Uninitialized members (UNINIT_CTOR) : Non-static class member param3 is not initialized in this constructor nor in any functions that it calls. + + [Neil Armstrong] + * linux: input: LibInputTouch: Switch to get_seat_slot() to fix single touch device input + + [anxdpanic] + * Use GetDynPath for ExternalPlayer, and playercorefactory + + [Lukas Rusak] + * gbm: fix surface creation when no modifiers are present + + [DaveTBlake] + * Fix display of video info dialog for music videos on music current playlist window + [Memphiz] * EventServer/client: - added debug logging for pressed keys and translated actions diff -Nru kodi-18.0+git20180908.0202-ef47f46/debian/changelog.tmp kodi-18.0+git20180909.0202-e70825a/debian/changelog.tmp --- kodi-18.0+git20180908.0202-ef47f46/debian/changelog.tmp 2018-09-08 00:03:01.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/debian/changelog.tmp 2018-09-09 00:03:04.000000000 +0000 @@ -1,4 +1,29 @@ -kodi (2:18.0+git20180908.0202-ef47f46-0dist) dist; urgency=high +kodi (2:18.0+git20180909.0202-e70825a-0dist) dist; urgency=high + + [Rechi] + * [addons] sync with repo + + [Kai Sommerfeld] + * [PVR] Guide window: Fix deadlock. + + [Rainer Hochecker] + * VideoPlayer: fix timeshift on demand, allow pause if no buffer exists + + [Kai Sommerfeld] + * [messaging] CID 1439117: Uninitialized members (UNINIT_CTOR) : Non-static class member param3 is not initialized in this constructor nor in any functions that it calls. + + [Neil Armstrong] + * linux: input: LibInputTouch: Switch to get_seat_slot() to fix single touch device input + + [anxdpanic] + * Use GetDynPath for ExternalPlayer, and playercorefactory + + [Lukas Rusak] + * gbm: fix surface creation when no modifiers are present + + [DaveTBlake] + * Fix display of video info dialog for music videos on music current playlist window + [Memphiz] * EventServer/client: - added debug logging for pressed keys and translated actions diff -Nru kodi-18.0+git20180908.0202-ef47f46/debian/changelog.tmp.old kodi-18.0+git20180909.0202-e70825a/debian/changelog.tmp.old --- kodi-18.0+git20180908.0202-ef47f46/debian/changelog.tmp.old 2018-09-08 00:02:25.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/debian/changelog.tmp.old 2018-09-09 00:02:12.000000000 +0000 @@ -1,5 +1,21 @@ kodi (2:18.0+git20180719.0202-3231481-0dist) dist; urgency=high + [Memphiz] + * EventServer/client: - added debug logging for pressed keys and translated actions + + [Memphiz] + * [EventClient] - when updating the item of the buttonqueue - ensure to also set m_bActive to false if key was released. (this fixes an issue were very quick release/press events are eaten because of the related logic not kicking in) + + [Memphiz] + * [XBMCHelper/osx] - bumped HIDRemote to V1.7 - fixes uncommanded short press of up/down buttons since macos 10.13.6 + + [ace20022] + * [videoplayer] DVDDemuxFFmpeg: Don't try to add streams that are flagged AVDISCARD_ALL. + + [ace20022] + * [bluray] Fix playback of disc with truehd tracks in nav mode. + + [Kai Sommerfeld] * [PVR] trac#18022: Add support for ACTION_SHOW_INFO to CGUIDialogPVRChannelGuide. diff -Nru kodi-18.0+git20180908.0202-ef47f46/VERSION kodi-18.0+git20180909.0202-e70825a/VERSION --- kodi-18.0+git20180908.0202-ef47f46/VERSION 2018-09-08 00:02:25.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/VERSION 2018-09-09 00:02:12.000000000 +0000 @@ -1 +1 @@ -ef47f46 +e70825a diff -Nru kodi-18.0+git20180908.0202-ef47f46/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp kodi-18.0+git20180909.0202-e70825a/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp --- kodi-18.0+git20180908.0202-ef47f46/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp 2018-08-26 13:40:15.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp 2018-09-09 00:01:56.000000000 +0000 @@ -89,7 +89,7 @@ m_bIsPlaying = true; m_time = 0; m_playbackStartTime = XbmcThreads::SystemClockMillis(); - m_launchFilename = file.GetPath(); + m_launchFilename = file.GetDynPath(); CLog::Log(LOGNOTICE, "%s: %s", __FUNCTION__, m_launchFilename.c_str()); Create(); diff -Nru kodi-18.0+git20180908.0202-ef47f46/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp kodi-18.0+git20180909.0202-e70825a/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp --- kodi-18.0+git20180908.0202-ef47f46/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp 2018-07-31 18:47:39.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp 2018-09-09 00:01:56.000000000 +0000 @@ -96,9 +96,9 @@ void CPlayerCoreFactory::GetPlayers(const CFileItem& item, std::vector&players) const { - CURL url(item.GetPath()); + CURL url(item.GetDynPath()); - CLog::Log(LOGDEBUG, "CPlayerCoreFactory::GetPlayers(%s)", CURL::GetRedacted(item.GetPath()).c_str()); + CLog::Log(LOGDEBUG, "CPlayerCoreFactory::GetPlayers(%s)", CURL::GetRedacted(item.GetDynPath()).c_str()); std::vectorvalidPlayers; GetPlayers(validPlayers); diff -Nru kodi-18.0+git20180908.0202-ef47f46/xbmc/cores/playercorefactory/PlayerSelectionRule.cpp kodi-18.0+git20180909.0202-e70825a/xbmc/cores/playercorefactory/PlayerSelectionRule.cpp --- kodi-18.0+git20180908.0202-ef47f46/xbmc/cores/playercorefactory/PlayerSelectionRule.cpp 2018-07-31 18:47:39.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/xbmc/cores/playercorefactory/PlayerSelectionRule.cpp 2018-09-09 00:01:56.000000000 +0000 @@ -157,7 +157,7 @@ return; } - CURL url(item.GetPath()); + CURL url(item.GetDynPath()); if (CompileRegExp(m_fileTypes, regExp) && !MatchesRegExp(url.GetFileType(), regExp)) return; @@ -168,7 +168,7 @@ if (CompileRegExp(m_mimeTypes, regExp) && !MatchesRegExp(item.GetMimeType(), regExp)) return; - if (CompileRegExp(m_fileName, regExp) && !MatchesRegExp(item.GetPath(), regExp)) + if (CompileRegExp(m_fileName, regExp) && !MatchesRegExp(item.GetDynPath(), regExp)) return; CLog::Log(LOGDEBUG, "CPlayerSelectionRule::GetPlayers: matches rule: %s", m_name.c_str()); diff -Nru kodi-18.0+git20180908.0202-ef47f46/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp kodi-18.0+git20180909.0202-e70825a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp --- kodi-18.0+git20180908.0202-ef47f46/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp 2018-07-31 18:47:39.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp 2018-09-09 00:01:56.000000000 +0000 @@ -22,9 +22,6 @@ CDVDInputStreamFFmpeg::CDVDInputStreamFFmpeg(const CFileItem& fileitem) : CDVDInputStream(DVDSTREAM_TYPE_FFMPEG, fileitem) - , m_can_pause(false) - , m_can_seek(false) - , m_aborted(false) { } @@ -47,23 +44,14 @@ if (!CDVDInputStream::Open()) return false; - m_can_pause = true; - m_can_seek = true; - m_aborted = false; + m_aborted = false; if(strnicmp(m_item.GetDynPath().c_str(), "udp://", 6) == 0 || strnicmp(m_item.GetDynPath().c_str(), "rtp://", 6) == 0) { - m_can_pause = false; - m_can_seek = false; m_realtime = true; } - if(strnicmp(m_item.GetDynPath().c_str(), "tcp://", 6) == 0) - { - m_can_pause = true; - m_can_seek = false; - } return true; } diff -Nru kodi-18.0+git20180908.0202-ef47f46/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.h kodi-18.0+git20180909.0202-e70825a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.h --- kodi-18.0+git20180908.0202-ef47f46/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.h 2018-07-31 18:47:39.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.h 2018-09-09 00:01:56.000000000 +0000 @@ -30,9 +30,6 @@ const CFileItem& GetItem() const { return m_item; } - bool CanSeek() override { return m_can_seek; } - bool CanPause() override { return m_can_pause; } - std::string GetProxyType() const; std::string GetProxyHost() const; uint16_t GetProxyPort() const; @@ -40,7 +37,5 @@ std::string GetProxyPassword() const; protected: - bool m_can_pause; - bool m_can_seek; - bool m_aborted; + bool m_aborted = false; }; diff -Nru kodi-18.0+git20180908.0202-ef47f46/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h kodi-18.0+git20180909.0202-e70825a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h --- kodi-18.0+git20180908.0202-ef47f46/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h 2018-07-31 18:47:39.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h 2018-09-09 00:01:56.000000000 +0000 @@ -155,8 +155,8 @@ virtual ENextStream NextStream() { return NEXTSTREAM_NONE; } virtual void Abort() {} virtual int GetBlockSize() { return 0; } - virtual bool CanSeek() { return true; } - virtual bool CanPause() { return true; } + virtual bool CanSeek() { return true; } //! @todo drop this + virtual bool CanPause() { return false; } /*! \brief Indicate expected read rate in bytes per second. * This could be used to throttle caching rate. Should diff -Nru kodi-18.0+git20180908.0202-ef47f46/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.h kodi-18.0+git20180909.0202-e70825a/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.h --- kodi-18.0+git20180908.0202-ef47f46/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.h 2018-07-31 18:47:39.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.h 2018-09-09 00:01:56.000000000 +0000 @@ -53,7 +53,7 @@ bool Pause(double dTime) override; int64_t GetLength() override; bool IsEOF() override; - bool CanSeek() override; + bool CanSeek() override; //! @todo drop this bool CanPause() override; // IDisplayTime diff -Nru kodi-18.0+git20180908.0202-ef47f46/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamPVRBase.h kodi-18.0+git20180909.0202-e70825a/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamPVRBase.h --- kodi-18.0+git20180908.0202-ef47f46/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamPVRBase.h 2018-07-31 18:47:39.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamPVRBase.h 2018-09-09 00:01:56.000000000 +0000 @@ -46,7 +46,7 @@ CDVDInputStream::ITimes* GetITimes() override { return this; } bool GetTimes(Times ×) override; - bool CanSeek() override; + bool CanSeek() override; //! @todo drop this bool CanPause() override; void Pause(bool bPaused); diff -Nru kodi-18.0+git20180908.0202-ef47f46/xbmc/cores/VideoPlayer/VideoPlayer.cpp kodi-18.0+git20180909.0202-e70825a/xbmc/cores/VideoPlayer/VideoPlayer.cpp --- kodi-18.0+git20180908.0202-ef47f46/xbmc/cores/VideoPlayer/VideoPlayer.cpp 2018-08-30 00:01:51.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/xbmc/cores/VideoPlayer/VideoPlayer.cpp 2018-09-09 00:01:56.000000000 +0000 @@ -4672,8 +4672,9 @@ state.timeMax = m_pDemuxer->GetStreamLength(); } - state.canpause = true; - state.canseek = true; + state.canpause = false; + state.canseek = false; + state.cantempo = false; state.isInMenu = false; state.hasMenu = false; @@ -4732,7 +4733,6 @@ } state.canpause = m_pInputStream->CanPause(); - state.canseek = m_pInputStream->CanSeek(); bool realtime = m_pInputStream->IsRealtime(); @@ -4794,9 +4794,13 @@ if (state.timeMin == state.timeMax) { state.canseek = false; - state.canpause = false; state.cantempo = false; } + else + { + state.canseek = true; + state.canpause = true; + } m_processInfo->SetPlayTimes(state.startTime, state.time, state.timeMin, state.timeMax); diff -Nru kodi-18.0+git20180908.0202-ef47f46/xbmc/messaging/ThreadMessage.h kodi-18.0+git20180909.0202-e70825a/xbmc/messaging/ThreadMessage.h --- kodi-18.0+git20180908.0202-ef47f46/xbmc/messaging/ThreadMessage.h 2018-09-06 00:01:15.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/xbmc/messaging/ThreadMessage.h 2018-09-09 00:01:56.000000000 +0000 @@ -53,6 +53,7 @@ : dwMessage{ messageId } , param1{ p1 } , param2{ p2 } + , param3{ 0 } , lpVoid{ payload } , strParam( param ) , params( vecParams ) diff -Nru kodi-18.0+git20180908.0202-ef47f46/xbmc/music/windows/GUIWindowMusicBase.cpp kodi-18.0+git20180909.0202-e70825a/xbmc/music/windows/GUIWindowMusicBase.cpp --- kodi-18.0+git20180908.0202-ef47f46/xbmc/music/windows/GUIWindowMusicBase.cpp 2018-08-30 00:01:51.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/xbmc/music/windows/GUIWindowMusicBase.cpp 2018-09-09 00:01:56.000000000 +0000 @@ -58,6 +58,7 @@ #include "cores/playercorefactory/PlayerCoreFactory.h" #include "CueDocument.h" #include "Autorun.h" +#include "video/dialogs/GUIDialogVideoInfo.h" #ifdef TARGET_POSIX #include "platform/linux/XTimeUtils.h" @@ -274,9 +275,9 @@ CFileItemPtr item = m_vecItems->Get(iItem); - if (item->IsVideoDb()) + if (item->IsVideo()) { // Music video on a mixed current playlist - OnContextButton(iItem, CONTEXT_BUTTON_INFO); + CGUIDialogVideoInfo::ShowFor(*item); return; } @@ -316,7 +317,7 @@ for (int i = 0; i < m_vecItems->Size(); ++i) { CFileItemPtr pItem = (*m_vecItems)[i]; - if (pItem->m_bIsFolder || pItem->IsPlayList() || pItem->IsPicture() || pItem->IsLyrics()) + if (pItem->m_bIsFolder || pItem->IsPlayList() || pItem->IsPicture() || pItem->IsLyrics() || pItem->IsVideo()) continue; CMusicInfoTag& tag = *pItem->GetMusicInfoTag(); diff -Nru kodi-18.0+git20180908.0202-ef47f46/xbmc/platform/linux/input/LibInputTouch.cpp kodi-18.0+git20180909.0202-e70825a/xbmc/platform/linux/input/LibInputTouch.cpp --- kodi-18.0+git20180908.0202-ef47f46/xbmc/platform/linux/input/LibInputTouch.cpp 2018-07-31 18:47:40.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/xbmc/platform/linux/input/LibInputTouch.cpp 2018-09-09 00:01:56.000000000 +0000 @@ -55,7 +55,7 @@ void CLibInputTouch::ProcessTouchDown(libinput_event_touch *e) { - int slot = libinput_event_touch_get_slot(e); + int slot = libinput_event_touch_get_seat_slot(e); SetPosition(slot, GetPos(e)); SetEvent(slot, TouchInputDown); @@ -64,7 +64,7 @@ void CLibInputTouch::ProcessTouchMotion(libinput_event_touch *e) { - int slot = libinput_event_touch_get_slot(e); + int slot = libinput_event_touch_get_seat_slot(e); uint64_t nanotime = libinput_event_touch_get_time_usec(e) * 1000LL; SetPosition(slot, GetPos(e)); @@ -78,7 +78,7 @@ void CLibInputTouch::ProcessTouchUp(libinput_event_touch *e) { - int slot = libinput_event_touch_get_slot(e); + int slot = libinput_event_touch_get_seat_slot(e); SetEvent(slot, TouchInputUp); CLog::Log(LOGDEBUG, "CLibInputTouch::%s - touch input up", __FUNCTION__); @@ -86,7 +86,7 @@ void CLibInputTouch::ProcessTouchCancel(libinput_event_touch *e) { - int slot = libinput_event_touch_get_slot(e); + int slot = libinput_event_touch_get_seat_slot(e); uint64_t nanotime = libinput_event_touch_get_time_usec(e) * 1000LL; CLog::Log(LOGDEBUG, "CLibInputTouch::%s - touch input cancel", __FUNCTION__); diff -Nru kodi-18.0+git20180908.0202-ef47f46/xbmc/pvr/windows/GUIEPGGridContainer.cpp kodi-18.0+git20180909.0202-e70825a/xbmc/pvr/windows/GUIEPGGridContainer.cpp --- kodi-18.0+git20180908.0202-ef47f46/xbmc/pvr/windows/GUIEPGGridContainer.cpp 2018-07-31 18:47:40.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/xbmc/pvr/windows/GUIEPGGridContainer.cpp 2018-09-09 00:01:56.000000000 +0000 @@ -143,7 +143,6 @@ m_channelScrollOffset(other.m_channelScrollOffset), m_gridModel(new CGUIEPGGridContainerModel(*other.m_gridModel)), m_updatedGridModel(other.m_updatedGridModel ? new CGUIEPGGridContainerModel(*other.m_updatedGridModel) : nullptr), - m_outdatedGridModel(other.m_outdatedGridModel ? new CGUIEPGGridContainerModel(*other.m_outdatedGridModel) : nullptr), m_item(GetItem(m_channelCursor)) // pointer to grid model internal data. { } @@ -736,7 +735,6 @@ m_lastChannel = nullptr; // always use asynchronously precalculated grid data. - m_outdatedGridModel = std::move(m_gridModel); // destructing grid data can be very expensive, thus this will be done asynchronously, not here. m_gridModel = std::move(m_updatedGridModel); if (prevSelectedEpgTag) @@ -1726,18 +1724,16 @@ fBlockSize = m_blockSize; } - std::unique_ptr oldOutdatedGridModel; std::unique_ptr oldUpdatedGridModel; std::unique_ptr newUpdatedGridModel(new CGUIEPGGridContainerModel); // can be very expensive. never call with lock acquired. - newUpdatedGridModel->Refresh(items, gridStart, gridEnd, iRulerUnit, iBlocksPerPage, fBlockSize); + newUpdatedGridModel->Initialize(items, gridStart, gridEnd, iRulerUnit, iBlocksPerPage, fBlockSize); { CSingleLock lock(m_critSection); // grid contains CFileItem instances. CFileItem dtor locks global graphics mutex. // by increasing its refcount make sure, old data are not deleted while we're holding own mutex. - oldOutdatedGridModel = std::move(m_outdatedGridModel); oldUpdatedGridModel = std::move(m_updatedGridModel); m_updatedGridModel = std::move(newUpdatedGridModel); diff -Nru kodi-18.0+git20180908.0202-ef47f46/xbmc/pvr/windows/GUIEPGGridContainer.h kodi-18.0+git20180909.0202-e70825a/xbmc/pvr/windows/GUIEPGGridContainer.h --- kodi-18.0+git20180908.0202-ef47f46/xbmc/pvr/windows/GUIEPGGridContainer.h 2018-07-31 18:47:40.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/xbmc/pvr/windows/GUIEPGGridContainer.h 2018-09-09 00:01:56.000000000 +0000 @@ -225,7 +225,6 @@ mutable CCriticalSection m_critSection; std::unique_ptr m_gridModel; std::unique_ptr m_updatedGridModel; - std::unique_ptr m_outdatedGridModel; GridItem *m_item; }; diff -Nru kodi-18.0+git20180908.0202-ef47f46/xbmc/pvr/windows/GUIEPGGridContainerModel.cpp kodi-18.0+git20180909.0202-e70825a/xbmc/pvr/windows/GUIEPGGridContainerModel.cpp --- kodi-18.0+git20180908.0202-ef47f46/xbmc/pvr/windows/GUIEPGGridContainerModel.cpp 2018-07-31 18:47:40.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/xbmc/pvr/windows/GUIEPGGridContainerModel.cpp 2018-09-09 00:01:56.000000000 +0000 @@ -14,6 +14,7 @@ #include "ServiceBroker.h" #include "settings/Settings.h" #include "utils/Variant.h" +#include "utils/log.h" #include "pvr/PVRManager.h" #include "pvr/channels/PVRChannel.h" @@ -36,28 +37,13 @@ ruler->SetInvalid(); } -void CGUIEPGGridContainerModel::Reset() +void CGUIEPGGridContainerModel::Initialize(const std::unique_ptr &items, const CDateTime &gridStart, const CDateTime &gridEnd, int iRulerUnit, int iBlocksPerPage, float fBlockSize) { - for (auto &channel : m_gridIndex) + if (!m_channelItems.empty()) { - for (const auto &block : channel) - { - if (block.item) - block.item->ClearProperties(); - } - channel.clear(); + CLog::LogF(LOGERROR, "Already initialized!"); + return; } - m_gridIndex.clear(); - - m_channelItems.clear(); - m_programmeItems.clear(); - m_rulerItems.clear(); - m_epgItemsPtr.clear(); -} - -void CGUIEPGGridContainerModel::Refresh(const std::unique_ptr &items, const CDateTime &gridStart, const CDateTime &gridEnd, int iRulerUnit, int iBlocksPerPage, float fBlockSize) -{ - Reset(); //////////////////////////////////////////////////////////////////////// // Create programme & channel items diff -Nru kodi-18.0+git20180908.0202-ef47f46/xbmc/pvr/windows/GUIEPGGridContainerModel.h kodi-18.0+git20180909.0202-e70825a/xbmc/pvr/windows/GUIEPGGridContainerModel.h --- kodi-18.0+git20180908.0202-ef47f46/xbmc/pvr/windows/GUIEPGGridContainerModel.h 2018-07-31 18:47:40.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/xbmc/pvr/windows/GUIEPGGridContainerModel.h 2018-09-09 00:01:56.000000000 +0000 @@ -36,9 +36,10 @@ static const int MINSPERBLOCK = 5; // minutes static const int MAXBLOCKS = 33 * 24 * 60 / MINSPERBLOCK; //! 33 days of 5 minute blocks (31 days for upcoming data + 1 day for past data + 1 day for fillers) - virtual ~CGUIEPGGridContainerModel() { Reset(); } + CGUIEPGGridContainerModel() = default; + virtual ~CGUIEPGGridContainerModel() = default; - void Refresh(const std::unique_ptr &items, const CDateTime &gridStart, const CDateTime &gridEnd, int iRulerUnit, int iBlocksPerPage, float fBlockSize); + void Initialize(const std::unique_ptr &items, const CDateTime &gridStart, const CDateTime &gridEnd, int iRulerUnit, int iBlocksPerPage, float fBlockSize); void SetInvalid(); static const int INVALID_INDEX = -1; @@ -83,7 +84,6 @@ private: void FreeItemsMemory(); - void Reset(); struct ItemsPtr { diff -Nru kodi-18.0+git20180908.0202-ef47f46/xbmc/windowing/gbm/DRMUtils.cpp kodi-18.0+git20180909.0202-e70825a/xbmc/windowing/gbm/DRMUtils.cpp --- kodi-18.0+git20180908.0202-ef47f46/xbmc/windowing/gbm/DRMUtils.cpp 2018-08-26 13:40:16.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/xbmc/windowing/gbm/DRMUtils.cpp 2018-09-09 00:01:56.000000000 +0000 @@ -428,6 +428,8 @@ if (!FindModifiersForPlane(m_overlay_plane)) { CLog::Log(LOGDEBUG, "CDRMUtils::%s - no drm modifiers present for the overlay plane", __FUNCTION__); + m_overlay_plane->modifiers_map.emplace(DRM_FORMAT_ARGB8888, std::vector{DRM_FORMAT_MOD_LINEAR}); + m_overlay_plane->modifiers_map.emplace(DRM_FORMAT_XRGB8888, std::vector{DRM_FORMAT_MOD_LINEAR}); } return true; diff -Nru kodi-18.0+git20180908.0202-ef47f46/xbmc/windowing/gbm/GBMUtils.cpp kodi-18.0+git20180909.0202-e70825a/xbmc/windowing/gbm/GBMUtils.cpp --- kodi-18.0+git20180908.0202-ef47f46/xbmc/windowing/gbm/GBMUtils.cpp 2018-08-26 13:40:16.000000000 +0000 +++ kodi-18.0+git20180909.0202-e70825a/xbmc/windowing/gbm/GBMUtils.cpp 2018-09-09 00:01:56.000000000 +0000 @@ -48,13 +48,15 @@ GBM_FORMAT_ARGB8888, modifiers, modifiers_count); -#else - m_surface = gbm_surface_create(m_device, - width, - height, - GBM_FORMAT_ARGB8888, - GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING); #endif + if (!m_surface) + { + m_surface = gbm_surface_create(m_device, + width, + height, + GBM_FORMAT_ARGB8888, + GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING); + } if (!m_surface) {