Merge pull request #4681 from skipmodea1/matrix

[plugin.video.worldstarhiphop] 1.0.16+matrix.1

Author: basrieter

plugin.video.worldstarhiphop/addon.xml

@@ -2,15 +2,15 @@
 <addon 
 	id="plugin.video.worldstarhiphop" 
 	name="World Star Hip Hop" 
-	version="1.0.15+matrix.1"
+	version="1.0.16+matrix.1"
 	provider-name="Skipmode A1">
   <requires>
     <import addon="xbmc.python"                     version="3.0.0"/>
     <import addon="script.module.beautifulsoup4"    version="4.3.2"/>
     <import addon="script.module.requests"          version="2.4.3"/>
     <import addon="script.module.future"            version="0.0.1"/>
   	<import addon="script.module.html5lib"          version="0.999.0"/>
-	<import addon="script.module.youtube.dl"        version="20.616.0+matrix.1"/>
+	<import addon="script.module.youtube.dl"        version="25.05.18+matrix.1"/>
   </requires>
 	<extension point="xbmc.python.pluginsource" library="addon.py">
 		<provides>video</provides>
@@ -30,7 +30,7 @@
       <icon>resources/icon.png</icon>
       <fanart>resources/fanart.jpg</fanart>
     </assets>
-    <news>v1.0.15 (2023-10-11) (Kudos to jdig4240)
+    <news>v1.0.16 (2025-07-01)
     - changes due to website changes
     </news>
   </extension>

plugin.video.worldstarhiphop/changelog.txt

@@ -1,3 +1,6 @@
+v1.0.16 (2025-07-01)
+- changes due to website changes
+
 v1.0.15 (2023-10-11) (Kudos to jdig4240)
 - changes due to website changes
 

plugin.video.worldstarhiphop/resources/language/resource.language.en_gb/strings.po

@@ -109,4 +109,8 @@ msgstr ""
 
 msgctxt "#30507"
 msgid "Error getting page: %s"
+msgstr ""
+
+msgctxt "#30508"
+msgid "Error parsing JSON"
 msgstr ""

plugin.video.worldstarhiphop/resources/lib/worldstarhiphop_const.py

@@ -4,7 +4,9 @@
 import sys
 import os
 import xbmc
+import xbmcgui
 import xbmcaddon
+import urllib.parse
 from bs4 import BeautifulSoup
 
 #
@@ -13,12 +15,13 @@
 ADDON = "plugin.video.worldstarhiphop"
 SETTINGS = xbmcaddon.Addon()
 LANGUAGE = SETTINGS.getLocalizedString
-BASEURLWSHH = "https://worldstarhiphop.com"
-BASEURLWS = "https://worldstar.com"
+BASE_URL_WSHH = "https://worldstarhiphop.com"
+INITIAL_API_VIDEO_URL = "https://api-mobile.worldstar.com/video/feed?daysSize=2&heroVideosSize=3&clean=false&pageCursor="
+INITIAL_API_SEARCH_URL = "https://api-mobile.worldstar.com/search/suggestion?searchTerm=<search_string>&pageSize=40&filter=newest&clean=false"
 IMAGES_PATH = os.path.join(xbmcaddon.Addon().getAddonInfo('path'), 'resources')
 HEADERS = {'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 Safari/537.36'}
-DATE = "2022-04-21"
-VERSION = "1.0.14"
+DATE = "2025-07-01"
+VERSION = "1.0.16"
 
 
 if sys.version_info[0] > 2:
@@ -48,4 +51,88 @@ def log(name_object, object):
 
 def getSoup(html, default_parser="html5lib"):
     soup = BeautifulSoup(html, default_parser)
-    return soup
+    return soup
+
+
+def create_video_list_item(video_data, addon_name, images_path, log):
+    """
+    Creates and configures an xbmcgui.ListItem for a video.
+
+    Args:
+        video_data (dict): Dictionary containing video information.
+        addon_name (str): The name of the addon.
+        images_path (str): Path to the addon's images.
+        log (function): The logging function to use.
+
+    Returns:
+        xbmcgui.ListItem: The configured list item, or None if data is malformed.
+    """
+    try:
+        title = video_data.get('title', '')
+        title_highlight = video_data.get('titleHighlight', '')
+        description = video_data.get('description', '')
+        duration = video_data.get('duration', 0)
+        thumbnail_url = video_data.get('imageUrl', '')
+    except KeyError as e:
+        log("ERROR", f"Missing key in video data: {e}")
+        return None  # Return None if data is malformed
+
+    log("title", title)
+    log("title_highlight", title_highlight)
+    log("description", description)
+    log("duration", duration)
+    log("thumbnail_url", thumbnail_url)
+
+    if title_highlight == "":
+        plot = description
+    else:
+        plot = title_highlight
+
+    log("plot", plot)
+
+    list_item = xbmcgui.ListItem(title)
+    list_item.setInfo("video", {
+        "title": title,
+        "studio": addon_name,
+        "plot": plot,
+        "duration": duration
+    })
+    list_item.setArt({
+        'thumb': thumbnail_url,
+        'icon': thumbnail_url,
+        'fanart': os.path.join(images_path, 'fanart-blur.jpg')
+    })
+    list_item.setProperty('IsPlayable', 'true')
+
+    # Add refresh option to context menu
+    list_item.addContextMenuItems([('Refresh', 'Container.Refresh')])
+
+    return list_item
+
+def add_video_to_listing(video_data, plugin_url, listing, addon_name, images_path, log):
+    """
+    Processes a video dictionary, creates a list item, and appends it to the listing.
+
+    Args:
+        video_data (dict): Dictionary containing video information.
+        plugin_url (str): The base plugin URL.
+        listing (list): The list to append the new list item to.
+        addon_name (str): The name of the addon.
+        images_path (str): Path to the addon's images.
+        log (function): The logging function to use.
+    """
+    list_item = create_video_list_item(video_data, addon_name, images_path, log)
+    # Skip if list item creation failed
+    if list_item is None:
+        return
+
+    video_url = video_data.get('videoUrl', '')
+
+    log("video_url", video_url)
+
+    parameters = {"action": "play", "video_page_url": video_url}
+    url = f"{plugin_url}?{urllib.parse.urlencode(parameters)}"
+    is_folder = False
+
+    # Add our item to the listing as a 3-element tuple.
+    listing.append((url, list_item, is_folder))