Fix REGEX for channels with no thumbnail

Fix REGEX for channels with no thumbnail in the cat_video video type
master
azzy9 5 months ago
parent bb1f6a54ea
commit 6c04afb607

@ -292,10 +292,14 @@ def dir_list_create( data, cat, video_type='video', search = False, play=0 ):
add_dir( video_title, BASE_URL + link.strip(), 4, img, img, '', cat, False, True, play, { 'name' : link.strip(), 'subscribe': False } )
elif video_type == 'cat_video':
videos = re.compile(r'<img\s*class=\"thumbnail__image\"\s*draggable=\"false\"\s*src=\"(.+?)\"\s*alt=(?:\"[^\"]+\"|[^\"\s]+)\s*(?:[^\>]+)>\s*<div\s*class=\"videostream__info\">\s*<div\s*class=\"videostream__badge videostream__status videostream__status--duration\"\s*>\s*(.+?)\s*</div>\s*</div>\s*<a class=\"videostream__link link\" draggable=\"false\" href=\"/(?:[^\>]+)\"></a>\s*</div>\s*<div class=\"videostream__footer\">\s*<a\s*class=\"title__link link\"\s*href=\"([^\>]+)\">\s*<h3\s*class=\"thumbnail__title clamp-2\"(?:[^\>]+)>\s*([^\<]+)</h3>\s*</a>\s*<address class=\"channel\">\s*<a\s*rel=\"author\"\s*class=\"channel__link link ([^\"]+)\"\s*href=\"([^\"]+)\"\s*>\s*<div class=\"channel__avatar channel__border\">\s*<img\s*class=\"channel__avatar channel__image\"\s*src=\"([^\"]+)\"\s*alt=\"([^\"]+)\"', re.MULTILINE|re.DOTALL|re.IGNORECASE).findall(data)
videos = re.compile(r'<img\s*class=\"thumbnail__image\"\s*draggable=\"false\"\s*src=\"(.+?)\"\s*alt=(?:\"[^\"]+\"|[^\"\s]+)\s*(?:[^\>]+)>\s*<div\s*class=\"videostream__info\">\s*<div\s*class=\"videostream__badge videostream__status videostream__status--duration\"\s*>\s*(.+?)\s*</div>\s*</div>\s*<a class=\"videostream__link link\" draggable=\"false\" href=\"/(?:[^\>]+)\"></a>\s*</div>\s*<div class=\"videostream__footer\">\s*<a\s*class=\"title__link link\"\s*href=\"([^\>]+)\">\s*<h3\s*class=\"thumbnail__title clamp-2\"(?:[^\>]+)>\s*([^\<]+)</h3>\s*</a>\s*<address class=\"channel\">\s*<a\s*rel=\"author\"\s*class=\"channel__link link ([^\"]+)\"\s*href=\"([^\"]+)\"\s*>\s*(?:<div class=\"channel__avatar channel__border\">\s*<img\s*class=\"channel__avatar channel__image\"\s*src=\"([^\"]+)\"\s*alt=\"([^\"]+)\"|<span class=\"channel__avatar channel__letter\" title=\"([^\"]+)\">\s*([a-z])\s*</span>)', re.MULTILINE|re.DOTALL|re.IGNORECASE).findall(data)
if videos:
amount = len(videos)
for img, video_length, link, title, img_id, channel_link, channel_img, channel_name in videos:
for img, video_length, link, title, img_id, channel_link, channel_img, channel_name, channel_name_alt, img_letter in videos:
if img_letter:
channel_name = channel_name_alt
if '<svg' in channel_name:
channel_name = channel_name.split('<svg')[0] + " (Verified)"

Loading…
Cancel
Save