emdee/toxygen
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

default profile bug fix. install.md fix

Browse Source
This commit is contained in:
ingvar1995 2017-07-12 21:36:19 +03:00
parent 1e1772e306
commit 2ff41313f8
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/install.md
View File

@ -17,7 +17,7 @@ Run app using ``toxygen`` command.
2. Install PortAudio: 2. Install PortAudio:
``sudo apt-get install portaudio19-dev`` ``sudo apt-get install portaudio19-dev``
3. For 32-bit Linux install PyQt5: ``sudo apt-get install python3-pyqt5`` 3. For 32-bit Linux install PyQt5: ``sudo apt-get install python3-pyqt5``
4. Install [OpenCV](http://docs.opencv.org/trunk/d7/d9f/tutorial_linux_install.html) 4. Install [OpenCV](http://docs.opencv.org/trunk/d7/d9f/tutorial_linux_install.html) or via ``sudo apt-get install python3-opencv``
5. Install toxygen: 5. Install toxygen:
``sudo pip3 install toxygen`` ``sudo pip3 install toxygen``
6. Run toxygen using ``toxygen`` command. 6. Run toxygen using ``toxygen`` command.
@ -38,10 +38,10 @@ Note: 32-bit Python isn't supported due to bug with videocalls. It is strictly r
2. Install PyQt5: ``pip install pyqt5`` 2. Install PyQt5: ``pip install pyqt5``
3. Install PyAudio: ``pip install pyaudio`` 3. Install PyAudio: ``pip install pyaudio``
4. Install numpy: ``pip install numpy`` 4. Install numpy: ``pip install numpy``
5. Install OpenCV: ``pip install opencv-python`` or via ``sudo apt-get install python3-opencv`` 5. Install OpenCV: ``pip install opencv-python``
6. [Download toxygen](https://github.com/toxygen-project/toxygen/archive/master.zip) 6. [Download toxygen](https://github.com/toxygen-project/toxygen/archive/master.zip)
7. Unpack archive 7. Unpack archive
8. Download latest libtox.dll build, download latest libsodium.a build, put it into \src\libs\ 8. Download latest libtox.dll build, download latest libsodium.a build, put it into \toxygen\libs\
9. Run \toxygen\main.py. 9. Run \toxygen\main.py.
Optional: install toxygen using setup.py: ``python setup.py install`` Optional: install toxygen using setup.py: ``python setup.py install``

5
toxygen/settings.py
View File

@ -57,7 +57,10 @@ class Settings(dict, Singleton):
data = fl.read() data = fl.read()
auto = json.loads(data) auto = json.loads(data)
if 'path' in auto and 'name' in auto: if 'path' in auto and 'name' in auto:
return str(auto['path']), str(auto['name']) path = str(auto['path'])
name = str(auto['name'])
if os.path.isfile(append_slash(path) + name + '.tox'):
return path, name
return '', '' return '', ''
@staticmethod @staticmethod