diff --git a/.github/workflows/installer_creation.yml b/.github/workflows/installer_creation.yml new file mode 100644 index 0000000..69b58b3 --- /dev/null +++ b/.github/workflows/installer_creation.yml @@ -0,0 +1,50 @@ +name: Installer creation +on: [push] +jobs: + deb-package-creation: + runs-on: ubuntu-latest + steps: + - name: checkout repository content + uses: actions/checkout@v2 + - name: setup python + uses: actions/setup-python@v2 + - name: Delete previous deb file + run: rm bin/jarvis_deb.deb + - name: Update + run: sudo apt-get update + - name: Install portaudio19-dev and python3-pyaudio + run: sudo apt install portaudio19-dev python3-pyaudio + - name: Install espeak + run: sudo apt-get install espeak + - name: Install requirements + run: pip3 install -r ubuntu_requirements.txt + - name: Install pyinstaller + run: pip3 install pyinstaller + - name: Build pyinstaller package + run: pyinstaller Jarvis2.py -w + - name: delete build directory + run: rm -rf build + - name: delete spec file + run: rm Jarvis2.spec + - name: jarvis_deb directory + run: mkdir -p jarvis_deb/usr/local/bin ; mkdir -p jarvis_deb/usr/share/applications ; mkdir jarvis_deb/DEBIAN + - name: Copy debian control file and .desktop file + run: cp -b "installer maker files/control" "jarvis_deb/DEBIAN" ; cp -b "installer maker files/jarvis desktop assistant.desktop" "jarvis_deb/usr/share/applications" + - name: Copy pyinstaller package + run: cp -r "dist/Jarvis2" "jarvis_deb/usr/local/bin" + - name: Build deb package + run: dpkg-deb --build --root-owner-group jarvis_deb + - name: Remove dist and jarvis_deb directories + run: rm -r dist ; rm -r jarvis_deb + - name: Move Jarvis_deb.deb to bin folder + run: cp -b "jarvis_deb.deb" "bin" && rm "jarvis_deb.deb" + - name: Git config + run: git config --global user.name "Installer creation bot" + - name: Git add + run: git add -A + - name: Git commit + run: git commit -m "Installer update" + - name: Git pull + run: git pull + - name: Git push + run: git push diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b6e4761 --- /dev/null +++ b/.gitignore @@ -0,0 +1,129 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +pip-wheel-metadata/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +.python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ diff --git a/Jarvis2.py b/Jarvis2.py index a79865d..9ccb7a9 100755 --- a/Jarvis2.py +++ b/Jarvis2.py @@ -78,6 +78,12 @@ def take_command(): with sr.Microphone() as source: print("Listening....") r.pause_threshold = 0.5 + r.energy_threshold = 300 + """The default value as per speech_recognition documentation. + Increase if application stops responding. and decrease if + assistant doesn't execute any command and just says next + command sir.""" + audio = r.listen(source) print("Recognizing....") diff --git a/Jarvis2_4windows.py b/Jarvis2_4windows.py index 4681632..4b2cda4 100644 --- a/Jarvis2_4windows.py +++ b/Jarvis2_4windows.py @@ -4,27 +4,27 @@ import os # isort: skip import gui # isort: skip import speech_recognition as sr # isort: skip from actions import ( # isort: skip - change_rate, - change_voice, - change_volume, - search_engine_selector, - set_gui_speak, - speak, - wish_me + change_rate, + change_voice, + change_volume, + search_engine_selector, + set_gui_speak, + speak, + wish_me ) from commands import ( # isort: skip - command_bye, - command_hello, - command_mail, - command_nothing, - command_open, - command_pause_music, - command_play_music, - command_search, - command_stop_music, - command_unpause_music, - command_whatsup, - command_wikipedia + command_bye, + command_hello, + command_mail, + command_nothing, + command_open, + command_pause_music, + command_play_music, + command_search, + command_stop_music, + command_unpause_music, + command_whatsup, + command_wikipedia ) popular_websites = { @@ -86,6 +86,7 @@ def main(search_engine, take_command, debug): change_volume(query, take_command) speak("Next Command! Sir!") + gui.set_speak_command(execute_the_command_said_by_user) set_gui_speak(gui.speak) gui.mainloop() @@ -107,6 +108,7 @@ def run(): with sr.Microphone() as source: print("Listening....") r.pause_threshold = 0.5 + r.energy_threshold = int(config['DEFAULT']['energy_threshold']) audio = r.listen(source) query = " " diff --git a/README.md b/README.md index 8cb53b0..5c29b89 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,9 @@ For ubuntu user run python Jarvis2.py ``` Wow! all done and now give some voice command - +# Download + - For Windows users, download this [installer](https://raw.githubusercontent.com/Harsha200105/DesktopAssistant/issue_44/bin/jarvis%20desktop%20assistant%20setup.exe) + - For Ubuntu users, download this [deb package](https://raw.githubusercontent.com/Harsha200105/DesktopAssistant/issue_44/bin/jarvis_deb.deb). # Contributing Guidelines :
- We are Open for Pull Requests - Please contribute and add value to the code diff --git a/__pycache__/Jarvis2.cpython-39.pyc b/__pycache__/Jarvis2.cpython-39.pyc new file mode 100644 index 0000000..5f80a8c Binary files /dev/null and b/__pycache__/Jarvis2.cpython-39.pyc differ diff --git a/bin/jarvis desktop assistant setup.exe b/bin/jarvis desktop assistant setup.exe new file mode 100755 index 0000000..2713cc0 Binary files /dev/null and b/bin/jarvis desktop assistant setup.exe differ diff --git a/bin/jarvis_deb.deb b/bin/jarvis_deb.deb new file mode 100644 index 0000000..2f69086 Binary files /dev/null and b/bin/jarvis_deb.deb differ diff --git a/config.ini b/config.ini index 2765b59..17b21c8 100644 --- a/config.ini +++ b/config.ini @@ -6,6 +6,7 @@ musicpath = voice = Male rate = 150 volume = 100 +energy_threshold = 300 [EMAIL] server = smtp.gmail.com diff --git a/installer maker files/control b/installer maker files/control new file mode 100644 index 0000000..5435226 --- /dev/null +++ b/installer maker files/control @@ -0,0 +1,8 @@ +Package: Jarvis +Version: 1.0.0 +Architecture: all +Maintainer: Technerd Brainiac +Copyright: 2021 Technerd Brainiac +License: MIT +Homepage: https://github.com/Harsha200105/DesktopAssistant +Description: A Virtual Desktop Assistant Written in Python diff --git a/installer maker files/jarvis desktop assistant.desktop b/installer maker files/jarvis desktop assistant.desktop new file mode 100644 index 0000000..7ff57f5 --- /dev/null +++ b/installer maker files/jarvis desktop assistant.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0.0 +Type=Application +Terminal=false +Exec=/usr/local/bin/Jarvis2/Jarvis2 +Name=Jarvis