From 303c58320142d6162ad2648c2928783f52997438 Mon Sep 17 00:00:00 2001 From: sundowndev Date: Tue, 19 Feb 2019 14:21:11 +0100 Subject: [PATCH 1/3] Fix: country name for OVH scan --- phoneinfoga.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/phoneinfoga.py b/phoneinfoga.py index bd5309c..d82a5f9 100644 --- a/phoneinfoga.py +++ b/phoneinfoga.py @@ -202,20 +202,23 @@ def localScan(InputNumber): PhoneNumberObject, phonenumbers.PhoneNumberFormat.E164).replace('+', '') numberCountryCode = phonenumbers.format_number( PhoneNumberObject, phonenumbers.PhoneNumberFormat.INTERNATIONAL).split(' ')[0] + numberCountry = phonenumbers.region_code_for_country_code( + int(numberCountryCode.replace('+', ''))) localNumber = phonenumbers.format_number( PhoneNumberObject, phonenumbers.PhoneNumberFormat.E164).replace(numberCountryCode, '') internationalNumber = phonenumbers.format_number( PhoneNumberObject, phonenumbers.PhoneNumberFormat.INTERNATIONAL) + country = geocoder.country_name_for_number(PhoneNumberObject, "en") + location = geocoder.description_for_number(PhoneNumberObject, "en") + carrierName = carrier.name_for_number(PhoneNumberObject, 'en') + print(code_result + 'International format: {}'.format(internationalNumber)) print(code_result + 'Local format: 0{}'.format(localNumber)) - print(code_result + 'Country found: {} ({})'.format( - geocoder.country_name_for_number(PhoneNumberObject, "en"), numberCountryCode)) - print(code_result + 'City/Area: {}'.format( - geocoder.description_for_number(PhoneNumberObject, "en"))) - print(code_result + - 'Carrier: {}'.format(carrier.name_for_number(PhoneNumberObject, 'en'))) + print(code_result + 'Country found: {} ({})'.format(country, numberCountryCode)) + print(code_result + 'City/Area: {}'.format(location)) + print(code_result + 'Carrier: {}'.format(carrierName)) for timezoneResult in timezone.time_zones_for_number(PhoneNumberObject): print(code_result + 'Timezone: {}'.format(timezoneResult)) @@ -544,17 +547,17 @@ def askForExit(): def scanNumber(InputNumber): - print(code_title + - "[!] ---- Fetching informations for {} ---- [!]".format(formatNumber(InputNumber))) - - localScan(InputNumber) - global number global localNumber global internationalNumber global numberCountryCode global numberCountry + print(code_title + + "[!] ---- Fetching informations for {} ---- [!]".format(formatNumber(InputNumber))) + + localScan(InputNumber) + if not number: print((code_error + "Error: number {} is not valid. Skipping.".format(formatNumber(InputNumber)))) sys.exit() From f020a1ec853eba1d18485523fea21f6d120452cc Mon Sep 17 00:00:00 2001 From: Raphael Date: Tue, 19 Feb 2019 14:59:02 +0100 Subject: [PATCH 2/3] Version --- phoneinfoga.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoneinfoga.py b/phoneinfoga.py index d82a5f9..9736727 100644 --- a/phoneinfoga.py +++ b/phoneinfoga.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -__version__ = 'v1.0.0' +__version__ = 'v1.0.1' try: import sys From e02b4edaeb1c93350d128a1f0b2f0e8d44cf2423 Mon Sep 17 00:00:00 2001 From: Raphael Date: Tue, 19 Feb 2019 15:04:28 +0100 Subject: [PATCH 3/3] Remove useless .replace() --- phoneinfoga.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/phoneinfoga.py b/phoneinfoga.py index 9736727..5750ecf 100644 --- a/phoneinfoga.py +++ b/phoneinfoga.py @@ -202,8 +202,7 @@ def localScan(InputNumber): PhoneNumberObject, phonenumbers.PhoneNumberFormat.E164).replace('+', '') numberCountryCode = phonenumbers.format_number( PhoneNumberObject, phonenumbers.PhoneNumberFormat.INTERNATIONAL).split(' ')[0] - numberCountry = phonenumbers.region_code_for_country_code( - int(numberCountryCode.replace('+', ''))) + numberCountry = phonenumbers.region_code_for_country_code(int(numberCountryCode)) localNumber = phonenumbers.format_number( PhoneNumberObject, phonenumbers.PhoneNumberFormat.E164).replace(numberCountryCode, '')