From ef9defa759e2dbdb76e144ced02a57513dc80d14 Mon Sep 17 00:00:00 2001
From: TallGorilla <24dasemu@gmail.com>
Date: Wed, 6 Oct 2021 21:48:16 +0200
Subject: [PATCH 01/26] windows version upgraded.

Organized code, added config file and config reading,  fixed 2 bugs and added a debug mode in wich you can type commands in the console instead of saying them.
---
 Jarvis2_4windows.py | 326 ++++++++++++++++++++++++--------------------
 config.ini          |  13 ++
 2 files changed, 194 insertions(+), 145 deletions(-)
 create mode 100644 config.ini

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index bb9aa14..c879f8d 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -9,166 +9,202 @@
 import wikipedia
 from pygame import mixer
 
-mixer.init()
+import configparser
+import os
 
-print("Initializing Jarvis....")
-MASTER = "Tony Stark"
+mixer.init()
 
 engine = pyttsx3.init("sapi5")
 voices = engine.getProperty("voices")
 engine.setProperty("voice", voices[0].id)
-popular_websites = {
-    "google": "https://www.google.com",
-    "youtube": "https://www.youtube.com",
-    "wikipedia": "https://www.wikipedia.org",
-    "amazon": "https://www.amazon.com",
-}
-search_engines = {
-    "google": "https://www.google.com",
-    "youtube": "https://www.youtube.com",
-    "bing": "https://www.bing.com",
-}
 
+def search_engine_selector():
+    
+    if config['DEFAULT']['search_engine'] == 'Google':
+        return "https://www.google.com"
+    elif config['DEFAULT']['search_engine'] == 'Bing':
+        return "https://www.bing.com"
+    elif config['DEFAULT']['search_engine'] == 'DuckDuckGo':
+        return "https://www.duckduckgo.com"
+    elif config['DEFAULT']['search_engine'] == 'Youtube':
+        return "https://www.youtube.com"
+    else: 
+        return f"https://www.{config['DEFAULT']['search_engine'].lower()}.com"
 
 def open_url(url):
-    webbrowser.open(url)
-    chrome_path = r"open -a /Applications/Google\ Chrome.app %s"
-    webbrowser.get(chrome_path).open(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):
-    try:
-        open_url(f"{search_engines[search_engine]}/search?q={search_query}")
-    except IndexError:
-        open_url(f"https://www.google.com/search?q={search_query}")
-
+    open_url(f"{search_engine}/search?q={search_query}")
 
 def speak(text):
-    engine.say(text)
-    engine.runAndWait()
+        engine.say(text)
+        engine.runAndWait()
+
+def wishMe(MASTER):
+        hour = datetime.datetime.now().hour
+        # print(hour)
+        if hour >= 0 and hour < 12:
+            speak("Good Morning" + MASTER)
+
+        elif hour >= 12 and hour < 18:
+            speak("Good Afternoon" + MASTER)
+
+        else:
+            speak("Good Evening" + MASTER)
+
+        # speak("Hey I am Jarvis. How may I help you")
+
+def main():
+    MASTER = config['DEFAULT']['MASTER']
 
+    popular_websites = {
+        "google": "https://www.google.com",
+        "youtube": "https://www.youtube.com",
+        "wikipedia": "https://www.wikipedia.org",
+        "amazon": "https://www.amazon.com",
+    }
 
-def wishMe():
-    hour = datetime.datetime.now().hour
-    # print(hour)
-    if hour >= 0 and hour < 12:
-        speak("Good Morning" + MASTER)
+    search_engine = search_engine_selector()
 
-    elif hour >= 12 and hour < 18:
-        speak("Good Afternoon" + MASTER)
+    debug = config['DEFAULT']['debug']
 
+    if debug == "True":
+        def takeCommand():
+            query = input("Command |--> ")
+            return query
     else:
-        speak("Good Evening" + MASTER)
-
-    # speak("Hey I am Jarvis. How may I help you")
-
-
-# This is where our programme begins....
-def takeCommand():
-    r = sr.Recognizer()
-    with sr.Microphone() as source:
-        print("Listening....")
-        r.pause_threshold = 0.5
-        audio = r.listen(source)
-
-    query = " "
-    try:
-        print("Recognizing....")
-        query = r.recognize_google(audio, language="en-in")
-        print("user said: " + query)
-
-    except sr.UnknownValueError:
-        print("Sorry Could You please try again")
-
-    except Exception as e:
-        print(e)
-        print("Say That Again Please")
-        query = None
-
-    return query
-
-
-speak("Initializing Jarvis....")
-wishMe()
-while True:
-    query = takeCommand()
-
-    # logic for executing basic tasks
-    if "wikipedia" in query.lower():
-        speak("Searching wikipedia....")
-        query = query.replace("wikipedia", "")
-        results = wikipedia.summary(query, sentences=2)
-        print(results)
-        speak(results)
-
-    elif "what's up" in query or "how are you" in query:
-        stMsgs = [
-            "Just doing my thing!",
-            "I am fine!",
-            "Nice!",
-            "I am nice and full of energy",
-        ]
-        speak(random.choice(stMsgs))
-
-    elif "open" in query.lower():
-        website = query.replace("open", "").strip().lower()
-        try:
-            open_url(popular_websites[website])
-        except IndexError:  # If the website is unknown
-            print(f"Unknown website: {website}")
-            speak(f"Sorry, i don't know the website {website}")
-
-    elif "search" in query.lower():
-        search_query = query.split("for")[-1]
-        search_engine = query.split("for")[0].replace("search", "").strip().lower()
-        search(search_query, search_engine)
-
-    elif "mail" in query:
-        speak("Who is the recipient? ")
-        recipient = takeCommand()
-
-        if "me" in recipient:
+        def takeCommand():
+            r = sr.Recognizer()
+            with sr.Microphone() as source:
+                if debug == "True":print("Listening....")
+                else:pass
+                r.pause_threshold = 0.5
+                audio = r.listen(source)
+
+            query = " "
             try:
-                speak("What should I say? ")
-                content = takeCommand()
-
-                server = smtplib.SMTP("smtp.gmail.com", 587)
-                server.ehlo()
-                server.starttls()
-                server.login("Your_Username", "Your_Password")
-                server.sendmail("Your_Username", "Recipient_Username", content)
-                server.close()
-                speak("Email sent!")
-            except Exception:
-                speak("Sorry Sir! I am unable to send your message at this moment!")
-
-    elif "nothing" in query or "abort" in query or "stop" in query:
-        speak("okay")
-        speak("Bye Sir, have a good day.")
-        sys.exit()
-
-    elif "hello" in query:
-        speak("Hello Sir")
-
-    elif "bye" in query:
-        speak("Bye Sir, have a good day.")
-        sys.exit()
-
-    elif "play music" in query:
-        music_folder = "Your_music_folder_path(absolute_path)"
-        music = ("music1", "music2", "music3", "music4")
-        random_music = music_folder + random.choice(music) + ".mp3"
-        speak("Playing your request")
-        mixer.music.load(random_music)
-        mixer.music.play()
-
-    elif "pause music" in query:
-        mixer.music.pause()
-
-    elif "stop music" in query:
-        mixer.music.stop()
-
-    elif "unpause" in query:
-        mixer.music.unpause()
-
-    speak("Next Command! Sir!")
+                if debug == "True":print("Recognizing....")
+                else:pass
+                query = r.recognize_google(audio, language="en-in")
+                if debug == "True":print("user said: " + query)
+                else:pass
+
+            except sr.UnknownValueError:
+                if debug == "True":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
+                query = None
+
+            return query
+
+    speak("Initializing Jarvis....")
+    wishMe(MASTER)
+    while True:
+        query = takeCommand()
+
+        # logic for executing basic tasks
+        if "wikipedia" in query.lower():
+            speak("Searching wikipedia....")
+            query = query.replace("wikipedia", "")
+            results = wikipedia.summary(query, sentences=2)
+            if debug == "True":print(results)
+            else:pass
+            speak(results)
+
+        elif "what's up" in query or "how are you" in query:
+            stMsgs = [
+                "Just doing my thing!",
+                "I am fine!",
+                "Nice!",
+                "I am nice and full of energy",
+            ]
+            speak(random.choice(stMsgs))
+
+        elif "open" in query.lower():
+            website = query.replace("open", "").strip().lower()
+            try:
+                open_url(popular_websites[website])
+            except KeyError:  # If the website is unknown
+                if debug == "True":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 )
+                else:
+                    pass
+
+
+        elif "search" in query.lower():
+            search_query = query.split("for")[-1]
+            search(search_query, search_engine)
+
+        elif "mail" in query:
+            speak("Who is the recipient? ")
+            recipient = takeCommand()
+
+            if "me" in recipient:
+                try:
+                    speak("What should I say? ")
+                    content = takeCommand()
+
+                    server = smtplib.SMTP(config['EMAIL']['server'], config['EMAIL']['port'])
+                    server.ehlo()
+                    server.starttls()
+                    server.login(config['EMAIL']['username'], config['EMAIL']['password'])
+                    server.sendmail(config['EMAIL']['username'], recipient, content)
+                    server.close()
+                    speak("Email sent!")
+                except Exception:
+                    speak("Sorry Sir! I am unable to send your message at this moment!")
+
+        elif "nothing" in query or "abort" in query or "stop" in query:
+            speak("okay")
+            speak("Bye Sir, have a good day.")
+            sys.exit()
+
+        elif "hello" in query:
+            speak("Hello Sir")
+
+        elif "bye" in query:
+            speak("Bye Sir, have a good day.")
+            sys.exit()
+
+        elif "play music" in query:
+            try:
+                music_folder = "Your_music_folder_path(absolute_path)"
+                music = ("music1", "music2", "music3", "music4")
+                random_music = music_folder + random.choice(music) + ".mp3"
+                speak("Playing your request")
+                mixer.music.load(random_music)
+                mixer.music.play()
+            except Exception as e:
+                speak(e)
+
+
+        elif "pause music" in query:
+            mixer.music.pause()
+
+        elif "stop music" in query:
+            mixer.music.stop()
+
+        elif "unpause" in query:
+            mixer.music.unpause()
+
+        speak("Next Command! Sir!")
+
+if os.path.isfile('./config.ini'):
+    config = configparser.ConfigParser()
+    config.read('config.ini')
+    main()
+else:
+    print('You need a config.ini file. Check the documentation in the Github Repository.')
\ No newline at end of file
diff --git a/config.ini b/config.ini
new file mode 100644
index 0000000..6799f7f
--- /dev/null
+++ b/config.ini
@@ -0,0 +1,13 @@
+[DEFAULT]
+MASTER = YourName
+search_engine = Google 
+                #Google/Bing/DuckDuckGo/Youtube
+debug = True
+        #True/False
+[EMAIL]
+server = smtp.gmail.com
+         #You can use any email service provider that allows SMTP. Check docs to see how to configure your email provider here.
+port = 587
+       #In most cases you will need this port.
+username = 
+password = 

From 750a84706d2902c58d1a3b42bb0dd3d2d00b9df6 Mon Sep 17 00:00:00 2001
From: TallGorilla <24dasemu@gmail.com>
Date: Wed, 6 Oct 2021 22:12:24 +0200
Subject: [PATCH 02/26] Update Jarvis2_4windows.py

---
 Jarvis2_4windows.py | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index c879f8d..5ae7edc 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -3,14 +3,15 @@
 import smtplib
 import sys
 import webbrowser
-
 import pyttsx3
-import speech_recognition as sr
 import wikipedia
-from pygame import mixer
-
 import configparser
 import os
+import requests
+
+import speech_recognition as sr
+
+from pygame import mixer
 
 mixer.init()
 
@@ -18,8 +19,8 @@
 voices = engine.getProperty("voices")
 engine.setProperty("voice", voices[0].id)
 
-def search_engine_selector():
-    
+
+def search_engine_selector():  # this funcition checks wich search engine is selected in config file.
     if config['DEFAULT']['search_engine'] == 'Google':
         return "https://www.google.com"
     elif config['DEFAULT']['search_engine'] == 'Bing':
@@ -28,8 +29,14 @@ def search_engine_selector():
         return "https://www.duckduckgo.com"
     elif config['DEFAULT']['search_engine'] == 'Youtube':
         return "https://www.youtube.com"
-    else: 
-        return f"https://www.{config['DEFAULT']['search_engine'].lower()}.com"
+    else:  #If none of default ones selected it tries to use https://{config['DEFAULT']['search_engine'].lower()}.com as search engine. 
+        #if its a valid url, it returns it as the search engine.
+        try:
+            if requests.get(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: return "https://www.google.com"
 
 def open_url(url):
         webbrowser.open(url)
@@ -202,9 +209,9 @@ def takeCommand():
 
         speak("Next Command! Sir!")
 
-if os.path.isfile('./config.ini'):
-    config = configparser.ConfigParser()
-    config.read('config.ini')
-    main()
+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:
-    print('You need a config.ini file. Check the documentation in the Github Repository.')
\ No newline at end of file
+    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.
\ No newline at end of file

From a378db0ab6dcdf3380119a5e4c68f1c7efae7f99 Mon Sep 17 00:00:00 2001
From: Dasemu <24dasemu@gmail.com>
Date: Wed, 6 Oct 2021 22:23:57 +0200
Subject: [PATCH 03/26] Update Jarvis2_4windows.py

---
 Jarvis2_4windows.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index 5ae7edc..22428fd 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -20,7 +20,7 @@
 engine.setProperty("voice", voices[0].id)
 
 
-def search_engine_selector():  # this funcition checks wich search engine is selected in config file.
+def search_engine_selector():  # this funcition checks which search engine is selected in config file.
     if config['DEFAULT']['search_engine'] == 'Google':
         return "https://www.google.com"
     elif config['DEFAULT']['search_engine'] == 'Bing':
@@ -212,6 +212,6 @@ def takeCommand():
 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
+    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.
\ No newline at end of file
+    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.

From d6004eac289a6c276c83c5af77b4dda673cce683 Mon Sep 17 00:00:00 2001
From: TallGorilla <24dasemu@gmail.com>
Date: Thu, 7 Oct 2021 16:05:57 +0200
Subject: [PATCH 04/26] Improving Code to met flake 8 requirements

---
 Jarvis2_4windows.py | 114 ++++++++++++++++++++++++++------------------
 config.ini          |   4 +-
 2 files changed, 69 insertions(+), 49 deletions(-)

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index 5ae7edc..6c326ea 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -20,7 +20,8 @@
 engine.setProperty("voice", voices[0].id)
 
 
-def search_engine_selector():  # this funcition checks wich search engine is selected in config file.
+# this funcition checks wich search engine is selected in config file.
+def search_engine_selector():
     if config['DEFAULT']['search_engine'] == 'Google':
         return "https://www.google.com"
     elif config['DEFAULT']['search_engine'] == 'Bing':
@@ -29,40 +30,52 @@ def search_engine_selector():  # this funcition checks wich search engine is sel
         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. 
-        #if its a valid url, it returns it as the search engine.
+    else:
+        # If none of default ones selected
         try:
-            if requests.get(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: return "https://www.google.com"
+            if requests.get(
+                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"
+
 
 def open_url(url):
-        webbrowser.open(url)
-        chrome_path = r"open -a /Applications/Google\ Chrome.app %s"
-        webbrowser.get(chrome_path).open(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()
+    engine.say(text)
+    engine.runAndWait()
+
 
 def wishMe(MASTER):
-        hour = datetime.datetime.now().hour
-        # print(hour)
-        if hour >= 0 and hour < 12:
-            speak("Good Morning" + MASTER)
+    hour = datetime.datetime.now().hour
+    # print(hour)
+    if hour >= 0 and hour < 12:
+        speak("Good Morning" + MASTER)
 
-        elif hour >= 12 and hour < 18:
-            speak("Good Afternoon" + MASTER)
+    elif hour >= 12 and hour < 18:
+        speak("Good Afternoon" + MASTER)
 
-        else:
-            speak("Good Evening" + MASTER)
+    else:
+        speak("Good Evening" + MASTER)
+
+    # speak("Hey I am Jarvis. How may I help you")
 
-        # speak("Hey I am Jarvis. How may I help you")
 
 def main():
     MASTER = config['DEFAULT']['MASTER']
@@ -86,29 +99,29 @@ def takeCommand():
         def takeCommand():
             r = sr.Recognizer()
             with sr.Microphone() as source:
-                if debug == "True":print("Listening....")
-                else:pass
+                print("Listening....")
                 r.pause_threshold = 0.5
                 audio = r.listen(source)
 
             query = " "
             try:
-                if debug == "True":print("Recognizing....")
-                else:pass
+                print("Recognizing....")
                 query = r.recognize_google(audio, language="en-in")
-                if debug == "True":print("user said: " + query)
-                else:pass
+                print("user said: " + query)
 
             except sr.UnknownValueError:
-                if debug == "True":print("Sorry Could You please try again")
-                else:pass
+                if debug == "True":
+                    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 +136,10 @@ def takeCommand():
             speak("Searching wikipedia....")
             query = query.replace("wikipedia", "")
             results = wikipedia.summary(query, sentences=2)
-            if debug == "True":print(results)
-            else:pass
+            if debug == "True":
+                print(results)
+            else:
+                pass
             speak(results)
 
         elif "what's up" in query or "how are you" in query:
@@ -141,16 +156,17 @@ def takeCommand():
             try:
                 open_url(popular_websites[website])
             except KeyError:  # If the website is unknown
-                if debug == "True":print(f"Unknown website: {website}")
-                else:pass
+                if debug == "True":
+                    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 +180,17 @@ def takeCommand():
                     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.sendmail(config['EMAIL']['username'], recipient, content)
+                    server.login(email['username'], email['password'])
+                    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 +215,6 @@ def takeCommand():
             except Exception as e:
                 speak(e)
 
-
         elif "pause music" in query:
             mixer.music.pause()
 
@@ -209,9 +226,12 @@ def takeCommand():
 
         speak("Next Command! Sir!")
 
-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
+
+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:
-    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.
\ No newline at end of file
+    # 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.')
diff --git a/config.ini b/config.ini
index 6799f7f..e4e5d32 100644
--- a/config.ini
+++ b/config.ini
@@ -1,8 +1,8 @@
 [DEFAULT]
 MASTER = YourName
-search_engine = Google 
+search_engine = Google
                 #Google/Bing/DuckDuckGo/Youtube
-debug = True
+debug = False
         #True/False
 [EMAIL]
 server = smtp.gmail.com

From 8acc3da1349edc0dc73f967ab33bf6e97aac5f63 Mon Sep 17 00:00:00 2001
From: TallGorilla <24dasemu@gmail.com>
Date: Thu, 7 Oct 2021 16:09:11 +0200
Subject: [PATCH 05/26] Update Jarvis2_4windows.py

---
 Jarvis2_4windows.py | 115 ++++++++++++++++++++++++++++----------------
 1 file changed, 74 insertions(+), 41 deletions(-)

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index 22428fd..b7199ee 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -20,7 +20,12 @@
 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,40 +34,52 @@ 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. 
-        #if its a valid url, it returns it as the search engine.
+    else:
+        # If none of default ones selected
         try:
-            if requests.get(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: return "https://www.google.com"
+            if requests.get(
+                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"
+
 
 def open_url(url):
-        webbrowser.open(url)
-        chrome_path = r"open -a /Applications/Google\ Chrome.app %s"
-        webbrowser.get(chrome_path).open(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()
+    engine.say(text)
+    engine.runAndWait()
+
 
 def wishMe(MASTER):
-        hour = datetime.datetime.now().hour
-        # print(hour)
-        if hour >= 0 and hour < 12:
-            speak("Good Morning" + MASTER)
+    hour = datetime.datetime.now().hour
+    # print(hour)
+    if hour >= 0 and hour < 12:
+        speak("Good Morning" + MASTER)
 
-        elif hour >= 12 and hour < 18:
-            speak("Good Afternoon" + MASTER)
+    elif hour >= 12 and hour < 18:
+        speak("Good Afternoon" + MASTER)
 
-        else:
-            speak("Good Evening" + MASTER)
+    else:
+        speak("Good Evening" + MASTER)
+
+    # speak("Hey I am Jarvis. How may I help you")
 
-        # speak("Hey I am Jarvis. How may I help you")
 
 def main():
     MASTER = config['DEFAULT']['MASTER']
@@ -86,29 +103,29 @@ def takeCommand():
         def takeCommand():
             r = sr.Recognizer()
             with sr.Microphone() as source:
-                if debug == "True":print("Listening....")
-                else:pass
+                print("Listening....")
                 r.pause_threshold = 0.5
                 audio = r.listen(source)
 
             query = " "
             try:
-                if debug == "True":print("Recognizing....")
-                else:pass
+                print("Recognizing....")
                 query = r.recognize_google(audio, language="en-in")
-                if debug == "True":print("user said: " + query)
-                else:pass
+                print("user said: " + query)
 
             except sr.UnknownValueError:
-                if debug == "True":print("Sorry Could You please try again")
-                else:pass
+                if debug == "True":
+                    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 takeCommand():
             speak("Searching wikipedia....")
             query = query.replace("wikipedia", "")
             results = wikipedia.summary(query, sentences=2)
-            if debug == "True":print(results)
-            else:pass
+            if debug == "True":
+                print(results)
+            else:
+                pass
             speak(results)
 
         elif "what's up" in query or "how are you" in query:
@@ -141,16 +160,17 @@ def takeCommand():
             try:
                 open_url(popular_websites[website])
             except KeyError:  # If the website is unknown
-                if debug == "True":print(f"Unknown website: {website}")
-                else:pass
+                if debug == "True":
+                    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 takeCommand():
                     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.sendmail(config['EMAIL']['username'], recipient, content)
+                    server.login(email['username'], email['password'])
+                    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 takeCommand():
             except Exception as e:
                 speak(e)
 
-
         elif "pause music" in query:
             mixer.music.pause()
 
@@ -209,9 +230,21 @@ def takeCommand():
 
         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

From 0d19e93b3ccb5362158ede2a1db74e7c3869d32f Mon Sep 17 00:00:00 2001
From: TallGorilla <24dasemu@gmail.com>
Date: Thu, 7 Oct 2021 16:09:43 +0200
Subject: [PATCH 06/26] Update Jarvis2_4windows.py

---
 Jarvis2_4windows.py | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index b7199ee..6c326ea 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -20,12 +20,8 @@
 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':
@@ -230,7 +226,6 @@ def takeCommand():
 
         speak("Next Command! Sir!")
 
-<<<<<<< HEAD
 
 if os.path.isfile('./config.ini'):  # Checks if config.ini exists.
     config = configparser.ConfigParser()  # if exists loads library.
@@ -240,11 +235,3 @@ def takeCommand():
     # 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

From 59fab95aaec81ab49d960215bae0c6e7ec679084 Mon Sep 17 00:00:00 2001
From: TallGorilla <24dasemu@gmail.com>
Date: Thu, 7 Oct 2021 16:11:28 +0200
Subject: [PATCH 07/26] Update Jarvis2_4windows.py

---
 Jarvis2_4windows.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index 6c326ea..6ff373b 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -20,7 +20,7 @@
 engine.setProperty("voice", voices[0].id)
 
 
-# this funcition checks wich search engine is selected in config file.
+# this funcition checks which search engine is selected in config file.
 def search_engine_selector():
     if config['DEFAULT']['search_engine'] == 'Google':
         return "https://www.google.com"
@@ -230,7 +230,7 @@ def takeCommand():
 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
+    main()  # Then it launches the main program
 else:
     # if it doesn't exist it drops an error message and exits.
     print('You need a config.ini file.')

From cb3cb604b15bc1eb2844afaafff9b41bfb175616 Mon Sep 17 00:00:00 2001
From: TallGorilla <24dasemu@gmail.com>
Date: Thu, 7 Oct 2021 16:16:42 +0200
Subject: [PATCH 08/26] Update Jarvis2_4windows.py

---
 Jarvis2_4windows.py | 108 +++++++++++++++++++++++---------------------
 1 file changed, 56 insertions(+), 52 deletions(-)

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index 6ff373b..50eec1b 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -19,6 +19,13 @@
 voices = engine.getProperty("voices")
 engine.setProperty("voice", voices[0].id)
 
+popular_websites = {
+        "google": "https://www.google.com",
+        "youtube": "https://www.youtube.com",
+        "wikipedia": "https://www.wikipedia.org",
+        "amazon": "https://www.amazon.com",
+    }
+
 
 # this funcition checks which search engine is selected in config file.
 def search_engine_selector():
@@ -77,57 +84,7 @@ def wishMe(MASTER):
     # speak("Hey I am Jarvis. How may I help you")
 
 
-def main():
-    MASTER = config['DEFAULT']['MASTER']
-
-    popular_websites = {
-        "google": "https://www.google.com",
-        "youtube": "https://www.youtube.com",
-        "wikipedia": "https://www.wikipedia.org",
-        "amazon": "https://www.amazon.com",
-    }
-
-    search_engine = search_engine_selector()
-
-    debug = config['DEFAULT']['debug']
-
-    if debug == "True":
-        def takeCommand():
-            query = input("Command |--> ")
-            return query
-    else:
-        def takeCommand():
-            r = sr.Recognizer()
-            with sr.Microphone() as source:
-                print("Listening....")
-                r.pause_threshold = 0.5
-                audio = r.listen(source)
-
-            query = " "
-            try:
-                print("Recognizing....")
-                query = r.recognize_google(audio, language="en-in")
-                print("user said: " + query)
-
-            except sr.UnknownValueError:
-                if debug == "True":
-                    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
-                query = None
-
-            return query
-
-    speak("Initializing Jarvis....")
-    wishMe(MASTER)
+def main(search_engine, takeCommand, debug):
     while True:
         query = takeCommand()
 
@@ -227,10 +184,57 @@ def takeCommand():
         speak("Next Command! Sir!")
 
 
+def run():
+    MASTER = config['DEFAULT']['MASTER']
+
+    search_engine = search_engine_selector()
+
+    debug = config['DEFAULT']['debug']
+
+    if debug == "True":
+        def takeCommand():
+            query = input("Command |--> ")
+            return query
+    else:
+        def takeCommand():
+            r = sr.Recognizer()
+            with sr.Microphone() as source:
+                print("Listening....")
+                r.pause_threshold = 0.5
+                audio = r.listen(source)
+
+            query = " "
+            try:
+                print("Recognizing....")
+                query = r.recognize_google(audio, language="en-in")
+                print("user said: " + query)
+
+            except sr.UnknownValueError:
+                if debug == "True":
+                    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
+                query = None
+
+            return query
+
+    speak("Initializing Jarvis....")
+    wishMe(MASTER)
+    main(search_engine, takeCommand, debug)
+
+
 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 it launches the main program
+    run()  # Then it launches the main program
 else:
     # if it doesn't exist it drops an error message and exits.
     print('You need a config.ini file.')

From c11968cd91f11aeda6cbe6cabfa9100f1ac5f544 Mon Sep 17 00:00:00 2001
From: TallGorilla <24dasemu@gmail.com>
Date: Thu, 7 Oct 2021 17:27:42 +0200
Subject: [PATCH 09/26] Changed execution estructure and fixed bugs

---
 Jarvis2_4windows.py                         | 181 +++++---------------
 __pycache__/Jarvis2_4windows.cpython-37.pyc | Bin 0 -> 3577 bytes
 __pycache__/actions.cpython-37.pyc          | Bin 0 -> 1709 bytes
 __pycache__/commands.cpython-37.pyc         | Bin 0 -> 3414 bytes
 actions.py                                  |  64 +++++++
 commands.py                                 | 115 +++++++++++++
 config.ini                                  |   3 +-
 7 files changed, 222 insertions(+), 141 deletions(-)
 create mode 100644 __pycache__/Jarvis2_4windows.cpython-37.pyc
 create mode 100644 __pycache__/actions.cpython-37.pyc
 create mode 100644 __pycache__/commands.cpython-37.pyc
 create mode 100644 actions.py
 create mode 100644 commands.py

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index 50eec1b..8f58f86 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -1,23 +1,27 @@
-import datetime
-import random
-import smtplib
-import sys
-import webbrowser
-import pyttsx3
-import wikipedia
 import configparser
 import os
-import requests
-
 import speech_recognition as sr
 
 from pygame import mixer
 
-mixer.init()
+from actions import search_engine_selector, speak, wishMe
+
+from commands import (
+    command_bye,
+    command_hello,
+    command_mail,
+    command_nothing,
+    command_pauseMusic,
+    command_playMusic,
+    command_stopMusic,
+    command_unpauseMusic,
+    command_whatsup,
+    command_wikipedia,
+    command_open,
+    command_search
+)
 
-engine = pyttsx3.init("sapi5")
-voices = engine.getProperty("voices")
-engine.setProperty("voice", voices[0].id)
+mixer.init()
 
 popular_websites = {
         "google": "https://www.google.com",
@@ -27,159 +31,56 @@
     }
 
 
-# this funcition checks which search engine is selected in config file.
-def search_engine_selector():
-    if config['DEFAULT']['search_engine'] == 'Google':
-        return "https://www.google.com"
-    elif config['DEFAULT']['search_engine'] == 'Bing':
-        return "https://www.bing.com"
-    elif config['DEFAULT']['search_engine'] == 'DuckDuckGo':
-        return "https://www.duckduckgo.com"
-    elif config['DEFAULT']['search_engine'] == 'Youtube':
-        return "https://www.youtube.com"
-    else:
-        # If none of default ones selected
-        try:
-            if requests.get(
-                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"
-
-
-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)
-    if hour >= 0 and hour < 12:
-        speak("Good Morning" + MASTER)
-
-    elif hour >= 12 and hour < 18:
-        speak("Good Afternoon" + MASTER)
-
-    else:
-        speak("Good Evening" + MASTER)
-
-    # speak("Hey I am Jarvis. How may I help you")
-
-
 def main(search_engine, takeCommand, debug):
     while True:
         query = takeCommand()
 
         # logic for executing basic tasks
         if "wikipedia" in query.lower():
-            speak("Searching wikipedia....")
-            query = query.replace("wikipedia", "")
-            results = wikipedia.summary(query, sentences=2)
-            if debug == "True":
-                print(results)
-            else:
-                pass
-            speak(results)
+            command_wikipedia(
+                speak,
+                debug,
+                query
+            )
 
         elif "what's up" in query or "how are you" in query:
-            stMsgs = [
-                "Just doing my thing!",
-                "I am fine!",
-                "Nice!",
-                "I am nice and full of energy",
-            ]
-            speak(random.choice(stMsgs))
+            command_whatsup()
 
         elif "open" in query.lower():
-            website = query.replace("open", "").strip().lower()
-            try:
-                open_url(popular_websites[website])
-            except KeyError:  # If the website is unknown
-                if debug == "True":
-                    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)
-                else:
-                    pass
+            command_open(
+                query,
+                popular_websites,
+                debug,
+                search_engine,
+                takeCommand
+            )
 
         elif "search" in query.lower():
-            search_query = query.split("for")[-1]
-            search(search_query, search_engine)
+            command_search(query, search_engine)
 
         elif "mail" in query:
-            speak("Who is the recipient? ")
-            recipient = takeCommand()
-
-            if "me" in recipient:
-                try:
-                    speak("What should I say? ")
-                    content = takeCommand()
-
-                    email = config['EMAIL']
-                    server = smtplib.SMTP(email['server'], email['port'])
-                    server.ehlo()
-                    server.starttls()
-                    server.login(email['username'], email['password'])
-                    server.sendmail(email['username'], recipient, content)
-                    server.close()
-                    speak("Email sent!")
-                except Exception:
-                    speak("Sorry Sir!")
-                    speak("I am unable to send your message at this moment!")
+            command_mail(takeCommand)
 
         elif "nothing" in query or "abort" in query or "stop" in query:
-            speak("okay")
-            speak("Bye Sir, have a good day.")
-            sys.exit()
+            command_nothing()
 
         elif "hello" in query:
-            speak("Hello Sir")
+            command_hello()
 
         elif "bye" in query:
-            speak("Bye Sir, have a good day.")
-            sys.exit()
+            command_bye()
 
         elif "play music" in query:
-            try:
-                music_folder = "Your_music_folder_path(absolute_path)"
-                music = ("music1", "music2", "music3", "music4")
-                random_music = music_folder + random.choice(music) + ".mp3"
-                speak("Playing your request")
-                mixer.music.load(random_music)
-                mixer.music.play()
-            except Exception as e:
-                speak(e)
+            command_playMusic()
 
         elif "pause music" in query:
-            mixer.music.pause()
+            command_pauseMusic()
 
         elif "stop music" in query:
-            mixer.music.stop()
+            command_stopMusic
 
         elif "unpause" in query:
-            mixer.music.unpause()
+            command_unpauseMusic()
 
         speak("Next Command! Sir!")
 
@@ -187,7 +88,7 @@ def main(search_engine, takeCommand, debug):
 def run():
     MASTER = config['DEFAULT']['MASTER']
 
-    search_engine = search_engine_selector()
+    search_engine = search_engine_selector(config)
 
     debug = config['DEFAULT']['debug']
 
@@ -226,7 +127,7 @@ def takeCommand():
 
             return query
 
-    speak("Initializing Jarvis....")
+    speak(text="Initializing Jarvis....")
     wishMe(MASTER)
     main(search_engine, takeCommand, debug)
 
diff --git a/__pycache__/Jarvis2_4windows.cpython-37.pyc b/__pycache__/Jarvis2_4windows.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c7c10263557dc2096f3acc7e25b339f9a1146b5c
GIT binary patch
literal 3577
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
ZaM$q{c#E<fRDxdy7aMc{oWKj5{{i22$J77-

literal 0
HcmV?d00001

diff --git a/__pycache__/actions.cpython-37.pyc b/__pycache__/actions.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..711448d270f0b2e50ceb891baa9b8c58cc3b3a50
GIT binary patch
literal 1709
zcmZuwOK%%D5GJ_~tyk+ug4C{qq7aG(s2tP+lJrm`eJHVOqlk^5P7r4yKv*pqX)S5F
zCb^L%$i1}JUV8}wSjYa6qKEzhUVHLi=&8e%t;j}Km>JGDBhGLhPZk$_1mBNAGy1xO
z&_71G`W!fX4<rRJiYV@(a4K<#3!Q|dkXC3h>)fVff<uQn=PtG2RDzR7ZC0Xa9UU)B
z2u9SQ?yo5HX^DCu%XESIAOl*a0mwzVNS8n^QGAH1%NGzA9fXdIvg9l6zU4{GWatz!
z#>NOA0WxoR3MBsqHik^s5hXxYmxw#mKAguKz`mgFHLL{KW9nVQ765xr{X;Z-rqD5_
z<q!9slL>l<Xz<=L`6iey|3;22x&r_B{r~+Ak;&o}N;hnz?5;2V#OMrTGzye6#=pSH
z*ePH?<0JGMrQ`@SsKKoRUE1FHq5ksO3%w{=B;rn!rR^kTp}Wg@yT?YW9i=k4RjUmK
zgUxn<ZN|JG+E0?SJ-Rb*Z2?l){OvsM8rtQfyYn6tFhgx#_?2GsT;(k`TAOzoPC?@_
z@~#Xc+vpmfK;KWJe%51EtlcaUQD0vC1%0Wy+7s*~XHrRRwVBdRj}Mp#%Th%um(7?{
zrWbZjW0t9er`pLxlBz1vZp_m+Nn2y~2NKJ0)xTTuR^z2)LN*>eqLFND^EmIbRLRC}
zqW1DuW1GpY;#pnFL`A7;M6tP2Ze~NhdaaC2$$BhST$IiHd=3oZ6>QIwML=K00d~p9
zmIoFOi(BA#Z3Ha<iV^$_4ho&)F`AgR;xh~y8RH3_VWzR<V052nEUkPQRciGt>m_ki
zq*$A_wNZK65xmbfqb#f3lT}Om1J-H@K7eOy+x%55Kqx4Wm5W|jjtlo@7O75AqbXYf
z7wsAECV1TgO}fAk_Tf$9BRIuofy`&54OF~h6%GoGF^oC9<Q;l%6+?QNxnG;s@Vk?5
zs?%GlBn&R=3LO?hVQ#vahdcGS4<=be#lpmy)zPf<td7$Ru4-m#I6+WPlL0<}a=4dk
zV9970`XW#3DSZ_s3Z~9h>{Q(h?#PTq-I|GQax)bW>mX;*O-8fmN1(vkLmwyTn4IA;
zrnu{f4UnXZ#D=n{HAZX5R3)9Fj@SdM4c0xdIx}kkntP=c`IioadFn*~Y!pDhX=R^_
z6qfViwt<!ksQyMVk#e41y6n7V#-(a&k4B2Aq|daK@`1KHJQu}V%&zR$4`1y3BtC_U
zZkE6uB(k&59)U@k*a!z?1uq%0L<RKfvM>n<&#+H`g{5q$lstW??IcZ<SOZL#VRxSk
zm?@!#!c+}5_yeLzLW}h%rmJXhky{a9E+ezYVmh9W`<&)I_N^(3G=2AA#o$MLXwq%V
LyX(20?K%GeXsVNZ

literal 0
HcmV?d00001

diff --git a/__pycache__/commands.cpython-37.pyc b/__pycache__/commands.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..97cea7bd17e75ac7719e2ebe4ec98e7d66f574f3
GIT binary patch
literal 3414
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
MfgiY#P1NrH06Yu~NdN!<

literal 0
HcmV?d00001

diff --git a/actions.py b/actions.py
new file mode 100644
index 0000000..956db21
--- /dev/null
+++ b/actions.py
@@ -0,0 +1,64 @@
+import webbrowser
+import requests
+import datetime
+import pyttsx3
+
+engine = pyttsx3.init("sapi5")
+voices = engine.getProperty("voices")
+engine.setProperty("voice", voices[0].id)
+
+
+def search_engine_selector(config):
+    if config['DEFAULT']['search_engine'] == 'Google':
+        return "https://www.google.com"
+    elif config['DEFAULT']['search_engine'] == 'Bing':
+        return "https://www.bing.com"
+    elif config['DEFAULT']['search_engine'] == 'DuckDuckGo':
+        return "https://www.duckduckgo.com"
+    elif config['DEFAULT']['search_engine'] == 'Youtube':
+        return "https://www.youtube.com"
+    else:
+        # If none of default ones selected
+        try:
+            if requests.get(
+                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"
+
+
+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)
+    if hour >= 0 and hour < 12:
+        speak("Good Morning" + MASTER)
+
+    elif hour >= 12 and hour < 18:
+        speak("Good Afternoon" + MASTER)
+
+    else:
+        speak("Good Evening" + MASTER)
+
+    # speak("Hey I am Jarvis. How may I help you")
diff --git a/commands.py b/commands.py
new file mode 100644
index 0000000..47185f3
--- /dev/null
+++ b/commands.py
@@ -0,0 +1,115 @@
+import wikipedia
+import smtplib
+import sys
+import random
+import configparser
+
+from pygame import mixer
+
+from actions import open_url, search, speak
+
+config = configparser.ConfigParser()  # if exists loads library.
+config.read('config.ini')
+
+
+def command_wikipedia(debug, query):
+    speak("Searching wikipedia....")
+    query = query.replace("wikipedia", "")
+    results = wikipedia.summary(query, sentences=2)
+    if debug == "True":
+        print(results)
+    else:
+        pass
+    speak(results)
+
+
+def command_whatsup():
+    stMsgs = [
+        "Just doing my thing!",
+        "I am fine!",
+        "Nice!",
+        "I am nice and full of energy",
+    ]
+    speak(random.choice(stMsgs))
+
+
+def command_open(query, popular_websites, debug, search_engine, takeCommand):
+    website = query.replace("open", "").strip().lower()
+    try:
+        open_url(popular_websites[website])
+    except KeyError:  # If the website is unknown
+        if debug == "True":
+            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)
+        else:
+            pass
+
+
+def command_search(query, search_engine):
+    search_query = query.split("for")[-1]
+    search(search_query, search_engine)
+
+
+def command_mail(takeCommand):
+    speak("Who is the recipient? ")
+    recipient = takeCommand()
+
+    try:
+        speak("What should I say? ")
+        content = takeCommand()
+
+        email = config['EMAIL']
+        server = smtplib.SMTP(email['server'], email['port'])
+        server.ehlo()
+        server.starttls()
+        server.login(email['username'], email['password'])
+        server.sendmail(email['username'], recipient, content)
+        server.close()
+        speak("Email sent!")
+    except Exception:
+        speak("Sorry Sir!")
+        speak("I am unable to send your message at this moment!")
+
+
+def command_nothing():
+    speak("okay")
+    speak("Bye Sir, have a good day.")
+    sys.exit()
+
+
+def command_hello():
+    speak("Hello Sir")
+
+
+def command_bye():
+    speak("Bye Sir, have a good day.")
+    sys.exit()
+
+
+def command_playMusic():
+    try:
+        music_folder = config['DEFAULT']['musicPath']
+        music = ("music1", "music2", "music3", "music4")
+        random_music = music_folder + random.choice(music) + ".mp3"
+        speak("Playing your request")
+        mixer.music.load(random_music)
+        mixer.music.play()
+    except Exception as e:
+        speak(e)
+
+
+def command_pauseMusic():
+    mixer.music.pause()
+
+
+def command_stopMusic():
+    mixer.music.stop()
+
+
+def command_unpauseMusic():
+    mixer.music.unpause()
diff --git a/config.ini b/config.ini
index e4e5d32..b8f9bd0 100644
--- a/config.ini
+++ b/config.ini
@@ -2,8 +2,9 @@
 MASTER = YourName
 search_engine = Google
                 #Google/Bing/DuckDuckGo/Youtube
-debug = False
+debug = True
         #True/False
+musicPath = 
 [EMAIL]
 server = smtp.gmail.com
          #You can use any email service provider that allows SMTP. Check docs to see how to configure your email provider here.

From 44a2ddf936af94eacca20d701c70466621bfa1e1 Mon Sep 17 00:00:00 2001
From: TallGorilla <24dasemu@gmail.com>
Date: Thu, 7 Oct 2021 17:31:11 +0200
Subject: [PATCH 10/26] fixed imports

---
 Jarvis2_4windows.py | 21 +++++----------------
 actions.py          |  5 +++--
 commands.py         |  6 +++---
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index 8f58f86..0b72dc1 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -1,25 +1,14 @@
 import configparser
 import os
-import speech_recognition as sr
 
+import speech_recognition as sr
 from pygame import mixer
 
 from actions import search_engine_selector, speak, wishMe
-
-from commands import (
-    command_bye,
-    command_hello,
-    command_mail,
-    command_nothing,
-    command_pauseMusic,
-    command_playMusic,
-    command_stopMusic,
-    command_unpauseMusic,
-    command_whatsup,
-    command_wikipedia,
-    command_open,
-    command_search
-)
+from commands import (command_bye, command_hello, command_mail,
+                      command_nothing, command_open, command_pauseMusic,
+                      command_playMusic, command_search, command_stopMusic,
+                      command_unpauseMusic, command_whatsup, command_wikipedia)
 
 mixer.init()
 
diff --git a/actions.py b/actions.py
index 956db21..ab0464a 100644
--- a/actions.py
+++ b/actions.py
@@ -1,7 +1,8 @@
-import webbrowser
-import requests
 import datetime
+import webbrowser
+
 import pyttsx3
+import requests
 
 engine = pyttsx3.init("sapi5")
 voices = engine.getProperty("voices")
diff --git a/commands.py b/commands.py
index 47185f3..34694d6 100644
--- a/commands.py
+++ b/commands.py
@@ -1,9 +1,9 @@
-import wikipedia
+import configparser
+import random
 import smtplib
 import sys
-import random
-import configparser
 
+import wikipedia
 from pygame import mixer
 
 from actions import open_url, search, speak

From f7542a5ae68bb6fc3a8ec325f0e9c69a135311ce Mon Sep 17 00:00:00 2001
From: TallGorilla <24dasemu@gmail.com>
Date: Thu, 7 Oct 2021 17:36:59 +0200
Subject: [PATCH 11/26] Update Jarvis2_4windows.py

---
 Jarvis2_4windows.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index 0b72dc1..22836d3 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -2,7 +2,6 @@
 import os
 
 import speech_recognition as sr
-from pygame import mixer
 
 from actions import search_engine_selector, speak, wishMe
 from commands import (command_bye, command_hello, command_mail,
@@ -10,8 +9,6 @@
                       command_playMusic, command_search, command_stopMusic,
                       command_unpauseMusic, command_whatsup, command_wikipedia)
 
-mixer.init()
-
 popular_websites = {
         "google": "https://www.google.com",
         "youtube": "https://www.youtube.com",

From 1fada104ae1b2c3a803b8c071dd5bd155043ef0c Mon Sep 17 00:00:00 2001
From: TallGorilla <24dasemu@gmail.com>
Date: Thu, 7 Oct 2021 17:38:48 +0200
Subject: [PATCH 12/26] Update Jarvis2_4windows.py

---
 Jarvis2_4windows.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index 22836d3..05088f1 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -4,10 +4,20 @@
 import speech_recognition as sr
 
 from actions import search_engine_selector, speak, wishMe
-from commands import (command_bye, command_hello, command_mail,
-                      command_nothing, command_open, command_pauseMusic,
-                      command_playMusic, command_search, command_stopMusic,
-                      command_unpauseMusic, command_whatsup, command_wikipedia)
+from commands import (
+    command_bye,
+    command_hello,
+    command_mail,
+    command_nothing,
+    command_open,
+    command_pauseMusic,
+    command_playMusic,
+    command_search,
+    command_stopMusic,
+    command_unpauseMusic,
+    command_whatsup,
+    command_wikipedia,
+)
 
 popular_websites = {
         "google": "https://www.google.com",

From 4a06c8fa4c1b1c85ab5f4db2be119459da28eb7d Mon Sep 17 00:00:00 2001
From: Dasemu <24dasemu@gmail.com>
Date: Thu, 7 Oct 2021 17:59:45 +0200
Subject: [PATCH 13/26] Update config.ini

---
 config.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.ini b/config.ini
index b8f9bd0..4c9f381 100644
--- a/config.ini
+++ b/config.ini
@@ -2,7 +2,7 @@
 MASTER = YourName
 search_engine = Google
                 #Google/Bing/DuckDuckGo/Youtube
-debug = True
+debug = False
         #True/False
 musicPath = 
 [EMAIL]

From 4584b6f18c21475d2cea45af174c2d76eec02434 Mon Sep 17 00:00:00 2001
From: Dasemu <24dasemu@gmail.com>
Date: Thu, 7 Oct 2021 20:21:26 +0200
Subject: [PATCH 14/26] Update Jarvis2_4windows.py

Co-authored-by: Christian Clauss <cclauss@me.com>
---
 Jarvis2_4windows.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index 05088f1..76b8a9a 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -73,7 +73,7 @@ def main(search_engine, takeCommand, debug):
             command_pauseMusic()
 
         elif "stop music" in query:
-            command_stopMusic
+            command_stopMusic()
 
         elif "unpause" in query:
             command_unpauseMusic()

From 0682bbe1d3a7079c9dff632a510a41984b51565d Mon Sep 17 00:00:00 2001
From: Dasemu <24dasemu@gmail.com>
Date: Thu, 7 Oct 2021 20:21:48 +0200
Subject: [PATCH 15/26] Update Jarvis2_4windows.py

Co-authored-by: Christian Clauss <cclauss@me.com>
---
 Jarvis2_4windows.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index 76b8a9a..95b91b5 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -33,11 +33,7 @@ def main(search_engine, takeCommand, debug):
 
         # logic for executing basic tasks
         if "wikipedia" in query.lower():
-            command_wikipedia(
-                speak,
-                debug,
-                query
-            )
+            command_wikipedia(speak, debug, query)
 
         elif "what's up" in query or "how are you" in query:
             command_whatsup()

From 76afa5bf537e83456497d0ddb916f92d188be60b Mon Sep 17 00:00:00 2001
From: Dasemu <24dasemu@gmail.com>
Date: Thu, 7 Oct 2021 20:27:30 +0200
Subject: [PATCH 16/26] Update Jarvis2_4windows.py

Co-authored-by: Christian Clauss <cclauss@me.com>
---
 Jarvis2_4windows.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index 95b91b5..39a666e 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -10,11 +10,11 @@
     command_mail,
     command_nothing,
     command_open,
-    command_pauseMusic,
-    command_playMusic,
+    command_pause_music,
+    command_play_music,
     command_search,
-    command_stopMusic,
-    command_unpauseMusic,
+    command_stop_music,
+    command_unpause_music,
     command_whatsup,
     command_wikipedia,
 )

From 38b70f4d2258c92a054685033249c4c7fb926738 Mon Sep 17 00:00:00 2001
From: Dasemu <24dasemu@gmail.com>
Date: Thu, 7 Oct 2021 20:27:39 +0200
Subject: [PATCH 17/26] Update Jarvis2_4windows.py

Co-authored-by: Christian Clauss <cclauss@me.com>
---
 Jarvis2_4windows.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index 39a666e..1c15894 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -29,7 +29,7 @@
 
 def main(search_engine, takeCommand, debug):
     while True:
-        query = takeCommand()
+        query = takeCommand().lower()
 
         # logic for executing basic tasks
         if "wikipedia" in query.lower():

From f2305ab68526e98f9c8e86ef54a94db70d1fb1c5 Mon Sep 17 00:00:00 2001
From: TallGorilla <24dasemu@gmail.com>
Date: Thu, 7 Oct 2021 20:47:16 +0200
Subject: [PATCH 18/26] Included 4th request by cclauss and fixed bugs

now its easier to use commands without arguments
---
 Jarvis2_4windows.py                 |  43 ++++++++++++----------------
 __pycache__/actions.cpython-37.pyc  | Bin 1709 -> 1709 bytes
 __pycache__/commands.cpython-37.pyc | Bin 3414 -> 3418 bytes
 commands.py                         |   8 +++---
 4 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index 1c15894..21281e2 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -31,13 +31,27 @@ def main(search_engine, takeCommand, debug):
     while True:
         query = takeCommand().lower()
 
-        # logic for executing basic tasks
+        # logic for executing commands without arguments
+        phrases = {
+            "what's up": command_whatsup,
+            "nothing": command_nothing,
+            "abort": command_nothing,
+            "stop": command_nothing,
+            "hello": command_hello,
+            "bye": command_bye,
+            "play music": command_play_music,
+            "unpause": command_unpause_music,
+            "pause music": command_pause_music,
+            "stop music": command_stop_music,
+        }
+        for phrase, command in phrases.items():
+            if phrase in query:
+                command()
+
+        # logic for executing commands with arguments
         if "wikipedia" in query.lower():
             command_wikipedia(speak, debug, query)
 
-        elif "what's up" in query or "how are you" in query:
-            command_whatsup()
-
         elif "open" in query.lower():
             command_open(
                 query,
@@ -53,27 +67,6 @@ def main(search_engine, takeCommand, debug):
         elif "mail" in query:
             command_mail(takeCommand)
 
-        elif "nothing" in query or "abort" in query or "stop" in query:
-            command_nothing()
-
-        elif "hello" in query:
-            command_hello()
-
-        elif "bye" in query:
-            command_bye()
-
-        elif "play music" in query:
-            command_playMusic()
-
-        elif "pause music" in query:
-            command_pauseMusic()
-
-        elif "stop music" in query:
-            command_stopMusic()
-
-        elif "unpause" in query:
-            command_unpauseMusic()
-
         speak("Next Command! Sir!")
 
 
diff --git a/__pycache__/actions.cpython-37.pyc b/__pycache__/actions.cpython-37.pyc
index 711448d270f0b2e50ceb891baa9b8c58cc3b3a50..86bdcf1e1198310a911be0fdb98f2824d115358a 100644
GIT binary patch
delta 129
zcmZ3>yOx*NiI<m)0SJ}}#V1-%<h5gD+UT>NiIHbA5A$P2waFitTN!mGm$6hc8f^Z=
z!pvx53RGLn1Jc3B!z94S2g1xn3P8Rle~}E3DiQ(`QS1ekB_+ib#zh=J-egU-LSZHj
VMh+$}MlMDnW)3M1HVzgJRsgRN7Cry~

delta 129
zcmZ3>yOx*NiI<m)0SLT!;u9?=^4c*nZ}i#E#K=9Fhxsw1>f{g1t&G}}%UG%z^*4WF
zVP-Tj0je$L0qJ1mVG>~E17YSO1t4FOzeos36>)$F86XkGUQk(5Qe0s?S(B|$n302#
UgNcigi&2P~LyCiqgN1_?0CSHO)c^nh

diff --git a/__pycache__/commands.cpython-37.pyc b/__pycache__/commands.cpython-37.pyc
index 97cea7bd17e75ac7719e2ebe4ec98e7d66f574f3..f2dd31265c8a39d0c0b3a05350ee5ca0f5980033 100644
GIT binary patch
delta 267
zcmca6bxVrZiI<m)0SI#J;}cCL@}@B|Y%G!EVvL$RnahD+C^<hjH!&|Iz91*DGCp_m
zLoNkI%gGPfB_~UB+bRmfWfMz_Q{!_>i!+n6fJPNFfed6UvWBWun!K4?N&#+GaY=pw
zL~$OHVq3Ukbskx7QJB%Cc?Af=i;&dY1KFBVw|J8C^U^ZY3lfWpQ;Uj(fPzIDAi@Ad
numOpv$$dO&0+t}IHHfeU5%!Z0a!5>;;gw`&;$WO?!7B#<0*^-(

delta 285
zcmca5bxn%biI<m)0SGz-;}Z=g@}@DeY%G!EV!SnZGM9tCU~+zLZem_ad_hiPrEh6*
zW^x=*X|WJU10xe74<ies5F-bW=3^9KEV7#XkX>@J47cs%^W2=`1&O7_sbD=>AU#ZA
zJw-N9HA<7Wa!bj>%`Yy=F955}LsDx8SF6P%>m>qnOKBd$=prQL4nVf1R1q7HD$)QE
z1|S0D)>}Nu`FUxX=>>^J#i>QNCQsr?6R-kF+JFc<5aBTSAcw?c1zt&JMh>RQHoS5G
D=Zr=o

diff --git a/commands.py b/commands.py
index 34694d6..575fc16 100644
--- a/commands.py
+++ b/commands.py
@@ -91,7 +91,7 @@ def command_bye():
     sys.exit()
 
 
-def command_playMusic():
+def command_play_music():
     try:
         music_folder = config['DEFAULT']['musicPath']
         music = ("music1", "music2", "music3", "music4")
@@ -103,13 +103,13 @@ def command_playMusic():
         speak(e)
 
 
-def command_pauseMusic():
+def command_pause_music():
     mixer.music.pause()
 
 
-def command_stopMusic():
+def command_stop_music():
     mixer.music.stop()
 
 
-def command_unpauseMusic():
+def command_unpause_music():
     mixer.music.unpause()

From b92bb6514ee8deec42905e491ca46197b77a38a8 Mon Sep 17 00:00:00 2001
From: TallGorilla <24dasemu@gmail.com>
Date: Fri, 8 Oct 2021 18:28:43 +0200
Subject: [PATCH 19/26] created requirements.txt

---
 __pycache__/gui.cpython-37.pyc             | Bin 0 -> 1075 bytes
 __pycache__/tkscrolledframe.cpython-37.pyc | Bin 0 -> 6800 bytes
 requirements.txt                           |  10 ++++++++++
 3 files changed, 10 insertions(+)
 create mode 100644 __pycache__/gui.cpython-37.pyc
 create mode 100644 __pycache__/tkscrolledframe.cpython-37.pyc
 create mode 100644 requirements.txt

diff --git a/__pycache__/gui.cpython-37.pyc b/__pycache__/gui.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..67ff71c2c13cc6b589d4ba4039963f56d1e83420
GIT binary patch
literal 1075
zcmZ`%yKYo55Vd_Dd-weyNkNr%8w!Ldq9}q8LW(F98-!%7w0N(baQD7ewwI779clLq
z5NKCa{E}NLJ^?DmPL?D{Sn|x+GxnT0GrP@Z4Z->~eaF5Lgnrn=Y6W0CgRQ=T;E3Z4
zQ4E@7B=@L?k-!UoiD)1^5pZvgX(+-)Mc_%a#Iy>!2KPP>czA_)W$w{Bk9hS8(T1o`
zn&5B2Zu8olV8rXZ0iF(T@)qc>2wg;vx91o#1&ar~v%I#}c$asV@J0lab-K>+0QGx6
z0V6u<W78bOvdl8U_a(~(T!cAOT1XlUrh=uhjaw}Y#tYcW2f-2igO9!=X-~J}_tSW5
z_(ln-hL4|criOcEJj+F))$moK4`$=xo=~YSr_Ys2G%NJ*be24to||YpWBHh~or+BX
z8_5tv-;*9F<7@Fzn@U{fIV*T<vDjs`^*dZ0Ff^LrOJLvf;4l&>Q%2zF6Vp((sL^<)
zby=8dToxzE=}bc1F5<QdX}f8<O6bw`lbgJ@{R%n{iDeyRpHN>VT$qp*@%vKV!)1wa
zxHiDBxHNId$iiC!@D)1Z3Y50&zHf+5O>oG@A~Us|CB^8(Hpci<7N-EyM*R!32X%Y^
z!kJFWVwBmpT?kv@wDvt*fBEWxM*~-v=rj64KHV~QQMcVuwmn;$kkx+ipX7n#XZ=n-
z`zs8Rf0AU`MfaxLn{4&ret*MMbea?}WwHsew5?NhGli~LX$dyuI5oa3OHErV?==^+
z#S=Bn*!k!z;ip2Iz|F2~+rPqH*IQYIgX@sALt*^Gm;1+*4Bom@q=iWR-PgwlG&;*i
zI?<V+RVh?*!N!>|k!3zB%jq4e-I%+vh_>^R&oZ%Nhfh5O5#a`ja1A%`niu&!*pc6I
F=Rcn4@^%0K

literal 0
HcmV?d00001

diff --git a/__pycache__/tkscrolledframe.cpython-37.pyc b/__pycache__/tkscrolledframe.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d139d4eba81e3528b2308375822007e7613d9ad7
GIT binary patch
literal 6800
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
H7mWV`c5U8`

literal 0
HcmV?d00001

diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..ce28810
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,10 @@
+pygame==2.0.1
+pyttsx3==2.90
+SpeechRecognition==3.8.1
+wikipedia==1.4.0
+PyAudio==0.2.11
+pygame==2.0.1
+pyttsx3==2.90
+SpeechRecognition==3.8.1
+wikipedia==1.4.0
+

From 6f5fece60e227d86e43d20b8aa49bbacdc052b31 Mon Sep 17 00:00:00 2001
From: TallGorilla <24dasemu@gmail.com>
Date: Fri, 8 Oct 2021 18:43:18 +0200
Subject: [PATCH 20/26] fixed everything

---
 Jarvis2.py          | 11 ++++++-----
 Jarvis2_4windows.py |  5 ++---
 actions.py          |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Jarvis2.py b/Jarvis2.py
index b37d890..67e13b6 100755
--- a/Jarvis2.py
+++ b/Jarvis2.py
@@ -13,7 +13,7 @@
 import wikipedia
 
 print("Initializing Jarvis....")
-MASTER = getpass.getuser()
+master = getpass.getuser()
 
 engine = pyttsx3.init("nsss")
 voices = engine.getProperty("voices")
@@ -58,11 +58,11 @@ def print_and_speak(text):
 def wish_me():
     hour = datetime.datetime.now().hour
     if hour < 12:
-        speak("Good Morning" + MASTER)
+        speak("Good Morning" + master)
     elif hour < 18:
-        speak("Good Afternoon" + MASTER)
+        speak("Good Afternoon" + master)
     else:
-        speak("Good Evening" + MASTER)
+        speak("Good Evening" + master)
 
     # speak("Hey I am Jarvis. How may I help you")
 
@@ -148,7 +148,8 @@ def take_command():
             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")
diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index f6b1a5d..5287e1a 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -72,7 +72,7 @@ def main(search_engine, takeCommand, debug):
 
 
 def run():
-    MASTER = config['DEFAULT']['MASTER']
+    master = config['DEFAULT']['MASTER']
 
     search_engine = search_engine_selector(config)
 
@@ -114,7 +114,7 @@ def takeCommand():
             return query
 
     speak(text="Initializing Jarvis....")
-    wishMe(MASTER)
+    wishMe(master)
     main(search_engine, takeCommand, debug)
 
 
@@ -126,4 +126,3 @@ def takeCommand():
     # 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.')
-
diff --git a/actions.py b/actions.py
index ab0464a..1d86ace 100644
--- a/actions.py
+++ b/actions.py
@@ -50,16 +50,16 @@ def speak(text):
     engine.runAndWait()
 
 
-def wishMe(MASTER):
+def wishMe(master):
     hour = datetime.datetime.now().hour
     # print(hour)
     if hour >= 0 and hour < 12:
-        speak("Good Morning" + MASTER)
+        speak("Good Morning" + master)
 
     elif hour >= 12 and hour < 18:
-        speak("Good Afternoon" + MASTER)
+        speak("Good Afternoon" + master)
 
     else:
-        speak("Good Evening" + MASTER)
+        speak("Good Evening" + master)
 
     # speak("Hey I am Jarvis. How may I help you")

From 295e6fa322a5363b425829931c295c2b4ad43df5 Mon Sep 17 00:00:00 2001
From: TallGorilla <24dasemu@gmail.com>
Date: Fri, 8 Oct 2021 18:46:20 +0200
Subject: [PATCH 21/26] fixed everything 2

---
 Jarvis2_4windows.py | 2 +-
 config.ini          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index 5287e1a..436b23f 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -72,7 +72,7 @@ def main(search_engine, takeCommand, debug):
 
 
 def run():
-    master = config['DEFAULT']['MASTER']
+    master = config['DEFAULT']['master']
 
     search_engine = search_engine_selector(config)
 
diff --git a/config.ini b/config.ini
index 4c9f381..a429e48 100644
--- a/config.ini
+++ b/config.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
-MASTER = YourName
+master = YourName
 search_engine = Google
                 #Google/Bing/DuckDuckGo/Youtube
 debug = False

From 3350726592cd4fdd465e5c558c450a964ce694bb Mon Sep 17 00:00:00 2001
From: TallGorilla <24dasemu@gmail.com>
Date: Fri, 8 Oct 2021 18:53:12 +0200
Subject: [PATCH 22/26] fixed everything again

---
 Jarvis2_4windows.py                 |  26 ++++++++++++--------------
 __pycache__/actions.cpython-37.pyc  | Bin 1709 -> 1710 bytes
 __pycache__/commands.cpython-37.pyc | Bin 3418 -> 3420 bytes
 actions.py                          |   2 +-
 commands.py                         |  14 +++++++-------
 config.ini                          |   2 +-
 6 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index 436b23f..845fc80 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -3,7 +3,7 @@
 
 import speech_recognition as sr
 
-from actions import search_engine_selector, speak, wishMe
+from actions import search_engine_selector, speak, wish_me
 from commands import (
     command_bye,
     command_hello,
@@ -24,13 +24,13 @@
     "youtube": "https://www.youtube.com",
     "wikipedia": "https://www.wikipedia.org",
     "amazon": "https://www.amazon.com",
-    "GitHub": "https://www.github.com",
+    "github": "https://www.github.com",
 }
 
 
-def main(search_engine, takeCommand, debug):
+def main(search_engine, take_command, debug):
     while True:
-        query = takeCommand().lower()
+        query = take_command().lower()
 
         # logic for executing commands without arguments
         phrases = {
@@ -59,14 +59,14 @@ def main(search_engine, takeCommand, debug):
                 popular_websites,
                 debug,
                 search_engine,
-                takeCommand
+                take_command
             )
 
         elif "search" in query.lower():
             command_search(query, search_engine)
 
         elif "mail" in query:
-            command_mail(takeCommand)
+            command_mail(take_command)
 
         speak("Next Command! Sir!")
 
@@ -79,11 +79,10 @@ def run():
     debug = config['DEFAULT']['debug']
 
     if debug == "True":
-        def takeCommand():
-            query = input("Command |--> ")
-            return query
+        def take_command():
+            return input("Command |--> ")
     else:
-        def takeCommand():
+        def take_command():
             r = sr.Recognizer()
             with sr.Microphone() as source:
                 print("Listening....")
@@ -109,13 +108,12 @@ def takeCommand():
                     print("Say That Again Please")
                 else:
                     pass
-                query = None
 
-            return query
+            return None
 
     speak(text="Initializing Jarvis....")
-    wishMe(master)
-    main(search_engine, takeCommand, debug)
+    wish_me(master)
+    main(search_engine, take_command, debug)
 
 
 if os.path.isfile('./config.ini'):  # Checks if config.ini exists.
diff --git a/__pycache__/actions.cpython-37.pyc b/__pycache__/actions.cpython-37.pyc
index 86bdcf1e1198310a911be0fdb98f2824d115358a..007000dcf2513c8289a04bd835c4150bc92fb26b 100644
GIT binary patch
delta 61
zcmZ3>yN;LFiI<m)0SHXW5)y4T@*ZPV%1taTNi8ap0}2-L!wCT(>lS-?W^qP*?&L45
FI{~u|4~PH&

delta 60
zcmZ3-yOx*NiI<m)0SJ}}#V1;C<UPi!=<669;u=&W2NW#ghZ6!o)-AU3%;F5+$zNG_
F0sxFp4paaD

diff --git a/__pycache__/commands.cpython-37.pyc b/__pycache__/commands.cpython-37.pyc
index f2dd31265c8a39d0c0b3a05350ee5ca0f5980033..1f8d27a72efc67221f480a747b199760cfdf9f8d 100644
GIT binary patch
delta 46
zcmca5bw`TViI<m)0SHc&B_vvJ<o(IS%3fR&pSzihc{d|FPf22SYJBqM(=7cQ05;<e
AApigX

delta 44
ycmca3bxVrZiI<m)0SI#J;}cCb^8RFEVJj~2-OSCrn~{yXBr!YHdGlG8ehvTx-3)~Q

diff --git a/actions.py b/actions.py
index 1d86ace..965b5cd 100644
--- a/actions.py
+++ b/actions.py
@@ -50,7 +50,7 @@ def speak(text):
     engine.runAndWait()
 
 
-def wishMe(master):
+def wish_me(master):
     hour = datetime.datetime.now().hour
     # print(hour)
     if hour >= 0 and hour < 12:
diff --git a/commands.py b/commands.py
index 575fc16..c930b71 100644
--- a/commands.py
+++ b/commands.py
@@ -24,16 +24,16 @@ def command_wikipedia(debug, query):
 
 
 def command_whatsup():
-    stMsgs = [
+    st_msgs = [
         "Just doing my thing!",
         "I am fine!",
         "Nice!",
         "I am nice and full of energy",
     ]
-    speak(random.choice(stMsgs))
+    speak(random.choice(st_msgs))
 
 
-def command_open(query, popular_websites, debug, search_engine, takeCommand):
+def command_open(query, popular_websites, debug, search_engine, take_command):
     website = query.replace("open", "").strip().lower()
     try:
         open_url(popular_websites[website])
@@ -44,7 +44,7 @@ def command_open(query, popular_websites, debug, search_engine, takeCommand):
             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":
+        if take_command() == "yes":
             search(website, search_engine)
         else:
             pass
@@ -55,13 +55,13 @@ def command_search(query, search_engine):
     search(search_query, search_engine)
 
 
-def command_mail(takeCommand):
+def command_mail(take_command):
     speak("Who is the recipient? ")
-    recipient = takeCommand()
+    recipient = take_command()
 
     try:
         speak("What should I say? ")
-        content = takeCommand()
+        content = take_command()
 
         email = config['EMAIL']
         server = smtplib.SMTP(email['server'], email['port'])
diff --git a/config.ini b/config.ini
index a429e48..3b76e46 100644
--- a/config.ini
+++ b/config.ini
@@ -2,7 +2,7 @@
 master = YourName
 search_engine = Google
                 #Google/Bing/DuckDuckGo/Youtube
-debug = False
+debug = True
         #True/False
 musicPath = 
 [EMAIL]

From a2d5789db91bbf266fccefe120cb8e565b17fc05 Mon Sep 17 00:00:00 2001
From: TallGorilla <24dasemu@gmail.com>
Date: Fri, 8 Oct 2021 18:54:13 +0200
Subject: [PATCH 23/26] Update Jarvis2_4windows.py

---
 Jarvis2_4windows.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index 845fc80..cf5c922 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -109,7 +109,7 @@ def take_command():
                 else:
                     pass
 
-            return None
+            return
 
     speak(text="Initializing Jarvis....")
     wish_me(master)

From 84113c17645da4f963ad0fea26513d6452713376 Mon Sep 17 00:00:00 2001
From: Dasemu <24dasemu@gmail.com>
Date: Fri, 8 Oct 2021 20:12:33 +0200
Subject: [PATCH 24/26] Update Jarvis2.py

Co-authored-by: Christian Clauss <cclauss@me.com>
---
 Jarvis2.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Jarvis2.py b/Jarvis2.py
index 67e13b6..a86f25c 100755
--- a/Jarvis2.py
+++ b/Jarvis2.py
@@ -148,8 +148,9 @@ def take_command():
             server.close()
             speak("Email sent!")
         except Exception:
-            speak("Sorry Sir!")
-            speak("I am unable to send your message at this moment!")
+            speak(
+                "Sorry, Sir!  I am unable to send your message at this moment!"
+            )
 
 elif "nothing" in query or "abort" in query or "stop" in query:
     speak("okay")

From a4bed18e5bfc579261353efa1a960c2818082da1 Mon Sep 17 00:00:00 2001
From: TallGorilla <24dasemu@gmail.com>
Date: Sat, 9 Oct 2021 12:46:14 +0200
Subject: [PATCH 25/26] Update Jarvis2_4windows.py

---
 Jarvis2_4windows.py | 99 ++++++++++++++++++++++-----------------------
 1 file changed, 48 insertions(+), 51 deletions(-)

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index a5403dc..b973dc9 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -37,57 +37,54 @@
 
 def main(search_engine, take_command, debug):
     while True:
-        try:
-            query = take_command()
-
-            # logic for executing commands without arguments
-            phrases = {
-                "what's up": command_whatsup,
-                "nothing": command_nothing,
-                "abort": command_nothing,
-                "stop": command_nothing,
-                "hello": command_hello,
-                "bye": command_bye,
-                "play music": command_play_music,
-                "unpause": command_unpause_music,
-                "pause music": command_pause_music,
-                "stop music": command_stop_music
-            }
-            for phrase, command in phrases.items():
-                if phrase in query:
-                    command()
-
-            # logic for executing commands with arguments
-            if "wikipedia" in query:
-                command_wikipedia(speak, debug, query)
-
-            elif "open" in query:
-                command_open(
-                    query,
-                    popular_websites,
-                    debug,
-                    search_engine,
-                    take_command
-                )
-
-            elif "search" in query:
-                command_search(query, search_engine)
-
-            elif "mail" in query:
-                command_mail(take_command)
-
-            elif "change rate" in query:
-                change_rate(query, take_command)
-
-            elif "change voice" in query.lower():
-                change_voice(query, take_command)
-
-            elif "change volume" in query.lower():
-                change_volume(query, take_command)
-
-            speak("Next Command! Sir!")
-        except Exception:
-            pass
+        query = take_command()
+
+        # logic for executing commands without arguments
+        phrases = {
+            "what's up": command_whatsup,
+            "nothing": command_nothing,
+            "abort": command_nothing,
+            "stop": command_nothing,
+            "hello": command_hello,
+            "bye": command_bye,
+            "play music": command_play_music,
+            "unpause": command_unpause_music,
+            "pause music": command_pause_music,
+            "stop music": command_stop_music
+        }
+        for phrase, command in phrases.items():
+            if phrase in query:
+                command()
+
+        # logic for executing commands with arguments
+        if "wikipedia" in query:
+            command_wikipedia(speak, debug, query)
+
+        elif "open" in query:
+            command_open(
+                query,
+                popular_websites,
+                debug,
+                search_engine,
+                take_command
+            )
+
+        elif "search" in query:
+            command_search(query, search_engine)
+
+        elif "mail" in query:
+            command_mail(take_command)
+
+        elif "change rate" in query:
+            change_rate(query, take_command)
+
+        elif "change voice" in query.lower():
+            change_voice(query, take_command)
+
+        elif "change volume" in query.lower():
+            change_volume(query, take_command)
+
+        speak("Next Command! Sir!")
 
 
 def run():

From c7e24cf9d46fd55ae35f9f9264ece0d3119a169e Mon Sep 17 00:00:00 2001
From: TallGorilla <24dasemu@gmail.com>
Date: Sat, 9 Oct 2021 12:47:49 +0200
Subject: [PATCH 26/26] fixed imports

---
 Jarvis2_4windows.py | 2 +-
 actions.py          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py
index b973dc9..5dfef30 100644
--- a/Jarvis2_4windows.py
+++ b/Jarvis2_4windows.py
@@ -4,9 +4,9 @@
 import speech_recognition as sr
 
 from actions import (
-    change_volume,
     change_rate,
     change_voice,
+    change_volume,
     search_engine_selector,
     speak,
     wish_me,
diff --git a/actions.py b/actions.py
index f33d84a..4dea1e3 100644
--- a/actions.py
+++ b/actions.py
@@ -1,9 +1,9 @@
+import configparser
 import datetime
 import webbrowser
 
 import pyttsx3
 import requests
-import configparser
 
 
 def search_engine_selector(config):