Merge pull request #90 from mediathekview/develop

Improvements after Kodi-PR-Review

addon.py

@@ -258,10 +258,8 @@ def run( self ):
 			Downloader( self ).download_episode( filmid, quality )
 		elif mode == 'playwithsrt':
 			filmid		= self.get_arg( 'id', 0 )
-			external	= self.get_arg( 'external', 'False' ) == 'True'
-			Downloader( self ).play_movie_with_subs( filmid, external )
-#		elif mode == 'enqueue':
-#			self.enqueue_film( self.get_arg( 'id', 0 ) )
+			only_sru	= self.get_arg( 'only_set_resolved_url', 'False' ) == 'True'
+			Downloader( self ).play_movie_with_subs( filmid, only_sru )
 
 		# cleanup saved searches
 		if mode is None or mode != 'search':

resources/language/resource.language.it_it/strings.po

@@ -36,7 +36,7 @@ msgstr "Preferisci alta definizione"
 
 msgctxt "#30111"
 msgid "Autoplay Subtitles"
-msgstr "Mostra Sottotitoli"
+msgstr "Riproduci sempre con sottotitoli"
 
 msgctxt "#30112"
 msgid "No future videos (usually trailers)"

resources/lib/downloader.py

@@ -34,24 +34,24 @@ def __init__( self, plugin ):
 		self.settings	= plugin.settings
 		self.notifier	= plugin.notifier
 
-	def play_movie_with_subs( self, filmid, external ):
+	def play_movie_with_subs( self, filmid, only_set_resolved_url ):
 		film = self.database.RetrieveFilmInfo( filmid )
 		if film is None:
 			self.notifier.ShowError( 30990, self.plugin.language( 30991 ) )
 			return
-		ttmname = self.plugin.datapath + '/subtitle.ttml'
-		srtname = self.plugin.datapath + '/subtitle.srt'
+		ttmname = os.path.join( self.plugin.datapath, 'subtitle.ttml' )
+		srtname = os.path.join( self.plugin.datapath, 'subtitle.srt' )
 		subs = []
 		if self.download_subtitle( film, ttmname, srtname, 'subtitle' ):
 			subs.append( srtname )
 		( videourl, listitem ) = FilmUI( self.plugin ).get_list_item( None, film )
 		if listitem:
 			if subs:
 				listitem.setSubtitles( subs )
-			if external:
-				xbmc.Player().play( videourl, listitem )
-			else:
+			if only_set_resolved_url:
 				self.plugin.setResolvedUrl( True, listitem )
+			else:
+				xbmc.Player().play( videourl, listitem )
 
 	def download_subtitle( self, film, ttmname, srtname, filename ):
 		ret = False

resources/lib/filmui.py

@@ -9,6 +9,8 @@
 # pylint: disable=mixed-indentation, bad-whitespace, bad-continuation, missing-docstring
 
 # -- Imports ------------------------------------------------
+import os
+
 import xbmcgui
 import xbmcplugin
 
@@ -52,7 +54,7 @@ def Add( self, alttitle = None, totalItems = None ):
 						self.plugin.build_url( {
 							'mode': "playwithsrt",
 							'id': self.id,
-							'external': True
+							'only_set_resolved_url': False
 						} )
 					)
 				) )
@@ -110,7 +112,7 @@ def Add( self, alttitle = None, totalItems = None ):
 			videourl = self.plugin.build_url( {
 				'mode': "playwithsrt",
 				'id': self.id,
-				'external': False
+				'only_set_resolved_url': True
 			} )
 
 		if totalItems is not None:
@@ -172,7 +174,7 @@ def get_list_item( self, alttitle, film = None ):
 				info_labels['aired']		= airedstring
 				info_labels['dateadded']	= airedstring
 
-		icon = 'special://home/addons/' + self.plugin.addon_id + '/resources/icons/' + film.channel.lower() + '-m.png'
+		icon = os.path.join( self.plugin.addon.getAddonInfo( 'path' ), 'resources', 'icons', film.channel.lower() + '-m.png' )
 
 		listitem = xbmcgui.ListItem( resultingtitle, path = videourl )
 		listitem.setInfo( type = 'video', infoLabels = info_labels )