@@ -113,7 +113,7 @@ def getTitle(self):
113113 tries += 1
114114 title = xbmc .getInfoLabel ('MusicPlayer.Title' )
115115 if title is None or title == '' :
116- return 'Kodi cannot detect title'
116+ return u 'Kodi cannot detect title'
117117 else :
118118 return title
119119 elif self .isPlayingVideo ():
@@ -137,46 +137,46 @@ def getTitle(self):
137137 title = ''
138138 else :
139139 try :
140- title = ret ['result' ]['item' ]['title' ]
140+ title = ret [u 'result'u 'item'u 'title'
141141 except KeyError :
142- title = 'Kodi cannot detect title'
142+ title = u 'Kodi cannot detect title'
143143 else :
144- if title == '' :
145- title = ret ['result' ]['item' ]['label' ]
146- if title == '' :
147- title = 'Kodi cannot detect title'
144+ if title == u ''
145+ title = ret [u 'result'u 'item'u 'label'
146+ if title == u ''
147+ title = u 'Kodi cannot detect title'
148148 return title
149149 else :
150150 return title
151151 else :
152- return 'Kodi cannot detect title - none playing'
152+ return u 'Kodi cannot detect title - none playing'
153153
154154 def getAudioInfo (self , playerid ):
155155 try :
156156 info = json .loads (xbmc .executeJSONRPC (
157157 '{"jsonrpc": "2.0", "method": "Player.GetItem", "params": { "properties": ["title", "album",'
158158 ' "artist", "duration", "file", "streamdetails"], "playerid": %s }, "id": "AudioGetItem"}'
159159 % playerid ))['result' ]['item' ]
160- if 'artist' in info .keys ():
161- t = info ['artist' ]
162- if isinstance (t , list ):
163- info ['artist' ] = t [0 ]
160+ if u 'artist'in info .keys ():
161+ t = info [u 'artist'
162+ if isinstance (t , list ) and len ( t ) > 0 :
163+ info [u 'artist'= t [0 ]
164164 elif isinstance (t , unicode ):
165165 if t != u'' :
166- info ['artist' ] = t
166+ info [u 'artist'= t
167167 else :
168- info ['artist' ] = u'unknown'
168+ info [u 'artist'= u'unknown'
169169 else :
170- info ['artist' ] = u'unknown'
170+ info [u 'artist'= u'unknown'
171171 else :
172- info ['artist' ] = u'unknown'
173- items = ['duration' , 'id' , 'label' , 'type' ]
172+ info [u 'artist'= u'unknown'
173+ items = [u 'duration'u 'id'u 'label'u 'type'
174174 for item in items :
175175 try :
176176 del info [item ]
177177 except KeyError :
178178 pass
179- info ['mediaType' ] = 'audio'
179+ info [u 'mediaType'= u 'audio'
180180 except RuntimeError :
181181 self .info = {}
182182 else :
@@ -191,43 +191,61 @@ def getVideoInfo(self, playerid):
191191 except RuntimeError :
192192 self .info = {}
193193 else :
194- items = ['label' , 'id' , 'tvshowid' ]
194+ items = [u 'label'u 'id'u 'tvshowid'
195195 for item in items :
196196 try :
197197 del info [item ]
198198 except KeyError :
199199 pass
200- items = {'mediaType' : 'type' , 'fileName' : 'file' }
200+ items = {u 'mediaType'u 'type'u 'fileName'u 'file'
201201 for item in items .keys ():
202202 try :
203203 t = items [item ]
204204 info [item ] = info .pop (t , 'unknown' )
205205 except KeyError :
206- info [item ] = 'unknown'
206+ info [item ] = u 'unknown'
207207 if info ['mediaType' ] != 'musicvideo' :
208- items = ['artist' , 'album' ]
208+ items = [u 'artist'u 'album'
209209 for item in items :
210210 try :
211211 del info [item ]
212212 except KeyError :
213213 pass
214214 else :
215- info ['artist' ] = info ['artist' ][0 ]
216- if 'streamdetails' in info .keys ():
217- sd = info .pop ('streamdetails' , {})
218- info ['stereomode' ] = sd ['video' ][0 ]['stereomode' ]
219- info ['width' ] = str (sd ['video' ][0 ]['width' ])
220- info ['height' ] = str (sd ['video' ][0 ]['height' ])
221- info ['aspectRatio' ] = str (int ((sd ['video' ][0 ]['aspect' ] * 100.0 ) + 0.5 ) / 100.0 )
222- if info ['mediaType' ] == u'episode' :
223- items = ['episode' , 'season' ]
215+ try :
216+ info [u'artist' ] = info [u'artist' ][0 ]
217+ except (KeyError , IndexError ):
218+ info [u'artist' ] = u'unknown'
219+ if u'streamdetails' in info .keys ():
220+ sd = info .pop (u'streamdetails' , {})
221+ try :
222+ info [u'stereomode' ] = sd [u'video' ][0 ][u'stereomode' ]
223+ except (KeyError , IndexError ):
224+ info [u'stereomode' ] = u'unknown'
225+ else :
226+ if info [u'stereomode' ] == u'' :
227+ info [u'stereomode' ] = u'unknown'
228+ try :
229+ info [u'width' ] = unicode (sd [u'video' ][0 ][u'width' ])
230+ except (KeyError , IndexError ):
231+ info [u'width' ] = u'unknown'
232+ try :
233+ info [u'height' ] = unicode (sd [u'video' ][0 ][u'height' ])
234+ except (KeyError , IndexError ):
235+ info [u'height' ] = u'unknown'
236+ try :
237+ info [u'aspectRatio' ] = unicode (int ((sd [u'video' ][0 ][u'aspect' ] * 100.0 ) + 0.5 ) / 100.0 )
238+ except (KeyError , IndexError ):
239+ info [u'aspectRatio' ] = u'unknown'
240+ if info [u'mediaType' ] == u'episode' :
241+ items = [u'episode' , u'season' ]
224242 for item in items :
225243 try :
226- info [item ] = str (info [item ]).zfill (2 )
244+ info [item ] = unicode (info [item ]).zfill (2 )
227245 except KeyError :
228- info [item ] = 'unknown'
246+ info [item ] = u 'unknown'
229247 else :
230- items = ['episode' , 'season' , 'showtitle' ]
248+ items = [u 'episode'u 'season'u 'showtitle'
231249 for item in items :
232250 try :
233251 del info [item ]
@@ -261,52 +279,52 @@ def getInfo(self):
261279 self .info = {}
262280
263281 def rectifyUnknowns (self ):
264- items = {'filename 'self .getPlayingFileX , 'aspectRatio' : self .getAspectRatio , 'height' : self .getResoluion ,
265- 'title' : self .getTitle }
282+ items = {u'fileName 'self .getPlayingFileX , u 'aspectRatio'self .getAspectRatio , u 'height'self .getResoluion ,
283+ u 'title'self .getTitle }
266284 for item in items .keys ():
267285 if item not in self .info .keys ():
268286 self .info [item ] = items [item ]()
269287 else :
270288 try :
271- if self .info [item ] == '' or self .info [item ] == 'unknown' :
289+ if self .info [item ] == '' or self .info [item ] == u 'unknown'
272290 self .info [item ] = items [item ]()
273291 except KeyError :
274292 pass
275293 pt = self .playing_type ()
276- if 'mediaType' not in self .info .keys ():
277- self .info ['mediaType' ] = pt
294+ if u 'mediaType'not in self .info .keys ():
295+ self .info [u 'mediaType'= pt
278296 else :
279297 try :
280- if pt != 'unknown' and self .info ['mediaType' ] != pt :
281- self .info ['mediaType' ] = pt
298+ if pt != u 'unknown'and self .info [u 'mediaType'!= pt :
299+ self .info [u 'mediaType'= pt
282300 except KeyError :
283301 pass
284302
285303 def getPlayingFileX (self ):
286304 try :
287305 fn = self .getPlayingFile ()
288306 except RuntimeError :
289- fn = 'unknown'
307+ fn = u 'unknown'
290308 if fn is None or fn == '' :
291- fn = 'unknown'
309+ fn = u 'unknown'
292310 return xbmc .translatePath (fn )
293311
294312 @staticmethod
295313 def getAspectRatio ():
296314 ar = xbmc .getInfoLabel ("VideoPlayer.VideoAspect" )
297315 if ar is None :
298- ar = 'unknown'
316+ ar = u 'unknown'
299317 elif ar == '' :
300- ar = 'unknown'
318+ ar = u 'unknown'
301319 return str (ar )
302320
303321 @staticmethod
304322 def getResoluion ():
305323 vr = xbmc .getInfoLabel ("VideoPlayer.VideoResolution" )
306324 if vr is None :
307- vr = 'unknown'
325+ vr = u 'unknown'
308326 elif vr == '' :
309- vr = 'unknown'
327+ vr = u 'unknown'
310328 return str (vr )
311329
312330 def onPlayBackStarted (self ):
0 commit comments