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] 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
 
-engine = pyttsx3.init("sapi5")
-voices = engine.getProperty("voices")
-engine.setProperty("voice", voices[0].id)
+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
+)
+
+mixer.init()
 
 popular_websites = {
         "google": "https://www.google.com",
@@ -27,159 +31,56 @@ popular_websites = {
     }
 
 
-# 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 run():
 
             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.