[plugin.video.piped] 1.1.0

Author: syhlx

plugin.video.piped/README.md

@@ -14,7 +14,8 @@ An addon which allows you to access any Piped instance, login and manage your pl
 - [x] Subtitles
 - [x] Pick favourite your Piped instance
 - [x] Compatible with Sponsor Block
-- [ ] Watch live streams (can be watched once finished, for now)
+- [x] Blacklist channels and video titles
+- [x] Watch live streams
 
 **Account Features (logged in to a Piped instance)**
 
@@ -42,4 +43,4 @@ But, you can also choose your favourite Piped instance or host your own and chan
 This plugin is neither affiliated with nor endorsed by TeamPiped.
 
 # License
-Piped Addon for Kodi is licensed under the AGPL v3 License. See [LICENSE](LICENSE.txt) for details.
+Piped Addon for Kodi is licensed under the AGPL v3 License. See [LICENSE](LICENSE.txt) for details.

plugin.video.piped/addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.piped" name="Piped" version="1.0.1" provider-name="Syhlx">
+<addon id="plugin.video.piped" name="Piped" version="1.1.0" provider-name="Syhlx">
 	<requires>
 		<import addon="xbmc.python" version="3.0.0" />
 		<import addon="inputstream.adaptive" version="19.0.0" />

plugin.video.piped/lib/blacklist.py

@@ -0,0 +1,36 @@
+import json
+from xbmcaddon import Addon
+from xbmcvfs import translatePath
+from xbmcgui import Dialog
+
+addon = Addon()
+blacklist_path: str = f"{translatePath(addon.getAddonInfo('profile'))}/blacklist.json"
+
+def blacklist_load() -> dict:
+	try:
+		with open(blacklist_path, 'r') as f: return json.load(f)
+	except:
+		return dict()
+
+def blacklist_save(blacklist: dict) -> None:
+	with open(blacklist_path, 'w+') as f:
+		json.dump(blacklist, f)
+
+def blacklist_add(channel_id: str, channel_name: str) -> None:
+	blacklist: dict = blacklist_load()
+
+	if channel_id not in blacklist:
+		blacklist[channel_id] = dict(name = channel_name)
+
+	blacklist_save(blacklist)
+
+def blacklist_remove(channel_id: str, prompt: bool=False) -> None:
+	blacklist: dict = blacklist_load()
+
+	if prompt:
+		if not Dialog().yesno(blacklist[channel_id]['name'], addon.getLocalizedString(30024)):
+			return
+
+	if channel_id in blacklist:
+		del blacklist[channel_id]
+		blacklist_save(blacklist)

plugin.video.piped/lib/dash.py

@@ -1,19 +1,16 @@
-from requests import get
 import xbmc
 from xbmcaddon import Addon
 
 class AutoIncrement():
 	def __init__(self):
-		self.i: int = 0
+		self.i: int = -1
 
 	def gen(self):
 		self.i += 1
 		return self.i
 
-def generate_dash(video_id: str) -> str:
+def generate_dash(video_info) -> str:
 	addon = Addon()
-	resp = get(f'{addon.getSettingString("instance")}/streams/{video_id}').json()
-
 	autoincrement = AutoIncrement()
 
 	streams: dict = dict(
@@ -29,7 +26,7 @@ def generate_dash(video_id: str) -> str:
 	if len(addon.getSettingString("video_codec_priority")) > 1:
 		for codec in addon.getSettingString("video_codec_priority").split(','): streams['video']['null'][codec]: list = list()
 
-	for stream in resp["audioStreams"] + resp["videoStreams"]:
+	for stream in video_info["audioStreams"] + video_info["videoStreams"]:
 		media_lang = stream["audioTrackLocale"] if stream["audioTrackLocale"] is not None else 'null'
 		media_type, _ = stream["mimeType"].split("/")
 		if 'codec' not in stream or not isinstance(stream["codec"], str): continue
@@ -47,14 +44,14 @@ def generate_dash(video_id: str) -> str:
 	streams['audio'] = default_audio | streams['audio']
 
 	mpd: str = '<?xml version="1.0" encoding="utf-8"?>'
-	mpd += f'<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" profiles="urn:mpeg:dash:profile:full:2011" minBufferTime="PT1.5S" type="static" mediaPresentationDuration="PT{resp["duration"]}S">'
+	mpd += f'<MPD schemaLocation="urn:mpeg:DASH:schema:MPD:2011 DASH-MPD.xsd" minBufferTime="PT1.500S" profiles="urn:mpeg:dash:profile:isoff-main:2011" type="static" mediaPresentationDuration="PT{video_info["duration"]}S">'
 
 	mpd += '<Period>'
 
 	if addon.getSettingBool("subtitles_load"):
-		for subtitle in resp["subtitles"]:
+		for subtitle in video_info["subtitles"]:
 			mpd += f'<AdaptationSet contentType="text" mimeType="{subtitle["mimeType"]}" segmentAlignment="true" lang="{subtitle["code"]}">'
-			mpd += '<Role schemeIdUri="urn:mpeg:dash:role:2011" value="subtitle"/>'
+			mpd += '<Role schemeIdUri="urn:mpeg:dash:role:2011" value="subtitle" />'
 			mpd += f'<Representation id="caption_{subtitle["code"]}{"_auto" if subtitle["autoGenerated"] else ""}_{autoincrement.gen()}" bandwidth="256">'
 			mpd += f'<BaseURL>{subtitle["url"].replace("&", "&amp;")}</BaseURL>'
 			mpd += '</Representation></AdaptationSet>'
@@ -65,19 +62,23 @@ def generate_dash(video_id: str) -> str:
 				stream_xml: str = ''
 				for stream in streams[stream_type][stream_lang][stream_format]:
 					if stream["initEnd"] > 0:
-						stream_xml += f'<Representation id="{stream["itag"]}_{autoincrement.gen()}" codecs="{stream["codec"]}" bandwidth="{stream["bitrate"]}"'
+						stream_xml += f'<Representation id="{stream["itag"]}" codecs="{stream["codec"]}" startWithSAP="1" bandwidth="{stream["bitrate"]}"'
+						if stream_type == 'video':
+							stream_xml += f' width="{stream["width"]}" height="{stream["height"]}" maxPlayoutRate="1" frameRate="{stream["fps"]}"'
+						stream_xml += '>'
 						if stream_type == 'audio':
-							stream_xml += '><AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>'
-						elif stream_type == 'video':
-							stream_xml += f' width="{stream["width"]}" height="{stream["height"]}" maxPlayoutRate="1" frameRate="{stream["fps"]}">'
+							stream_xml += '<AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2" />'
 						stream_xml += f'<BaseURL>{stream["url"].replace("&", "&amp;")}</BaseURL>'
 						stream_xml += f'<SegmentBase indexRange="{stream["indexStart"]}-{stream["indexEnd"]}">'
-						stream_xml += f'<Initialization range="{stream["initStart"]}-{stream["initEnd"]}"/>'
+						stream_xml += f'<Initialization range="{stream["initStart"]}-{stream["initEnd"]}" />'
 						stream_xml += '</SegmentBase></Representation>'
 
 				if len(stream_xml) > 0:
-					mpd += f'<AdaptationSet mimeType="{stream["mimeType"]}" startWithSAP="1" subsegmentAlignment="true"'
-					mpd += ' scanType="progressive">' if stream_type == 'video' else f' lang="{stream_lang}">'
+					mpd += f'<AdaptationSet id="{autoincrement.gen()}" mimeType="{stream["mimeType"]}" subsegmentAlignment="true"'
+					if stream_type != 'video' and stream_lang != 'null':
+						mpd += f' lang="{stream_lang}"'
+					mpd += '>'
+					mpd += '<Role schemeIdUri="urn:mpeg:DASH:role:2011" value="main" />'
 					mpd += stream_xml
 					mpd += f'</AdaptationSet>'
 

plugin.video.piped/lib/sections.py

@@ -1,7 +1,7 @@
 import time
 import json
-from re import sub
-from urllib.parse import quote
+import re
+from urllib.parse import quote, unquote
 from requests import get
 from xbmcaddon import Addon
 from xbmcvfs import translatePath
@@ -10,6 +10,7 @@
 
 from lib.authentication import authenticated_request
 from lib.history import set_watch_history, mark_as_watched, mark_as_unwatched
+from lib.blacklist import blacklist_load, blacklist_add, blacklist_remove
 from lib.utils import get_component, human_format
 
 addon = Addon()
@@ -19,15 +20,25 @@
 def home() -> None:
 	folders: list = list()
 	if addon.getSettingBool('use_login'):
-		folders.append(('feed', addon.getLocalizedString(30001)))
-		folders.append(('subscriptions', addon.getLocalizedString(30002)))
-		folders.append(('playlists',addon.getLocalizedString(30003)))
-		if addon.getSettingBool('watch_history_enable') and len(addon.getSettingString('watch_history_playlist')) > 0:
+		if addon.getSettingBool('menu_show_feed'):
+			folders.append(('feed', addon.getLocalizedString(30001)))
+		if addon.getSettingBool('menu_show_feed_update'):
+			folders.append(('updatefeed', addon.getLocalizedString(30020)))
+		if addon.getSettingBool('menu_show_subscriptions'):
+			folders.append(('subscriptions', addon.getLocalizedString(30002)))
+		if addon.getSettingBool('menu_show_playlists'):
+			folders.append(('playlists',addon.getLocalizedString(30003)))
+		if addon.getSettingBool('menu_show_watch_history') and addon.getSettingBool('watch_history_enable') and len(addon.getSettingString('watch_history_playlist')) > 0:
 			folders.append(('watch_history', addon.getLocalizedString(30004)))
-	
-	folders.append(('trending', addon.getLocalizedString(30005)))
-	folders.append(('search_select', addon.getLocalizedString(30006)))
-	folders.append(('settings', addon.getLocalizedString(30007)))
+
+	if addon.getSettingBool('menu_show_watch_trending'):
+		folders.append(('trending', addon.getLocalizedString(30005)))
+	if addon.getSettingBool('menu_show_watch_blacklist') and addon.getSettingBool('blacklist_channels_enable'):
+			folders.append(('blacklist_section', addon.getLocalizedString(30600)))
+	if addon.getSettingBool('menu_show_watch_search'):
+		folders.append(('search_select', addon.getLocalizedString(30006)))
+	if addon.getSettingBool('menu_show_watch_settings'):
+		folders.append(('settings', addon.getLocalizedString(30007)))
 
 	for folder in folders:
 		xbmcplugin.addDirectoryItem(handle=addon_handle, url=f"{addon_url}/{folder[0]}", listitem=xbmcgui.ListItem(folder[1]), isFolder=True)
@@ -39,7 +50,6 @@ def watch(video_id: str) -> None:
 		path=f'http://localhost:{addon.getSettingInt("http_port")}/watch?v={video_id}',
 	)
 	listitem.setProperty('inputstream', 'inputstream.adaptive')
-	listitem.setProperty('inputstream.adaptive.manifest_type', 'mpd')
 	listitem.setProperty('piped_video_id', video_id)
 
 	xbmcplugin.setResolvedUrl(handle=addon_handle, succeeded=True, listitem=listitem)
@@ -49,32 +59,53 @@ def list_videos(videos: list, hide_watched: bool=False, nextpage: str='') -> Non
 	watch_history_enabled: bool = addon.getSettingBool('watch_history_enable') and len(addon.getSettingString('watch_history_playlist')) > 0
 	if watch_history_enabled:
 		try:
-			with open(f'{translatePath(addon.getAddonInfo("profile"))}/watch_history.json', 'r') as f:                                                    
+			with open(f'{translatePath(addon.getAddonInfo("profile"))}/watch_history.json', 'r') as f:
 				history = json.load(f)
 		except:
 			pass
 
+	blacklist_channels_enabled: bool = addon.getSettingBool('blacklist_channels_enable')
+	if blacklist_channels_enabled:
+		blacklist_channels_list = blacklist_load()
+
+	blacklist_titles_enabled: bool = addon.getSettingBool('blacklist_titles_enable')
+	if blacklist_titles_enabled:
+		blacklist_titles_regex_str: str = addon.getSettingString('blacklist_titles_regex')
+		if len(blacklist_titles_regex_str) > 0:
+			blacklist_titles_regex = re.compile(rf"{blacklist_titles_regex_str}", re.IGNORECASE if addon.getSettingBool('blacklist_titles_case_insensitive') else re.NOFLAG)
+		else:
+			blacklist_titles_enabled = False
+
 	for video in videos:
+		if blacklist_titles_enabled and 'title' in video and re.match(blacklist_titles_regex, video['title']):
+			continue
+
 		plugin_url: str = f"{addon_url}{video['url'].replace('?v=', '/')}"
 		video_id: str = get_component(video['url'])['params']['v']
-		if hide_watched and video_id in history: continue
+		channel_id: str = video['uploaderUrl'][9:] if ('uploaderUrl' in video and len(str(video['uploaderUrl'])) > 8) else ''
+
+		if (hide_watched and video_id in history) or (blacklist_channels_enabled and channel_id in blacklist_channels_list):
+			continue
+
 		if 'uploadedDate' in video and video['uploadedDate'] is not None: date: str = video['uploadedDate']
 		elif video['uploaded'] > 0: date: str = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(video['uploaded'] / 1000))
 		else: date: str = ''
 		info: str = f"{video['title']}\n\n{video['uploaderName']}\n\n"
+		if addon.getSettingBool('show_description') and 'shortDescription' in video and video['shortDescription'] is not None: info += video['shortDescription'] + "\n\n"
 		if video['views'] >=0: info += f"{addon.getLocalizedString(30008)}: {human_format(video['views'])}\n"
 		if len(date) > 2: info += f"{addon.getLocalizedString(30009)}: {date}"
 		listitem = xbmcgui.ListItem(label=video['title'], path=plugin_url)
 		listitem.setProperty('isplayable', 'true')
 		listitem.setArt(dict(
 			thumb = video['thumbnail'],
-			fanart = video['uploaderAvatar']
+			fanart = video['thumbnail'].replace('hqdefault.jpg', 'maxresdefault.jpg')
 		))
 
 		tag = listitem.getVideoInfoTag()
 		tag.setTitle(video['title'])
 		tag.setPlot(info)
 		tag.setDuration(video['duration'])
+		if 'uploaded' in video and video['uploaded'] > 0: tag.setFirstAired(time.strftime('%Y-%m-%d', time.localtime(video['uploaded'] / 1000)))
 		tag.setFilenameAndPath(plugin_url)
 		tag.setPath(plugin_url)
 
@@ -84,6 +115,13 @@ def list_videos(videos: list, hide_watched: bool=False, nextpage: str='') -> Non
 				context_menu_items.append((addon.getLocalizedString(30011), f"RunPlugin({addon_url}/mark_as_unwatched?id={video_id})"))
 			else:
 				context_menu_items.append((addon.getLocalizedString(30012), f"RunPlugin({addon_url}/mark_as_watched?id={video_id})"))
+
+		if blacklist_channels_enabled:
+			if channel_id in blacklist_channels_list:
+				context_menu_items.append((addon.getLocalizedString(30023), f"RunPlugin({addon_url}/blacklist_remove?id={channel_id})"))
+			else:
+				context_menu_items.append((addon.getLocalizedString(30022), f"RunPlugin({addon_url}/blacklist_add?id={channel_id}&name={quote(video['uploaderName'])})"))
+
 		listitem.addContextMenuItems(context_menu_items, replaceItems=True)
 
 		xbmcplugin.addDirectoryItem(addon_handle, plugin_url, listitem, False)
@@ -96,6 +134,22 @@ def list_videos(videos: list, hide_watched: bool=False, nextpage: str='') -> Non
 def feed() -> None:
 	list_videos(authenticated_request('/feed?authToken=', True), addon.getSettingBool('watch_history_hide_watched_feed'))
 
+def updatefeed() -> None:
+	instance: str = addon.getSettingString('instance')
+
+	channels: list = authenticated_request('/subscriptions')
+	channelcount: int = len(channels)
+
+	progressbar = xbmcgui.DialogProgress()
+	progressbar.create(addon.getLocalizedString(30021))
+
+	for i in range(channelcount):
+		channel = channels[i]
+		progressbar.update(int((i + 1) / channelcount * 100), f"{i + 1}/{channelcount} | {channel['name']}")
+		authenticated_request(channel['url'])
+
+	feed()
+
 def list_channels(channels: list, nextpage: str='') -> None:
 	for channel in channels:
 		info: str = ''
@@ -136,10 +190,11 @@ def list_playlists(playlists: list, nextpage: str='') -> None:
 
 		if 'id' not in playlist:
 			playlist['id'] = get_component(playlist['url'])['params']['list']
-		
+
 		listitem = xbmcgui.ListItem(playlist['name'])
 		listitem.setArt(dict(
-			thumb = playlist['thumbnail']
+			thumb = playlist['thumbnail'],
+			fanart = playlist['thumbnail'].replace('hqdefault.jpg', 'maxresdefault.jpg')
 		))
 
 		tag = listitem.getVideoInfoTag()
@@ -169,6 +224,19 @@ def playlist(playlist_id: str, hide_watched=None) -> None:
 def watch_history() -> None:
 	playlist(addon.getSettingString('watch_history_playlist'), False)
 
+def blacklist_section() -> None:
+	blacklist: dict = dict(sorted(blacklist_load().items(), key=lambda x: x[1]['name'].lower()))
+
+	for channel_id in blacklist.keys():
+		listitem = xbmcgui.ListItem(blacklist[channel_id]['name'])
+
+		tag = listitem.getVideoInfoTag()
+		tag.setTitle(blacklist[channel_id]['name'])
+
+		xbmcplugin.addDirectoryItem(addon_handle, f"{addon_url}/blacklist_remove?id={channel_id}&prompt=true", listitem, False)
+
+	xbmcplugin.endOfDirectory(addon_handle)
+
 def channel(channel_id: str, nextpage: str="") -> None:
 	instance: str = addon.getSettingString('instance')
 
@@ -235,9 +303,11 @@ def router(argv: list) -> None:
 	routes: dict = {
 		'home': {},
 		'feed': {},
+		'updatefeed': {},
 		'settings': {},
 		'subscriptions': {},
 		'playlists': {},
+		'blacklist_section': {},
 		'search_select': {},
 		'search': {
 			'search_filter': component['params']['search_filter'] if 'search_filter' in component['params'] else '',
@@ -258,17 +328,25 @@ def router(argv: list) -> None:
 		'mark_as_unwatched': {
 			'video_id': component['params']['id'] if 'id' in component['params'] else ''
 		},
+		'blacklist_add': {
+			'channel_id': component['params']['id'] if 'id' in component['params'] else '',
+			'channel_name': unquote(component['params']['name']) if 'name' in component['params'] else ''
+		},
+		'blacklist_remove': {
+			'channel_id': component['params']['id'] if 'id' in component['params'] else '',
+			'prompt': True if 'prompt' in component['params'] and component['params']['prompt'] == 'true' else False
+		},
 		'watch': {
-			'video_id': sub(r'.*\/', '', component['path'])
+			'video_id': re.sub(r'.*\/', '', component['path'])
 		},
 		'channel': {
-			'channel_id': sub(r'.*\/', '', component['path']),
+			'channel_id': re.sub(r'.*\/', '', component['path']),
 			'nextpage': component['params']['nextpage'] if 'nextpage' in component['params'] else ''
 		},
 	}
 
-	route: str = sub(r'\/.*', '', component['path'][1:])
+	route: str = re.sub(r'\/.*', '', component['path'][1:])
 	if route == '': route = 'home'
 
 	if route in routes:
-		globals()[route](**routes[route])
+		globals()[route](**routes[route])