Clean more code & add get comment method

master
azzy9 12 months ago
parent 1f74fa10d4
commit a0778cf09a

@ -9,7 +9,7 @@ import time
import xbmcaddon
from lib.general import *
from lib.general import request_get
from lib.md5ex import MD5Ex
try:
@ -94,7 +94,7 @@ class RumbleUser:
data = request_get(
self.base_url + '/service.php?name=user.get_salts',
{'username': self.username},
[ ( 'Referer', self.base_url ), ( 'Content-type', 'application/x-www-form-urlencoded' ) ]
[('Referer', self.base_url), ('Content-type', 'application/x-www-form-urlencoded')]
)
if data:
salts = json.loads(data)['data']['salts']
@ -118,7 +118,7 @@ class RumbleUser:
data = request_get(
self.base_url + '/service.php?name=user.login',
{'username': self.username, 'password_hashes': hashes},
[( 'Referer', self.base_url ), ( 'Content-type', 'application/x-www-form-urlencoded' )]
[('Referer', self.base_url), ('Content-type', 'application/x-www-form-urlencoded')]
)
if data:
@ -132,6 +132,28 @@ class RumbleUser:
return False
def get_comments( self, video_id ):
""" method to get comments for video """
if video_id and self.has_session():
headers = {
'Referer': self.base_url + video_id,
'Content-type': 'application/x-www-form-urlencoded'
}
data = request_get(
self.base_url + '/service.php?name=comment.list&video=' + video_id,
None,
headers
)
if data:
comments = json.loads(data)['js_code']
#<a\sclass=\\\"comments-meta-author\\\"\shref=\\\"([^\"]+)\\\">([^\<]+)</a>(?:[\s|\n||\\n|\\t]+)<a\sclass='comments-meta-post-time'\shref='#comment-([0-9]+)' title='([A-Z][^\,]+),\s([A-Z][^\s]+)\s([0-9]+),\s([0-9]+)\s([0-9]{2}):([0-9]{2})\sAM\s-04'>([^\<]+)</a>(?:[\s|\n||\\n|\\t]+)</div>(?:[\s|\n||\\n|\\t]+)<p class=\\\"comment-text\\\">([^\<]+)</p>
return {}
def set_session_cookie( self ):

@ -29,12 +29,12 @@ ADDON = xbmcaddon.Addon()
ADDON_ICON = ADDON.getAddonInfo('icon')
ADDON_NAME = ADDON.getAddonInfo('name')
HOME_DIR = 'special://home/addons/{0}'.format(PLUGIN_NAME)
HOME_DIR = 'special://home/addons/' + PLUGIN_NAME
RESOURCE_DIR = HOME_DIR + 'resources/'
MEDIA_DIR = RESOURCE_DIR + 'media/'
kodi_version = float(xbmcaddon.Addon('xbmc.addon').getAddonInfo('version')[:4])
date_format = ADDON.getSetting('date_format')
KODI_VERSION = float(xbmcaddon.Addon('xbmc.addon').getAddonInfo('version')[:4])
DATE_FORMAT = ADDON.getSetting('date_format')
RUMBLE_USER = RumbleUser()
@ -258,7 +258,7 @@ def dir_list_create( data, cat, video_type='video', search = False, play=False )
if '<svg' in channel_name:
channel_name = channel_name.split('<svg')[0] + " (Verified)"
video_title = '[B]' + clean_text( title ) + '[/B]\n[COLOR gold]' + channel_name + ' - [COLOR lime]' + get_date_formatted( date_format, year, month, day ) + '[/COLOR]'
video_title = '[B]' + clean_text( title ) + '[/B]\n[COLOR gold]' + channel_name + ' - [COLOR lime]' + get_date_formatted( DATE_FORMAT, year, month, day ) + '[/COLOR]'
#open get url and open player
add_dir( video_title, BASE_URL + link, 4, str(img), str(img), '', cat, False, True, play, { 'name' : channel_link, 'subscribe': True } )
@ -378,7 +378,7 @@ def play_video( name, url, iconimage, play=2 ):
list_item = xbmcgui.ListItem(name, path=url)
list_item.setArt({'icon': iconimage, 'thumb': iconimage})
if kodi_version > 19.8:
if KODI_VERSION > 19.8:
vidtag = list_item.getVideoInfoTag()
vidtag.setTitle(name)
else:
@ -586,7 +586,7 @@ def add_dir(name, url, mode, iconimage, fanart, description, cat, folder=True, f
list_item.setProperty('IsPlayable', 'true')
context_menu.append((get_string(30158), 'Action(Queue)'))
if kodi_version > 19.8:
if KODI_VERSION > 19.8:
vidtag = list_item.getVideoInfoTag()
vidtag.setMediaType('video')
vidtag.setTitle(name)

Loading…
Cancel
Save