Skip to content

Commit

Permalink
- Add support videos and playlist from description
Browse files Browse the repository at this point in the history
  • Loading branch information
KOL committed Jun 27, 2015
1 parent 5457636 commit 039c52a
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 1 deletion.
24 changes: 24 additions & 0 deletions Contents/Code/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,30 @@ def VideoInfo(vid, pl_item_id=None):
thumb=ICONS['remove'],
))

links = Video.ParseLinksFromDescription(item['snippet']['description'])
if len(links):
for (ext_title, url) in links:
try:
ext_vid = URLService.NormalizeURL(url)
except:
continue
if ext_vid is None:
continue

if 'playlist?' in ext_vid:
ext_vid = ext_vid[ext_vid.rfind('list=')+5:]
oc.add(DirectoryObject(
key=Callback(Playlist, oid=ext_vid, title=ext_title),
title=u'[*] %s' % ext_title
))
else:
ext_vid = ext_vid[ext_vid.rfind('/')+1:]
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
))

return oc


Expand Down
2 changes: 1 addition & 1 deletion Contents/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<key>CFBundleSignature</key>
<string>hook</string>
<key>CFBundleVersion</key>
<string>3.1</string>
<string>3.2</string>

<key>PlexPluginVersionUrl</key>
<string>http://bit.ly/1FuE3dz</string>
Expand Down
13 changes: 13 additions & 0 deletions Contents/Services/Shared Code/video.pys
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,19 @@ def GetVideoUrls(url):
return ret


def ParseLinksFromDescription(text):
re = Regex(
(
r'^(.+)[\s\n]*(https?://(?:www\.|m\.)?youtu(?:be\.com|\.be)/'
'(?!account(?:_|\?)?|artist(?:/|\?)|blog\?|categories\?|'
'channels\?|charts|embed/(?:__videoid__|videoseries\?)|p/|'
'profile\?|channel/|results\?|subscribe_widget|\?tab=).+)'
),
Regex.MULTILINE
)
return re.findall(text)


def GetUrlFromStream(item):
ret = item['url']
if 's' in item:
Expand Down

0 comments on commit 039c52a

Please sign in to comment.