torbox cloud fixes

Author: umbrellaplug

matrix/plugin.video.umbrella/addon.xml

@@ -1,4 +1,4 @@
-<addon id="plugin.video.umbrella" name="Umbrella" provider-name="Umbrella" version="6.7.31">
+<addon id="plugin.video.umbrella" name="Umbrella" provider-name="Umbrella" version="6.7.32">
 	<requires>
 		<import addon="xbmc.python" version="3.0.0"/>
 		<import addon="script.module.requests"/>
@@ -179,13 +179,9 @@
 			<screenshot>resources/screenshots/screenshot003.jpg</screenshot>
 		</assets>
 		<news>
-[B]Update - v6.7.31 - December 26th, 2024[/B]
---[Change] Made changes to the cache torrent function for TorBox.
---[Change] Made context menu use highlight color for Umbrella Settings
---[Fix] Changes in module loads for internal and cloud scrapers.
---[Fix] Change in way Trakt regular expression for list was handled.
---[Fix] Change to source_utils for title regedit.
---[Fix] Fixed error in code comparing string literal.
+[B]Update - v6.7.32 - December 27th, 2024[/B]
+--[Fix] Used changes from kodifitzwell for TorBox cloud scraping and playing from cloud.
+--[Change] Used updates from kodifitzwell for TorBox for usenet.
 		</news>
 	</extension>
 

matrix/plugin.video.umbrella/changelog.txt

@@ -1,3 +1,7 @@
+[B]Update - v6.7.32 - December 27th, 2024[/B]
+--[Fix] Used changes from kodifitzwell for TorBox cloud scraping and playing from cloud.
+--[Change] Used updates from kodifitzwell for TorBox for usenet.
+
 [B]Update - v6.7.31 - December 26th, 2024[/B]
 --[Change] Made changes to the cache torrent function for TorBox.
 --[Change] Made context menu use highlight color for Umbrella Settings

matrix/plugin.video.umbrella/resources/lib/cloud_scrapers/tb_cloud.py

@@ -4,6 +4,7 @@
 """
 
 import re
+from threading import Thread
 from resources.lib.cloud_scrapers import cloud_utils
 from resources.lib.database import cache
 from resources.lib.debrid.torbox import TorBox
@@ -34,20 +35,25 @@ def sources(self, data, hostDict):
 			self.episode = str(data['episode']) if 'tvshowtitle' in data else None
 			query_list = self.episode_query_list() if 'tvshowtitle' in data else self.year_query_list()
 			# log_utils.log('query_list = %s' % query_list)
-			cloud_folders = TorBox().user_cloud()
-			if not cloud_folders: return sources
-			cloud_folders = [i for i in cloud_folders['data'] if i['download_finished']]
-			if not cloud_folders: return sources
+			folders = []
+			threads = (
+				Thread(target=self._scraper, args=(TorBox().user_cloud, folders, 'torent')),
+				Thread(target=self._scraper, args=(TorBox().user_cloud_usenet, folders, 'usenet'))
+			)
+			[i.start() for i in threads]
+			[i.join() for i in threads]
+			if not folders: return sources
 			extras_filter = cloud_utils.extras_filter()
 		except:
 			from resources.lib.modules import log_utils
 			log_utils.error('TB_CLOUD: ')
 			return sources
 
-		for folder in cloud_folders:
+		for folder in folders:
 			try:
 				folder_name = folder.get('name', '')
-				if not cloud_utils.cloud_check_title(title, aliases, folder_name): continue
+#				if not cloud_utils.cloud_check_title(title, aliases, folder_name): continue
+				mediatype = folder.get('mediatype', '')
 				request_id = folder.get('id', '')
 				folder_files = folder['files']
 			except:
@@ -90,9 +96,14 @@ def sources(self, data, hostDict):
 #						name = name[len(name)-1]
 #						index_pos = folder_files.index(file)
 #						link = torrent_info['links'][index_pos]
-						link = '%d,%d' % (int(request_id), file['id'])
+						link = '%d,%d,%s' % (int(request_id), file['id'], mediatype)
 						size = file.get('size', '')
 
+					if not (
+						cloud_utils.cloud_check_title(title, aliases, name)
+						or # because usenet obfuscation
+						cloud_utils.cloud_check_title(title, aliases, folder_name)
+					): continue
 					name_info = sc_utils.info_from_name(name, title, self.year, hdlr, episode_title)
 					hash = folder.get('hash', '')
 					quality, info = sc_utils.get_release_quality(name_info, name)
@@ -145,9 +156,15 @@ def episode_list(self): # checks against formatted release_title with removed wh
 
 	def resolve(self, url):
 		try:
-			url = cache.get(TorBox().unrestrict_link, 48, url)
+			url, mediatype = url.rsplit(',', 1)
+			if mediatype == 'usenet': url = cache.get(TorBox().unrestrict_usenet, 1, url)
+			else: url = cache.get(TorBox().unrestrict_link, 1, url)
 			return url
 		except:
 			from resources.lib.modules import log_utils
 			log_utils.error('TB_CLOUD: ')
 			return None
+
+	def _scraper(self, function, results, mediatype):
+		try: results += [{**i, 'mediatype': mediatype} for i in function()['data'] if i['download_finished']]
+		except: pass

matrix/plugin.video.umbrella/resources/lib/debrid/torbox.py

@@ -18,10 +18,14 @@
 
 class TorBox:
 	download = '/torrents/requestdl'
+	download_usenet = '/usenet/requestdl'
 	remove = '/torrents/controltorrent'
+	remove_usenet = '/usenet/controlusenetdownload'
 	stats = '/user/me'
 	history = '/torrents/mylist'
+	history_usenet = '/usenet/mylist'
 	explore = '/torrents/mylist?id=%s'
+	explore_usenet = '/usenet/mylist?id=%s'
 	cache = '/torrents/checkcached'
 	cloud = '/torrents/createtorrent'
 	queued = '/torrents/getqueued'
@@ -72,12 +76,22 @@ def delete_torrent(self, request_id=''):
 	def delete_torrent_queued(self, request_id=''):
 		data = {'torrent_id': request_id, 'operation': 'delete'}
 		return self._POST(self.removeQueued, json=data)
-
+		
+	def delete_usenet(self, request_id=''):
+		data = {'usenet_id': request_id, 'operation': 'delete'}
+		return self._POST(self.remove_usenet, json=data)
+		
 	def unrestrict_link(self, file_id):
 		torrent_id, file_id = file_id.split(',')
-		params = {'token': self.api_key, 'torrent_id': torrent_id, 'file_id': file_id, 'user_ip': True}
+		params = {'token': self.api_key, 'torrent_id': torrent_id, 'file_id': file_id}
 		try: return self._GET(self.download, params=params)['data']
 		except: return None
+		
+	def unrestrict_usenet(self, file_id):
+		usenet_id, file_id = file_id.split(',')
+		params = {'token': self.api_key, 'usenet_id': usenet_id, 'file_id': file_id}
+		try: return self._GET(self.download_usenet, params=params)['data']
+		except: return None
 
 	def check_cache_single(self, hash):
 		return self._GET(self.cache, params={'hash': hash, 'format': 'list'})
@@ -266,8 +280,12 @@ def account_info_to_dialog(self):
 			return control.selectDialog(items, 'TorBox')
 		except: log_utils.error()
 
-	def user_cloud(self):
-		url = self.history
+	def user_cloud(self, request_id=None):
+		url = self.explore % request_id if request_id else self.history
+		return self._GET(url)
+
+	def user_cloud_usenet(self, request_id=None):
+		url = self.explore_usenet % request_id if request_id else self.history_usenet
 		return self._GET(url)
 
 	def user_cloud_clear(self):
@@ -282,17 +300,21 @@ def user_cloud_to_listItem(self, folder_id=None):
 		highlight_color = getSetting('highlight.color')
 		folder_str, deleteMenu = getLS(40046).upper(), getLS(40050)
 		file_str, downloadMenu = getLS(40047).upper(), getLS(40048)
-		cloud_dict = self.user_cloud()
-		cloud_dict = [i for i in cloud_dict['data'] if i['download_finished']]
-		for count, item in enumerate(cloud_dict, 1):
+		folders = []
+		try: folders += [{**i, 'mediatype': 'torent'} for i in self.user_cloud()['data'] if i['download_finished']]
+		except: pass
+		try: folders += [{**i, 'mediatype': 'usenet'} for i in self.user_cloud_usenet()['data'] if i['download_finished']]
+		except: pass
+		folders.sort(key=lambda k: k['updated_at'], reverse=True)
+		for count, item in enumerate(folders, 1):
 			try:
 				cm = []
 				folder_name = string_tools.strip_non_ascii_and_unprintable(item['name'])
 				status_str = '[COLOR %s]%s[/COLOR]' % (highlight_color, item['download_state'].capitalize())
-				cm.append((deleteMenu % 'Torrent', 'RunPlugin(%s?action=tb_DeleteUserTorrent&id=%s&name=%s)' %
-					(sysaddon, item['id'], quote_plus(folder_name))))
+				cm.append((deleteMenu % 'Torrent', 'RunPlugin(%s?action=tb_DeleteUserTorrent&id=%s&mediatype=%s&name=%s)' %
+					(sysaddon, item['id'], item['mediatype'], quote_plus(folder_name))))
 				label = '%02d | [B]%s[/B] | [B]%s[/B] | [I]%s [/I]' % (count, status_str, folder_str, folder_name)
-				url = '%s?action=tb_BrowseUserTorrents&id=%s' % (sysaddon, item['id'])
+				url = '%s?action=tb_BrowseUserTorrents&id=%s&mediatype=%s' % (sysaddon, item['id'], item['mediatype'])
 				item = control.item(label=label, offscreen=True)
 				item.addContextMenuItems(cm)
 				item.setArt({'icon': tb_icon, 'poster': tb_icon, 'thumb': tb_icon, 'fanart': addonFanart, 'banner': tb_icon})
@@ -302,13 +324,13 @@ def user_cloud_to_listItem(self, folder_id=None):
 		control.content(syshandle, 'files')
 		control.directory(syshandle, cacheToDisc=True)
 
-	def browse_user_torrents(self, folder_id):
+	def browse_user_torrents(self, folder_id, mediatype):
 		sysaddon, syshandle = 'plugin://plugin.video.umbrella/', int(argv[1])
 		quote_plus = requests.utils.quote
 		extensions = supported_video_extensions()
 		file_str, downloadMenu = getLS(40047).upper(), getLS(40048)
-		torrent_files = self.torrent_info(folder_id)
-		video_files = [i for i in torrent_files['data']['files'] if i['short_name'].lower().endswith(tuple(extensions))]
+		files = self.user_cloud_usenet(folder_id) if mediatype == 'usenet' else self.user_cloud(folder_id)
+		video_files = [i for i in files['data']['files'] if i['short_name'].lower().endswith(tuple(extensions))]
 		for count, item in enumerate(video_files, 1):
 			try:
 				cm = []
@@ -317,9 +339,9 @@ def browse_user_torrents(self, folder_id):
 				display_size = float(int(size)) / 1073741824
 				label = '%02d | [B]%s[/B] | %.2f GB | [I]%s [/I]' % (count, file_str, display_size, name)
 				item = '%d,%d' % (int(folder_id), item['id'])
-				url = '%s?action=play_URL&url=%s&caller=torbox&type=unrestrict' % (sysaddon, item)
-				cm.append((downloadMenu, 'RunPlugin(%s?action=download&name=%s&image=%s&url=%s&caller=torbox&type=unrestrict)' %
-					(sysaddon, quote_plus(name), quote_plus(tb_icon), item)))
+				url = '%s?action=play_URL&url=%s&caller=torbox&mediatype=%s&type=unrestrict' % (sysaddon, item, mediatype)
+				cm.append((downloadMenu, 'RunPlugin(%s?action=download&name=%s&image=%s&url=%s&caller=torbox&mediatype=%s&type=unrestrict)' %
+					(sysaddon, quote_plus(name), quote_plus(tb_icon), item, mediatype)))
 				item = control.item(label=label, offscreen=True)
 				item.addContextMenuItems(cm)
 				item.setArt({'icon': tb_icon, 'poster': tb_icon, 'thumb': tb_icon, 'fanart': addonFanart, 'banner': tb_icon})
@@ -329,10 +351,10 @@ def browse_user_torrents(self, folder_id):
 		control.content(syshandle, 'files')
 		control.directory(syshandle, cacheToDisc=True)
 
-	def delete_user_torrent(self, request_id, name, multi=False):
+	def delete_user_torrent(self, request_id, mediatype, name, multi=False):
 		if multi == False:
 			if not control.yesnoDialog(getLS(40050) % '?\n' + name, '', ''): return
-		result = self.delete_torrent(request_id)
+		result = self.delete_usenet(request_id) if mediatype == 'usenet' else self.delete_torrent(request_id)
 		if result['success']:
 			control.notification(message='TorBox: %s was removed' % name, icon=tb_icon)
 			if not multi: control.refresh()
@@ -386,7 +408,8 @@ def delete_active_torrents(self, data):
 		for torrent in data:
 			name = torrent.get('name','Unknown')
 			request_id = torrent.get('id')
-			self.delete_user_torrent(request_id, name, multi=True)
+			mediatype = torrent.get('mediatype')
+			self.delete_user_torrent(request_id, mediatype, name, multi=True)
 
 	def delete_queued_torrents(self, data):
 		if not control.yesnoDialog(getLS(40544), '', ''): return

matrix/plugin.video.umbrella/resources/lib/modules/router.py

@@ -613,10 +613,10 @@ def router(argv2):
 			torbox.TorBox().user_cloud_to_listItem()
 		elif action == 'tb_BrowseUserTorrents':
 			from resources.lib.debrid import torbox
-			torbox.TorBox().browse_user_torrents(params.get('id'))
+			torbox.TorBox().browse_user_torrents(params.get('id'), mediatype)
 		elif action == 'tb_DeleteUserTorrent':
 			from resources.lib.debrid import torbox
-			torbox.TorBox().delete_user_torrent(params.get('id'), name)
+			torbox.TorBox().delete_user_torrent(params.get('id'), mediatype, name)
 		if action == 'tb_ServiceNavigator':
 			from resources.lib.menus import navigator
 			navigator.Navigator().torbox_service()
@@ -796,7 +796,8 @@ def router(argv2):
 				try:
 					from resources.lib.modules import downloader
 					from resources.lib.debrid import torbox
-					url = torbox.TorBox().unrestrict_link(url.replace(' ', '%20'))
+					if mediatype == 'usenet': url = torbox.TorBox().unrestrict_usenet(url.replace(' ', '%20'))
+					else: url = torbox.TorBox().unrestrict_link(url.replace(' ', '%20'))
 					downloader.download(name, image, torbox.TorBox().add_headers_to_url(url))
 				except:
 					import traceback
@@ -969,6 +970,12 @@ def router(argv2):
 				from resources.lib.debrid import alldebrid
 				if params.get('type') == 'unrestrict': control.player.play(alldebrid.AllDebrid().unrestrict_link(url.replace(' ', '%20')))
 				else: control.player.play(url.replace(' ', '%20'))
+			elif caller == 'torbox':
+				from resources.lib.debrid import torbox
+				if params.get('type') == 'unrestrict':
+					if mediatype == 'usenet': control.player.play(torbox.TorBox().unrestrict_usenet(url.replace(' ', '%20')))
+					else: control.player.play(torbox.TorBox().unrestrict_link(url.replace(' ', '%20')))
+				else: control.player.play(url.replace(' ', '%20'))
 			else:
 				control.player.play(url.replace(' ', '%20'))
 		elif action == 'play_EpisodesList': # global context option

matrix/zips/addons.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<addons><addon id="plugin.video.umbrella" name="Umbrella" provider-name="Umbrella" version="6.7.31">
+<addons><addon id="plugin.video.umbrella" name="Umbrella" provider-name="Umbrella" version="6.7.32">
 	<requires>
 		<import addon="xbmc.python" version="3.0.0" />
 		<import addon="script.module.requests" />
@@ -180,13 +180,9 @@
 			<screenshot>resources/screenshots/screenshot003.jpg</screenshot>
 		</assets>
 		<news>
-[B]Update - v6.7.31 - December 26th, 2024[/B]
---[Change] Made changes to the cache torrent function for TorBox.
---[Change] Made context menu use highlight color for Umbrella Settings
---[Fix] Changes in module loads for internal and cloud scrapers.
---[Fix] Change in way Trakt regular expression for list was handled.
---[Fix] Change to source_utils for title regedit.
---[Fix] Fixed error in code comparing string literal.
+[B]Update - v6.7.32 - December 27th, 2024[/B]
+--[Fix] Used changes from kodifitzwell for TorBox cloud scraping and playing from cloud.
+--[Change] Used updates from kodifitzwell for TorBox for usenet.
 		</news>
 	</extension>
 

matrix/zips/addons.xml.md5

@@ -1 +1 @@
-f7629b12573fa3ff2b8d86a27f001975
+4f2c9385be36610a1a3bbae7fdf6d447

matrix/zips/plugin.video.umbrella/addon.xml

@@ -1,4 +1,4 @@
-<addon id="plugin.video.umbrella" name="Umbrella" provider-name="Umbrella" version="6.7.31">
+<addon id="plugin.video.umbrella" name="Umbrella" provider-name="Umbrella" version="6.7.32">
 	<requires>
 		<import addon="xbmc.python" version="3.0.0"/>
 		<import addon="script.module.requests"/>
@@ -179,13 +179,9 @@
 			<screenshot>resources/screenshots/screenshot003.jpg</screenshot>
 		</assets>
 		<news>
-[B]Update - v6.7.31 - December 26th, 2024[/B]
---[Change] Made changes to the cache torrent function for TorBox.
---[Change] Made context menu use highlight color for Umbrella Settings
---[Fix] Changes in module loads for internal and cloud scrapers.
---[Fix] Change in way Trakt regular expression for list was handled.
---[Fix] Change to source_utils for title regedit.
---[Fix] Fixed error in code comparing string literal.
+[B]Update - v6.7.32 - December 27th, 2024[/B]
+--[Fix] Used changes from kodifitzwell for TorBox cloud scraping and playing from cloud.
+--[Change] Used updates from kodifitzwell for TorBox for usenet.
 		</news>
 	</extension>
 

matrix/zips/plugin.video.umbrella/plugin.video.umbrella-6.7.31.zip matrix/zips/plugin.video.umbrella/plugin.video.umbrella-6.7.32.zip

@@ -0,0 +1,11 @@
+{
+    "python.testing.unittestArgs": [
+        "-v",
+        "-s",
+        ".",
+        "-p",
+        "*test.py"
+    ],
+    "python.testing.pytestEnabled": false,
+    "python.testing.unittestEnabled": true
+}

nexus/plugin.video.umbrella/.vscode/settings.json

@@ -1,4 +1,4 @@
-<addon id="plugin.video.umbrella" name="Umbrella" provider-name="Umbrella" version="6.7.31">
+<addon id="plugin.video.umbrella" name="Umbrella" provider-name="Umbrella" version="6.7.32">
 	<requires>
 		<import addon="xbmc.python" version="3.0.0"/>
 		<import addon="script.module.requests"/>
@@ -179,13 +179,9 @@
 			<screenshot>resources/screenshots/screenshot003.jpg</screenshot>
 		</assets>
 		<news>
-[B]Update - v6.7.31 - December 26th, 2024[/B]
---[Change] Made changes to the cache torrent function for TorBox.
---[Change] Made context menu use highlight color for Umbrella Settings
---[Fix] Changes in module loads for internal and cloud scrapers.
---[Fix] Change in way Trakt regular expression for list was handled.
---[Fix] Change to source_utils for title regedit.
---[Fix] Fixed error in code comparing string literal.
+[B]Update - v6.7.32 - December 27th, 2024[/B]
+--[Fix] Used changes from kodifitzwell for TorBox cloud scraping and playing from cloud.
+--[Change] Used updates from kodifitzwell for TorBox for usenet.
 		</news>
 	</extension>
 

nexus/plugin.video.umbrella/addon.xml

@@ -1,3 +1,7 @@
+[B]Update - v6.7.32 - December 27th, 2024[/B]
+--[Fix] Used changes from kodifitzwell for TorBox cloud scraping and playing from cloud.
+--[Change] Used updates from kodifitzwell for TorBox for usenet.
+
 [B]Update - v6.7.31 - December 26th, 2024[/B]
 --[Change] Made changes to the cache torrent function for TorBox.
 --[Change] Made context menu use highlight color for Umbrella Settings