From b2b5d7336b6314fe33cf2990d1adc6472b470d29 Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Sat, 7 Dec 2019 19:16:21 +0100 Subject: [PATCH 1/5] cf list --- core/httptools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/httptools.py b/core/httptools.py index 67768255..00369812 100755 --- a/core/httptools.py +++ b/core/httptools.py @@ -409,7 +409,7 @@ def downloadpage(url, **opt): """ load_cookies() - if scrapertoolsV2.get_domain_from_url(url) in ['www.seriehd.moda', 'wstream.video', 'www.guardaserie.media']: # cloudflare urls + if scrapertoolsV2.get_domain_from_url(url) in ['www.seriehd.moda', 'wstream.video', 'www.guardaserie.media', 'akvideo.stream','www.piratestreaming.top']: # cloudflare urls if opt.get('session', False): session = opt['session'] # same session to speed up search else: From a89df6e6f9a46d199b68792d32e3b8598a08034b Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Sat, 7 Dec 2019 19:36:30 +0100 Subject: [PATCH 2/5] KoD 0.5.2 --- addon.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/addon.xml b/addon.xml index 2009d381..d48be31c 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + @@ -20,10 +20,9 @@ resources/media/themes/ss/2.png resources/media/themes/ss/3.png - -override DNS di default - -nuovi canali: streamtime e netfreex - -fixato cloudflare - -aggiunta opzione "apri nel browser" + - Fixato cloudflare (parzialmente) + - Ricerca e navigazione più veloce + - N.B. Su Android alcunu siti come SerieHD e GuardaSerie.click non funzionano Naviga velocemente sul web e guarda i contenuti presenti [COLOR red]The owners and submitters to this addon do not host or distribute any of the content displayed by these addons nor do they have any affiliation with the content providers.[/COLOR] [COLOR yellow]Kodi © is a registered trademark of the XBMC Foundation. We are not connected to or in any other way affiliated with Kodi, Team Kodi, or the XBMC Foundation. Furthermore, any software, addons, or products offered by us will receive no support in official Kodi channels, including the Kodi forums and various social networks.[/COLOR] From d060880a08323caa24cabc98afe4492dc219b7df Mon Sep 17 00:00:00 2001 From: greko17 Date: Mon, 9 Dec 2019 19:21:33 +0100 Subject: [PATCH 3/5] fix: impostazioni resolverDNS --- resources/language/English/strings.po | 53 +++++++++++------------ resources/language/Italian/strings.po | 60 +++++++++++++-------------- resources/settings.xml | 30 +++++++------- specials/checkhost.py | 7 ++-- specials/resolverdns.py | 40 +++++++++--------- 5 files changed, 98 insertions(+), 92 deletions(-) diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po index 0ceea226..6cc290a8 100644 --- a/resources/language/English/strings.po +++ b/resources/language/English/strings.po @@ -5681,8 +5681,9 @@ msgctxt "#70740" msgid "Your system does not have a web browser, so here's the short link you can open in another device:\n%s" msgstr "" +# DNS start [ settings and declaration ] msgctxt "#707401" -msgid "Enable Check DNS" +msgid "Enable DNS Check Alert" msgstr "" msgctxt "#707402" @@ -5690,54 +5691,54 @@ msgid "Connection or DNS problems" msgstr "" msgctxt "#707403" -msgid "Reminder Activation" +msgid "Disable alert" msgstr "" msgctxt "#707404" -msgid "By deactivating the DNS check, you have activated a reminder that it will appear at the top right." +msgid "Remind me" msgstr "" msgctxt "#707405" -msgid "If you disable 'Enable DNS' you will use the dns set in your modem or device." -msgstr "" - -msgctxt "#707412" -msgid "If you want to insert YOUR DNS that do not appear in the list, run in order:" -msgstr "" - -msgctxt "#707413" -msgid "'Enable DNS' -> OFF - 'Enter your DNS' -> ON" -msgstr "" - -msgctxt "#707414" -msgid "Note: If 'Activate DNS' and 'Insert your DNS' are both ON, the former will prevail." -msgstr "" - -msgctxt "#707415" -msgid "For any change to the DNS you MUST restart KODI!" +msgid "Notice Activation" msgstr "" msgctxt "#707406" -msgid "Activate DNS" +msgid "By disabling the alert, you have activated a notice\nthat will appear at the top right in case of problems" msgstr "" msgctxt "#707407" -msgid "Choose the DNS provider" +msgid "For any change to the DNS you MUST restart KODI!" msgstr "" msgctxt "#707408" -msgid "Choose your preferred DNS provider and restart KODI!" +msgid "Activate DNS" msgstr "" msgctxt "#707409" -msgid "Insert your DNS" +msgid "Choose the DNS provider" msgstr "" msgctxt "#707410" +msgid "DNS supplier." +msgstr "" + +msgctxt "#707411" +msgid "Insert your DNS" +msgstr "" + +msgctxt "#707412" msgid "DNS1" msgstr "" -msgctxt "#7074011" +msgctxt "#707413" msgid "DNS2" msgstr "" -# DNS end + +msgctxt "#707414" +msgid "You are using the DNS set on your device or modem" +msgstr "" + +msgctxt "#707415" +msgid "You have not selected any choice, the cloudflare DNS will be used." +msgstr "" +# end DNS diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po index 74fdc18a..45e35cd1 100644 --- a/resources/language/Italian/strings.po +++ b/resources/language/Italian/strings.po @@ -5685,64 +5685,64 @@ msgctxt "#70740" msgid "Your system does not have a web browser, so here's the short link you can open in another device:\n%s" msgstr "Il tuo sistema non ha un browser, quindi ecco un link corto che puoi aprire in un altro dispositivo\n%s" -# DNS start +# DNS start [ settings and declaration ] msgctxt "#707401" -msgid "Enable Check DNS" -msgstr "Abilita Check DNS" +msgid "Enable DNS Check Alert" +msgstr "Abilita Avviso Check DNS" msgctxt "#707402" msgid "Connection or DNS problems" msgstr "Problema di connessione o DNS" msgctxt "#707403" -msgid "Reminder Activation" -msgstr "Attivazione Promemoria..." +msgid "Disable alert" +msgstr "Disattiva avviso" 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" +msgid "Remind me" +msgstr "Ricordami" msgctxt "#707405" -msgid "If you disable 'Enable DNS' you will use the dns set in your modem or device." -msgstr "Se disattivi Attiva DNS userai i dns impostati nel modem o nel dispositivo in uso." +msgid "Notice Activation" +msgstr "Attivazione Notifica" -msgctxt "#707412" -msgid "If you want to insert YOUR DNS that do not appear in the list, run in order:" -msgstr "Se vuoi inserire TUOI DNS che non compaiono nell'elenco, esegui in ordine:" +msgctxt "#707406" +msgid "By disabling the alert, you have activated a notice\nthat will appear at the top right in case of problems" +msgstr "Disattivando l'avviso, hai attivato una notifica\nche apparirà in alto a dx in caso di problemi" -msgctxt "#707413" -msgid "'Enable DNS' -> OFF - 'Enter your DNS' -> ON" -msgstr "Attiva DNS -> OFF - Inserisci i tuoi DNS -> ON" - -msgctxt "#707414" -msgid "Note: If 'Activate DNS' and 'Insert your DNS' are both ON, the former will prevail." -msgstr "N.B: Se Attiva DNS e Inserisci i tuoi DNS sono entrambi a ON, prevarranno i primi." - -msgctxt "#707415" +msgctxt "#707407" msgid "For any change to the DNS you MUST restart KODI!" msgstr "Per ogni modifica sui DNS DEVI riavviare KODI!" -msgctxt "#707406" +msgctxt "#707408" msgid "Activate DNS" msgstr "Attiva DNS" -msgctxt "#707407" +msgctxt "#707409" msgid "Choose the DNS provider" msgstr "Scegli il fornitore DNS" -msgctxt "#707408" -msgid "Choose your preferred DNS provider and restart KODI!" -msgstr "Scegli il tuo provider per i DNS che preferisci." +msgctxt "#707410" +msgid "DNS supplier." +msgstr "Fornitore DNS" -msgctxt "#707409" +msgctxt "#707411" msgid "Insert your DNS" msgstr "Inserisci i tuoi DNS" -msgctxt "#707410" +msgctxt "#707412" msgid "DNS1" msgstr "DNS1" -msgctxt "#707411" +msgctxt "#707413" msgid "DNS2" msgstr "DNS2" -# DNS end + +msgctxt "#707414" +msgid "You are using the DNS set on your device or modem" +msgstr "Stai utilizzando i DNS impostati sul dispositivo o modem" + +msgctxt "#707415" +msgid "You have not selected any choice, the cloudflare DNS will be used." +msgstr "Non hai selezionato nessuna scelta!\nVerranno utilizzati i DNS di cloudflare." +# end DNS diff --git a/resources/settings.xml b/resources/settings.xml index 9c7f5799..f06c3501 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -123,23 +123,25 @@ 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)"/> --> - + - - - - - - - - - + - - - - + + + + + + + + + + + + + + diff --git a/specials/checkhost.py b/specials/checkhost.py index 43cbca30..c98eba1d 100644 --- a/specials/checkhost.py +++ b/specials/checkhost.py @@ -34,6 +34,7 @@ class Kdicc(): self.view_msg = view_msg self.lst_site_check_dns = lst_site_check_dns self.urls = [] + logger.info("check #### INIZIO INIT#### ") def check_Ip(self): """ @@ -189,13 +190,13 @@ class Kdicc(): dialog = xbmcgui.Dialog() if config.get_setting('checkdns'): - risposta= dialog.yesno(addonname, txt, nolabel='Disattiva', yeslabel='Ricordami') + risposta= dialog.yesno(addonname, txt, nolabel=config.get_localized_string(707403), yeslabel=config.get_localized_string(707404)) if risposta == False: config.set_setting('checkdns', False) - dialog.textviewer(addonname+ ' '+config.get_localized_string(707403), config.get_localized_string(707404)) + dialog.textviewer(addonname+' '+config.get_localized_string(707405), config.get_localized_string(707406)) else: txt = config.get_localized_string(707402) - dialog.notification(addonname, txt, xbmcgui.NOTIFICATION_INFO, 5000) + dialog.notification(addonname, txt, xbmcgui.NOTIFICATION_INFO, 10000) """ def richiamato in launcher.py """ diff --git a/specials/resolverdns.py b/specials/resolverdns.py index 56455fb8..92770ca2 100644 --- a/specials/resolverdns.py +++ b/specials/resolverdns.py @@ -4,7 +4,8 @@ from platformcode import config from core import support -if config.get_setting('resolver_dns') or config.get_setting('resolver_dns_custom'): +##if config.get_setting('resolver_dns') or config.get_setting('resolver_dns_custom'): +if config.get_setting('resolver_dns'): from lib import dns import dns.resolver from dns.resolver import override_system_resolver @@ -18,25 +19,26 @@ if config.get_setting('resolver_dns') or config.get_setting('resolver_dns_custom 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'] + if config.get_setting('resolver_dns_custom') and not config.get_setting('resolver_dns_service_choose'): + res.nameservers = [config.get_setting('resolver_dns_custom1'),config.get_setting('resolver_dns_custom2')] + else: + nameservers_dns = config.get_setting('resolver_dns_service') + # config.get_setting('resolver_dns_service_choose') == true + if 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'] + else:#if nameservers_dns == 0:#'Cloudflare' + res.nameservers = ['1.1.1.1', '2606:4700:4700::1111', + '1.0.0.1', '2606:4700:4700::1001'] + # log di verifica dei DNS impostati, d'aiuto quando gli utenti smanettano... support.log("NAME SERVER2: {}".format(res.nameservers)) override_system_resolver(res) - From 3b960d7af848a91f5113afc371e6735d191c58bd Mon Sep 17 00:00:00 2001 From: greko17 Date: Mon, 9 Dec 2019 21:21:41 +0100 Subject: [PATCH 4/5] fix: cinemalibero.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit novità serietv --- channels/cinemalibero.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/channels/cinemalibero.py b/channels/cinemalibero.py index 033d5633..bdd5b7d2 100644 --- a/channels/cinemalibero.py +++ b/channels/cinemalibero.py @@ -62,7 +62,7 @@ def peliculas(item): patronBlock = r'
.*?class="col-md-12[^"]*?">(?P.*?)
' if item.args == 'newest': patron = r'
[^>]+>[^>]+>\s[^\)]+)\)">[^>]+>(?P[^<]+)<[^>]+>[^>]+>(?:[^>]+>)?\s?(?P<rating>[\d\.]+)?[^>]+>.+?(?:[ ]\((?P<year>\d{4})\))?<[^>]+>[^>]+>(.?[\d\-x]+\s\(?(?P<lang>[sSuUbBiItTaA\-]+)?\)?\s?(?P<quality>[\w]+)?[|]?\s?(?:[fFiInNeE]+)?\s?\(?(?P<lang2>[sSuUbBiItTaA\-]+)?\)?)?' - pagination = 25 + pagination = 25 elif item.contentType == 'movie': patron = r'<a href="(?P<url>[^"]+)" title="(?P<title>.+?)(?:[ ]\[(?P<lang>[sSuUbB\-iItTaA]+)\])?(?:[ ]\((?P<year>\d{4})\))?"\salt="[^"]+"\sclass="[^"]+"(?: style="background-image: url\((?P<thumb>.+?)\)">)?<div class="voto">[^>]+>[^>]+>.(?P<rating>[\d\.a-zA-Z\/]+)?[^>]+>[^>]+>[^>]+>(?:<div class="genere">(?P<quality>[^<]+)</div>)?' if item.args == 'update': @@ -80,8 +80,6 @@ def peliculas(item): else: #search patron = r'<div class="col-lg-3">[^>]+>[^>]+>\s<a href="(?P<url>[^"]+)".+?url\((?P<thumb>[^\)]+)\)">[^>]+>[^>]+>[^>]+>(?:[^>]+>)?\s?(?P<rating>[\d\.]+)?[^>]+>(?P<title>.+?)(?:[ ]\((?P<year>\d{4})\))?<[^>]+>[^>]+>(.?[\d\-x]+\s\(?(?P<lang>[sSuUbBiItTaA\-]+)?\)?\s?(?P<quality>[\w]+)?[|]?\s?(?:[fFiInNeE]+)?\s?\(?(?P<lang2>[sSuUbBiItTaA\-]+)?\)?)?' - - def itemHook(item): if item.lang2: @@ -118,7 +116,7 @@ def peliculas(item): return item patronNext = r'<a class="next page-numbers".*?href="([^"]+)">' - #debug = True + debug = True return locals() @support.scrape @@ -179,6 +177,7 @@ def newest(categoria): elif categoria == 'series' or categoria == 'anime': item.args = 'update' item.url = host+'/aggiornamenti-serie-tv/' + item.contentType = 'tvshow' item.action = 'peliculas' itemlist = peliculas(item) From c688f07e4a4b0156bc9186a6541c87c257f670a5 Mon Sep 17 00:00:00 2001 From: greko17 <sex1712@email.it> Date: Mon, 9 Dec 2019 22:29:25 +0100 Subject: [PATCH 5/5] fix: cinemalibero tolgo debug --- channels/cinemalibero.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/cinemalibero.py b/channels/cinemalibero.py index bdd5b7d2..36b56231 100644 --- a/channels/cinemalibero.py +++ b/channels/cinemalibero.py @@ -116,7 +116,7 @@ def peliculas(item): return item patronNext = r'<a class="next page-numbers".*?href="([^"]+)">' - debug = True + #debug = True return locals() @support.scrape