Update Jarvis2_4windows.py

Jarvis2_4windows.py

@@ -20,7 +20,12 @@ voices = engine.getProperty("voices")
 engine.setProperty("voice", voices[0].id)
 
 
+<<<<<<< HEAD
+# this funcition checks wich search engine is selected in config file.
+def search_engine_selector():
+=======
 def search_engine_selector():  # this funcition checks which search engine is selected in config file.
+>>>>>>> 05cd5b49df1eb083cc6e39fb9b246fd6630aa75f
     if config['DEFAULT']['search_engine'] == 'Google':
         return "https://www.google.com"
     elif config['DEFAULT']['search_engine'] == 'Bing':
@@ -29,27 +34,38 @@ def search_engine_selector():  # this funcition checks which search engine is se
         return "https://www.duckduckgo.com"
     elif config['DEFAULT']['search_engine'] == 'Youtube':
         return "https://www.youtube.com"
-    else:  #If none of default ones selected it tries to use https://{config['DEFAULT']['search_engine'].lower()}.com as search engine. 
+    else:
-        #if its a valid url, it returns it as the search engine.
+        # If none of default ones selected
         try:
-            if requests.get(f"https://{config['DEFAULT']['search_engine'].lower()}.com", params= {'q':'example'}).status_code == 200:
+            if requests.get(
-                return f"https://{config['DEFAULT']['search_engine'].lower()}.com"
+                f"https://{config['DEFAULT']['search_engine'].lower()}.com",
+                params={'q': 'example'}
+            ).status_code == 200:
+                return (
+                    f"https://{config['DEFAULT']['search_engine'].lower()}.com"
+                )
+            else:
+                return "https://www.google.com"
+        except Exception as e:
+            print(e)
+            return "https://www.google.com"
 
-            else: return "https://www.google.com"
-        except: return "https://www.google.com"
 
 def open_url(url):
     webbrowser.open(url)
     chrome_path = r"open -a /Applications/Google\ Chrome.app %s"
     webbrowser.get(chrome_path).open(url)
 
+
 def search(search_query, search_engine):
     open_url(f"{search_engine}/search?q={search_query}")
 
+
 def speak(text):
     engine.say(text)
     engine.runAndWait()
 
+
 def wishMe(MASTER):
     hour = datetime.datetime.now().hour
     # print(hour)
@@ -64,6 +80,7 @@ def wishMe(MASTER):
 
     # speak("Hey I am Jarvis. How may I help you")
 
+
 def main():
     MASTER = config['DEFAULT']['MASTER']
 
@@ -86,29 +103,29 @@ def main():
         def takeCommand():
             r = sr.Recognizer()
             with sr.Microphone() as source:
-                if debug == "True":print("Listening....")
+                print("Listening....")
-                else:pass
                 r.pause_threshold = 0.5
                 audio = r.listen(source)
 
             query = " "
             try:
-                if debug == "True":print("Recognizing....")
+                print("Recognizing....")
-                else:pass
                 query = r.recognize_google(audio, language="en-in")
-                if debug == "True":print("user said: " + query)
+                print("user said: " + query)
-                else:pass
 
             except sr.UnknownValueError:
-                if debug == "True":print("Sorry Could You please try again")
+                if debug == "True":
-                else:pass
+                    print("Sorry Could You please try again")
+                else:
+                    pass
                 speak("Sorry Could You please try again")
 
             except Exception as e:
                 if debug == "True":
                     print(e)
                     print("Say That Again Please")
-                else:pass
+                else:
+                    pass
                 query = None
 
             return query
@@ -123,8 +140,10 @@ def main():
             speak("Searching wikipedia....")
             query = query.replace("wikipedia", "")
             results = wikipedia.summary(query, sentences=2)
-            if debug == "True":print(results)
+            if debug == "True":
-            else:pass
+                print(results)
+            else:
+                pass
             speak(results)
 
         elif "what's up" in query or "how are you" in query:
@@ -141,16 +160,17 @@ def main():
             try:
                 open_url(popular_websites[website])
             except KeyError:  # If the website is unknown
-                if debug == "True":print(f"Unknown website: {website}")
+                if debug == "True":
-                else:pass
+                    print(f"Unknown website: {website}")
+                else:
+                    pass
                 speak(f"Sorry, i don't know the website {website}")
                 speak(f"¿Do you want me to search {website} in the web?")
                 if takeCommand() == "yes":
-                    search(website, search_engine )
+                    search(website, search_engine)
                 else:
                     pass
 
-
         elif "search" in query.lower():
             search_query = query.split("for")[-1]
             search(search_query, search_engine)
@@ -164,15 +184,17 @@ def main():
                     speak("What should I say? ")
                     content = takeCommand()
 
-                    server = smtplib.SMTP(config['EMAIL']['server'], config['EMAIL']['port'])
+                    email = config['EMAIL']
+                    server = smtplib.SMTP(email['server'], email['port'])
                     server.ehlo()
                     server.starttls()
-                    server.login(config['EMAIL']['username'], config['EMAIL']['password'])
+                    server.login(email['username'], email['password'])
-                    server.sendmail(config['EMAIL']['username'], recipient, content)
+                    server.sendmail(email['username'], recipient, content)
                     server.close()
                     speak("Email sent!")
                 except Exception:
-                    speak("Sorry Sir! I am unable to send your message at this moment!")
+                    speak("Sorry Sir!")
+                    speak("I am unable to send your message at this moment!")
 
         elif "nothing" in query or "abort" in query or "stop" in query:
             speak("okay")
@@ -197,7 +219,6 @@ def main():
             except Exception as e:
                 speak(e)
 
-
         elif "pause music" in query:
             mixer.music.pause()
 
@@ -209,9 +230,21 @@ def main():
 
         speak("Next Command! Sir!")
 
+<<<<<<< HEAD
+
+if os.path.isfile('./config.ini'):  # Checks if config.ini exists.
+    config = configparser.ConfigParser()  # if exists loads library.
+    config.read('config.ini')  # and also the file.
+    main()  # Then launchs the main program
+else:
+    # if it doesn't exist it drops an error message and exits.
+    print('You need a config.ini file.')
+    print('Check the documentation in the Github Repository.')
+=======
 if os.path.isfile('./config.ini'): #Checks if config.ini exists.
     config = configparser.ConfigParser() #if exists loads library.
     config.read('config.ini') #and also the file.
     main() #Then launches the main program
 else:
     print('You need a config.ini file. Check the documentation in the Github Repository.') #if it doesn't exist it drops an error message and exits.
+>>>>>>> 05cd5b49df1eb083cc6e39fb9b246fd6630aa75f