Altri Fix

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
+1 -1
View File
@@ -37,7 +37,7 @@
"piratestreaming": "https://www.piratestreaming.movie", "piratestreaming": "https://www.piratestreaming.movie",
"polpotv": "https://polpotv.life", "polpotv": "https://polpotv.life",
"raiplay": "https://www.raiplay.it", "raiplay": "https://www.raiplay.it",
"seriehd": "https://seriehd.productions", "seriehd": "https://seriehd.group",
"serietvonline": "https://serietvonline.press", "serietvonline": "https://serietvonline.press",
"serietvsubita": "http://serietvsubita.xyz", "serietvsubita": "http://serietvsubita.xyz",
"serietvu": "https://www.serietvu.link", "serietvu": "https://www.serietvu.link",
+1 -1
View File
@@ -106,7 +106,7 @@ def search(item, texto):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("%s" % line) support.logger.error("%s" % line)
return [] return []
def newest(categoria): def newest(categoria):
+2 -2
View File
@@ -40,7 +40,7 @@ def search(item, texto):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("%s" % line) support.logger.error("%s" % line)
return [] return []
@@ -56,7 +56,7 @@ def newest(categoria):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("{0}".format(line)) support.logger.error("{0}".format(line))
return [] return []
+2 -2
View File
@@ -49,7 +49,7 @@ def newest(categoria):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("{0}".format(line)) support.logger.error("{0}".format(line))
return [] return []
return itemlist return itemlist
@@ -65,7 +65,7 @@ def search(item, texto):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("%s" % line) support.logger.error("%s" % line)
return [] return []
+1 -1
View File
@@ -41,7 +41,7 @@ def search(item, texto):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("%s" % line) support.logger.error("%s" % line)
return [] return []
+2 -2
View File
@@ -41,7 +41,7 @@ def search(item, texto):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("%s" % line) support.logger.error("%s" % line)
return [] return []
@@ -57,7 +57,7 @@ def newest(categoria):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("{0}".format(line)) support.logger.error("{0}".format(line))
return [] return []
+1 -1
View File
@@ -52,7 +52,7 @@ def newest(categoria):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("{0}".format(line)) support.logger.error("{0}".format(line))
return [] return []
return itemlist return itemlist
+1 -1
View File
@@ -44,7 +44,7 @@ def search(item, text):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("%s" % line) support.logger.error("%s" % line)
return [] return []
+1 -1
View File
@@ -69,7 +69,7 @@ def newest(categoria):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("{0}".format(line)) support.logger.error("{0}".format(line))
return [] return []
+1 -1
View File
@@ -45,7 +45,7 @@ def newest(categoria):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("{0}".format(line)) support.logger.error("{0}".format(line))
return [] return []
+1 -1
View File
@@ -50,7 +50,7 @@ def search(item, text):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("search except: %s" % line) support.logger.error("search except: %s" % line)
return [] return []
+1 -1
View File
@@ -75,7 +75,7 @@ def search(item, text):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("search except: %s" % line) support.logger.error("search except: %s" % line)
return [] return []
+1 -1
View File
@@ -60,7 +60,7 @@ def search(item, text):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("%s" % line) support.logger.error("%s" % line)
return itemlist return itemlist
def menu(item): def menu(item):
+1 -1
View File
@@ -64,5 +64,5 @@ def search(item, text):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("%s" % line) support.logger.error("%s" % line)
return [] return []
+2 -2
View File
@@ -48,7 +48,7 @@ def search(item, text):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("%s" % line) support.logger.error("%s" % line)
return [] return []
@@ -69,7 +69,7 @@ def newest(categoria):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("{0}".format(line)) support.logger.error("{0}".format(line))
return [] return []
+1 -1
View File
@@ -35,7 +35,7 @@ def search(item, text):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("%s" % line) support.logger.error("%s" % line)
return [] return []
+2 -2
View File
@@ -31,7 +31,7 @@ def search(item, texto):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("%s" % line) support.logger.error("%s" % line)
return [] return []
@@ -56,7 +56,7 @@ def newest(categoria):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("{0}".format(line)) support.logger.error("{0}".format(line))
return [] return []
return itemlist return itemlist
+1 -1
View File
@@ -118,7 +118,7 @@ def search(item, texto):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("%s" % line) support.logger.error("%s" % line)
return [] return []
def search_movie_by_genre(item): def search_movie_by_genre(item):
+1 -1
View File
@@ -77,7 +77,7 @@ def newest(categoria):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("%s" % line) support.logger.error("%s" % line)
return [] return []
return itemlist return itemlist
+1 -1
View File
@@ -136,7 +136,7 @@ def search(item, text):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("%s" % line) support.logger.error("%s" % line)
return [] return []
return itemlist return itemlist
+5 -3
View File
@@ -5,8 +5,10 @@
from core import support 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]] headers = [['Referer', host]]
@@ -36,7 +38,7 @@ def search(item, texto):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("%s" % line) support.logger.error("%s" % line)
return [] return []
@@ -55,7 +57,7 @@ def newest(categoria):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("{0}".format(line)) support.logger.error("{0}".format(line))
return [] return []
return itemlist return itemlist
+1 -1
View File
@@ -39,7 +39,7 @@ def search(item, text):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("%s" % line) support.logger.error("%s" % line)
return [] return []
+2 -2
View File
@@ -37,7 +37,7 @@ def search(item, texto):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("%s" % line) support.logger.error("%s" % line)
return [] return []
@@ -53,7 +53,7 @@ def newest(categoria):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("{0}".format(line)) support.logger.error("{0}".format(line))
return [] return []
+1 -1
View File
@@ -93,5 +93,5 @@ def search(item, text):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("%s" % line) support.logger.error("%s" % line)
return [] return []
+1 -1
View File
@@ -82,7 +82,7 @@ def search(item, text):
except: except:
import sys import sys
for line in sys.exc_info(): for line in sys.exc_info():
support.infoger.error("%s" % line) support.logger.error("%s" % line)
return [] return []
return itemlist return itemlist
+2 -2
View File
@@ -335,7 +335,7 @@ class Tvdb(object):
self.list_results = [] self.list_results = []
self.lang = "" self.lang = ""
self.search_name = kwargs['search'] = \ 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.list_episodes = {}
self.episodes = {} self.episodes = {}
@@ -837,7 +837,7 @@ class Tvdb(object):
except Exception as ex: except Exception as ex:
# if isinstance(ex, urllib).HTTPError: # 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)) message = "An exception of type %s occured. Arguments:\n%s" % (type(ex).__name__, repr(ex.args))
logger.error("error: %s" % message) logger.error("error: %s" % message)
+15 -14
View File
@@ -33,8 +33,8 @@ except:
xbmcgui = None xbmcgui = None
import re, base64, json, inspect import re, base64, json, inspect
from core import jsontools, tvdb, scrapertools, filetools from core import jsontools, tvdb, scrapertools, filetools
from core.support import typo, info from core.support import typo
from platformcode import config, platformtools from platformcode import config, platformtools, logger
TAG_TVSHOW_RENUMERATE = "TVSHOW_AUTORENUMBER" TAG_TVSHOW_RENUMERATE = "TVSHOW_AUTORENUMBER"
TAG_ID = "ID" TAG_ID = "ID"
@@ -49,7 +49,7 @@ TAG_TYPE = "Type"
def renumber(itemlist, item='', typography=''): def renumber(itemlist, item='', typography=''):
info() logger.info()
dict_series = load(itemlist[0]) if len(itemlist) > 0 else {} dict_series = load(itemlist[0]) if len(itemlist) > 0 else {}
if item: if item:
@@ -103,7 +103,7 @@ def renumber(itemlist, item='', typography=''):
def config_item(item, itemlist=[], typography='', active=False): def config_item(item, itemlist=[], typography='', active=False):
info() logger.info()
# Configurazione Automatica, Tenta la numerazione Automatica degli episodi # Configurazione Automatica, Tenta la numerazione Automatica degli episodi
title = item.fulltitle.rstrip() title = item.fulltitle.rstrip()
@@ -140,7 +140,7 @@ def config_item(item, itemlist=[], typography='', active=False):
def semiautomatic_config_item(item): def semiautomatic_config_item(item):
info() logger.info()
# Configurazione Semi Automatica, utile in caso la numerazione automatica fallisca # Configurazione Semi Automatica, utile in caso la numerazione automatica fallisca
tvdb.find_and_set_infoLabels(item) 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): def manual_renumeration(item, modify=False):
info() logger.info()
_list = [] _list = []
if item.from_channel: item.channel = item.from_channel if item.from_channel: item.channel = item.from_channel
title = item.fulltitle.rstrip() title = item.fulltitle.rstrip()
@@ -342,7 +342,7 @@ def manual_renumeration(item, modify=False):
def delete_renumeration(item): def delete_renumeration(item):
info() logger.info()
if item.from_channel: item.channel = item.from_channel if item.from_channel: item.channel = item.from_channel
title = item.fulltitle.rstrip() 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): def make_list(itemlist, item, typography, dict_series, ID, Season, Episode, Mode, title):
info() logger.info()
exist = True exist = True
item.infoLabels['tvdb_id'] = ID item.infoLabels['tvdb_id'] = ID
tvdb.set_infoLabels_item(item) tvdb.set_infoLabels_item(item)
@@ -372,6 +372,7 @@ def make_list(itemlist, item, typography, dict_series, ID, Season, Episode, Mode
if check: if check:
for page in Pages: for page in Pages:
data = tvdb.otvdb_global.get_list_episodes(ID,page) data = tvdb.otvdb_global.get_list_episodes(ID,page)
logger.info('DATA',data)
for episodes in data['data']: for episodes in data['data']:
if episodes['firstAired'] and [episodes['firstAired'], episodes['airedSeason'], episodes['airedEpisodeNumber']] not in EpList: if episodes['firstAired'] and [episodes['firstAired'], episodes['airedSeason'], episodes['airedEpisodeNumber']] not in EpList:
EpList.append([episodes['firstAired'], episodes['airedSeason'], episodes['airedEpisodeNumber']]) 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): def check(item):
info() logger.info()
dict_series = load(item) dict_series = load(item)
title = item.fulltitle.rstrip() title = item.fulltitle.rstrip()
if title in dict_series: title = dict_series[title] if title in dict_series: title = dict_series[title]
@@ -493,7 +494,7 @@ def error(itemlist):
def find_episodes(item): def find_episodes(item):
info() logger.info()
ch = __import__('channels.' + item.channel, fromlist=["channels.%s" % item.channel]) ch = __import__('channels.' + item.channel, fromlist=["channels.%s" % item.channel])
itemlist = ch.episodios(item) itemlist = ch.episodios(item)
return itemlist return itemlist
@@ -501,7 +502,7 @@ def find_episodes(item):
def RepresentsInt(s): def RepresentsInt(s):
# Controllo Numro Stagione # Controllo Numro Stagione
info() logger.info()
try: try:
int(s) int(s)
return True return True
@@ -537,7 +538,7 @@ def select_type(item):
def filename(item): def filename(item):
info() logger.info()
name_file = item.channel + "_data.json" name_file = item.channel + "_data.json"
path = filetools.join(config.get_data_path(), "settings_channels") path = filetools.join(config.get_data_path(), "settings_channels")
fname = filetools.join(path, name_file) fname = filetools.join(path, name_file)
@@ -546,7 +547,7 @@ def filename(item):
def load(item): def load(item):
info() logger.info()
try: try:
json_file = open(filename(item), "r").read() json_file = open(filename(item), "r").read()
json = jsontools.load(json_file)[TAG_TVSHOW_RENUMERATE] json = jsontools.load(json_file)[TAG_TVSHOW_RENUMERATE]
@@ -558,7 +559,7 @@ def load(item):
def write(item, json): def write(item, json):
info() logger.info()
json_file = open(filename(item), "r").read() json_file = open(filename(item), "r").read()
js = jsontools.load(json_file) js = jsontools.load(json_file)
js[TAG_TVSHOW_RENUMERATE] = json js[TAG_TVSHOW_RENUMERATE] = json
+4
View File
@@ -129,6 +129,10 @@ def run(item=None):
from platformcode import shortcuts from platformcode import shortcuts
return getattr(shortcuts, item.action)(item) 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": elif item.action == "delete_key":
from platformcode import keymaptools from platformcode import keymaptools
return keymaptools.delete_key() return keymaptools.delete_key()
+71 -71
View File
@@ -71,9 +71,9 @@
<control type="label" id="10006"> <control type="label" id="10006">
<top>100</top> <top>100</top>
<left>60</left> <left>60</left>
<height>40</height> <height>30</height>
<width>100</width> <width>200</width>
<font>font10</font> <font>font13</font>
<textcolor>FFFFFFFF</textcolor> <textcolor>FFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor> <shadowcolor>black</shadowcolor>
<align>left</align> <align>left</align>
@@ -82,10 +82,10 @@
</control> </control>
<control type="label" id="10007"> <control type="label" id="10007">
<top>100</top> <top>100</top>
<left>200</left> <left>250</left>
<height>40</height> <height>30</height>
<width>365</width> <width>365</width>
<font>font10</font> <font>font13</font>
<scrollsuffix> | </scrollsuffix> <scrollsuffix> | </scrollsuffix>
<scroll>true</scroll> <scroll>true</scroll>
<textcolor>FFFFFFFF</textcolor> <textcolor>FFFFFFFF</textcolor>
@@ -95,11 +95,11 @@
<label></label> <label></label>
</control> </control>
<control type="label" id="10008"> <!-- Lingua Originale --> <control type="label" id="10008"> <!-- Lingua Originale -->
<top>125</top> <top>130</top>
<left>60</left> <left>60</left>
<height>40</height> <height>30</height>
<width>100</width> <width>200</width>
<font>font10</font> <font>font13</font>
<textcolor>0xFFFFFFFF</textcolor> <textcolor>0xFFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor> <shadowcolor>black</shadowcolor>
<align>left</align> <align>left</align>
@@ -107,11 +107,11 @@
<label></label> <label></label>
</control> </control>
<control type="label" id="10009"> <control type="label" id="10009">
<top>125</top> <top>130</top>
<left>200</left> <left>250</left>
<height>40</height> <height>30</height>
<width>365</width> <width>365</width>
<font>font10</font> <font>font13</font>
<scrollsuffix> | </scrollsuffix> <scrollsuffix> | </scrollsuffix>
<scroll>true</scroll> <scroll>true</scroll>
<textcolor>0xFFFFFFFF</textcolor> <textcolor>0xFFFFFFFF</textcolor>
@@ -121,11 +121,11 @@
<label></label> <label></label>
</control> </control>
<control type="label" id="100010"> <!-- Punteggio --> <control type="label" id="100010"> <!-- Punteggio -->
<top>150</top> <top>160</top>
<left>60</left> <left>60</left>
<height>40</height> <height>30</height>
<width>100</width> <width>200</width>
<font>font10</font> <font>font13</font>
<textcolor>0xFFFFFFFF</textcolor> <textcolor>0xFFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor> <shadowcolor>black</shadowcolor>
<align>left</align> <align>left</align>
@@ -133,11 +133,11 @@
<label></label> <label></label>
</control> </control>
<control type="label" id="100011"> <control type="label" id="100011">
<top>150</top> <top>160</top>
<left>200</left> <left>250</left>
<height>40</height> <height>30</height>
<width>365</width> <width>365</width>
<font>font10</font> <font>font13</font>
<scrollsuffix> | </scrollsuffix> <scrollsuffix> | </scrollsuffix>
<scroll>true</scroll> <scroll>true</scroll>
<textcolor>0xFFFFFFFF</textcolor> <textcolor>0xFFFFFFFF</textcolor>
@@ -147,11 +147,11 @@
<label></label> <label></label>
</control> </control>
<control type="label" id="100012"> <!-- Generi --> <control type="label" id="100012"> <!-- Generi -->
<top>175</top> <top>190</top>
<left>60</left> <left>60</left>
<height>40</height> <height>30</height>
<width>100</width> <width>200</width>
<font>font10</font> <font>font13</font>
<textcolor>0xFFFFFFFF</textcolor> <textcolor>0xFFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor> <shadowcolor>black</shadowcolor>
<align>left</align> <align>left</align>
@@ -159,11 +159,11 @@
<label></label> <label></label>
</control> </control>
<control type="label" id="100013"> <control type="label" id="100013">
<top>175</top> <top>190</top>
<left>200</left> <left>250</left>
<height>40</height> <height>30</height>
<width>365</width> <width>365</width>
<font>font10</font> <font>font13</font>
<scrollsuffix> | </scrollsuffix> <scrollsuffix> | </scrollsuffix>
<scroll>true</scroll> <scroll>true</scroll>
<textcolor>0xFFFFFFFF</textcolor> <textcolor>0xFFFFFFFF</textcolor>
@@ -173,11 +173,11 @@
<label></label> <label></label>
</control> </control>
<control type="label" id="100014"> <control type="label" id="100014">
<top>200</top> <top>220</top>
<left>60</left> <left>60</left>
<height>40</height> <height>30</height>
<width>100</width> <width>200</width>
<font>font10</font> <font>font13</font>
<textcolor>0xFFFFFFFF</textcolor> <textcolor>0xFFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor> <shadowcolor>black</shadowcolor>
<align>left</align> <align>left</align>
@@ -185,11 +185,11 @@
<label></label> <label></label>
</control> </control>
<control type="label" id="100015"> <control type="label" id="100015">
<top>200</top> <top>220</top>
<left>200</left> <left>250</left>
<height>40</height> <height>30</height>
<width>365</width> <width>365</width>
<font>font10</font> <font>font13</font>
<scrollsuffix> | </scrollsuffix> <scrollsuffix> | </scrollsuffix>
<scroll>true</scroll> <scroll>true</scroll>
<textcolor>0xFFFFFFFF</textcolor> <textcolor>0xFFFFFFFF</textcolor>
@@ -199,11 +199,11 @@
<label></label> <label></label>
</control> </control>
<control type="label" id="100016"> <control type="label" id="100016">
<top>225</top> <top>250</top>
<left>60</left> <left>60</left>
<height>40</height> <height>30</height>
<width>100</width> <width>200</width>
<font>font10</font> <font>font13</font>
<textcolor>0xFFFFFFFF</textcolor> <textcolor>0xFFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor> <shadowcolor>black</shadowcolor>
<align>left</align> <align>left</align>
@@ -211,11 +211,11 @@
<label></label> <label></label>
</control> </control>
<control type="label" id="100017"> <control type="label" id="100017">
<top>225</top> <top>250</top>
<left>200</left> <left>250</left>
<height>40</height> <height>30</height>
<width>365</width> <width>365</width>
<font>font10</font> <font>font13</font>
<scrollsuffix> | </scrollsuffix> <scrollsuffix> | </scrollsuffix>
<scroll>true</scroll> <scroll>true</scroll>
<textcolor>0xFFFFFFFF</textcolor> <textcolor>0xFFFFFFFF</textcolor>
@@ -225,11 +225,11 @@
<label></label> <label></label>
</control> </control>
<control type="label" id="100018"> <control type="label" id="100018">
<top>250</top> <top>280</top>
<left>60</left> <left>60</left>
<height>40</height> <height>30</height>
<width>100</width> <width>200</width>
<font>font10</font> <font>font13</font>
<textcolor>0xFFFFFFFF</textcolor> <textcolor>0xFFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor> <shadowcolor>black</shadowcolor>
<align>left</align> <align>left</align>
@@ -237,11 +237,11 @@
<label></label> <label></label>
</control> </control>
<control type="label" id="100019"> <control type="label" id="100019">
<top>250</top> <top>280</top>
<left>200</left> <left>250</left>
<height>40</height> <height>30</height>
<width>365</width> <width>365</width>
<font>font10</font> <font>font13</font>
<scrollsuffix> | </scrollsuffix> <scrollsuffix> | </scrollsuffix>
<scroll>true</scroll> <scroll>true</scroll>
<textcolor>0xFFFFFFFF</textcolor> <textcolor>0xFFFFFFFF</textcolor>
@@ -251,11 +251,11 @@
<label></label> <label></label>
</control> </control>
<control type="label" id="100020"> <control type="label" id="100020">
<top>275</top> <top>310</top>
<left>60</left> <left>60</left>
<height>40</height> <height>30</height>
<width>100</width> <width>200</width>
<font>font10</font> <font>font13</font>
<textcolor>0xFFFFFFFF</textcolor> <textcolor>0xFFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor> <shadowcolor>black</shadowcolor>
<align>left</align> <align>left</align>
@@ -263,11 +263,11 @@
<label></label> <label></label>
</control> </control>
<control type="label" id="100021"> <control type="label" id="100021">
<top>275</top> <top>310</top>
<left>200</left> <left>250</left>
<height>40</height> <height>30</height>
<width>365</width> <width>365</width>
<font>font10</font> <font>font13</font>
<scrollsuffix> | </scrollsuffix> <scrollsuffix> | </scrollsuffix>
<scroll>true</scroll> <scroll>true</scroll>
<textcolor>0xFFFFFFFF</textcolor> <textcolor>0xFFFFFFFF</textcolor>
@@ -277,11 +277,11 @@
<label></label> <label></label>
</control> </control>
<control type="label" id="100022"> <!-- Trama --> <control type="label" id="100022"> <!-- Trama -->
<top>300</top> <top>330</top>
<left>60</left> <left>60</left>
<height>40</height> <height>30</height>
<width>505</width> <width>505</width>
<font>font10</font> <font>font13</font>
<textcolor>0xFFFFFFFF</textcolor> <textcolor>0xFFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor> <shadowcolor>black</shadowcolor>
<align>left</align> <align>left</align>
@@ -289,11 +289,11 @@
<label></label> <label></label>
</control> </control>
<control type="textbox" id="100023"> <control type="textbox" id="100023">
<top>300</top> <top>330</top>
<left>200</left> <left>250</left>
<height>294</height> <height>250</height>
<width>500</width> <width>550</width>
<font>font10</font> <font>font13</font>
<textcolor>0xFFFFFFFF</textcolor> <textcolor>0xFFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor> <shadowcolor>black</shadowcolor>
<wrapmultiline>true</wrapmultiline> <wrapmultiline>true</wrapmultiline>
@@ -362,7 +362,7 @@
<left>1080</left> <left>1080</left>
<height>30</height> <height>30</height>
<width>110</width> <width>110</width>
<font>font10</font> <font>font13</font>
<textcolor>FFFFFFFF</textcolor> <textcolor>FFFFFFFF</textcolor>
<shadowcolor>black</shadowcolor> <shadowcolor>black</shadowcolor>
<align>right</align> <align>right</align>
+6 -6
View File
@@ -331,12 +331,12 @@ class AddonMonitor(xbmc.Monitor):
if self.settings_pre.get("videolibrarypath", None) != settings_post.get("videolibrarypath", None) or \ 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_movies", None) != settings_post.get("folder_movies", None) or \
self.settings_pre.get("folder_tvshows", None) != settings_post.get("folder_tvshows", None): self.settings_pre.get("folder_tvshows", None) != settings_post.get("folder_tvshows", None):
videolibrary.move_videolibrary(self.settings_pre.get("videolibrarypath", None), videolibrary.move_videolibrary(self.settings_pre.get("videolibrarypath", ''),
settings_post.get("videolibrarypath", None), settings_post.get("videolibrarypath", ''),
self.settings_pre.get("folder_movies", None), self.settings_pre.get("folder_movies", ''),
settings_post.get("folder_movies", None), settings_post.get("folder_movies", ''),
self.settings_pre.get("folder_tvshows", None), self.settings_pre.get("folder_tvshows", ''),
settings_post.get("folder_tvshows", None)) settings_post.get("folder_tvshows", ''))
# si se ha puesto que se quiere autoconfigurar y se había creado el directorio de la videoteca # 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): if not self.settings_pre.get("videolibrary_kodi", None) and settings_post.get("videolibrary_kodi", None):