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

Altri Fix

Browse Source
This commit is contained in:
Alhaziel01
2020-09-24 17:38:50 +02:00
parent 39f5467825
commit 1758f35fa5
30 changed files with 133 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels.json
View File

@@ -37,7 +37,7 @@
"piratestreaming": "https://www.piratestreaming.movie",
"polpotv": "https://polpotv.life",
"raiplay": "https://www.raiplay.it",
"seriehd": "https://seriehd.productions",
"seriehd": "https://seriehd.group",
"serietvonline": "https://serietvonline.press",
"serietvsubita": "http://serietvsubita.xyz",
"serietvu": "https://www.serietvu.link",

2
channels/altadefinizioneclick.py
View File

@@ -106,7 +106,7 @@ def search(item, texto):
except:
import sys
for line in sys.exc_info():
support.infoger.error("%s" % line)
support.logger.error("%s" % line)
return []
def newest(categoria):

4
channels/animealtadefinizione.py
View File

@@ -40,7 +40,7 @@ def search(item, texto):
except:
import sys
for line in sys.exc_info():
support.infoger.error("%s" % line)
support.logger.error("%s" % line)
return []
@@ -56,7 +56,7 @@ def newest(categoria):
except:
import sys
for line in sys.exc_info():
support.infoger.error("{0}".format(line))
support.logger.error("{0}".format(line))
return []

4
channels/animeforce.py
View File

@@ -49,7 +49,7 @@ def newest(categoria):
except:
import sys
for line in sys.exc_info():
support.infoger.error("{0}".format(line))
support.logger.error("{0}".format(line))
return []
return itemlist
@@ -65,7 +65,7 @@ def search(item, texto):
except:
import sys
for line in sys.exc_info():
support.infoger.error("%s" % line)
support.logger.error("%s" % line)
return []

2
channels/animeleggendari.py
View File

@@ -41,7 +41,7 @@ def search(item, texto):
except:
import sys
for line in sys.exc_info():
support.infoger.error("%s" % line)
support.logger.error("%s" % line)
return []

4
channels/animeuniverse.py
View File

@@ -41,7 +41,7 @@ def search(item, texto):
except:
import sys
for line in sys.exc_info():
support.infoger.error("%s" % line)
support.logger.error("%s" % line)
return []
@@ -57,7 +57,7 @@ def newest(categoria):
except:
import sys
for line in sys.exc_info():
support.infoger.error("{0}".format(line))
support.logger.error("{0}".format(line))
return []

2
channels/cb01anime.py
View File

@@ -52,7 +52,7 @@ def newest(categoria):
except:
import sys
for line in sys.exc_info():
support.infoger.error("{0}".format(line))
support.logger.error("{0}".format(line))
return []
return itemlist

2
channels/cinetecadibologna.py
View File

@@ -44,7 +44,7 @@ def search(item, text):
except:
import sys
for line in sys.exc_info():
support.infoger.error("%s" % line)
support.logger.error("%s" % line)
return []

2
channels/dreamsub.py
View File

@@ -69,7 +69,7 @@ def newest(categoria):
except:
import sys
for line in sys.exc_info():
support.infoger.error("{0}".format(line))
support.logger.error("{0}".format(line))
return []

2
channels/dsda.py
View File

@@ -45,7 +45,7 @@ def newest(categoria):
except:
import sys
for line in sys.exc_info():
support.infoger.error("{0}".format(line))
support.logger.error("{0}".format(line))
return []

2
channels/hd4me.py
View File

@@ -50,7 +50,7 @@ def search(item, text):
except:
import sys
for line in sys.exc_info():
support.infoger.error("search except: %s" % line)
support.logger.error("search except: %s" % line)
return []

2
channels/ilcorsaronero.py
View File

@@ -75,7 +75,7 @@ def search(item, text):
except:
import sys
for line in sys.exc_info():
support.infoger.error("search except: %s" % line)
support.logger.error("search except: %s" % line)
return []

2
channels/mediasetplay.py
View File

@@ -60,7 +60,7 @@ def search(item, text):
except:
import sys
for line in sys.exc_info():
support.infoger.error("%s" % line)
support.logger.error("%s" % line)
return itemlist
def menu(item):

2
channels/metalvideo.py
View File

@@ -64,5 +64,5 @@ def search(item, text):
except:
import sys
for line in sys.exc_info():
support.infoger.error("%s" % line)
support.logger.error("%s" % line)
return []

4
channels/mondoserietv.py
View File

@@ -48,7 +48,7 @@ def search(item, text):
except:
import sys
for line in sys.exc_info():
support.infoger.error("%s" % line)
support.logger.error("%s" % line)
return []
@@ -69,7 +69,7 @@ def newest(categoria):
except:
import sys
for line in sys.exc_info():
support.infoger.error("{0}".format(line))
support.logger.error("{0}".format(line))
return []

2
channels/paramount.py
View File

@@ -35,7 +35,7 @@ def search(item, text):
except:
import sys
for line in sys.exc_info():
support.infoger.error("%s" % line)
support.logger.error("%s" % line)
return []

4
channels/piratestreaming.py
View File

@@ -31,7 +31,7 @@ def search(item, texto):
except:
import sys
for line in sys.exc_info():
support.infoger.error("%s" % line)
support.logger.error("%s" % line)
return []
@@ -56,7 +56,7 @@ def newest(categoria):
except:
import sys
for line in sys.exc_info():
support.infoger.error("{0}".format(line))
support.logger.error("{0}".format(line))
return []
return itemlist

2
channels/polpotv.py
View File

@@ -118,7 +118,7 @@ def search(item, texto):
except:
import sys
for line in sys.exc_info():
support.infoger.error("%s" % line)
support.logger.error("%s" % line)
return []
def search_movie_by_genre(item):

2
channels/pufimovies.py
View File

@@ -77,7 +77,7 @@ def newest(categoria):
except:
import sys
for line in sys.exc_info():
support.infoger.error("%s" % line)
support.logger.error("%s" % line)
return []
return itemlist

2
channels/raiplay.py
View File

@@ -136,7 +136,7 @@ def search(item, text):
except:
import sys
for line in sys.exc_info():
support.infoger.error("%s" % line)
support.logger.error("%s" % line)
return []
return itemlist

8
channels/seriehd.py
View File

@@ -5,8 +5,10 @@
from core import support
def findhost():
return support.match('https://nuovoindirizzo.info/seriehd/', patron=r'<h2[^>]+><a href="([^"]+)"').match
host = support.config.get_channel_url()
host = support.config.get_channel_url(findhost)
headers = [['Referer', host]]
@@ -36,7 +38,7 @@ def search(item, texto):
except:
import sys
for line in sys.exc_info():
support.infoger.error("%s" % line)
support.logger.error("%s" % line)
return []
@@ -55,7 +57,7 @@ def newest(categoria):
except:
import sys
for line in sys.exc_info():
support.infoger.error("{0}".format(line))
support.logger.error("{0}".format(line))
return []
return itemlist

2
channels/streamingaltadefinizione.py
View File

@@ -39,7 +39,7 @@ def search(item, text):
except:
import sys
for line in sys.exc_info():
support.infoger.error("%s" % line)
support.logger.error("%s" % line)
return []

4
channels/toonitalia.py
View File

@@ -37,7 +37,7 @@ def search(item, texto):
except:
import sys
for line in sys.exc_info():
support.infoger.error("%s" % line)
support.logger.error("%s" % line)
return []
@@ -53,7 +53,7 @@ def newest(categoria):
except:
import sys
for line in sys.exc_info():
support.infoger.error("{0}".format(line))
support.logger.error("{0}".format(line))
return []

2
channels/tunein.py
View File

@@ -93,5 +93,5 @@ def search(item, text):
except:
import sys
for line in sys.exc_info():
support.infoger.error("%s" % line)
support.logger.error("%s" % line)
return []

2
channels/vvvvid.py
View File

@@ -82,7 +82,7 @@ def search(item, text):
except:
import sys
for line in sys.exc_info():
support.infoger.error("%s" % line)
support.logger.error("%s" % line)
return []
return itemlist

4
core/tvdb.py
View File

@@ -335,7 +335,7 @@ class Tvdb(object):
self.list_results = []
self.lang = ""
self.search_name = kwargs['search'] = \
re.sub('\[\\\?(B|I|COLOR)\s?[^\]]*\]', '', kwargs.get('search', ''))
re.sub(r'\[\\\?(B|I|COLOR)\s?[^\]]*\]', '', kwargs.get('search', ''))
self.list_episodes = {}
self.episodes = {}
@@ -837,7 +837,7 @@ class Tvdb(object):
except Exception as ex:
# if isinstance(ex, urllib).HTTPError:
logger.debug("code %s " % ex.code)
logger.debug("code %s " % ex)
message = "An exception of type %s occured. Arguments:\n%s" % (type(ex).__name__, repr(ex.args))
logger.error("error: %s" % message)

29
platformcode/autorenumber.py
View File

@@ -33,8 +33,8 @@ except:
xbmcgui = None
import re, base64, json, inspect
from core import jsontools, tvdb, scrapertools, filetools
from core.support import typo, info
from platformcode import config, platformtools
from core.support import typo
from platformcode import config, platformtools, logger
TAG_TVSHOW_RENUMERATE = "TVSHOW_AUTORENUMBER"
TAG_ID = "ID"
@@ -49,7 +49,7 @@ TAG_TYPE = "Type"
def renumber(itemlist, item='', typography=''):
info()
logger.info()
dict_series = load(itemlist[0]) if len(itemlist) > 0 else {}
if item:
@@ -103,7 +103,7 @@ def renumber(itemlist, item='', typography=''):
def config_item(item, itemlist=[], typography='', active=False):
info()
logger.info()
# Configurazione Automatica, Tenta la numerazione Automatica degli episodi
title = item.fulltitle.rstrip()
@@ -140,7 +140,7 @@ def config_item(item, itemlist=[], typography='', active=False):
def semiautomatic_config_item(item):
info()
logger.info()
# Configurazione Semi Automatica, utile in caso la numerazione automatica fallisca
tvdb.find_and_set_infoLabels(item)
@@ -254,7 +254,7 @@ def renumeration (itemlist, item, typography, dict_series, ID, Season, Episode,
def manual_renumeration(item, modify=False):
info()
logger.info()
_list = []
if item.from_channel: item.channel = item.from_channel
title = item.fulltitle.rstrip()
@@ -342,7 +342,7 @@ def manual_renumeration(item, modify=False):
def delete_renumeration(item):
info()
logger.info()
if item.from_channel: item.channel = item.from_channel
title = item.fulltitle.rstrip()
@@ -352,7 +352,7 @@ def delete_renumeration(item):
def make_list(itemlist, item, typography, dict_series, ID, Season, Episode, Mode, title):
info()
logger.info()
exist = True
item.infoLabels['tvdb_id'] = ID
tvdb.set_infoLabels_item(item)
@@ -372,6 +372,7 @@ def make_list(itemlist, item, typography, dict_series, ID, Season, Episode, Mode
if check:
for page in Pages:
data = tvdb.otvdb_global.get_list_episodes(ID,page)
logger.info('DATA',data)
for episodes in data['data']:
if episodes['firstAired'] and [episodes['firstAired'], episodes['airedSeason'], episodes['airedEpisodeNumber']] not in EpList:
EpList.append([episodes['firstAired'], episodes['airedSeason'], episodes['airedEpisodeNumber']])
@@ -478,7 +479,7 @@ def make_list(itemlist, item, typography, dict_series, ID, Season, Episode, Mode
def check(item):
info()
logger.info()
dict_series = load(item)
title = item.fulltitle.rstrip()
if title in dict_series: title = dict_series[title]
@@ -493,7 +494,7 @@ def error(itemlist):
def find_episodes(item):
info()
logger.info()
ch = __import__('channels.' + item.channel, fromlist=["channels.%s" % item.channel])
itemlist = ch.episodios(item)
return itemlist
@@ -501,7 +502,7 @@ def find_episodes(item):
def RepresentsInt(s):
# Controllo Numro Stagione
info()
logger.info()
try:
int(s)
return True
@@ -537,7 +538,7 @@ def select_type(item):
def filename(item):
info()
logger.info()
name_file = item.channel + "_data.json"
path = filetools.join(config.get_data_path(), "settings_channels")
fname = filetools.join(path, name_file)
@@ -546,7 +547,7 @@ def filename(item):
def load(item):
info()
logger.info()
try:
json_file = open(filename(item), "r").read()
json = jsontools.load(json_file)[TAG_TVSHOW_RENUMERATE]
@@ -558,7 +559,7 @@ def load(item):
def write(item, json):
info()
logger.info()
json_file = open(filename(item), "r").read()
js = jsontools.load(json_file)
js[TAG_TVSHOW_RENUMERATE] = json

4
platformcode/launcher.py
View File

@@ -129,6 +129,10 @@ def run(item=None):
from platformcode import shortcuts
return getattr(shortcuts, item.action)(item)
elif item.channel == "autorenumber":
from platformcode import autorenumber
return getattr(autorenumber, item.action)(item)
elif item.action == "delete_key":
from platformcode import keymaptools
return keymaptools.delete_key()

142
resources/skins/Default/720p/InfoWindow.xml
View File

@@ -71,9 +71,9 @@
<control type="label" id="10006">
<top>100</top>
<left>60</left>
<height>40</height>
<width>100</width>
<font>font10</font>
<height>30</height>
<width>200</width>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor>
<align>left</align>
@@ -82,10 +82,10 @@
</control>
<control type="label" id="10007">
<top>100</top>
<left>200</left>
<height>40</height>
<left>250</left>
<height>30</height>
<width>365</width>
<font>font10</font>
<font>font13</font>
<scrollsuffix> | </scrollsuffix>
<scroll>true</scroll>
<textcolor>FFFFFFFF</textcolor>
@@ -95,11 +95,11 @@
<label></label>
</control>
<control type="label" id="10008"> <!-- Lingua Originale -->
<top>125</top>
<top>130</top>
<left>60</left>
<height>40</height>
<width>100</width>
<font>font10</font>
<height>30</height>
<width>200</width>
<font>font13</font>
<textcolor>0xFFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor>
<align>left</align>
@@ -107,11 +107,11 @@
<label></label>
</control>
<control type="label" id="10009">
<top>125</top>
<left>200</left>
<height>40</height>
<top>130</top>
<left>250</left>
<height>30</height>
<width>365</width>
<font>font10</font>
<font>font13</font>
<scrollsuffix> | </scrollsuffix>
<scroll>true</scroll>
<textcolor>0xFFFFFFFF</textcolor>
@@ -121,11 +121,11 @@
<label></label>
</control>
<control type="label" id="100010"> <!-- Punteggio -->
<top>150</top>
<top>160</top>
<left>60</left>
<height>40</height>
<width>100</width>
<font>font10</font>
<height>30</height>
<width>200</width>
<font>font13</font>
<textcolor>0xFFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor>
<align>left</align>
@@ -133,11 +133,11 @@
<label></label>
</control>
<control type="label" id="100011">
<top>150</top>
<left>200</left>
<height>40</height>
<top>160</top>
<left>250</left>
<height>30</height>
<width>365</width>
<font>font10</font>
<font>font13</font>
<scrollsuffix> | </scrollsuffix>
<scroll>true</scroll>
<textcolor>0xFFFFFFFF</textcolor>
@@ -147,11 +147,11 @@
<label></label>
</control>
<control type="label" id="100012"> <!-- Generi -->
<top>175</top>
<top>190</top>
<left>60</left>
<height>40</height>
<width>100</width>
<font>font10</font>
<height>30</height>
<width>200</width>
<font>font13</font>
<textcolor>0xFFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor>
<align>left</align>
@@ -159,11 +159,11 @@
<label></label>
</control>
<control type="label" id="100013">
<top>175</top>
<left>200</left>
<height>40</height>
<top>190</top>
<left>250</left>
<height>30</height>
<width>365</width>
<font>font10</font>
<font>font13</font>
<scrollsuffix> | </scrollsuffix>
<scroll>true</scroll>
<textcolor>0xFFFFFFFF</textcolor>
@@ -173,11 +173,11 @@
<label></label>
</control>
<control type="label" id="100014">
<top>200</top>
<top>220</top>
<left>60</left>
<height>40</height>
<width>100</width>
<font>font10</font>
<height>30</height>
<width>200</width>
<font>font13</font>
<textcolor>0xFFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor>
<align>left</align>
@@ -185,11 +185,11 @@
<label></label>
</control>
<control type="label" id="100015">
<top>200</top>
<left>200</left>
<height>40</height>
<top>220</top>
<left>250</left>
<height>30</height>
<width>365</width>
<font>font10</font>
<font>font13</font>
<scrollsuffix> | </scrollsuffix>
<scroll>true</scroll>
<textcolor>0xFFFFFFFF</textcolor>
@@ -199,11 +199,11 @@
<label></label>
</control>
<control type="label" id="100016">
<top>225</top>
<top>250</top>
<left>60</left>
<height>40</height>
<width>100</width>
<font>font10</font>
<height>30</height>
<width>200</width>
<font>font13</font>
<textcolor>0xFFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor>
<align>left</align>
@@ -211,11 +211,11 @@
<label></label>
</control>
<control type="label" id="100017">
<top>225</top>
<left>200</left>
<height>40</height>
<top>250</top>
<left>250</left>
<height>30</height>
<width>365</width>
<font>font10</font>
<font>font13</font>
<scrollsuffix> | </scrollsuffix>
<scroll>true</scroll>
<textcolor>0xFFFFFFFF</textcolor>
@@ -225,11 +225,11 @@
<label></label>
</control>
<control type="label" id="100018">
<top>250</top>
<top>280</top>
<left>60</left>
<height>40</height>
<width>100</width>
<font>font10</font>
<height>30</height>
<width>200</width>
<font>font13</font>
<textcolor>0xFFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor>
<align>left</align>
@@ -237,11 +237,11 @@
<label></label>
</control>
<control type="label" id="100019">
<top>250</top>
<left>200</left>
<height>40</height>
<top>280</top>
<left>250</left>
<height>30</height>
<width>365</width>
<font>font10</font>
<font>font13</font>
<scrollsuffix> | </scrollsuffix>
<scroll>true</scroll>
<textcolor>0xFFFFFFFF</textcolor>
@@ -251,11 +251,11 @@
<label></label>
</control>
<control type="label" id="100020">
<top>275</top>
<top>310</top>
<left>60</left>
<height>40</height>
<width>100</width>
<font>font10</font>
<height>30</height>
<width>200</width>
<font>font13</font>
<textcolor>0xFFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor>
<align>left</align>
@@ -263,11 +263,11 @@
<label></label>
</control>
<control type="label" id="100021">
<top>275</top>
<left>200</left>
<height>40</height>
<top>310</top>
<left>250</left>
<height>30</height>
<width>365</width>
<font>font10</font>
<font>font13</font>
<scrollsuffix> | </scrollsuffix>
<scroll>true</scroll>
<textcolor>0xFFFFFFFF</textcolor>
@@ -277,11 +277,11 @@
<label></label>
</control>
<control type="label" id="100022"> <!-- Trama -->
<top>300</top>
<top>330</top>
<left>60</left>
<height>40</height>
<height>30</height>
<width>505</width>
<font>font10</font>
<font>font13</font>
<textcolor>0xFFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor>
<align>left</align>
@@ -289,11 +289,11 @@
<label></label>
</control>
<control type="textbox" id="100023">
<top>300</top>
<left>200</left>
<height>294</height>
<width>500</width>
<font>font10</font>
<top>330</top>
<left>250</left>
<height>250</height>
<width>550</width>
<font>font13</font>
<textcolor>0xFFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor>
<wrapmultiline>true</wrapmultiline>
@@ -362,7 +362,7 @@
<left>1080</left>
<height>30</height>
<width>110</width>
<font>font10</font>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor>
<align>right</align>

12
service.py
View File

@@ -331,12 +331,12 @@ class AddonMonitor(xbmc.Monitor):
if self.settings_pre.get("videolibrarypath", None) != settings_post.get("videolibrarypath", None) or \
self.settings_pre.get("folder_movies", None) != settings_post.get("folder_movies", None) or \
self.settings_pre.get("folder_tvshows", None) != settings_post.get("folder_tvshows", None):
videolibrary.move_videolibrary(self.settings_pre.get("videolibrarypath", None),
settings_post.get("videolibrarypath", None),
self.settings_pre.get("folder_movies", None),
settings_post.get("folder_movies", None),
self.settings_pre.get("folder_tvshows", None),
settings_post.get("folder_tvshows", None))
videolibrary.move_videolibrary(self.settings_pre.get("videolibrarypath", ''),
settings_post.get("videolibrarypath", ''),
self.settings_pre.get("folder_movies", ''),
settings_post.get("folder_movies", ''),
self.settings_pre.get("folder_tvshows", ''),
settings_post.get("folder_tvshows", ''))
# si se ha puesto que se quiere autoconfigurar y se había creado el directorio de la videoteca
if not self.settings_pre.get("videolibrary_kodi", None) and settings_post.get("videolibrary_kodi", None):