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

KoD 0.5.2

Browse Source 
- Fix Parziale Cloudflare
- Maggiore Reattività
- Su ANDROID alcuni siti es. SerieHD e GuardaSerie.click non funzionano
This commit is contained in:
Alhaziel
2019-12-07 19:50:43 +01:00
parent 98580ba11a
commit 58e7a3e84d
147 changed files with 59089 additions and 11503 deletions
Download Patch File Download Diff File Expand all files Collapse all files
specials/resolverdns.py
+35 -24
View File
@@ -1,31 +1,42 @@
# -*- coding: utf-8 -*-
# -*- CLOUDFLARE'S DNS -*-
# -*- OVERRIDE RESOLVE DNS -*-
##from lib import dns
##import dns.resolver
##from dns.resolver import override_system_resolver
##import socket
##import requests
##
##def dns_resolver():
## res = dns.resolver.Resolver(configure=True)
## res.nameservers = ['1.1.1.1', '2606:4700:4700::1111',
## '1.0.0.1', '2606:4700:4700::1001']
## override_system_resolver(res)
from platformcode import config
from core import support
## Da prevedere di aggiungere la possibilità
## di inserire i dns a piacere degli utenti!!!
if config.get_setting('resolver_dns') or config.get_setting('resolver_dns_custom'):
from lib import dns
import dns.resolver
from dns.resolver import override_system_resolver
import dns.name
import socket
import requests
from lib import dns
import dns.resolver
from dns.resolver import override_system_resolver
import dns.name
import socket
import requests
res = dns.resolver.Resolver(configure=True)
res = dns.resolver.Resolver(configure=True)
"""
legge le impostazioni dalla configurazione
e setta i relativi DNS
"""
nameservers_dns = config.get_setting('resolver_dns_service')
support.log("NAME SERVER1: {}".format(nameservers_dns))
if config.get_setting('resolver_dns_custom') and not config.get_setting('resolver_dns'):
res.nameservers = [config.get_setting('resolver_dns_custom1'),config.get_setting('resolver_dns_custom2')]
elif nameservers_dns == 1:# 'Google'
res.nameservers = ['8.8.8.8', '2001:4860:4860::8888',
'8.8.4.4', '2001:4860:4860::8844']
elif nameservers_dns == 2:#'OpenDns Home ip(v4)':
res.nameservers = ['208.67.222.222', '208.67.222.220']
elif nameservers_dns == 3:#'OpenDns Family Shield ip(v4)':
res.nameservers = ['208.67.222.123', '208.67.220.123']
elif nameservers_dns == 4:#'OpenDns ip(v6)':
#https://support.opendns.com/hc/en-us/articles/227986667-Does-OpenDNS-Support-IPv6-
res.nameservers = ['2620:119:35::35', '2620:119:53::53']
elif nameservers_dns == 0:#'Cloudflare':
res.nameservers = ['1.1.1.1', '2606:4700:4700::1111',
'1.0.0.1', '2606:4700:4700::1001']
res.nameservers = ['1.1.1.1', '2606:4700:4700::1111',
'1.0.0.1', '2606:4700:4700::1001' ]
support.log("NAME SERVER2: {}".format(res.nameservers))
override_system_resolver(res)
override_system_resolver(res)
specials/search.py
Regular → Executable
+6 -3
View File
@@ -424,7 +424,7 @@ def show_result(item):
return getattr(channel, item.action)(item)
def channel_search(search_results, channel_parameters, tecleado):
def channel_search(search_results, channel_parameters, tecleado, session):
try:
exec("from channels import " + channel_parameters["channel"] + " as module")
mainlist = module.mainlist(Item(channel=channel_parameters["channel"]))
@@ -433,6 +433,7 @@ def channel_search(search_results, channel_parameters, tecleado):
search_items = [Item(channel=channel_parameters["channel"], action="search")]
for item in search_items:
item.session = session
result = module.search(item.clone(), tecleado)
if result is None:
result = []
@@ -548,6 +549,8 @@ def do_search(item, categories=None):
logger.error(traceback.format_exc())
continue
from lib import cloudscraper
session = cloudscraper.create_scraper()
for index, infile in enumerate(list_channels_search):
try:
@@ -566,7 +569,7 @@ def do_search(item, categories=None):
logger.info("Búsqueda cancelada")
return itemlist
if multithread:
t = Thread(target=channel_search, args=[search_results, channel_parameters, tecleado],
t = Thread(target=channel_search, args=[search_results, channel_parameters, tecleado, session],
name=channel_parameters["title"])
t.setDaemon(True)
t.start()
@@ -574,7 +577,7 @@ def do_search(item, categories=None):
# Modo single Thread
else:
logger.info("Intentado búsqueda en %s de %s " % (basename_without_extension, tecleado))
channel_search(search_results, channel_parameters, tecleado)
channel_search(search_results, channel_parameters, tecleado, session)
except:
logger.error("No se puede buscar en: %s" % channel_parameters["title"])
import traceback