diff --git a/Address Validator/AddressValidator.py b/Address Validator/AddressValidator.py index 0dc49be1..6f99905c 100644 --- a/Address Validator/AddressValidator.py +++ b/Address Validator/AddressValidator.py @@ -1,16 +1,16 @@ -def addressVal(address): - dot = address.find(".") - at = address.find("@") - if (dot == -1): - print("Invalid") - elif (at == -1): - print("Invalid") - else: +import re + + +def addressVal(address: str) -> None: + address_pattern: str = r"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$" + if re.fullmatch(address_pattern, address): print("Valid") + else: + print("Invalid") -print("This program will decide if your input is a valid email address") -while(True): - print("A valid email address needs an '@' symbol and a '.'") - x = input("Input your email address:") - addressVal(x) +print("This program will decide if your input is a valid email address") +while True: + print("A valid email address should look like 'example@gmail.com'") + address = input("Input your email address:") + addressVal(address) diff --git a/Email Slicer/EmailSlicer.py b/Email Slicer/EmailSlicer.py index 54171bcf..d6e70db0 100644 --- a/Email Slicer/EmailSlicer.py +++ b/Email Slicer/EmailSlicer.py @@ -13,8 +13,7 @@ def isValidEmail(email): email = input("Enter your email id - ") if isValidEmail(email): - username = email[0:email.index('@')] - domain = email[email.index('@')+1: ] + username, domain = email.split('@') print("Username - ", username) print("Domain - ", domain) else: diff --git a/NASA_Image_Extraction/Astro_Images/2022-11-25_NGC 6744: Extragalactic Close-Up.mp3 b/NASA_Image_Extraction/Astro_Images/2022-11-25_NGC 6744: Extragalactic Close-Up.mp3 deleted file mode 100644 index f5611fcf..00000000 Binary files a/NASA_Image_Extraction/Astro_Images/2022-11-25_NGC 6744: Extragalactic Close-Up.mp3 and /dev/null differ diff --git a/NASA_Image_Extraction/Astro_Images/2022-11-25_NGC_6744__Extragalactic_Close-Up.mp3 b/NASA_Image_Extraction/Astro_Images/2022-11-25_NGC_6744__Extragalactic_Close-Up.mp3 new file mode 100644 index 00000000..e69de29b