stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
marco
2021-11-21 13:34:37 +01:00
parent 15785a653e 2dee7d7708
commit 264b2d4292
5 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels.json
+8 -8
View File
@@ -1,6 +1,6 @@
{ {
"direct": { "direct": {
"altadefinizione01": "https://www.altadefinizione01.plus", "altadefinizione01": "https://www.altadefinizione01.sbs",
"altadefinizione01_link": "https://altadefinizione01.travel", "altadefinizione01_link": "https://altadefinizione01.travel",
"animealtadefinizione": "https://www.animealtadefinizione.it", "animealtadefinizione": "https://www.animealtadefinizione.it",
"animeforce": "https://www.animeforce.it", "animeforce": "https://www.animeforce.it",
@@ -13,21 +13,21 @@
"casacinema": "https://www.casacinema.page", "casacinema": "https://www.casacinema.page",
"cb01anime": "https://www.cineblog01.red", "cb01anime": "https://www.cineblog01.red",
"cineblog01": "https://cb01.uno", "cineblog01": "https://cb01.uno",
"cinemalibero": "https://cinemalibero.surf", "cinemalibero": "https://cinemalibero.guru",
"cinetecadibologna": "http://cinestore.cinetecadibologna.it", "cinetecadibologna": "http://cinestore.cinetecadibologna.it",
"discoveryplus": "https://www.discoveryplus.com", "discoveryplus": "https://www.discoveryplus.com",
"dreamsub": "https://dreamsub.stream", "dreamsub": "https://dreamsub.stream",
"dsda": "https://www.dsda.press", "dsda": "https://www.dsda.press",
"eurostreaming": "https://eurostreaming.world", "eurostreaming": "https://eurostreaming.rip",
"filmigratis": "https://filmigratis.org", "filmigratis": "https://filmigratis.org",
"guardaseriecam": "https://guardaserie.cam", "guardaseriecam": "https://guardaserie.cam",
"guardaserieclick": "https://www.guardaserie.builders", "guardaserieclick": "https://www.guardaserie.builders",
"guardaserieicu": "https://guardaserie.center", "guardaserieicu": "https://guardaserie.cheap",
"hd4me": "https://hd4me.net", "hd4me": "https://hd4me.net",
"ilcorsaronero": "https://ilcorsaronero.link", "ilcorsaronero": "https://ilcorsaronero.link",
"ilgeniodellostreaming": "https://ilgeniodellostreaming.bet", "ilgeniodellostreaming": "https://ilgeniodellostreaming.re",
"ilgeniodellostreaming_cam": "https://ilgeniodellostreaming.city", "ilgeniodellostreaming_cam": "https://ilgeniodellostreaming.city",
"italiaserie": "https://italiaserie.men", "italiaserie": "https://italiaserie.monster",
"mediasetplay": "https://www.mediasetplay.mediaset.it", "mediasetplay": "https://www.mediasetplay.mediaset.it",
"mondoserietv": "https://mondoserietv.club", "mondoserietv": "https://mondoserietv.club",
"paramount": "https://www.paramountnetwork.it", "paramount": "https://www.paramountnetwork.it",
@@ -38,10 +38,10 @@
"serietvonline": "https://serietvonline.art", "serietvonline": "https://serietvonline.art",
"serietvsubita": "http://serietvsubita.xyz", "serietvsubita": "http://serietvsubita.xyz",
"serietvu": "https://www.serietvu.live", "serietvu": "https://www.serietvu.live",
"streamingcommunity": "https://streamingcommunity.space", "streamingcommunity": "https://streamingcommunity.art",
"streamingita": "https://www.streamingita.pro", "streamingita": "https://www.streamingita.pro",
"streamtime": "https://t.me/s/StreamTime", "streamtime": "https://t.me/s/StreamTime",
"tantifilm": "https://www.tantifilm.cfd", "tantifilm": "https://www.tantifilm.sbs",
"tapmovie": "https://it.tapmovie.net", "tapmovie": "https://it.tapmovie.net",
"toonitalia": "https://toonitalia.co", "toonitalia": "https://toonitalia.co",
"vvvvid": "https://www.vvvvid.it" "vvvvid": "https://www.vvvvid.it"
platformcode/launcher.py
-4
View File
@@ -468,12 +468,8 @@ def play_from_library(item):
import xbmcgui, xbmcplugin, xbmc import xbmcgui, xbmcplugin, xbmc
from time import sleep from time import sleep
# logger.debug("item: \n" + item.tostring('\n'))
# xbmc.Player().play(os.path.join(config.get_runtime_path(), "resources", "kod.mp4"))
if not item.autoplay and not item.next_ep: if not item.autoplay and not item.next_ep:
platformtools.fakeVideo() platformtools.fakeVideo()
# from core.support import dbg;dbg()
# platformtools.prevent_busy(item)
itemlist=[] itemlist=[]
platformcode/platformtools.py
+20 -13
View File
@@ -1496,26 +1496,33 @@ def play_torrent(item, xlistitem, mediaurl):
if torr_client in ['elementum'] and item.infoLabels['tmdb_id']: if torr_client in ['elementum'] and item.infoLabels['tmdb_id']:
if item.contentType == 'episode' and "elementum" not in torr_client: if item.contentType == 'episode' and "elementum" not in torr_client:
mediaurl += "&episode=%s&library=&season=%s&show=%s&tmdb=%s&type=episode" % (item.infoLabels['episode'], item.infoLabels['season'], item.infoLabels['tmdb_id'], item.infoLabels['tmdb_id']) mediaurl += "&episode=%s&season=%s&show=%s&tmdb=%s&type=episode" % (item.infoLabels['episode'], item.infoLabels['season'], item.infoLabels['tmdb_id'], item.infoLabels['tmdb_id'])
elif item.contentType == 'movie': elif item.contentType == 'movie':
mediaurl += "&library=&tmdb=%s&type=movie" % (item.infoLabels['tmdb_id']) mediaurl += "&tmdb=%s&type=movie" % (item.infoLabels['tmdb_id'])
if torr_client in ['elementum'] and item.downloadFilename: if torr_client in ['elementum'] and item.downloadFilename:
torrent.elementum_download(item) torrent.elementum_download(item)
else: else:
import xbmcaddon import xbmcaddon
xbmcaddon.Addon(id='plugin.video.elementum').setSetting('download_storage', '1') addon = xbmcaddon.Addon(id='plugin.video.elementum')
if (item.fromLibrary and item.play_from == 'window') or item.window: # from core.support import dbg;dbg()
xlistitem.setPath(torrent_options[selection][1] % mediaurl) if addon.getSetting('download_storage') == '0':
playlist = xbmc.PlayList(xbmc.PLAYLIST_VIDEO) addon.setSetting('download_storage', '1')
playlist.clear() xbmc.sleep(3000)
playlist.add(torrent_options[selection][1] % mediaurl, xlistitem) xbmc.executebuiltin("PlayMedia(" + torrent_options[selection][1] % mediaurl + ")")
xbmc_player.play(playlist, xlistitem) # import xbmcaddon
else: # xbmcaddon.Addon(id='plugin.video.elementum').setSetting('download_storage', '1')
if not item.autoplay and item.channel != 'videolibrary': fakeVideo() # if (item.fromLibrary and item.play_from == 'window') or item.window:
if xbmc.getCondVisibility("system.platform.android"): xbmc.sleep(3000) # xlistitem.setPath(torrent_options[selection][1] % mediaurl)
xbmc.executebuiltin("PlayMedia(" + torrent_options[selection][1] % mediaurl + ")") # playlist = xbmc.PlayList(xbmc.PLAYLIST_VIDEO)
# playlist.clear()
# playlist.add(torrent_options[selection][1] % mediaurl, xlistitem)
# xbmc_player.play(playlist, xlistitem)
# else:
# if not item.autoplay and item.channel != 'videolibrary': fakeVideo()
# if xbmc.getCondVisibility("system.platform.android"): xbmc.sleep(3000)
# xbmc.executebuiltin("PlayMedia(" + torrent_options[selection][1] % mediaurl + ")")
# torrent.mark_auto_as_watched(item) # torrent.mark_auto_as_watched(item)
servers/torrent.py
+13 -7
View File
@@ -4,9 +4,9 @@ import re, os, sys, time, requests, xbmc, xbmcaddon
from core import filetools, httptools, jsontools from core import filetools, httptools, jsontools
from core.support import info, match from core.support import info, match
from platformcode import config, platformtools from platformcode import config, platformtools, logger
from lib.guessit import guessit from lib.guessit import guessit
from torrentool.api import Torrent from lib.torrentool.api import Torrent
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
import urllib.parse as urllib import urllib.parse as urllib
@@ -92,13 +92,15 @@ def elementum_download(item):
while not filetools.isfile(filetools.join(elementum_setting.getSetting('torrents_path'), TorrentName + '.torrent')): while not filetools.isfile(filetools.join(elementum_setting.getSetting('torrents_path'), TorrentName + '.torrent')):
time.sleep(1) time.sleep(1)
monitor_update(TorrentPath, TorrentName) monitor_update(TorrentPath, TorrentName)
def elementum_monitor(): def elementum_monitor():
# from core.support import dbg;dbg()
path = xbmc.translatePath(config.get_setting('downloadlistpath')) path = xbmc.translatePath(config.get_setting('downloadlistpath'))
elementum_setting, elementum_host, TorrentPath = setting() elementum_setting, elementum_host, TorrentPath = setting()
# active_torrent = filetools.listdir(TorrentPath) # active_torrent = filetools.listdir(TorrentPath)
# logger.debug('ELEMENTUM:', elementum_setting, elementum_host, TorrentPath)
if elementum_setting: if elementum_setting:
# check if command file exist # check if command file exist
@@ -117,6 +119,7 @@ def elementum_monitor():
except: except:
data = '' data = ''
if data: if data:
# from core.support import dbg;dbg()
for it in data: for it in data:
progress = round(it['progress'], 2) progress = round(it['progress'], 2)
status = it['status'] status = it['status']
@@ -143,6 +146,7 @@ def monitor_update(TorrentPath, value, remove=False):
json = jsontools.load(open(monitor, "r").read()) json = jsontools.load(open(monitor, "r").read())
Monitor = json['monitor'] Monitor = json['monitor']
info = Torrent.from_file(filetools.join(TorrentPath, value + '.torrent')) info = Torrent.from_file(filetools.join(TorrentPath, value + '.torrent'))
logger.debug('ELEMENTUM MONITOR', Monitor)
path = xbmc.translatePath(config.get_setting('downloadlistpath')) path = xbmc.translatePath(config.get_setting('downloadlistpath'))
if not value in Monitor: if not value in Monitor:
@@ -174,13 +178,14 @@ def set_elementum(SET=False):
backup_setting = json['settings'] backup_setting = json['settings']
write = False write = False
if SET: if SET:
elementum_setting.setSetting('download_storage', '0')
if elementum_setting.getSetting('logger_silent') == False or not 'logger_silent' in backup_setting: if elementum_setting.getSetting('logger_silent') == False or not 'logger_silent' in backup_setting:
elementum_setting.setSetting('logger_silent', 'true') elementum_setting.setSetting('logger_silent', 'true')
backup_setting['logger_silent'] = 'false' backup_setting['logger_silent'] = 'false'
if elementum_setting.getSetting('download_storage') != 0 or not 'download_storage' in backup_setting: # if elementum_setting.getSetting('download_storage') != 0 or not 'download_storage' in backup_setting:
backup_setting['download_storage'] = elementum_setting.getSetting('download_storage') # Backup Setting # backup_setting['download_storage'] = elementum_setting.getSetting('download_storage') # Backup Setting
elementum_setting.setSetting('download_storage', '0') # Set Setting # elementum_setting.setSetting('download_storage', '0') # Set Setting
if elementum_setting.getSetting('download_path') != config.get_setting('downloadpath') or not 'download_path' in backup_setting: if elementum_setting.getSetting('download_path') != config.get_setting('downloadpath') or not 'download_path' in backup_setting:
backup_setting['download_path'] = elementum_setting.getSetting('download_path') # Backup Setting backup_setting['download_path'] = elementum_setting.getSetting('download_path') # Backup Setting
@@ -189,7 +194,8 @@ def set_elementum(SET=False):
elif backup_setting: elif backup_setting:
elementum_setting.setSetting('logger_silent', backup_setting['logger_silent']) elementum_setting.setSetting('logger_silent', backup_setting['logger_silent'])
elementum_setting.setSetting('download_storage', backup_setting['download_storage']) elementum_setting.setSetting('download_storage', '1')
# elementum_setting.setSetting('download_storage', backup_setting['download_storage'])
elementum_setting.setSetting('download_path', backup_setting['download_path']) elementum_setting.setSetting('download_path', backup_setting['download_path'])
json['settings'] = {} json['settings'] = {}
write = True write = True
specials/videolibrary.py
+2 -1
View File
@@ -485,7 +485,8 @@ def findvideos(item):
except ImportError: from urlparse import urlsplit except ImportError: from urlparse import urlsplit
try: try:
if urlsplit(item_json.url).netloc.split('.')[0] in channel.host: if urlsplit(item_json.url).netloc.split('.')[0] in channel.host:
item_json.url = channel.host + urlsplit(item_json.url).path spurl = urlsplit(item_json.url)
item_json.url = channel.host + spurl.path + ('?' + spurl.query if spurl.query else '')
except: pass except: pass
try: try: