From 9836d690461921eafb03c61f0e8f13baf9c9ef72 Mon Sep 17 00:00:00 2001 From: Ground-Zerro Date: Wed, 20 Mar 2024 21:00:43 +1100 Subject: [PATCH] bug fix --- main.py | 12 +-- platforms/dns-adobe.txt | 2 +- platforms/dns-apple.txt | 2 +- platforms/dns-bing.txt | 2 +- platforms/dns-facebook.txt | 2 +- platforms/dns-google.txt | 2 +- platforms/dns-instagram.txt | 158 ++++++++++++++++++------------------ platforms/dns-netflix.txt | 2 +- platforms/dns-openai.txt | 2 +- platforms/dns-tiktok.txt | 4 +- platforms/dns-ttruckers.txt | 2 +- platforms/dns-twitter.txt | 2 +- platforms/dns-youtube.txt | 2 +- 13 files changed, 98 insertions(+), 96 deletions(-) diff --git a/main.py b/main.py index 544eae5..3a679bf 100644 --- a/main.py +++ b/main.py @@ -25,7 +25,7 @@ urls = { # Function to display interactive service selection def display_service_selection(selected_services): os.system('clear') - print("Выберите сервисы:") + print("Выберите сервисы:") for idx, (service, url) in enumerate(urls.items(), 1): checkbox = "[*]" if service in selected_services else "[ ]" print(f"{idx}. {service.capitalize()} {checkbox}") @@ -53,8 +53,9 @@ def resolve_dns_and_write(service, url): if domain.strip(): futures.append(executor.submit(resolve_domain, resolver, domain, output_string)) for future in futures: - future.result() - resolved_domains += 1 + resolved, error = future.result() + resolved_domains += resolved + errors += error bar.next() bar.finish() @@ -71,8 +72,9 @@ def resolve_domain(resolver, domain, output_string): unique_ips = set(ip.address for ip in ips) for ip in unique_ips: output_string.write(ip + '\n') + return len(unique_ips), 0 except Exception as e: - pass # Ignore DNS resolution errors + return 0, 1 # Return 0 for resolved and 1 for error # Main function def main(): @@ -84,7 +86,7 @@ def main(): # Interactive service selection while True: display_service_selection(selected_services) - selection = input("Выберите номер сервиса (нажмите Enter для завершения): ") + selection = input("Введите номер сервиса и нажмите Enter (Пустая срока и Enter для завершения): ") if selection.isdigit(): idx = int(selection) - 1 if 0 <= idx < len(urls): diff --git a/platforms/dns-adobe.txt b/platforms/dns-adobe.txt index 21a5352..0ebc9f1 100644 --- a/platforms/dns-adobe.txt +++ b/platforms/dns-adobe.txt @@ -614,4 +614,4 @@ zenyangshoujidubozhengju.adobeaemcloud.com zhanghao.adobeaemcloud.com zhibangyulechengxinyuzenmeyang.adobeaemcloud.com zjj4.adobeaemcloud.com -zoumi.adobeaemcloud.com +zoumi.adobeaemcloud.com \ No newline at end of file diff --git a/platforms/dns-apple.txt b/platforms/dns-apple.txt index 9012c93..8c24713 100644 --- a/platforms/dns-apple.txt +++ b/platforms/dns-apple.txt @@ -597,4 +597,4 @@ www.apple.com.edgekey.net.globalredir.akadns.net xp.apple.com xp.apple.com.edgekey.net xp.itunes-apple.com.akadns.net -xp-daf.apple.com.edgekey.net +xp-daf.apple.com.edgekey.net \ No newline at end of file diff --git a/platforms/dns-bing.txt b/platforms/dns-bing.txt index 064da38..d57e595 100644 --- a/platforms/dns-bing.txt +++ b/platforms/dns-bing.txt @@ -59,4 +59,4 @@ www.bingapis.com www2.bing.com www2-www2.bing.com.trafficmanager.net www-bingapis-com.e-0001.e-msedge.net -www-www.bing.com.trafficmanager.net +www-www.bing.com.trafficmanager.net \ No newline at end of file diff --git a/platforms/dns-facebook.txt b/platforms/dns-facebook.txt index 0170026..991e6ee 100644 --- a/platforms/dns-facebook.txt +++ b/platforms/dns-facebook.txt @@ -77,4 +77,4 @@ z-m.c10r.facebook.com z-p3.c10r.facebook.com z-p3.facebook.com z-p3-graph.facebook.com -z-p42-chat-e2ee-ig.facebook.com +z-p42-chat-e2ee-ig.facebook.com \ No newline at end of file diff --git a/platforms/dns-google.txt b/platforms/dns-google.txt index fb55f53..90310f8 100644 --- a/platforms/dns-google.txt +++ b/platforms/dns-google.txt @@ -219,4 +219,4 @@ gvt3.com news.google.com oo.gl redirector.gvt1.com -withgoogle.com +withgoogle.com \ No newline at end of file diff --git a/platforms/dns-instagram.txt b/platforms/dns-instagram.txt index 515e05b..14fa47c 100644 --- a/platforms/dns-instagram.txt +++ b/platforms/dns-instagram.txt @@ -1,79 +1,79 @@ -a.ns.c10r.instagram.com -a.ns.cdninstagram.com -a.ns.instagram.com -b.ns.c10r.instagram.com -b.ns.cdninstagram.com -b.ns.instagram.com -c.ns.c10r.instagram.com -c.ns.cdninstagram.com -c.ns.instagram.com -c10r.instagram.com -cdninstagram.com -cdninstagram.com -creatorscampusinstagram.net -d.ns.c10r.instagram.com -d.ns.cdninstagram.com -d.ns.instagram.com -fallback.c10r.instagram.com -gateway.instagram.com -geo-p42.instagram.com -graph.instagram.com -hackearinstagram.com -i.instagram.com -i-fallback.instagram.com -instagram.c10r.facebook.com -instagram.c10r.instagram.com -instagram.com -instagram.com -instagram.fala6-1.fna.fbcdn.net -instagram.fbom5-1.fna.fbcdn.net -instagram.fkun2-1.fna.fbcdn.net -instagram.fmad5-1.fna.fbcdn.net -instagram.fopo2-2.fna.fbcdn.net -instagram.frix7-1.fna.fbcdn.net -instagram.frix8-1.fna.fbcdn.net -Instagram.org -instagrambodyguard.com -instagramemailscraper.com -instagrameticaret.com -instagramhub.com -instagrammagazin.com -instagramn.de -instagramphotodownload.cc -instagramscraperbot.com -instagramtelevision.net -instagramthesolution.com -instagramtools.net -instagramverifying.com -ip-instagram.com -l.instagram.com -lookaside.instagram.com -ninstagram.com -platform.instagram.com -scontent.cdninstagram.com -scontent-ams2-1.cdninstagram.com -scontent-ams4-1.cdninstagram.com -scontent-arn2-1.cdninstagram.com -scontent-bru2-1.cdninstagram.com -scontent-cdg4-1.cdninstagram.com -scontent-cdg4-2.cdninstagram.com -scontent-cph2-1.cdninstagram.com -scontent-fra3-1.cdninstagram.com -scontent-fra5-2.cdninstagram.com -scontent-hel3-1.cdninstagram.com -scontent-iad3-1.cdninstagram.com -scontent-iad3-2.cdninstagram.com -scontent-lga3-1.cdninstagram.com -scontent-lga3-2.cdninstagram.com -scontent-mad1-1.cdninstagram.com -scontent-sin6-4.cdninstagram.com -scontent-sof1-1.cdninstagram.com -scontent-sof1-2.cdninstagram.com -security-mail-instagram.com -star.fallback.c10r.instagram.com -static.cdninstagram.com -the-instagram-team.com -www.instagram.com -www.instagram.com -www.instagrammarketingexcellence.teemor.com -z-p42-instagram.c10r.instagram.com +a.ns.c10r.instagram.com +a.ns.cdninstagram.com +a.ns.instagram.com +b.ns.c10r.instagram.com +b.ns.cdninstagram.com +b.ns.instagram.com +c.ns.c10r.instagram.com +c.ns.cdninstagram.com +c.ns.instagram.com +c10r.instagram.com +cdninstagram.com +cdninstagram.com +creatorscampusinstagram.net +d.ns.c10r.instagram.com +d.ns.cdninstagram.com +d.ns.instagram.com +fallback.c10r.instagram.com +gateway.instagram.com +geo-p42.instagram.com +graph.instagram.com +hackearinstagram.com +i.instagram.com +i-fallback.instagram.com +instagram.c10r.facebook.com +instagram.c10r.instagram.com +instagram.com +instagram.com +instagram.fala6-1.fna.fbcdn.net +instagram.fbom5-1.fna.fbcdn.net +instagram.fkun2-1.fna.fbcdn.net +instagram.fmad5-1.fna.fbcdn.net +instagram.fopo2-2.fna.fbcdn.net +instagram.frix7-1.fna.fbcdn.net +instagram.frix8-1.fna.fbcdn.net +Instagram.org +instagrambodyguard.com +instagramemailscraper.com +instagrameticaret.com +instagramhub.com +instagrammagazin.com +instagramn.de +instagramphotodownload.cc +instagramscraperbot.com +instagramtelevision.net +instagramthesolution.com +instagramtools.net +instagramverifying.com +ip-instagram.com +l.instagram.com +lookaside.instagram.com +ninstagram.com +platform.instagram.com +scontent.cdninstagram.com +scontent-ams2-1.cdninstagram.com +scontent-ams4-1.cdninstagram.com +scontent-arn2-1.cdninstagram.com +scontent-bru2-1.cdninstagram.com +scontent-cdg4-1.cdninstagram.com +scontent-cdg4-2.cdninstagram.com +scontent-cph2-1.cdninstagram.com +scontent-fra3-1.cdninstagram.com +scontent-fra5-2.cdninstagram.com +scontent-hel3-1.cdninstagram.com +scontent-iad3-1.cdninstagram.com +scontent-iad3-2.cdninstagram.com +scontent-lga3-1.cdninstagram.com +scontent-lga3-2.cdninstagram.com +scontent-mad1-1.cdninstagram.com +scontent-sin6-4.cdninstagram.com +scontent-sof1-1.cdninstagram.com +scontent-sof1-2.cdninstagram.com +security-mail-instagram.com +star.fallback.c10r.instagram.com +static.cdninstagram.com +the-instagram-team.com +www.instagram.com +www.instagram.com +www.instagrammarketingexcellence.teemor.com +z-p42-instagram.c10r.instagram.com \ No newline at end of file diff --git a/platforms/dns-netflix.txt b/platforms/dns-netflix.txt index f6c7c19..05ccbf3 100644 --- a/platforms/dns-netflix.txt +++ b/platforms/dns-netflix.txt @@ -20,4 +20,4 @@ nflxext.com nflximg.com nflximg.net nflxso.net -nflxvideo.net +nflxvideo.net \ No newline at end of file diff --git a/platforms/dns-openai.txt b/platforms/dns-openai.txt index 9fc35d7..9cf4eb5 100644 --- a/platforms/dns-openai.txt +++ b/platforms/dns-openai.txt @@ -40,4 +40,4 @@ tcr9i.chat.openai.com trc9i.chat.openai.com universe.openai.com url3243.email.openai.com -www.openai.com +www.openai.com \ No newline at end of file diff --git a/platforms/dns-tiktok.txt b/platforms/dns-tiktok.txt index e52a148..af8ed6c 100644 --- a/platforms/dns-tiktok.txt +++ b/platforms/dns-tiktok.txt @@ -1,4 +1,4 @@ -abtest-sg-tiktok.byteoversea.com +abtest-sg-tiktok.byteoversea.com abtest-va-tiktok.byteoversea.com analytics.tiktok.com analytics.tiktok.com.bytewlb.akadns.net @@ -250,4 +250,4 @@ widget-sg.tiktokv.com.edgekey.net www.tiktok.com www.tiktok.com.edgesuite.net www-useast1a.tiktok.com.edgekey.net -xdevice-api.tiktokv.com.edgekey.net +xdevice-api.tiktokv.com.edgekey.net \ No newline at end of file diff --git a/platforms/dns-ttruckers.txt b/platforms/dns-ttruckers.txt index 7bc2be9..b53cb9a 100644 --- a/platforms/dns-ttruckers.txt +++ b/platforms/dns-ttruckers.txt @@ -17,4 +17,4 @@ torrentz2eu.org www.limetorrents.info www.pirateproxy-bay.com www.torlock.com -www.torrentdownloads.me +www.torrentdownloads.me \ No newline at end of file diff --git a/platforms/dns-twitter.txt b/platforms/dns-twitter.txt index 59000c1..aa58006 100644 --- a/platforms/dns-twitter.txt +++ b/platforms/dns-twitter.txt @@ -86,4 +86,4 @@ twtrdns.net twttr.com video.twimg.com vxtwitter.com -x.com +x.com \ No newline at end of file diff --git a/platforms/dns-youtube.txt b/platforms/dns-youtube.txt index 148513f..7f2ac5f 100644 --- a/platforms/dns-youtube.txt +++ b/platforms/dns-youtube.txt @@ -82,4 +82,4 @@ youtube-ui.l.google.com yt3.ggpht.com yt3.googleusercontent.com ytimg.com -ytimg.l.google.com +ytimg.l.google.com \ No newline at end of file