Update README.md

README.md

@@ -13,14 +13,17 @@ Save the settings.<br />
 - See your followed channels & users<br />
 - Subscribe to channel & users<br />
 - Unsubscribe to channels & users<br />
+- View your "Watch later" playlist<br />
+- Add videos to your "Watch later" playlist<br />
+- Delte videos from your "Watch later" playlist<br />
 - View video comments<br />
 
+## Install
+This plugin can be installed from the AzzyAddons repo: https://azzyaddons.github.io
+
 ## Issues
 If an issue occurs where the stream freezes after start,<br />
 you can try to enable http streams:<br />
 - Go to settings<br />
 - Debug<br />
 - Use HTTP
-  
-## Install
-This plugin can be installed from the AzzyAddons repo: https://azzyaddons.github.io

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.rumble" name="Rumble" version="1.6.1" provider-name="azzy9">
+<addon id="plugin.video.rumble" name="Rumble" version="1.7.0" provider-name="azzy9">
 	<requires>
 		<import addon="script.module.simplejson"/>
 		<import addon="script.module.requests"/>
@@ -21,7 +21,8 @@
 			<icon>icon.png</icon>
 			<fanart>fanart.jpg</fanart>
 		</assets>
-		<news>- v1.6.1 - Add Upcoming into upcoming video titles, Autoplay if only 1 quality, add m3u8 handler for live streams
+		<news>- v1.7.0 - Change where following is retrieved from, add methods and context menus to manage playlists, add watch later in menu
+- v1.6.1 - Add Upcoming into upcoming video titles, Autoplay if only 1 quality, add m3u8 handler for live streams
 - v1.6.0 - Remove view_set method, change how cat_video gets video data, Remove hardcoded categories, add Categories section, add Live Stream Section, add info_label to include duration and year, Fix user search and battle leaderboard REGEX
 - v1.5.4 - Fix search, Fix following users</news>
 	</extension>

lib/rumble_user.py

@@ -233,3 +233,29 @@ class RumbleUser:
             return data
 
         return False
+
+    def playlist_delete_video( self, video_id, playlist_id = 'watch-later' ):
+
+        """ method to delete video from playlist """
+
+        if self.has_session():
+
+            post_content = {
+                'playlist_id': playlist_id,
+                'video_id': video_id,
+            }
+
+            headers = {
+                'Referer': self.base_url,
+                'Content-type': 'application/x-www-form-urlencoded'
+            }
+
+            data = request_get(
+                self.base_url + '/service.php?name=playlist.delete_video',
+                post_content,
+                headers
+            )
+
+            return data
+
+        return False

main.py

@@ -117,7 +117,7 @@ def home_menu():
         # Subscriptions
         add_dir( 'Subscriptions', BASE_URL + '/subscriptions', 3, { 'thumb': 'favorite.png' }, {}, 'subscriptions' )
         # Following
-        add_dir( 'Following', BASE_URL + '/', 3, { 'thumb': 'favorite.png' }, {}, 'following' )
+        add_dir( 'Following', BASE_URL + '/followed-channels', 3, { 'thumb': 'favorite.png' }, {}, 'following' )
         # Watch Later
         add_dir( 'Watch Later', BASE_URL + '/playlists/watch-later', 3, { 'thumb': 'favorite.png' }, {}, 'playlist' )
 
@@ -280,7 +280,7 @@ def dir_list_create( data, cat, video_type='video', search = False, play=0 ):
 
         if video_type == 'live_stream':
             videos_regex = r'<div class=\"thumbnail__grid\"\s*role=\"list\">(.*)<nav class=\"paginator\">'
-        if video_type == 'playlist':
+        elif video_type == 'playlist':
             videos_regex = r'<ol\s*class=\"videostream__list\"(?:[^>]+)>(.*)</ol>'
         else:
             videos_regex = r'<ol\s*class=\"thumbnail__grid\">(.*)</ol>'
@@ -297,6 +297,7 @@ def dir_list_create( data, cat, video_type='video', search = False, play=0 ):
             for video in videos:
 
                 video_title = ''
+                images = {}
                 info_labels = {}
                 subscribe_context = False
 
@@ -304,7 +305,8 @@ def dir_list_create( data, cat, video_type='video', search = False, play=0 ):
                 link = re.compile(r'<a\sclass="videostream__link link"\sdraggable="false"\shref="([^\"]+)">', re.DOTALL|re.IGNORECASE).findall(video)
                 img = re.compile(r'<img\s*class=\"thumbnail__image\"\s*draggable=\"false\"\s*src=\"([^\"]+)\"', re.DOTALL|re.IGNORECASE).findall(video)
 
-                video_title = '[B]' + clean_text( title[0] ) + '[/B]'
+                if title:
+                    video_title = '[B]' + clean_text( title[0] ) + '[/B]'
                 if 'videostream__status--live' in video:
                     video_title += ' [COLOR red](Live)[/COLOR]'
                 if 'videostream__status--upcoming' in video:
@@ -329,7 +331,8 @@ def dir_list_create( data, cat, video_type='video', search = False, play=0 ):
                     info_labels[ 'year' ] = date_time[0][0]
                     video_title += ' - [COLOR lime]' + get_date_formatted( DATE_FORMAT, date_time[0][0], date_time[0][1], date_time[0][2] ) + '[/COLOR]'
 
-                images = { 'thumb': str(img[0]), 'fanart': str(img[0]) }
+                if img:
+                    images = { 'thumb': str(img[0]), 'fanart': str(img[0]) }
 
                 duration = re.compile(r'videostream__status--duration\"\s*>([^<]+)</div>', re.DOTALL|re.IGNORECASE).findall(video)
 
@@ -354,24 +357,55 @@ def dir_list_create( data, cat, video_type='video', search = False, play=0 ):
                 add_dir( clean_text( title ), BASE_URL + link.strip() + '/videos', 3, images, {}, cat )
 
     elif video_type == 'following':
-        following = re.compile(r'<a\s*class=\"main-menu-item-channel\s*(?:main-menu-item-channel-is-live)?\"\s*title=\"?(?:[^\"]+)\"?\s*href=([^>\s]+)(?:\s*data-js=\"main_menu_live_channel\")?\s*>\s*<div class=\"main-menu-item-channel-label-wrapper\">\s*<i class=\'user-image (?:user-image--img user-image--img--id-([^\s\']+)\s*(?:channel-live)?\')?(?:user-image--letter\s*(?:channel-live)?\' data-letter=([a-zA-Z]))? data-js=user-image>\s*</i>\s*<span class=\"main-menu-item-label main-menu-item-channel-label\">([^<]+)</span>', re.MULTILINE|re.DOTALL|re.IGNORECASE).findall(data)
-        if following:
-            amount = len(following)
-            for link, img_id, img_letter, channel_name in following:
 
-                if img_id:
-                    img = str( get_image( data, img_id ) )
-                else:
-                    img = MEDIA_DIR + 'letters/' + img_letter + '.png'
-                video_title = '[B]' + channel_name.strip() + '[/B]'
+        videos_regex = r'<ol\s*class=\"followed-channels__list\">(.*)</ol>'
+        videos = re.compile(videos_regex, re.DOTALL|re.IGNORECASE).findall(data)
+        if videos:
+            videos = videos[0].split('"followed-channel flex items-')
+
+            videos.pop(0)
+            amount = len(videos)
+            for video in videos:
+
+                video_title = ''
+                images = {}
+
+                title = re.compile(r'<span\s*class=\"clamp-2\">([^<]+)<\/span>', re.DOTALL|re.IGNORECASE).findall(video)
+                followers = re.compile(r'<div\s*class=\"followed-channel__followers(?:[^\"]+)\">([^<]+)</div>', re.DOTALL|re.IGNORECASE).findall(video)
+                link = re.compile(r'<a\s*class=\"(?:[^\"]+)\"\s*href=\"([^\"]+)\">', re.DOTALL|re.IGNORECASE).findall(video)
+                img = re.compile(r'<(?:img|span)\s*class=\"channel__avatar([^\"]+)\"\s*(?:src=\"([^\"]+)\")?', re.DOTALL|re.IGNORECASE).findall(video)
+
+                if title:
+                    video_title = '[B]' + clean_text( title[0] ) + '[/B]'
+
+                if '<use href="#channel_verified" />' in video:
+                    video_title += ' [COLOR gold](Verified)[/COLOR]'
+
+                link = link[0] if link else ""
+
+                if img:
+                    if 'channel__letter' in img[0][0]:
+                        if title:
+                            image_url = MEDIA_DIR + 'letters/' + title[0][0].lower() + '.png'
+                        else:
+                            image_url = ''
+                    else:
+                        image_url = img[0][1]
+
+                    images = { 'thumb': str(image_url), 'fanart': str(image_url) }
+
+                    if 'channel__live' in img[0][0]:
+                        video_title += ' [COLOR red](Live)[/COLOR]'
+
+                if followers:
+                    video_title += '\n[COLOR green]' + followers[0].strip() + '[/COLOR]'
 
                 cat = 'user'
                 if '/user/' not in link:
                     cat = 'channel_video'
-                images = { 'thumb': str(img), 'fanart': str(img) }
 
                 #open get url and open player
-                add_dir( video_title, BASE_URL + link.strip(), 3, images, {}, cat, True, True, play, { 'name' : link.strip(), 'subscribe': False } )
+                add_dir( video_title, BASE_URL + link, 3, images, {}, cat, True, True, play, { 'name' : link, 'subscribe': False } )
 
     else:
 
@@ -405,7 +439,10 @@ def dir_list_create( data, cat, video_type='video', search = False, play=0 ):
 
 def get_video_id( url ):
 
-    """ gets a video id from a URL, helps in resolving """
+    """
+    gets a video id from a URL
+    helps in resolving
+    """
 
     data = request_get(url)
 
@@ -419,6 +456,25 @@ def get_video_id( url ):
         return video_id[0]
     return False
 
+def get_playlist_video_id( url ):
+
+    """
+    gets a playlist video id from a URL
+    helps in adding video to playlist
+    """
+
+    data = request_get(url)
+
+    # gets embed id from embed url
+    video_id = re.compile(
+        'data-id=\"([0-9]+)\"',
+        re.MULTILINE|re.DOTALL|re.IGNORECASE
+    ).findall(data)
+
+    if video_id:
+        return video_id[0]
+    return False
+
 def resolver( url ):
 
     """ Resolves a URL for rumble & returns resolved link to video """
@@ -705,11 +761,11 @@ def add_dir( name, url, mode, images = {}, info_labels = {}, cat = '', folder=Tr
     }
 
     # set default image location to MEDIA_DIR
-    for art_type in art_dict:
-        if art_dict[ art_type ]:
-            if not art_dict[ art_type ].startswith( HOME_DIR ) and \
-                not art_dict[ art_type ].startswith( 'http' ) and \
-                not art_dict[ art_type ].startswith( '\\' ):
+    for art_type, art_loc in art_dict.items():
+        if art_loc:
+            if not art_loc.startswith( HOME_DIR ) and \
+                not art_loc.startswith( 'http' ) and \
+                not art_loc.startswith( '\\' ):
                 art_dict[ art_type ] = MEDIA_DIR + art_dict[ art_type ]
 
     link_params = {
@@ -740,6 +796,18 @@ def add_dir( name, url, mode, images = {}, info_labels = {}, cat = '', folder=Tr
         list_item.setProperty('IsPlayable', 'true')
         context_menu.append((get_string(30158), 'Action(Queue)'))
 
+        if RUMBLE_USER.has_login_details():
+            # need to get current
+            params=get_params()
+            current_url = params.get( 'url', None )
+
+            if '/playlists/watch-later' in current_url:
+                # delete watch later context
+                context_menu.append(('Delete from Watch Later','RunPlugin(%s)' % build_url( {'mode': '12','url': url, 'cat':'delete'} )))
+            else:
+                # add watch later context
+                context_menu.append(('Add to Watch Later','RunPlugin(%s)' % build_url( {'mode': '12','url': url, 'cat':'add'} )))
+
     info_labels['title'] = name
     if play:
         # adds information context menu
@@ -758,7 +826,7 @@ def add_dir( name, url, mode, images = {}, info_labels = {}, cat = '', folder=Tr
                 context_menu.append(('Unsubscribe to ' + subscribe_context['name'],'RunPlugin(%s)' % build_url( {'mode': '11','name': subscribe_context['name'], 'cat': 'unsubscribe'} )))
 
         if play == 2 and mode == 4:
-            context_menu.append(('Comments','RunPlugin(%s)' % build_url( {'mode': '12','url': url} )))
+            context_menu.append(('Comments','RunPlugin(%s)' % build_url( {'mode': '13','url': url} )))
 
     if fav_context:
 
@@ -797,6 +865,26 @@ def add_dir( name, url, mode, images = {}, info_labels = {}, cat = '', folder=Tr
 
     xbmcplugin.addDirectoryItem(handle=PLUGIN_ID, url=link, listitem=list_item, isFolder=folder)
 
+def playlist_manage( url, action="add" ):
+
+    """ Adds to Rumble's Playlist """
+    video_id = get_playlist_video_id( url )
+
+    if video_id:
+        if action == "add":
+            RUMBLE_USER.playlist_add_video( video_id )
+            message = "Added to playlist"
+        else:
+            RUMBLE_USER.playlist_delete_video( video_id )
+            message = "Deleted from playlist"
+    else:
+        if action == "add":
+            message = "Cannot add to playlist"
+        else:
+            message = "Cannot delete from playlist"
+
+    notify( message, "Playlist" )
+
 def comments_show( url ):
 
     """ Retrieves and shows video's comments in a modal """
@@ -900,8 +988,10 @@ def main():
     elif mode==11:
         subscribe(name, cat)
     elif mode==12:
-        comments_show(url)
+        playlist_manage(url, cat)
     elif mode==13:
+        comments_show(url)
+    elif mode==14:
         login_test()
 
 if __name__ == "__main__":

resources/settings.xml

@@ -10,7 +10,7 @@
     </category>
     <category label="Debug">
         <setting id="useHTTP" label="Use HTTP" type="bool" default="False"/>
-        <setting id="loginTest" label="Test Login Details" type="action" action="RunPlugin(plugin://plugin.video.rumble/?mode=13)"/>
+        <setting id="loginTest" label="Test Login Details" type="action" action="RunPlugin(plugin://plugin.video.rumble/?mode=14)"/>
         <setting id="importFavorites" label="Import Favorites" type="action" action="RunPlugin(plugin://plugin.video.rumble/?mode=9)"/>
     </category>
 </settings>