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] 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()