Fix Installer

installer/helper.py

@@ -1,6 +1,6 @@
 import os
 import sys
-import distutils.spawn
+import shutil
 import time
 import subprocess
 from threading import Thread
@@ -20,7 +20,7 @@
 
 
 def executable_exists(name):
-    binary_path = distutils.spawn.find_executable(name)
+    binary_path = shutil.which(name)
     return binary_path is not None and os.access(binary_path, os.X_OK)
 
 

installer/optional.py

@@ -154,7 +154,24 @@
 }
 
 
-OPTIONAL_REQUIREMENTS = [PortAudio, RequestsSecurity, FFMPEG, ESPEAK, WKHTMLTOPDF, Fasttext, HTOP]
+AKINATOR = {
+    "name": "akinator.py",
+    "pip": ['akinator.py'],
+    "description": "Required for akinator",
+    "instrauction": ""
+}
+
+
+PYDUB = {
+    "name": "pydub",
+    "pip": ['pydub', 'shazamio'],
+    "description": "Required for voice / music recognision",
+    "instrauction": ""
+}
+
+
+
+OPTIONAL_REQUIREMENTS = [PortAudio, RequestsSecurity, FFMPEG, ESPEAK, WKHTMLTOPDF, Fasttext, HTOP, AKINATOR, PYDUB]
 
 
 if not sys.platform == "darwin":

installer/requirements.txt

@@ -1,4 +1,3 @@
-akinator.py
 archey4==4.6.0.post1; sys_platform != 'darwin'
 beautifulsoup4
 climage
@@ -8,7 +7,7 @@ flake8
 forex-python
 geopy
 gitpython
-googletrans==3.1.0a0
+googletrans
 IMDbPY
 matplotlib
 mock
@@ -20,9 +19,8 @@ pluginmanager
 psutil; sys_platform == 'win32'
 pycricbuzz
 pydoc-markdown
-pydub
 pyjokes
-pync==1.6.1; sys_platform == 'darwin'
+pync; sys_platform == 'darwin'
 pypiwin32; sys_platform == 'win32'
 pyreadline; sys_platform == 'win32'
 python-dateutil
@@ -31,7 +29,6 @@ pyttsx3 == 2.71; sys_platform != 'darwin'
 pywin32; sys_platform == 'win32'
 random-word
 requests[security]
-shazamio==0.1.0.1
 speedtest-cli
 sympy
 tabulate
@@ -49,4 +46,4 @@ pdf2image
 python-nmap
 yeelight
 haversine
-FlightRadarAPI
+FlightRadarAPI