dasemu/DesktopAssistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Jarvis2_4windows.py

Browse Source
This commit is contained in:
TallGorilla 2021-10-07 16:09:43 +02:00
parent 8acc3da134
commit 0d19e93b3c
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Jarvis2_4windows.py
View File

@ -20,12 +20,8 @@ voices = engine.getProperty("voices")
engine.setProperty("voice", voices[0].id) engine.setProperty("voice", voices[0].id)
<<<<<<< HEAD
# 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(): 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': if config['DEFAULT']['search_engine'] == 'Google':
return "https://www.google.com" return "https://www.google.com"
elif config['DEFAULT']['search_engine'] == 'Bing': elif config['DEFAULT']['search_engine'] == 'Bing':
@ -230,7 +226,6 @@ def main():
speak("Next Command! Sir!") speak("Next Command! Sir!")
<<<<<<< HEAD
if os.path.isfile('./config.ini'): # Checks if config.ini exists. if os.path.isfile('./config.ini'): # Checks if config.ini exists.
config = configparser.ConfigParser() # if exists loads library. config = configparser.ConfigParser() # if exists loads library.
@ -240,11 +235,3 @@ else:
# if it doesn't exist it drops an error message and exits. # if it doesn't exist it drops an error message and exits.
print('You need a config.ini file.') print('You need a config.ini file.')
print('Check the documentation in the Github Repository.') 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