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

update docs

This commit is contained in:
emdee 2022-09-27 13:32:53 +00:00
parent 9008bcdb7f
commit cab3b4d9af
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,6 +1,5 @@
*.pyc *.pyc
*.pyo *.pyo
*.ui
toxygen/toxcore toxygen/toxcore
tests/tests tests/tests
tests/libs tests/libs
@ -25,3 +24,5 @@ html
Toxygen.egg-info Toxygen.egg-info
*.tox *.tox
.cache .cache
*.db

17
.travis.yml
View File

@ -12,13 +12,13 @@ before_install:
- sudo apt-get install -y checkinstall build-essential - sudo apt-get install -y checkinstall build-essential
- sudo apt-get install portaudio19-dev - sudo apt-get install portaudio19-dev
- sudo apt-get install libsecret-1-dev - sudo apt-get install libsecret-1-dev
- sudo apt-get install libconfig-dev libvpx-dev check -qq - sudo apt-get install libconfig-dev libvpx-dev check -qq
install: install:
- pip3 install sip - pip install sip
- pip3 install pyaudio - pip install pyqt5
- pip3 install pyqt5==5.14 - pip install pyaudio
- pip3 install opencv-python - pip install opencv-python
- pip install pydenticon
before_script: before_script:
# Opus # Opus
- wget http://downloads.xiph.org/releases/opus/opus-1.0.3.tar.gz - wget http://downloads.xiph.org/releases/opus/opus-1.0.3.tar.gz
@ -38,15 +38,16 @@ before_script:
- sudo ldconfig - sudo ldconfig
- cd .. - cd ..
# Toxcore # Toxcore
- git clone https://github.com/irungentoo/toxcore.git - git clone https://github.com/ingvar1995/toxcore.git --branch=ngc_rebase
- cd toxcore - cd toxcore
- autoreconf -if - mkdir _build && cd _build
- ./configure - cmake ..
- make -j$(nproc) - make -j$(nproc)
- sudo make install - sudo make install
- echo '/usr/local/lib/' | sudo tee -a /etc/ld.so.conf.d/locallib.conf - echo '/usr/local/lib/' | sudo tee -a /etc/ld.so.conf.d/locallib.conf
- sudo ldconfig - sudo ldconfig
- cd .. - cd ..
- cd ..
script: script:
- py.test tests/travis.py - py.test tests/travis.py
- py.test tests/tests.py - py.test tests/tests.py

9
toxygen/smileys/smileys.py
View File

@ -4,11 +4,6 @@ import os
from collections import OrderedDict from collections import OrderedDict
from PyQt5 import QtCore from PyQt5 import QtCore
# LOG=util.log
global LOG
import logging
LOG = logging.getLogger('app.'+__name__)
log = lambda x: LOG.info(x)
class SmileyLoader: class SmileyLoader:
""" """
@ -36,7 +31,7 @@ class SmileyLoader:
self._smileys = json.loads(fl.read()) self._smileys = json.loads(fl.read())
fl.seek(0) fl.seek(0)
tmp = json.loads(fl.read(), object_pairs_hook=OrderedDict) tmp = json.loads(fl.read(), object_pairs_hook=OrderedDict)
LOG.info('Smiley pack {} loaded'.format(pack_name)) print('Smiley pack {} loaded'.format(pack_name))
keys, values, self._list = [], [], [] keys, values, self._list = [], [], []
for key, value in tmp.items(): for key, value in tmp.items():
value = util.join_path(self.get_smileys_path(), value) value = util.join_path(self.get_smileys_path(), value)
@ -47,7 +42,7 @@ class SmileyLoader:
except Exception as ex: except Exception as ex:
self._smileys = {} self._smileys = {}
self._list = [] self._list = []
LOG.error('Smiley pack {} was not loaded. Error: {}'.format(pack_name, str(ex))) print('Smiley pack {} was not loaded. Error: {}'.format(pack_name, ex))
def get_smileys_path(self): def get_smileys_path(self):
return util.join_path(util.get_smileys_directory(), self._curr_pack) if self._curr_pack is not None else None return util.join_path(util.get_smileys_directory(), self._curr_pack) if self._curr_pack is not None else None