- Fix crash on get thumbnail url in some cases

kolsys · Jan 21, 2017 · 51b45c5 · 51b45c5
1 parent 484c898
commit 51b45c5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Contents/Code/__init__.py b/Contents/Code/__init__.py
@@ -835,7 +835,7 @@ def AddItemsFromDescription(oc, description):
             oc.add(DirectoryObject(
                 key=Callback(VideoInfo, vid=ext_vid),
                 title=u'[*] %s' % ext_title,
-                thumb='https://i.ytimg.com/vi/%s/hqdefault.jpg' % ext_vid
+                thumb=Video.GetThumb(ext_vid)
             ))
 
     return oc

diff --git a/Contents/Info.plist b/Contents/Info.plist
@@ -14,7 +14,7 @@
 	<key>CFBundleSignature</key>
 	<string>hook</string>
 	<key>CFBundleVersion</key>
-	<string>4.4</string>
+	<string>4.5</string>
 
 	<key>PlexPluginVersionUrl</key>
 	<string>http://bit.ly/1FuE3dz</string>

diff --git a/Contents/Services/Shared Code/video.pys b/Contents/Services/Shared Code/video.pys
@@ -78,6 +78,10 @@ def GetMetaUrlByServiceURL(url):
     return 'https://www.youtube.com/watch?v=%s' % GetOID(url)
 
 
+def GetThumb(vid):
+    return 'https://i.ytimg.com/vi/%s/hqdefault.jpg' % vid
+
+
 def GetVideoData(url):
     try:
         res = HTML.ElementFromURL(GetMetaUrlByServiceURL(url))

diff --git a/Contents/Services/URL/YouTubeTV/ServiceCode.pys b/Contents/Services/URL/YouTubeTV/ServiceCode.pys
@@ -121,18 +121,14 @@ def MetadataObjectForURL(url):
     if not meta:
         raise Ex.MediaNotAvailable
 
-    thumb = meta['iurl']
-    if thumb[0] == '/':
-        thumb = 'http:%s' % thumb
-
     return VideoClipObject(
         title=u'%s' % meta['title'],
         rating_key=url.split('&')[0],
         summary=u'%s\n%s' % (
             meta['author'],
             item['description'] if 'description' in item else '',
         ),
-        thumb=thumb,
+        thumb=Video.GetThumb(meta['video_id']),
         rating=(float(meta['avg_rating'])*2),
         tags=meta['keywords'].split(','),
         duration=int(meta['length_seconds'])*1000 if meta['length_seconds'] else None,