The branch, frodo has been updated via 87294fa4a89212dbc8442bed699e06892acc00b7 (commit) from ddbbb2e544cc126c849f6bb7045e461eaa70c6ca (commit)
- Log ----------------------------------------------------------------- http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=87294fa4a89212dbc8442bed699e06892acc00b7 commit 87294fa4a89212dbc8442bed699e06892acc00b7 Author: Martijn Kaijser <mcm.kaij...@gmail.com> Date: Tue Aug 19 18:51:40 2014 +0200 [plugin.video.massengeschmack] 1.2.0 diff --git a/plugin.video.massengeschmack/addon.xml b/plugin.video.massengeschmack/addon.xml index 9252ba5..72a91f0 100644 --- a/plugin.video.massengeschmack/addon.xml +++ b/plugin.video.massengeschmack/addon.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<addon id="plugin.video.massengeschmack" name="Massengeschmack" version="1.1.0" provider-name="Manko10"> +<addon id="plugin.video.massengeschmack" name="Massengeschmack" version="1.2.0" provider-name="Manko10"> <requires> <import addon="xbmc.python" version="2.1.0"/> </requires> diff --git a/plugin.video.massengeschmack/changelog.txt b/plugin.video.massengeschmack/changelog.txt index f96aeae..85936d4 100644 --- a/plugin.video.massengeschmack/changelog.txt +++ b/plugin.video.massengeschmack/changelog.txt @@ -1,3 +1,6 @@ +1.2.0 + - Add support for Massengeschmack Direkt + 1.1.0 - Add support for Hoaxilla-TV and Tonangeber - Use thumbnail URL from feed entry description instead of guessing diff --git a/plugin.video.massengeschmack/resources/language/English/strings.xml b/plugin.video.massengeschmack/resources/language/English/strings.xml index ddf06ce..1f71cae 100644 --- a/plugin.video.massengeschmack/resources/language/English/strings.xml +++ b/plugin.video.massengeschmack/resources/language/English/strings.xml @@ -39,7 +39,7 @@ <string id="30230">Massengeschmack-TV</string> <string id="30231">Comedy, Scripted Reality</string> <string id="30232">Germany</string> - <string id="30233">Massengeschmack-TV is the satirical answer to all the scripted reality shows on the major TV networks. Obviously inspired by âThe Officeâ and âStrombergâ, the series depicts the daily routine at the Alsterfilm studio.[CR][CR]Additionally to the comedy series, certain videos and uncategorized extras about the Massengeschmack network are published under the label âMassengeschmack-TVâ, too.</string> + <string id="30233">In this category you find all extra content regarding Massengeschmack such as âMassengeschmack Direktâ or the satirical weekly show âDas Studioâ.</string> <string id="30240">Pasch-TV</string> <string id="30241">Let's Play, Board Game</string> @@ -87,17 +87,21 @@ <string id="30350">All Fernsehkritik-TV episodes and extras, including Postecke, uncut interview and other specials.</string> <string id="30351">Regular Fernsehkritik-TV episodes.</string> <string id="30352">Postecke</string> - <string id="30353">Postecke is a video podcast where Holger reads and answers letters from Fernsehkritik-TV viewers.</string> + <string id="30353">Postecke is a video podcast where Holger reads and answers letters from Fernsehkritik-TV viewers (now replaced by Massengeschmack Direkt).</string> <string id="30354">Uncut interviews.</string> <string id="30355">Various extras.</string> <string id="30356">Sendeschluss</string> <string id="30357">Sendeschluss is a weekly retro TV magazine in which Holger deals with either very iconic or very bizarre TV shows from back in the day.</string> <string id="30360">Das Studio</string> - <string id="30361">All Massengeschmack-TV episodes, including âDas Studioâ and any extras.</string> - <string id="30362">âDas Studioâ is the Massengeschmack-TV reality TV show. It is guaranteed to be fake and scripted!</string> + <string id="30361">All Massengeschmack-TV content, including âMassengeschmack Direktâ, âDas Studioâ and any extras.</string> + <string id="30362">âDas Studioâ is the Massengeschmack reality show. It is guaranteed to be fake and scripted!</string> <string id="30363">Massengeschmack Internal</string> <string id="30364">Massengeschmack announcements and uncategorized extras.</string> + <string id="30365">Massengeschmack Direkt</string> + <string id="30366">Fan mail and live talk for subscribers.</string> + <string id="30367">-> Massengeschmack Direkt</string> + <string id="30368">Postecke has been replaced by âMassengeschmack Direktâ. Click on this link to go to the new âMassengeschmack Direktâ category. You can also find it in the main category âMassengeschmack-TVâ</string> <!-- General runtime error messages --> <string id="30901">Invalid internal command![CR]This is probably a bug. You should report it if it happens more often.</string> diff --git a/plugin.video.massengeschmack/resources/language/German/strings.xml b/plugin.video.massengeschmack/resources/language/German/strings.xml index 9f8d1a3..ef2293f 100644 --- a/plugin.video.massengeschmack/resources/language/German/strings.xml +++ b/plugin.video.massengeschmack/resources/language/German/strings.xml @@ -39,7 +39,7 @@ <string id="30230">Massengeschmack-TV</string> <string id="30231">Comedy, Scripted Reality</string> <string id="30232">Deutschland</string> - <string id="30233">Massengeschmack-TV ist die satirische Antwort auf all die Scripted-Reality-Formate der groÃen Fernsehsender. Offensichtlich inspiriert von âThe Officeâ und âStrombergâ, stellt die Serie den Alltag im Alsterfilm-Studio dar.[CR][CR]Zusätzlich zum Comedy-Format werden diverse Videos und unkategorisierte Extras zum Massengeschmack-Portal ebenfalls unter dem Label âMassengeschmack-TVâ veröffentlicht.</string> + <string id="30233">In dieser Kategorie finden Sie alle Extra-Inhalte von Massengeschmack wie etwa âMassengeschmack Direktâ oder die wöchentliche Satireshow âDas Studioâ.</string> <string id="30240">Pasch-TV</string> <string id="30241">Let's Play, Brettspiele</string> @@ -85,17 +85,21 @@ <string id="30350">Alle Fernsehkritik-TV-Folgen und Extras, einschlieÃlich Postecke, ungeschnittenen Interviews und anderen Specials.</string> <string id="30351">Reguläre Fernsehkritik-TV-Folgen.</string> <string id="30352">Postecke</string> - <string id="30353">Die Postecke ist ein Video-Podcast, in dem Holger Zuschauerpost vorliest und beantwortet.</string> + <string id="30353">Die Postecke ist ein Video-Podcast, in dem Holger Zuschauerpost vorliest und beantwortet (nun ersetzt durch Massengeschmack Direkt).</string> <string id="30354">Ungeschnittene Interviews.</string> <string id="30355">Verschiedene Extras.</string> <string id="30356">Sendeschluss</string> <string id="30357">Sendeschluss ist ein wöchentliches Retro-TV-Magazin, in dem Holger sich besonders kultige oder besonders skurrile Fernsehshows von damals vornimmt.</string> <string id="30360">Das Studio</string> - <string id="30361">Alle Massengeschmack-TV-Folgen, einschlieÃlich âDas Studioâ, sowie sämtliche Extras.</string> + <string id="30361">Alle Massengeschmack-TV-Inhalte, einschlieÃlich âMassengeschmack Direktâ, âDas Studioâ, sowie sämtliche Extras.</string> <string id="30362">âDas Studioâ ist die Massengeschmack-Reality-Show. Sie ist garantiert gefaked und gescripted!</string> <string id="30363">Massengeschmack Intern</string> <string id="30364">Massengeschmack-Ankündigungen und unkategorisierte Extras.</string> + <string id="30365">Massengeschmack Direkt</string> + <string id="30366">Postecke und Live-Talk für Abonnenten.</string> + <string id="30367">-> Massengeschmack Direkt</string> + <string id="30368">Postecke wurde durch âMassengeschmack Direktâ ersetzt. Klicken Sie auf den Link, um zur neuen âMassengeschmack Direktâ-Kategorie zu gelangen. Sie können diese auch in der Hauptkategorie âMassengeschmack-TVâ finden.</string> <!-- General runtime error messages --> <string id="30901">Ungültiges internes Kommando![CR]Dies ist möglicherweise ein Bug und Sie sollten ihn melden, wenn er häufiger auftritt.</string> diff --git a/plugin.video.massengeschmack/resources/lib/datasource.py b/plugin.video.massengeschmack/resources/lib/datasource.py index 998ec0b..546d38d 100644 --- a/plugin.video.massengeschmack/resources/lib/datasource.py +++ b/plugin.video.massengeschmack/resources/lib/datasource.py @@ -388,6 +388,22 @@ class FKTVDataSource(DataSource): data = resources.lib.parseRSSFeed(self.__urls[quality][submodule], True) listItems = [] + # in old Postecke category show link to Massengeschmack Direkt + if 'postecke' == submodule: + listItems.append( + ListItem( + MGTVDataSource.id, + ADDON.getLocalizedString(30367), + resources.lib.assembleListURL(MGTVDataSource.module, 'direkt'), + ADDON_BASE_PATH + '/resources/media/banner-' + MGTVDataSource.module + 'direkt.png', + ADDON_BASE_PATH + '/resources/media/fanart-' + MGTVDataSource.module + '.jpg', + { + 'Title' : ADDON.getLocalizedString(30367), + 'Plot' : ADDON.getLocalizedString(30368) + } + ) + ) + for i in data: iconimage = i["thumbUrl"] date = resources.lib.parseUTCDateString(i['pubdate']).strftime('%d.%m.%Y') @@ -721,19 +737,22 @@ class MGTVDataSource(DataSource): def __init__(self): self.__urls = { 'hd' : { - 'all' : DataSource._buildFeedURL(self, [1, 2], 'hd'), + 'all' : DataSource._buildFeedURL(self, [1, 2, 3], 'hd'), 'internal' : DataSource._buildFeedURL(self, [1], 'hd'), - 'studio' : DataSource._buildFeedURL(self, [2], 'hd') + 'studio' : DataSource._buildFeedURL(self, [2], 'hd'), + 'direkt' : DataSource._buildFeedURL(self, [3], 'hd') }, 'mobile' : { - 'all' : DataSource._buildFeedURL(self, [1, 2], 'mobile'), + 'all' : DataSource._buildFeedURL(self, [1, 2, 3], 'mobile'), 'internal' : DataSource._buildFeedURL(self, [1], 'mobile'), - 'studio' : DataSource._buildFeedURL(self, [2], 'mobile') + 'studio' : DataSource._buildFeedURL(self, [2], 'mobile'), + 'direkt' : DataSource._buildFeedURL(self, [3], 'mobile') }, 'audio' : { - 'all' : DataSource._buildFeedURL(self, [1, 2], 'audio'), + 'all' : DataSource._buildFeedURL(self, [1, 2, 3], 'audio'), 'internal' : DataSource._buildFeedURL(self, [1], 'audio'), - 'studio' : DataSource._buildFeedURL(self, [2], 'audio') + 'studio' : DataSource._buildFeedURL(self, [2], 'audio'), + 'direkt' : DataSource._buildFeedURL(self, [3], 'audio') } } @@ -810,7 +829,7 @@ class MGTVDataSource(DataSource): self.id, ADDON.getLocalizedString(30300), resources.lib.assembleListURL(self.module, 'all'), - ADDON_BASE_PATH + '/resources/media/banner-' + self.module + '.png', + ADDON_BASE_PATH + '/resources/media/banner-' + self.module + '_20140818.png', ADDON_BASE_PATH + '/resources/media/fanart-' + self.module + '.jpg', { 'Title': ADDON.getLocalizedString(30300), @@ -822,19 +841,31 @@ class MGTVDataSource(DataSource): self.id, ADDON.getLocalizedString(30360), resources.lib.assembleListURL(self.module, 'studio'), - ADDON_BASE_PATH + '/resources/media/banner-' + self.module + '.png', + ADDON_BASE_PATH + '/resources/media/banner-' + self.module + 'studio.png', ADDON_BASE_PATH + '/resources/media/fanart-' + self.module + '.jpg', { 'Title': ADDON.getLocalizedString(30360), 'Plot': ADDON.getLocalizedString(30362) } ), + # Massengeschmack Direkt + ListItem( + self.id, + ADDON.getLocalizedString(30365), + resources.lib.assembleListURL(self.module, 'direkt'), + ADDON_BASE_PATH + '/resources/media/banner-' + self.module + 'direkt.png', + ADDON_BASE_PATH + '/resources/media/fanart-' + self.module + '.jpg', + { + 'Title': ADDON.getLocalizedString(30365), + 'Plot': ADDON.getLocalizedString(30366) + } + ), # Massengeschmack Internal ListItem( self.id, ADDON.getLocalizedString(30363), resources.lib.assembleListURL(self.module, 'internal'), - ADDON_BASE_PATH + '/resources/media/banner-' + self.module + '.png', + ADDON_BASE_PATH + '/resources/media/banner-' + self.module + '_20140818.png', ADDON_BASE_PATH + '/resources/media/fanart-' + self.module + '.jpg', { 'Title': ADDON.getLocalizedString(30363), ----------------------------------------------------------------------- Summary of changes: plugin.video.massengeschmack/addon.xml | 2 +- plugin.video.massengeschmack/changelog.txt | 3 + .../resources/language/English/strings.xml | 12 +++-- .../resources/language/German/strings.xml | 10 +++- .../resources/lib/datasource.py | 49 ++++++++++++++++---- .../resources/media/banner-mgtv_20140818.png | Bin 0 -> 40802 bytes .../resources/media/banner-mgtvdirekt.png | Bin 0 -> 87370 bytes .../{banner-mgtv.png => banner-mgtvstudio.png} | Bin 37952 -> 37952 bytes 8 files changed, 59 insertions(+), 17 deletions(-) create mode 100644 plugin.video.massengeschmack/resources/media/banner-mgtv_20140818.png create mode 100644 plugin.video.massengeschmack/resources/media/banner-mgtvdirekt.png rename plugin.video.massengeschmack/resources/media/{banner-mgtv.png => banner-mgtvstudio.png} (100%) hooks/post-receive -- Plugins
------------------------------------------------------------------------------
_______________________________________________ Xbmc-addons mailing list Xbmc-addons@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/xbmc-addons