Concurent futures fix per Kodi 19

This commit is contained in:
Alhaziel
2020-02-29 18:40:12 +01:00
parent 80d4cacb06
commit 4dc434a32a
15 changed files with 45 additions and 9 deletions

View File

@@ -5,7 +5,11 @@
import requests
from core import support
from lib.concurrent import futures
import sys
if sys.version_info[0] >= 3:
from lib.concurrent import futures
else:
from lib.concurrent_py2 import futures
current_session = requests.Session()
host = support.config.get_channel_url()
onair = host + '/palinsesto/onAir.json'

View File

@@ -101,7 +101,11 @@ def episodios(item):
seasons = support.match(url, patronBlock=patron_season, patron=patron_option)
data = ''
from concurrent import futures
import sys
if sys.version_info[0] >= 3:
from lib.concurrent import futures
else:
from lib.concurrent_py2 import futures
with futures.ThreadPoolExecutor() as executor:
thL = []
for i, season in enumerate(seasons.matches):

View File

@@ -6,7 +6,11 @@ import requests, re
from core import support, tmdb
from core.item import Item
from specials import autorenumber
from lib.concurrent import futures
import sys
if sys.version_info[0] >= 3:
from lib.concurrent import futures
else:
from lib.concurrent_py2 import futures
host = support.config.get_channel_url()

View File

@@ -736,7 +736,11 @@ def check_list_links(itemlist, numero='', timeout=3):
El parámetro timeout indica un tope de espera para descargar la página
"""
numero = ((int(numero) + 1) * 5) if numero != '' else 10
from lib.concurrent import futures
import sys
if sys.version_info[0] >= 3:
from lib.concurrent import futures
else:
from lib.concurrent_py2 import futures
with futures.ThreadPoolExecutor() as executor:
checked = []
for it in itemlist:

View File

@@ -5,7 +5,11 @@ import base64
import inspect
import os
import re
from concurrent import futures
import sys
if sys.version_info[0] >= 3:
from lib.concurrent import futures
else:
from lib.concurrent_py2 import futures
try:
import urllib.request as urllib

View File

@@ -591,7 +591,11 @@ def findlinks(text):
# for match in matches:
# sh = unshorten(match)[0]
# text += '\n' + sh
from concurrent import futures
import sys
if sys.version_info[0] >= 3:
from lib.concurrent import futures
else:
from lib.concurrent_py2 import futures
with futures.ThreadPoolExecutor() as executor:
unshList = [executor.submit(unshorten, match) for match in matches]
for link in futures.as_completed(unshList):

View File

@@ -447,7 +447,11 @@ def get_search_menu(item, json='', itemlist=[], channel_name=''):
def submenu(item, json, key, itemlist = []):
from lib.concurrent import futures
import sys
if sys.version_info[0] >= 3:
from lib.concurrent import futures
else:
from lib.concurrent_py2 import futures
filter_list = []
for option in json[key]:

View File

@@ -4,7 +4,11 @@ from platformcode import config, platformtools, logger
from time import time, sleep
from core import scrapertools
from core import jsontools, filetools
from lib.concurrent import futures
import sys
if sys.version_info[0] >= 3:
from lib.concurrent import futures
else:
from lib.concurrent_py2 import futures
next_dialogs = ['NextDialog.xml', 'NextDialogExtended.xml', 'NextDialogCompact.xml']
next_ep_type = config.get_setting('next_ep_type')

View File

@@ -12,7 +12,11 @@ PY3 = False
if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int
import os, json, time, inspect, channelselector
from concurrent import futures
if PY3
from lib.concurrent import futures
else:
from lib.concurrent_py2 import futures
from core.item import Item
from core import tmdb, scrapertools, channeltools, filetools, jsontools
from channelselector import get_thumb