fix: ResolverDNS

Possibilità di scegliere il provider nelle impostazioni alla voce DNS
spostato abilita check DNS nella relativa voce in impostazioni
This commit is contained in:
greko17
2019-12-03 12:25:53 +01:00
parent f537c5eec0
commit 191e30201c
4 changed files with 64 additions and 25 deletions

View File

@@ -5696,3 +5696,15 @@ msgstr ""
msgctxt "#707404"
msgid "By deactivating the DNS check, you have activated a reminder that it will appear at the top right."
msgstr ""
msgctxt "#707405"
msgid "Activate DNS"
msgstr ""
msgctxt "#707406"
msgid "Choose the DNS provider"
msgstr ""
msgctxt "#707407"
msgid "Choose your preferred DNS provider and restart KODI!"
msgstr ""

View File

@@ -5700,3 +5700,15 @@ msgstr "Attivazione Promemoria..."
msgctxt "#707404"
msgid "By deactivating the DNS check, you have activated a reminder that it will appear at the top right."
msgstr "Disattivando il check DNS, hai attivato un promemoria\nche apparirà in alto a dx"
msgctxt "#707405"
msgid "Activate DNS"
msgstr "Attiva DNS"
msgctxt "#707406"
msgid "Choose the DNS provider"
msgstr "Scegli il fornitore DNS"
msgctxt "#707407"
msgid "Choose your preferred DNS provider and restart KODI!"
msgstr "Scegli il tuo provider per i DNS che preferisci e riavvia KODI!"

View File

@@ -5,7 +5,6 @@
<setting id="player_mode" type="enum" values="Direct|SetResolvedUrl|Built-In|Download and Play" label="30044" default="1"/>
<setting id="default_action" type="enum" lvalues="30006|30007|30008" label="30005" default="0"/>
<setting id="autoplay" type="bool" label="70562" default="false" visible="true"/>
<setting id="checkdns" type="bool" label="707401" default="true" visible="true"/>
<setting id="checklinks" type="bool" label="30020" default="false"/>
<setting id="checklinks_number" type="enum" values="5|10|15|20" label="30021" default="0" visible="eq(-1,true)"/>
<setting id="thumbnail_type" type="enum" lvalues="30011|30012|30200" label="30010" default="2"/>
@@ -124,6 +123,13 @@
values="[COLOR white]white[/COLOR]|[COLOR cyan]cyan[/COLOR]|[COLOR deepskyblue]deepskyblue[/COLOR]|[COLOR firebrick]firebrick[/COLOR]|[COLOR gold]gold[/COLOR]|[COLOR goldenrod]goldenrod[/COLOR]|[COLOR hotpink]hotpink[/COLOR]|[COLOR limegreen]limegreen[/COLOR]|[COLOR orange]orange[/COLOR]|[COLOR orchid]orchid[/COLOR]|[COLOR red]red[/COLOR]|[COLOR salmon]salmon[/COLOR]|[COLOR yellow]yellow[/COLOR]"
default="white" visible="eq(-17,true)+eq(-18,true)"/> -->
</category>
<!-- Scelgo i DNS da utilizzare-->
<category label="DNS">
<setting id="checkdns" type="bool" label="707401" default="true" visible="true"/>
<setting id="resolver_dns" type="bool" label="707405" default="True"/>
<setting id="resolver_dns_service" type="labelenum" values="Cloudflare|Google|OpenDns" label="707406" default="Cloudflare" visible="eq(-1,true)" option="hidden" enable="eq(-1,true)"/>
<setting label="707407" visible="eq(-2,true)" option="hidden" enable="eq(-2,true)"/>
</category>
<!-- Other -->
<category label="70149">
<setting label="70150" type="lsep"/>
@@ -169,4 +175,6 @@
default="Film" visible="eq(-3,True)+eq(-1,True)+eq(-2,False)" enable="eq(-3,True)+eq(-1,True)+(-2,false)"/>
</category>
</settings>

View File

@@ -1,31 +1,38 @@
# -*- 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!!!
active_dns = config.get_setting('resolver_dns')
from lib import dns
import dns.resolver
from dns.resolver import override_system_resolver
import dns.name
import socket
import requests
if active_dns == True:
res = dns.resolver.Resolver(configure=True)
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)
"""
legge le impostazioni dalla configurazione
e setta i relativi DNS
"""
nameservers_dns = config.get_setting('resolver_dns_service')
if nameservers_dns == 'Google':
res.nameservers_dns = ['8.8.8.8', '2001:4860:4860::8888',
'8.8.4.4', '2001:4860:4860::8844' ]
elif nameservers_dns == 'OpenDns':
res.nameservers_dns = ['208.67.222.222', '2620:119:35::35',
'208.67.222.220', '2620:119:53::53' ]
else:# resolver_dns_service == 'Cloudflare':
res.nameservers = ['1.1.1.1', '2606:4700:4700::1111',
'1.0.0.1', '2606:4700:4700::1001' ]
override_system_resolver(res)
res.nameservers = ['1.1.1.1', '2606:4700:4700::1111',
'1.0.0.1', '2606:4700:4700::1001' ]
override_system_resolver(res)